History

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 ...

Linus Torvalds committed 11 months ago

Commit 23cb64f2 parents fdeee1c 7a6013226 files · +94 −61Browse files

Unified · Split

26 files
  1. .mailmap +1 −0
  2. MAINTAINERS +6 −2
  3. arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji-data64.dts +14 −0
  4. arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dts +2 −2
  5. arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts +2 −2
  6. arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea-rmm.dts +1 −1
  7. arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts +10 −0
  8. arch/arm64/boot/dts/freescale/imx8-ss-img.dtsi +0 −2
  9. arch/arm64/boot/dts/freescale/imx8mp-kontron-bl-osm-s.dts +19 −5
  10. arch/arm64/boot/dts/freescale/imx95.dtsi +2 −1
  11. arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi +1 −0
  12. arch/arm64/boot/dts/rockchip/rk3328.dtsi +0 −1
  13. arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi +1 −1
  14. arch/arm64/boot/dts/rockchip/rk3399-puma-haikou-video-demo.dtso +5 −5
  15. arch/arm64/boot/dts/rockchip/rk3566-bigtreetech-cb2.dtsi +3 −3
  16. arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi +1 −1
  17. arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts +2 −0
  18. arch/arm64/boot/dts/rockchip/rk3576.dtsi +0 −14
  19. arch/arm64/boot/dts/rockchip/rk3588-opp.dtsi +1 −1
  20. arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi +1 −3
  21. arch/arm64/boot/dts/rockchip/rk3588j.dtsi +1 −1
  22. arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts +2 −2
  23. arch/arm64/configs/defconfig +1 −1
  24. drivers/memory/tegra/tegra210.c +2 −2
  25. drivers/reset/reset-imx8mp-audiomix.c +2 −2
  26. include/uapi/linux/tee.h +14 −9
