Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soc: fixes for 6.18, part 3 

These are mainly devicetree fixes for the arm platforms from Rockchips
 NXP, ASpeed and Broadcom, addressing issues with accidental overclocking,
 pinctrl, network and dtc warnings.
 
 There are additional fixes for regressions with the i.MX reset and memory
 controller drivers as well as the Tegra memory controller driver
 
 Minor updates to the MAINTAINERS file, tee documentation and defconfigs
 bring those up to date with recent changes elsewhere.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmkd2xgACgkQmmx57+YA
 GNki7g//aJ2V6J9T4qpg7puhACrmbv4WWBynSiC/hImUcsN7rf93GaYDL9NzKm1q
 6OWdOnvJIlinyyCFob0PxBrtNZprzVzCSL2bRlQx+q5FKrzJoW1aHpOcyuSANMan
 2UXAjbL2YobMj4uZ9SrnkzxO+Cd4gIuJJSH1HPLuGOwR3VSeiXUMhsrVxMB2g1Ch
 r8a1WhuRhnPy1qEKGbUp11CO1gnzG+wSmQOYUf+4mIIioax2OIr39eQlkY6NdOfl
 4OAWfrcbE0C7DaiURTB0xVgHGQKVw7Z1KemIl+uN9uF2YJUHbdZs0wnX/K+o8afm
 wxnSsmcFfXDgthXlvpt4LkU3j94CtYbAIDYL/Xp6O9nuYekDtpPjRmQHpbrt6b0V
 HRNf70ePm2nMX7QwWnC/L/I7AW6OY2m74WPjmlKJ19jKLNHcVa3G9K7uafc2lZbB
 w7/UdMriXaJ2rcZsg2RG/Qo+SRMuB3+uFMQjvM6JwRKV2gaJi4v2JqD7/te9tbGl
 FjbBc5aGVJmRiFuDhjO+Z6NTRlKWQpTljLoYzY1rmyXejAbMfrBnvOYO4avJ/ojE
 xL6UjuTZeyQ5EwkmMUzrI5vzSx0AL29QwSz4Sf7B5pkQYu8YddbMneKWjmAYleWs
 VQ5OsU2x84OIQgt2ORCZJd3p/FIOGnckT1Tl3xkZZ1ttdEvJOwQ=
 =5SRf
 -----END PGP SIGNATURE-----

Merge tag 'soc-fixes-6.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull SoC fixes from Arnd Bergmann:
 "These are mainly devicetree fixes for the arm platforms from Rockchips
  NXP, ASpeed and Broadcom, addressing issues with accidental
  overclocking, pinctrl, network and dtc warnings.

  There are additional fixes for regressions with the i.MX reset and
  memory controller drivers as well as the Tegra memory controller
  driver.

  Minor updates to the MAINTAINERS file, tee documentation and
  defconfigs bring those up to date with recent changes elsewhere"

* tag 'soc-fixes-6.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (29 commits)
  MAINTAINERS: sync omap devicetree maintainers with omap platform
  MAINTAINERS: Update Krzysztof Kozlowski's email
  arm64: dts: rockchip: fix PCIe 3.3V regulator voltage on orangepi-5
  arm64: dts: rockchip: disable HS400 on RK3588 Tiger
  arm64: dts: rockchip: drop reset from rk3576 i2c9 node
  tee: <uapi/linux/tee.h: fix all kernel-doc issues
  arm64: dts: rockchip: Fix USB power enable pin for BTT CB2 and Pi2
  arm64: dts: broadcom: bcm2712: rpi-5: Add ethernet0 alias
  arm64: dts: broadcom: Assign clock rates in eth node for RPi5
  reset: imx8mp-audiomix: Fix bad mask values
  ARM: dts: BCM53573: Fix address of Luxul XAP-1440's Ethernet PHY
  arm64: defconfig: Fix V3D deferred probe timeout
  arm64: dts: rockchip: Fix vccio4-supply on rk3566-pinetab2
  arm64: dts: rockchip: include rk3399-base instead of rk3399 in rk3399-op1
  arm64: dts: imx8mp-kontron: Fix USB OTG role switching
  arm64: dts: imx95: Fix MSI mapping for PCIe endpoint nodes
  arm64: dts: imx8-ss-img: Avoid gpio0_mipi_csi GPIOs being deferred
  arm: imx_v6_v7_defconfig: enable ext4 directly
  memory: tegra210: Fix incorrect client ids
  arm64: dts: rockchip: Fix indentation on rk3399 haikou demo dtso
  ...