.mailmap+1−0
@@ -438,6 +438,7 @@ Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org> · 437 unmodified lines
438Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>438Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
439Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>439Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
440Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>440Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
441Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@linaro.org>
441Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>442Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>
442Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>443Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>
443Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>444Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>
MAINTAINERS+6−2
@@ -16206,7 +16206,7 @@ MEMORY CONTROLLER DRIVERS · 16205 unmodified lines
16206M: Krzysztof Kozlowski <krzk@kernel.org>16206M: Krzysztof Kozlowski <krzk@kernel.org>
16207L: linux-kernel@vger.kernel.org16207L: linux-kernel@vger.kernel.org
16208S: Maintained16208S: Maintained
16209B: mailto:krzysztof.kozlowski@linaro.org16209B: mailto:krzk@kernel.org
16210T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git16210T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
16211F: Documentation/devicetree/bindings/memory-controllers/16211F: Documentation/devicetree/bindings/memory-controllers/
16212F: drivers/memory/16212F: drivers/memory/
@@ -18781,6 +18781,10 @@ S: Maintained · 2568 unmodified lines
18781F: arch/arm/*omap*/*clock*18781F: arch/arm/*omap*/*clock*
18782 18782
18783OMAP DEVICE TREE SUPPORT18783OMAP DEVICE TREE SUPPORT
18784M: Aaro Koskinen <aaro.koskinen@iki.fi>
18785M: Andreas Kemnade <andreas@kemnade.info>
18786M: Kevin Hilman <khilman@baylibre.com>
18787M: Roger Quadros <rogerq@kernel.org>
18784M: Tony Lindgren <tony@atomide.com>18788M: Tony Lindgren <tony@atomide.com>
18785L: linux-omap@vger.kernel.org18789L: linux-omap@vger.kernel.org
18786L: devicetree@vger.kernel.org18790L: devicetree@vger.kernel.org
@@ -21179,7 +21183,7 @@ F: Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml · 2392 unmodified lines
21179F: drivers/i2c/busses/i2c-qcom-cci.c21183F: drivers/i2c/busses/i2c-qcom-cci.c
21180 21184
21181QUALCOMM INTERCONNECT BWMON DRIVER21185QUALCOMM INTERCONNECT BWMON DRIVER
21182M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>21186M: Krzysztof Kozlowski <krzk@kernel.org>
21183L: linux-arm-msm@vger.kernel.org21187L: linux-arm-msm@vger.kernel.org
21184S: Maintained21188S: Maintained
21185F: Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml21189F: Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji-data64.dts+14−0
@@ -1254,3 +1254,17 @@ · 1253 unmodified lines
1254 max-frequency = <25000000>;1254 max-frequency = <25000000>;
1255 bus-width = <4>;1255 bus-width = <4>;
1256};1256};
1257
1258/*
1259 * FIXME: rgmii delay is introduced by MAC (configured in u-boot now)
1260 * instead of PCB on fuji board, so the "phy-mode" should be updated to
1261 * "rgmii-[tx|rx]id" when the aspeed-mac driver can handle the delay
1262 * properly.
1263 */
1264&mac3 {
1265 status = "okay";
1266 phy-mode = "rgmii";
1267 phy-handle = <&ethphy3>;
1268 pinctrl-names = "default";
1269 pinctrl-0 = <&pinctrl_rgmii4_default>;
1270};
arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dts+2−2
@@ -55,8 +55,8 @@ · 54 unmodified lines
55 mdio {55 mdio {
56 /delete-node/ switch@1e;56 /delete-node/ switch@1e;
57 57
58 bcm54210e: ethernet-phy@0 {58 bcm54210e: ethernet-phy@25 {
59 reg = <0>;59 reg = <25>;
60 };60 };
61 };61 };
62};62};
arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts+2−2
@@ -259,7 +259,7 @@ · 258 unmodified lines
259 pinctrl-0 = <&pinctrl_audmux>;259 pinctrl-0 = <&pinctrl_audmux>;
260 status = "okay";260 status = "okay";
261 261
262 ssi2 {262 mux-ssi2 {
263 fsl,audmux-port = <1>;263 fsl,audmux-port = <1>;
264 fsl,port-config = <264 fsl,port-config = <
265 (IMX_AUDMUX_V2_PTCR_SYN |265 (IMX_AUDMUX_V2_PTCR_SYN |
@@ -271,7 +271,7 @@ · 5 unmodified lines
271 >;271 >;
272 };272 };
273 273
274 aud3 {274 mux-aud3 {
275 fsl,audmux-port = <2>;275 fsl,audmux-port = <2>;
276 fsl,port-config = <276 fsl,port-config = <
277 IMX_AUDMUX_V2_PTCR_SYN277 IMX_AUDMUX_V2_PTCR_SYN
arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea-rmm.dts+1−1
@@ -136,7 +136,7 @@ · 135 unmodified lines
136 interrupt-parent = <&gpio2>;136 interrupt-parent = <&gpio2>;
137 interrupts = <8 IRQ_TYPE_EDGE_FALLING>;137 interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
138 reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;138 reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
139 report-rate-hz = <6>;139 report-rate-hz = <60>;
140 /* settings valid only for Hycon touchscreen */140 /* settings valid only for Hycon touchscreen */
141 touchscreen-size-x = <1280>;141 touchscreen-size-x = <1280>;
142 touchscreen-size-y = <800>;142 touchscreen-size-y = <800>;
arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts+10−0
@@ -18,11 +18,21 @@ · 17 unmodified lines
18 18
19#include "bcm2712-rpi-5-b-ovl-rp1.dts"19#include "bcm2712-rpi-5-b-ovl-rp1.dts"
20 20
21/ {
22 aliases {
23 ethernet0 = &rp1_eth;
24 };
25};
26
21&pcie2 {27&pcie2 {
22 #include "rp1-nexus.dtsi"28 #include "rp1-nexus.dtsi"
23};29};
24 30
25&rp1_eth {31&rp1_eth {
32 assigned-clocks = <&rp1_clocks RP1_CLK_ETH_TSU>,
33 <&rp1_clocks RP1_CLK_ETH>;
34 assigned-clock-rates = <50000000>,
35 <125000000>;
26 status = "okay";36 status = "okay";
27 phy-mode = "rgmii-id";37 phy-mode = "rgmii-id";
28 phy-handle = <&phy1>;38 phy-handle = <&phy1>;
arch/arm64/boot/dts/freescale/imx8-ss-img.dtsi+0−2
@@ -67,7 +67,6 @@ img_subsys: bus@58000000 { · 66 unmodified lines
67 power-domains = <&pd IMX_SC_R_CSI_0>;67 power-domains = <&pd IMX_SC_R_CSI_0>;
68 fsl,channel = <0>;68 fsl,channel = <0>;
69 fsl,num-irqs = <32>;69 fsl,num-irqs = <32>;
70 status = "disabled";
71 };70 };
72 71
73 gpio0_mipi_csi0: gpio@58222000 {72 gpio0_mipi_csi0: gpio@58222000 {
@@ -144,7 +143,6 @@ img_subsys: bus@58000000 { · 70 unmodified lines
144 power-domains = <&pd IMX_SC_R_CSI_1>;143 power-domains = <&pd IMX_SC_R_CSI_1>;
145 fsl,channel = <0>;144 fsl,channel = <0>;
146 fsl,num-irqs = <32>;145 fsl,num-irqs = <32>;
147 status = "disabled";
148 };146 };
149 147
150 gpio0_mipi_csi1: gpio@58242000 {148 gpio0_mipi_csi1: gpio@58242000 {
arch/arm64/boot/dts/freescale/imx8mp-kontron-bl-osm-s.dts+19−5
@@ -16,11 +16,20 @@ · 15 unmodified lines
16 ethernet1 = &eqos;16 ethernet1 = &eqos;
17 };17 };
18 18
19 extcon_usbc: usbc {19 connector {
20 compatible = "linux,extcon-usb-gpio";20 compatible = "gpio-usb-b-connector", "usb-b-connector";
21 id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
22 label = "Type-C";
21 pinctrl-names = "default";23 pinctrl-names = "default";
22 pinctrl-0 = <&pinctrl_usb1_id>;24 pinctrl-0 = <&pinctrl_usb1_id>;
23 id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;25 type = "micro";
26 vbus-supply = <&reg_usb1_vbus>;
27
28 port {
29 usb_dr_connector: endpoint {
30 remote-endpoint = <&usb3_dwc>;
31 };
32 };
24 };33 };
25 34
26 leds {35 leds {
@@ -244,9 +253,15 @@ · 217 unmodified lines
244 hnp-disable;253 hnp-disable;
245 srp-disable;254 srp-disable;
246 dr_mode = "otg";255 dr_mode = "otg";
247 extcon = <&extcon_usbc>;
248 usb-role-switch;256 usb-role-switch;
257 role-switch-default-mode = "peripheral";
249 status = "okay";258 status = "okay";
259
260 port {
261 usb3_dwc: endpoint {
262 remote-endpoint = <&usb_dr_connector>;
263 };
264 };
250};265};
251 266
252&usb_dwc3_1 {267&usb_dwc3_1 {
@@ -273,7 +288,6 @@ · 20 unmodified lines
273};288};
274 289
275&usb3_phy0 {290&usb3_phy0 {
276 vbus-supply = <&reg_usb1_vbus>;
277 status = "okay";291 status = "okay";
278};292};
279 293
arch/arm64/boot/dts/freescale/imx95.dtsi+2−1
@@ -1886,7 +1886,7 @@ · 1885 unmodified lines
1886 assigned-clock-rates = <3600000000>, <100000000>, <10000000>;1886 assigned-clock-rates = <3600000000>, <100000000>, <10000000>;
1887 assigned-clock-parents = <0>, <0>,1887 assigned-clock-parents = <0>, <0>,
1888 <&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>;1888 <&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>;
1889 msi-map = <0x0 &its 0x98 0x1>;1889 msi-map = <0x0 &its 0x10 0x1>;
1890 power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;1890 power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
1891 status = "disabled";1891 status = "disabled";
1892 };1892 };
@@ -1963,6 +1963,7 @@ · 70 unmodified lines
1963 assigned-clock-rates = <3600000000>, <100000000>, <10000000>;1963 assigned-clock-rates = <3600000000>, <100000000>, <10000000>;
1964 assigned-clock-parents = <0>, <0>,1964 assigned-clock-parents = <0>, <0>,
1965 <&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>;1965 <&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>;
1966 msi-map = <0x0 &its 0x98 0x1>;
1966 power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;1967 power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
1967 status = "disabled";1968 status = "disabled";
1968 };1969 };
arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi+1−0
@@ -42,6 +42,7 @@ · 41 unmodified lines
42 interrupt-parent = <&gpio>;42 interrupt-parent = <&gpio>;
43 interrupts = <TEGRA194_MAIN_GPIO(G, 4) IRQ_TYPE_LEVEL_LOW>;43 interrupts = <TEGRA194_MAIN_GPIO(G, 4) IRQ_TYPE_LEVEL_LOW>;
44 #phy-cells = <0>;44 #phy-cells = <0>;
45 wakeup-source;
45 };46 };
46 };47 };
47 };48 };
arch/arm64/boot/dts/rockchip/rk3328.dtsi+0−1
@@ -598,7 +598,6 @@ · 597 unmodified lines
598 pinctrl-2 = <&otp_pin>;598 pinctrl-2 = <&otp_pin>;
599 resets = <&cru SRST_TSADC>;599 resets = <&cru SRST_TSADC>;
600 reset-names = "tsadc-apb";600 reset-names = "tsadc-apb";
601 rockchip,grf = <&grf>;
602 rockchip,hw-tshut-temp = <100000>;601 rockchip,hw-tshut-temp = <100000>;
603 #thermal-sensor-cells = <1>;602 #thermal-sensor-cells = <1>;
604 status = "disabled";603 status = "disabled";
arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
3 * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd3 * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd
4 */4 */
5 5
6#include "rk3399.dtsi"6#include "rk3399-base.dtsi"
7 7
8/ {8/ {
9 cluster0_opp: opp-table-0 {9 cluster0_opp: opp-table-0 {
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou-video-demo.dtso+5−5
@@ -45,11 +45,11 @@ · 44 unmodified lines
45 45
46 cam_dovdd_1v8: regulator-cam-dovdd-1v8 {46 cam_dovdd_1v8: regulator-cam-dovdd-1v8 {
47 compatible = "regulator-fixed";47 compatible = "regulator-fixed";
48 gpio = <&pca9670 3 GPIO_ACTIVE_LOW>;48 gpio = <&pca9670 3 GPIO_ACTIVE_LOW>;
49 regulator-max-microvolt = <1800000>;49 regulator-max-microvolt = <1800000>;
50 regulator-min-microvolt = <1800000>;50 regulator-min-microvolt = <1800000>;
51 regulator-name = "cam-dovdd-1v8";51 regulator-name = "cam-dovdd-1v8";
52 vin-supply = <&vcc1v8_video>;52 vin-supply = <&vcc1v8_video>;
53 };53 };
54 54
55 cam_dvdd_1v2: regulator-cam-dvdd-1v2 {55 cam_dvdd_1v2: regulator-cam-dvdd-1v2 {
arch/arm64/boot/dts/rockchip/rk3566-bigtreetech-cb2.dtsi+3−3
@@ -120,7 +120,7 @@ · 119 unmodified lines
120 compatible = "regulator-fixed";120 compatible = "regulator-fixed";
121 regulator-name = "vcc3v3_pcie";121 regulator-name = "vcc3v3_pcie";
122 enable-active-high;122 enable-active-high;
123 gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;123 gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>;
124 pinctrl-names = "default";124 pinctrl-names = "default";
125 pinctrl-0 = <&pcie_drv>;125 pinctrl-0 = <&pcie_drv>;
126 regulator-always-on;126 regulator-always-on;
@@ -187,7 +187,7 @@ · 60 unmodified lines
187 vcc5v0_usb2b: regulator-vcc5v0-usb2b {187 vcc5v0_usb2b: regulator-vcc5v0-usb2b {
188 compatible = "regulator-fixed";188 compatible = "regulator-fixed";
189 enable-active-high;189 enable-active-high;
190 gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;190 gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
191 pinctrl-names = "default";191 pinctrl-names = "default";
192 pinctrl-0 = <&vcc5v0_usb2b_en>;192 pinctrl-0 = <&vcc5v0_usb2b_en>;
193 regulator-name = "vcc5v0_usb2b";193 regulator-name = "vcc5v0_usb2b";
@@ -199,7 +199,7 @@ · 5 unmodified lines
199 vcc5v0_usb2t: regulator-vcc5v0-usb2t {199 vcc5v0_usb2t: regulator-vcc5v0-usb2t {
200 compatible = "regulator-fixed";200 compatible = "regulator-fixed";
201 enable-active-high;201 enable-active-high;
202 gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;202 gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
203 pinctrl-names = "default";203 pinctrl-names = "default";
204 pinctrl-0 = <&vcc5v0_usb2t_en>;204 pinctrl-0 = <&vcc5v0_usb2t_en>;
205 regulator-name = "vcc5v0_usb2t";205 regulator-name = "vcc5v0_usb2t";
arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi+1−1
@@ -789,7 +789,7 @@ · 788 unmodified lines
789 vccio1-supply = <&vccio_acodec>;789 vccio1-supply = <&vccio_acodec>;
790 vccio2-supply = <&vcc_1v8>;790 vccio2-supply = <&vcc_1v8>;
791 vccio3-supply = <&vccio_sd>;791 vccio3-supply = <&vccio_sd>;
792 vccio4-supply = <&vcc_1v8>;792 vccio4-supply = <&vcca1v8_pmu>;
793 vccio5-supply = <&vcc_1v8>;793 vccio5-supply = <&vcc_1v8>;
794 vccio6-supply = <&vcc1v8_dvp>;794 vccio6-supply = <&vcc1v8_dvp>;
795 vccio7-supply = <&vcc_3v3>;795 vccio7-supply = <&vcc_3v3>;
arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts+2−0
@@ -482,6 +482,8 @@ · 481 unmodified lines
482};482};
483 483
484&i2s1_8ch {484&i2s1_8ch {
485 pinctrl-names = "default";
486 pinctrl-0 = <&i2s1m0_sclktx &i2s1m0_lrcktx &i2s1m0_sdi0 &i2s1m0_sdo0>;
485 rockchip,trcm-sync-tx-only;487 rockchip,trcm-sync-tx-only;
486 status = "okay";488 status = "okay";
487};489};
arch/arm64/boot/dts/rockchip/rk3576.dtsi+0−14
@@ -276,12 +276,6 @@ · 275 unmodified lines
276 opp-microvolt = <900000 900000 950000>;276 opp-microvolt = <900000 900000 950000>;
277 clock-latency-ns = <40000>;277 clock-latency-ns = <40000>;
278 };278 };
279
280 opp-2208000000 {
281 opp-hz = /bits/ 64 <2208000000>;
282 opp-microvolt = <950000 950000 950000>;
283 clock-latency-ns = <40000>;
284 };
285 };279 };
286 280
287 cluster1_opp_table: opp-table-cluster1 {281 cluster1_opp_table: opp-table-cluster1 {
@@ -348,12 +342,6 @@ · 60 unmodified lines
348 opp-microvolt = <925000 925000 950000>;342 opp-microvolt = <925000 925000 950000>;
349 clock-latency-ns = <40000>;343 clock-latency-ns = <40000>;
350 };344 };
351
352 opp-2304000000 {
353 opp-hz = /bits/ 64 <2304000000>;
354 opp-microvolt = <950000 950000 950000>;
355 clock-latency-ns = <40000>;
356 };
357 };345 };
358 346
359 gpu_opp_table: opp-table-gpu {347 gpu_opp_table: opp-table-gpu {
@@ -2561,8 +2549,6 @@ · 2201 unmodified lines
2561 interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;2549 interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
2562 pinctrl-names = "default";2550 pinctrl-names = "default";
2563 pinctrl-0 = <&i2c9m0_xfer>;2551 pinctrl-0 = <&i2c9m0_xfer>;
2564 resets = <&cru SRST_I2C9>, <&cru SRST_P_I2C9>;
2565 reset-names = "i2c", "apb";
2566 #address-cells = <1>;2552 #address-cells = <1>;
2567 #size-cells = <0>;2553 #size-cells = <0>;
2568 status = "disabled";2554 status = "disabled";
arch/arm64/boot/dts/rockchip/rk3588-opp.dtsi+1−1
@@ -115,7 +115,7 @@ · 114 unmodified lines
115 };115 };
116 };116 };
117 117
118 gpu_opp_table: opp-table {118 gpu_opp_table: opp-table-gpu {
119 compatible = "operating-points-v2";119 compatible = "operating-points-v2";
120 120
121 opp-300000000 {121 opp-300000000 {
arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi+1−3
@@ -382,14 +382,12 @@ · 381 unmodified lines
382 cap-mmc-highspeed;382 cap-mmc-highspeed;
383 mmc-ddr-1_8v;383 mmc-ddr-1_8v;
384 mmc-hs200-1_8v;384 mmc-hs200-1_8v;
385 mmc-hs400-1_8v;
386 mmc-hs400-enhanced-strobe;
387 mmc-pwrseq = <&emmc_pwrseq>;385 mmc-pwrseq = <&emmc_pwrseq>;
388 no-sdio;386 no-sdio;
389 no-sd;387 no-sd;
390 non-removable;388 non-removable;
391 pinctrl-names = "default";389 pinctrl-names = "default";
392 pinctrl-0 = <&emmc_bus8 &emmc_cmd &emmc_clk &emmc_data_strobe>;390 pinctrl-0 = <&emmc_bus8 &emmc_cmd &emmc_clk>;
393 vmmc-supply = <&vcc_3v3_s3>;391 vmmc-supply = <&vcc_3v3_s3>;
394 vqmmc-supply = <&vcc_1v8_s3>;392 vqmmc-supply = <&vcc_1v8_s3>;
395 status = "okay";393 status = "okay";
arch/arm64/boot/dts/rockchip/rk3588j.dtsi+1−1
@@ -66,7 +66,7 @@ · 65 unmodified lines
66 };66 };
67 };67 };
68 68
69 gpu_opp_table: opp-table {69 gpu_opp_table: opp-table-gpu {
70 compatible = "operating-points-v2";70 compatible = "operating-points-v2";
71 71
72 opp-300000000 {72 opp-300000000 {
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts+2−2
@@ -14,8 +14,8 @@ · 13 unmodified lines
14 gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;14 gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
15 regulator-name = "vcc3v3_pcie20";15 regulator-name = "vcc3v3_pcie20";
16 regulator-boot-on;16 regulator-boot-on;
17 regulator-min-microvolt = <1800000>;17 regulator-min-microvolt = <3300000>;
18 regulator-max-microvolt = <1800000>;18 regulator-max-microvolt = <3300000>;
19 startup-delay-us = <50000>;19 startup-delay-us = <50000>;
20 vin-supply = <&vcc5v0_sys>;20 vin-supply = <&vcc5v0_sys>;
21 };21 };
arch/arm64/configs/defconfig+1−1
@@ -1341,7 +1341,7 @@ CONFIG_COMMON_CLK_RS9_PCIE=y · 1340 unmodified lines
1341CONFIG_COMMON_CLK_VC3=y1341CONFIG_COMMON_CLK_VC3=y
1342CONFIG_COMMON_CLK_VC5=y1342CONFIG_COMMON_CLK_VC5=y
1343CONFIG_COMMON_CLK_BD718XX=m1343CONFIG_COMMON_CLK_BD718XX=m
1344CONFIG_CLK_RASPBERRYPI=m1344CONFIG_CLK_RASPBERRYPI=y
1345CONFIG_CLK_IMX8MM=y1345CONFIG_CLK_IMX8MM=y
1346CONFIG_CLK_IMX8MN=y1346CONFIG_CLK_IMX8MN=y
1347CONFIG_CLK_IMX8MP=y1347CONFIG_CLK_IMX8MP=y
drivers/memory/tegra/tegra210.c+2−2
@@ -1015,7 +1015,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { · 1014 unmodified lines
1015 },1015 },
1016 },1016 },
1017 }, {1017 }, {
1018 .id = TEGRA210_MC_SESRD,1018 .id = TEGRA210_MC_SESWR,
1019 .name = "seswr",1019 .name = "seswr",
1020 .swgroup = TEGRA_SWGROUP_SE,1020 .swgroup = TEGRA_SWGROUP_SE,
1021 .regs = {1021 .regs = {
@@ -1079,7 +1079,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { · 57 unmodified lines
1079 },1079 },
1080 },1080 },
1081 }, {1081 }, {
1082 .id = TEGRA210_MC_ETRR,1082 .id = TEGRA210_MC_ETRW,
1083 .name = "etrw",1083 .name = "etrw",
1084 .swgroup = TEGRA_SWGROUP_ETR,1084 .swgroup = TEGRA_SWGROUP_ETR,
1085 .regs = {1085 .regs = {
drivers/reset/reset-imx8mp-audiomix.c+2−2
@@ -14,8 +14,8 @@ · 13 unmodified lines
14#include <linux/reset-controller.h>14#include <linux/reset-controller.h>
15 15
16#define IMX8MP_AUDIOMIX_EARC_RESET_OFFSET 0x20016#define IMX8MP_AUDIOMIX_EARC_RESET_OFFSET 0x200
17#define IMX8MP_AUDIOMIX_EARC_RESET_MASK BIT(1)17#define IMX8MP_AUDIOMIX_EARC_RESET_MASK BIT(0)
18#define IMX8MP_AUDIOMIX_EARC_PHY_RESET_MASK BIT(2)18#define IMX8MP_AUDIOMIX_EARC_PHY_RESET_MASK BIT(1)
19 19
20#define IMX8MP_AUDIOMIX_DSP_RUNSTALL_OFFSET 0x10820#define IMX8MP_AUDIOMIX_DSP_RUNSTALL_OFFSET 0x108
21#define IMX8MP_AUDIOMIX_DSP_RUNSTALL_MASK BIT(5)21#define IMX8MP_AUDIOMIX_DSP_RUNSTALL_MASK BIT(5)
include/uapi/linux/tee.h+14−9
@@ -249,8 +249,9 @@ struct tee_ioctl_param { · 248 unmodified lines
249 * @cancel_id: [in] Cancellation id, a unique value to identify this request249 * @cancel_id: [in] Cancellation id, a unique value to identify this request
250 * @session: [out] Session id250 * @session: [out] Session id
251 * @ret: [out] return value251 * @ret: [out] return value
252 * @ret_origin [out] origin of the return value252 * @ret_origin: [out] origin of the return value
253 * @num_params [in] number of parameters following this struct253 * @num_params: [in] number of &struct tee_ioctl_param entries in @params
254 * @params: array of ioctl parameters
254 */255 */
255struct tee_ioctl_open_session_arg {256struct tee_ioctl_open_session_arg {
256 __u8 uuid[TEE_IOCTL_UUID_LEN];257 __u8 uuid[TEE_IOCTL_UUID_LEN];
@@ -276,14 +277,14 @@ struct tee_ioctl_open_session_arg { · 19 unmodified lines
276 struct tee_ioctl_buf_data)277 struct tee_ioctl_buf_data)
277 278
278/**279/**
279 * struct tee_ioctl_invoke_func_arg - Invokes a function in a Trusted280 * struct tee_ioctl_invoke_arg - Invokes a function in a Trusted Application
280 * Application
281 * @func: [in] Trusted Application function, specific to the TA281 * @func: [in] Trusted Application function, specific to the TA
282 * @session: [in] Session id282 * @session: [in] Session id
283 * @cancel_id: [in] Cancellation id, a unique value to identify this request283 * @cancel_id: [in] Cancellation id, a unique value to identify this request
284 * @ret: [out] return value284 * @ret: [out] return value
285 * @ret_origin [out] origin of the return value285 * @ret_origin: [out] origin of the return value
286 * @num_params [in] number of parameters following this struct286 * @num_params: [in] number of parameters following this struct
287 * @params: array of ioctl parameters
287 */288 */
288struct tee_ioctl_invoke_arg {289struct tee_ioctl_invoke_arg {
289 __u32 func;290 __u32 func;
@@ -338,7 +339,8 @@ struct tee_ioctl_close_session_arg { · 48 unmodified lines
338/**339/**
339 * struct tee_iocl_supp_recv_arg - Receive a request for a supplicant function340 * struct tee_iocl_supp_recv_arg - Receive a request for a supplicant function
340 * @func: [in] supplicant function341 * @func: [in] supplicant function
341 * @num_params [in/out] number of parameters following this struct342 * @num_params: [in/out] number of &struct tee_ioctl_param entries in @params
343 * @params: array of ioctl parameters
342 *344 *
343 * @num_params is the number of params that tee-supplicant has room to345 * @num_params is the number of params that tee-supplicant has room to
344 * receive when input, @num_params is the number of actual params346 * receive when input, @num_params is the number of actual params
@@ -363,7 +365,8 @@ struct tee_iocl_supp_recv_arg { · 18 unmodified lines
363/**365/**
364 * struct tee_iocl_supp_send_arg - Send a response to a received request366 * struct tee_iocl_supp_send_arg - Send a response to a received request
365 * @ret: [out] return value367 * @ret: [out] return value
366 * @num_params [in] number of parameters following this struct368 * @num_params: [in] number of &struct tee_ioctl_param entries in @params
369 * @params: array of ioctl parameters
367 */370 */
368struct tee_iocl_supp_send_arg {371struct tee_iocl_supp_send_arg {
369 __u32 ret;372 __u32 ret;
@@ -454,11 +457,13 @@ struct tee_ioctl_shm_register_fd_data { · 84 unmodified lines
454 */457 */
455 458
456/**459/**
457 * struct tee_ioctl_invoke_func_arg - Invokes an object in a Trusted Application460 * struct tee_ioctl_object_invoke_arg - Invokes an object in a
461 * Trusted Application
458 * @id: [in] Object id462 * @id: [in] Object id
459 * @op: [in] Object operation, specific to the object463 * @op: [in] Object operation, specific to the object
460 * @ret: [out] return value464 * @ret: [out] return value
461 * @num_params: [in] number of parameters following this struct465 * @num_params: [in] number of parameters following this struct
466 * @params: array of ioctl parameters
462 */467 */
463struct tee_ioctl_object_invoke_arg {468struct tee_ioctl_object_invoke_arg {
464 __u64 id;469 __u64 id;