This commit is contained in:
Linus Torvalds 2025-11-19 09:36:04 -08:00
parent fdeee1cc7f 7a601324ac
commit 23cb64fb76
26 changed files with 94 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -438,6 +438,7 @@ Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com> Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com> Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com> Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@linaro.org>
Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com> Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>
Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com> Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>
Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org> Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>

8
MAINTAINERS
View File

@ -16206,7 +16206,7 @@ MEMORY CONTROLLER DRIVERS
M: Krzysztof Kozlowski <krzk@kernel.org> M: Krzysztof Kozlowski <krzk@kernel.org>
L: linux-kernel@vger.kernel.org L: linux-kernel@vger.kernel.org
S: Maintained S: Maintained
B: mailto:krzysztof.kozlowski@linaro.org B: mailto:krzk@kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
F: Documentation/devicetree/bindings/memory-controllers/ F: Documentation/devicetree/bindings/memory-controllers/
F: drivers/memory/ F: drivers/memory/
@ -18781,6 +18781,10 @@ S: Maintained
F: arch/arm/*omap*/*clock* F: arch/arm/*omap*/*clock*
OMAP DEVICE TREE SUPPORT OMAP DEVICE TREE SUPPORT
M: Aaro Koskinen <aaro.koskinen@iki.fi>
M: Andreas Kemnade <andreas@kemnade.info>
M: Kevin Hilman <khilman@baylibre.com>
M: Roger Quadros <rogerq@kernel.org>
M: Tony Lindgren <tony@atomide.com> M: Tony Lindgren <tony@atomide.com>
L: linux-omap@vger.kernel.org L: linux-omap@vger.kernel.org
L: devicetree@vger.kernel.org L: devicetree@vger.kernel.org
@ -21179,7 +21183,7 @@ F: Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
F: drivers/i2c/busses/i2c-qcom-cci.c F: drivers/i2c/busses/i2c-qcom-cci.c
QUALCOMM INTERCONNECT BWMON DRIVER QUALCOMM INTERCONNECT BWMON DRIVER
M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> M: Krzysztof Kozlowski <krzk@kernel.org>
L: linux-arm-msm@vger.kernel.org L: linux-arm-msm@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml F: Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml

14
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji-data64.dts
View File

@ -1254,3 +1254,17 @@ &emmc {
max-frequency = <25000000>; max-frequency = <25000000>;
bus-width = <4>; bus-width = <4>;
}; };
/*
* FIXME: rgmii delay is introduced by MAC (configured in u-boot now)
* instead of PCB on fuji board, so the "phy-mode" should be updated to
* "rgmii-[tx|rx]id" when the aspeed-mac driver can handle the delay
* properly.
*/
&mac3 {
status = "okay";
phy-mode = "rgmii";
phy-handle = <&ethphy3>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rgmii4_default>;
};

4
arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dts
View File

@ -55,8 +55,8 @@ &gmac0 {
mdio { mdio {
/delete-node/ switch@1e; /delete-node/ switch@1e;
bcm54210e: ethernet-phy@0 { bcm54210e: ethernet-phy@25 {
reg = <0>; reg = <25>;
}; };
}; };
}; };

4
arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts
View File

@ -259,7 +259,7 @@ &audmux {
pinctrl-0 = <&pinctrl_audmux>; pinctrl-0 = <&pinctrl_audmux>;
status = "okay"; status = "okay";
ssi2 { mux-ssi2 {
fsl,audmux-port = <1>; fsl,audmux-port = <1>;
fsl,port-config = < fsl,port-config = <
(IMX_AUDMUX_V2_PTCR_SYN | (IMX_AUDMUX_V2_PTCR_SYN |
@ -271,7 +271,7 @@ IMX_AUDMUX_V2_PDCR_RXDSEL(2)
>; >;
}; };
aud3 { mux-aud3 {
fsl,audmux-port = <2>; fsl,audmux-port = <2>;
fsl,port-config = < fsl,port-config = <
IMX_AUDMUX_V2_PTCR_SYN IMX_AUDMUX_V2_PTCR_SYN

2
arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea-rmm.dts
View File

@ -136,7 +136,7 @@ touchscreen: touchscreen@38 {
interrupt-parent = <&gpio2>; interrupt-parent = <&gpio2>;
interrupts = <8 IRQ_TYPE_EDGE_FALLING>; interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
report-rate-hz = <6>; report-rate-hz = <60>;
/* settings valid only for Hycon touchscreen */ /* settings valid only for Hycon touchscreen */
touchscreen-size-x = <1280>; touchscreen-size-x = <1280>;
touchscreen-size-y = <800>; touchscreen-size-y = <800>;

10
arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
View File

@ -18,11 +18,21 @@
#include "bcm2712-rpi-5-b-ovl-rp1.dts" #include "bcm2712-rpi-5-b-ovl-rp1.dts"
/ {
aliases {
ethernet0 = &rp1_eth;
};
};
&pcie2 { &pcie2 {
#include "rp1-nexus.dtsi" #include "rp1-nexus.dtsi"
}; };
&rp1_eth { &rp1_eth {
assigned-clocks = <&rp1_clocks RP1_CLK_ETH_TSU>,
<&rp1_clocks RP1_CLK_ETH>;
assigned-clock-rates = <50000000>,
<125000000>;
status = "okay"; status = "okay";
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
phy-handle = <&phy1>; phy-handle = <&phy1>;

2
arch/arm64/boot/dts/freescale/imx8-ss-img.dtsi
View File

@ -67,7 +67,6 @@ irqsteer_csi0: irqsteer@58220000 {
power-domains = <&pd IMX_SC_R_CSI_0>; power-domains = <&pd IMX_SC_R_CSI_0>;
fsl,channel = <0>; fsl,channel = <0>;
fsl,num-irqs = <32>; fsl,num-irqs = <32>;
status = "disabled";
}; };
gpio0_mipi_csi0: gpio@58222000 { gpio0_mipi_csi0: gpio@58222000 {
@ -144,7 +143,6 @@ irqsteer_csi1: irqsteer@58240000 {
power-domains = <&pd IMX_SC_R_CSI_1>; power-domains = <&pd IMX_SC_R_CSI_1>;
fsl,channel = <0>; fsl,channel = <0>;
fsl,num-irqs = <32>; fsl,num-irqs = <32>;
status = "disabled";
}; };
gpio0_mipi_csi1: gpio@58242000 { gpio0_mipi_csi1: gpio@58242000 {

24
arch/arm64/boot/dts/freescale/imx8mp-kontron-bl-osm-s.dts
View File

@ -16,11 +16,20 @@ aliases {
ethernet1 = &eqos; ethernet1 = &eqos;
}; };
extcon_usbc: usbc { connector {
compatible = "linux,extcon-usb-gpio"; compatible = "gpio-usb-b-connector", "usb-b-connector";
id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
label = "Type-C";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb1_id>; pinctrl-0 = <&pinctrl_usb1_id>;
id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; type = "micro";
vbus-supply = <&reg_usb1_vbus>;
port {
usb_dr_connector: endpoint {
remote-endpoint = <&usb3_dwc>;
};
};
}; };
leds { leds {
@ -244,9 +253,15 @@ &usb_dwc3_0 {
hnp-disable; hnp-disable;
srp-disable; srp-disable;
dr_mode = "otg"; dr_mode = "otg";
extcon = <&extcon_usbc>;
usb-role-switch; usb-role-switch;
role-switch-default-mode = "peripheral";
status = "okay"; status = "okay";
port {
usb3_dwc: endpoint {
remote-endpoint = <&usb_dr_connector>;
};
};
}; };
&usb_dwc3_1 { &usb_dwc3_1 {
@ -273,7 +288,6 @@ &usb3_1 {
}; };
&usb3_phy0 { &usb3_phy0 {
vbus-supply = <&reg_usb1_vbus>;
status = "okay"; status = "okay";
}; };

3
arch/arm64/boot/dts/freescale/imx95.dtsi
View File

@ -1886,7 +1886,7 @@ pcie0_ep: pcie-ep@4c300000 {
assigned-clock-rates = <3600000000>, <100000000>, <10000000>; assigned-clock-rates = <3600000000>, <100000000>, <10000000>;
assigned-clock-parents = <0>, <0>, assigned-clock-parents = <0>, <0>,
<&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>; <&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>;
msi-map = <0x0 &its 0x98 0x1>; msi-map = <0x0 &its 0x10 0x1>;
power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>; power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
status = "disabled"; status = "disabled";
}; };
@ -1963,6 +1963,7 @@ pcie1_ep: pcie-ep@4c380000 {
assigned-clock-rates = <3600000000>, <100000000>, <10000000>; assigned-clock-rates = <3600000000>, <100000000>, <10000000>;
assigned-clock-parents = <0>, <0>, assigned-clock-parents = <0>, <0>,
<&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>; <&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>;
msi-map = <0x0 &its 0x98 0x1>;
power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>; power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
status = "disabled"; status = "disabled";
}; };

1
arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
View File

@ -42,6 +42,7 @@ phy: ethernet-phy@0 {
interrupt-parent = <&gpio>; interrupt-parent = <&gpio>;
interrupts = <TEGRA194_MAIN_GPIO(G, 4) IRQ_TYPE_LEVEL_LOW>; interrupts = <TEGRA194_MAIN_GPIO(G, 4) IRQ_TYPE_LEVEL_LOW>;
#phy-cells = <0>; #phy-cells = <0>;
wakeup-source;
}; };
}; };
}; };

1
arch/arm64/boot/dts/rockchip/rk3328.dtsi
View File

@ -598,7 +598,6 @@ tsadc: tsadc@ff250000 {
pinctrl-2 = <&otp_pin>; pinctrl-2 = <&otp_pin>;
resets = <&cru SRST_TSADC>; resets = <&cru SRST_TSADC>;
reset-names = "tsadc-apb"; reset-names = "tsadc-apb";
rockchip,grf = <&grf>;
rockchip,hw-tshut-temp = <100000>; rockchip,hw-tshut-temp = <100000>;
#thermal-sensor-cells = <1>; #thermal-sensor-cells = <1>;
status = "disabled"; status = "disabled";

2
arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi
View File

@ -3,7 +3,7 @@
* Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd
*/ */
#include "rk3399.dtsi" #include "rk3399-base.dtsi"
/ { / {
cluster0_opp: opp-table-0 { cluster0_opp: opp-table-0 {

10
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou-video-demo.dtso
View File

@ -45,11 +45,11 @@ cam_avdd_2v8: regulator-cam-avdd-2v8 {
cam_dovdd_1v8: regulator-cam-dovdd-1v8 { cam_dovdd_1v8: regulator-cam-dovdd-1v8 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
gpio = <&pca9670 3 GPIO_ACTIVE_LOW>; gpio = <&pca9670 3 GPIO_ACTIVE_LOW>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-name = "cam-dovdd-1v8"; regulator-name = "cam-dovdd-1v8";
vin-supply = <&vcc1v8_video>; vin-supply = <&vcc1v8_video>;
}; };
cam_dvdd_1v2: regulator-cam-dvdd-1v2 { cam_dvdd_1v2: regulator-cam-dvdd-1v2 {

6
arch/arm64/boot/dts/rockchip/rk3566-bigtreetech-cb2.dtsi
View File

@ -120,7 +120,7 @@ vcc3v3_pcie: regulator-vcc3v3-pcie {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc3v3_pcie"; regulator-name = "vcc3v3_pcie";
enable-active-high; enable-active-high;
gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pcie_drv>; pinctrl-0 = <&pcie_drv>;
regulator-always-on; regulator-always-on;
@ -187,7 +187,7 @@ vcc5v0_usb: regulator-vcc5v0-usb {
vcc5v0_usb2b: regulator-vcc5v0-usb2b { vcc5v0_usb2b: regulator-vcc5v0-usb2b {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vcc5v0_usb2b_en>; pinctrl-0 = <&vcc5v0_usb2b_en>;
regulator-name = "vcc5v0_usb2b"; regulator-name = "vcc5v0_usb2b";
@ -199,7 +199,7 @@ vcc5v0_usb2b: regulator-vcc5v0-usb2b {
vcc5v0_usb2t: regulator-vcc5v0-usb2t { vcc5v0_usb2t: regulator-vcc5v0-usb2t {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>; gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vcc5v0_usb2t_en>; pinctrl-0 = <&vcc5v0_usb2t_en>;
regulator-name = "vcc5v0_usb2t"; regulator-name = "vcc5v0_usb2t";

2
arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
View File

@ -789,7 +789,7 @@ &pmu_io_domains {
vccio1-supply = <&vccio_acodec>; vccio1-supply = <&vccio_acodec>;
vccio2-supply = <&vcc_1v8>; vccio2-supply = <&vcc_1v8>;
vccio3-supply = <&vccio_sd>; vccio3-supply = <&vccio_sd>;
vccio4-supply = <&vcc_1v8>; vccio4-supply = <&vcca1v8_pmu>;
vccio5-supply = <&vcc_1v8>; vccio5-supply = <&vcc_1v8>;
vccio6-supply = <&vcc1v8_dvp>; vccio6-supply = <&vcc1v8_dvp>;
vccio7-supply = <&vcc_3v3>; vccio7-supply = <&vcc_3v3>;

2
arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
View File

@ -482,6 +482,8 @@ &i2s0_8ch {
}; };
&i2s1_8ch { &i2s1_8ch {
pinctrl-names = "default";
pinctrl-0 = <&i2s1m0_sclktx &i2s1m0_lrcktx &i2s1m0_sdi0 &i2s1m0_sdo0>;
rockchip,trcm-sync-tx-only; rockchip,trcm-sync-tx-only;
status = "okay"; status = "okay";
}; };

14
arch/arm64/boot/dts/rockchip/rk3576.dtsi
View File

@ -276,12 +276,6 @@ opp-2016000000 {
opp-microvolt = <900000 900000 950000>; opp-microvolt = <900000 900000 950000>;
clock-latency-ns = <40000>; clock-latency-ns = <40000>;
}; };
opp-2208000000 {
opp-hz = /bits/ 64 <2208000000>;
opp-microvolt = <950000 950000 950000>;
clock-latency-ns = <40000>;
};
}; };
cluster1_opp_table: opp-table-cluster1 { cluster1_opp_table: opp-table-cluster1 {
@ -348,12 +342,6 @@ opp-2208000000 {
opp-microvolt = <925000 925000 950000>; opp-microvolt = <925000 925000 950000>;
clock-latency-ns = <40000>; clock-latency-ns = <40000>;
}; };
opp-2304000000 {
opp-hz = /bits/ 64 <2304000000>;
opp-microvolt = <950000 950000 950000>;
clock-latency-ns = <40000>;
};
}; };
gpu_opp_table: opp-table-gpu { gpu_opp_table: opp-table-gpu {
@ -2561,8 +2549,6 @@ i2c9: i2c@2ae80000 {
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c9m0_xfer>; pinctrl-0 = <&i2c9m0_xfer>;
resets = <&cru SRST_I2C9>, <&cru SRST_P_I2C9>;
reset-names = "i2c", "apb";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; status = "disabled";

2
arch/arm64/boot/dts/rockchip/rk3588-opp.dtsi
View File

@ -115,7 +115,7 @@ opp-2400000000 {
}; };
}; };
gpu_opp_table: opp-table { gpu_opp_table: opp-table-gpu {
compatible = "operating-points-v2"; compatible = "operating-points-v2";
opp-300000000 { opp-300000000 {

4
arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi
View File

@ -382,14 +382,12 @@ &sdhci {
cap-mmc-highspeed; cap-mmc-highspeed;
mmc-ddr-1_8v; mmc-ddr-1_8v;
mmc-hs200-1_8v; mmc-hs200-1_8v;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
mmc-pwrseq = <&emmc_pwrseq>; mmc-pwrseq = <&emmc_pwrseq>;
no-sdio; no-sdio;
no-sd; no-sd;
non-removable; non-removable;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&emmc_bus8 &emmc_cmd &emmc_clk &emmc_data_strobe>; pinctrl-0 = <&emmc_bus8 &emmc_cmd &emmc_clk>;
vmmc-supply = <&vcc_3v3_s3>; vmmc-supply = <&vcc_3v3_s3>;
vqmmc-supply = <&vcc_1v8_s3>; vqmmc-supply = <&vcc_1v8_s3>;
status = "okay"; status = "okay";

2
arch/arm64/boot/dts/rockchip/rk3588j.dtsi
View File

@ -66,7 +66,7 @@ opp-1608000000 {
}; };
}; };
gpu_opp_table: opp-table { gpu_opp_table: opp-table-gpu {
compatible = "operating-points-v2"; compatible = "operating-points-v2";
opp-300000000 { opp-300000000 {

4
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
View File

@ -14,8 +14,8 @@ vcc3v3_pcie20: regulator-vcc3v3-pcie20 {
gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
regulator-name = "vcc3v3_pcie20"; regulator-name = "vcc3v3_pcie20";
regulator-boot-on; regulator-boot-on;
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <3300000>;
startup-delay-us = <50000>; startup-delay-us = <50000>;
vin-supply = <&vcc5v0_sys>; vin-supply = <&vcc5v0_sys>;
}; };

2
arch/arm64/configs/defconfig
View File

@ -1341,7 +1341,7 @@ CONFIG_COMMON_CLK_RS9_PCIE=y
CONFIG_COMMON_CLK_VC3=y CONFIG_COMMON_CLK_VC3=y
CONFIG_COMMON_CLK_VC5=y CONFIG_COMMON_CLK_VC5=y
CONFIG_COMMON_CLK_BD718XX=m CONFIG_COMMON_CLK_BD718XX=m
CONFIG_CLK_RASPBERRYPI=m CONFIG_CLK_RASPBERRYPI=y
CONFIG_CLK_IMX8MM=y CONFIG_CLK_IMX8MM=y
CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MN=y
CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MP=y

4
drivers/memory/tegra/tegra210.c
View File

@ -1015,7 +1015,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
}, },
}, },
}, { }, {
.id = TEGRA210_MC_SESRD, .id = TEGRA210_MC_SESWR,
.name = "seswr", .name = "seswr",
.swgroup = TEGRA_SWGROUP_SE, .swgroup = TEGRA_SWGROUP_SE,
.regs = { .regs = {
@ -1079,7 +1079,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = {
}, },
}, },
}, { }, {
.id = TEGRA210_MC_ETRR, .id = TEGRA210_MC_ETRW,
.name = "etrw", .name = "etrw",
.swgroup = TEGRA_SWGROUP_ETR, .swgroup = TEGRA_SWGROUP_ETR,
.regs = { .regs = {

4
drivers/reset/reset-imx8mp-audiomix.c
View File

@ -14,8 +14,8 @@
#include <linux/reset-controller.h> #include <linux/reset-controller.h>
#define IMX8MP_AUDIOMIX_EARC_RESET_OFFSET 0x200 #define IMX8MP_AUDIOMIX_EARC_RESET_OFFSET 0x200
#define IMX8MP_AUDIOMIX_EARC_RESET_MASK BIT(1) #define IMX8MP_AUDIOMIX_EARC_RESET_MASK BIT(0)
#define IMX8MP_AUDIOMIX_EARC_PHY_RESET_MASK BIT(2) #define IMX8MP_AUDIOMIX_EARC_PHY_RESET_MASK BIT(1)
#define IMX8MP_AUDIOMIX_DSP_RUNSTALL_OFFSET 0x108 #define IMX8MP_AUDIOMIX_DSP_RUNSTALL_OFFSET 0x108
#define IMX8MP_AUDIOMIX_DSP_RUNSTALL_MASK BIT(5) #define IMX8MP_AUDIOMIX_DSP_RUNSTALL_MASK BIT(5)

23
include/uapi/linux/tee.h
View File

@ -249,8 +249,9 @@ struct tee_ioctl_param {
* @cancel_id: [in] Cancellation id, a unique value to identify this request * @cancel_id: [in] Cancellation id, a unique value to identify this request
* @session: [out] Session id * @session: [out] Session id
* @ret: [out] return value * @ret: [out] return value
* @ret_origin [out] origin of the return value * @ret_origin: [out] origin of the return value
* @num_params [in] number of parameters following this struct * @num_params: [in] number of &struct tee_ioctl_param entries in @params
* @params: array of ioctl parameters
*/ */
struct tee_ioctl_open_session_arg { struct tee_ioctl_open_session_arg {
__u8 uuid[TEE_IOCTL_UUID_LEN]; __u8 uuid[TEE_IOCTL_UUID_LEN];
@ -276,14 +277,14 @@ struct tee_ioctl_open_session_arg {
struct tee_ioctl_buf_data) struct tee_ioctl_buf_data)
/** /**
* struct tee_ioctl_invoke_func_arg - Invokes a function in a Trusted * struct tee_ioctl_invoke_arg - Invokes a function in a Trusted Application
* Application
* @func: [in] Trusted Application function, specific to the TA * @func: [in] Trusted Application function, specific to the TA
* @session: [in] Session id * @session: [in] Session id
* @cancel_id: [in] Cancellation id, a unique value to identify this request * @cancel_id: [in] Cancellation id, a unique value to identify this request
* @ret: [out] return value * @ret: [out] return value
* @ret_origin [out] origin of the return value * @ret_origin: [out] origin of the return value
* @num_params [in] number of parameters following this struct * @num_params: [in] number of parameters following this struct
* @params: array of ioctl parameters
*/ */
struct tee_ioctl_invoke_arg { struct tee_ioctl_invoke_arg {
__u32 func; __u32 func;
@ -338,7 +339,8 @@ struct tee_ioctl_close_session_arg {
/** /**
* struct tee_iocl_supp_recv_arg - Receive a request for a supplicant function * struct tee_iocl_supp_recv_arg - Receive a request for a supplicant function
* @func: [in] supplicant function * @func: [in] supplicant function
* @num_params [in/out] number of parameters following this struct * @num_params: [in/out] number of &struct tee_ioctl_param entries in @params
* @params: array of ioctl parameters
* *
* @num_params is the number of params that tee-supplicant has room to * @num_params is the number of params that tee-supplicant has room to
* receive when input, @num_params is the number of actual params * receive when input, @num_params is the number of actual params
@ -363,7 +365,8 @@ struct tee_iocl_supp_recv_arg {
/** /**
* struct tee_iocl_supp_send_arg - Send a response to a received request * struct tee_iocl_supp_send_arg - Send a response to a received request
* @ret: [out] return value * @ret: [out] return value
* @num_params [in] number of parameters following this struct * @num_params: [in] number of &struct tee_ioctl_param entries in @params
* @params: array of ioctl parameters
*/ */
struct tee_iocl_supp_send_arg { struct tee_iocl_supp_send_arg {
__u32 ret; __u32 ret;
@ -454,11 +457,13 @@ struct tee_ioctl_shm_register_fd_data {
*/ */
/** /**
* struct tee_ioctl_invoke_func_arg - Invokes an object in a Trusted Application * struct tee_ioctl_object_invoke_arg - Invokes an object in a
* Trusted Application
* @id: [in] Object id * @id: [in] Object id
* @op: [in] Object operation, specific to the object * @op: [in] Object operation, specific to the object
* @ret: [out] return value * @ret: [out] return value
* @num_params: [in] number of parameters following this struct * @num_params: [in] number of parameters following this struct
* @params: array of ioctl parameters
*/ */
struct tee_ioctl_object_invoke_arg { struct tee_ioctl_object_invoke_arg {
__u64 id; __u64 id;