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
438438 Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
439439 Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
440440 Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
441+Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@linaro.org>
441442 Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>
442443 Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>
443444 Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>
MAINTAINERS+6−2
@@ -16206,7 +16206,7 @@ MEMORY CONTROLLER DRIVERS · 16205 unmodified lines
1620616206 M: Krzysztof Kozlowski <krzk@kernel.org>
1620716207 L: linux-kernel@vger.kernel.org
1620816208 S: Maintained
16209−B: mailto:krzysztof.kozlowski@linaro.org
16209+B: mailto:krzk@kernel.org
1621016210 T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git
1621116211 F: Documentation/devicetree/bindings/memory-controllers/
1621216212 F: drivers/memory/
@@ -18781,6 +18781,10 @@ S: Maintained · 2568 unmodified lines
1878118781 F: arch/arm/*omap*/*clock*
1878218782
1878318783 OMAP DEVICE TREE SUPPORT
18784+M: Aaro Koskinen <aaro.koskinen@iki.fi>
18785+M: Andreas Kemnade <andreas@kemnade.info>
18786+M: Kevin Hilman <khilman@baylibre.com>
18787+M: Roger Quadros <rogerq@kernel.org>
1878418788 M: Tony Lindgren <tony@atomide.com>
1878518789 L: linux-omap@vger.kernel.org
1878618790 L: devicetree@vger.kernel.org
@@ -21179,7 +21183,7 @@ F: Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml · 2392 unmodified lines
2117921183 F: drivers/i2c/busses/i2c-qcom-cci.c
2118021184
2118121185 QUALCOMM INTERCONNECT BWMON DRIVER
21182−M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
21186+M: Krzysztof Kozlowski <krzk@kernel.org>
2118321187 L: linux-arm-msm@vger.kernel.org
2118421188 S: Maintained
2118521189 F: 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
12541254 max-frequency = <25000000>;
12551255 bus-width = <4>;
12561256 };
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
5555 mdio {
5656 /delete-node/ switch@1e;
5757
58− bcm54210e: ethernet-phy@0 {
59− reg = <0>;
58+ bcm54210e: ethernet-phy@25 {
59+ reg = <25>;
6060 };
6161 };
6262 };
arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts+2−2
@@ -259,7 +259,7 @@ · 258 unmodified lines
259259 pinctrl-0 = <&pinctrl_audmux>;
260260 status = "okay";
261261
262− ssi2 {
262+ mux-ssi2 {
263263 fsl,audmux-port = <1>;
264264 fsl,port-config = <
265265 (IMX_AUDMUX_V2_PTCR_SYN |
@@ -271,7 +271,7 @@ · 5 unmodified lines
271271 >;
272272 };
273273
274− aud3 {
274+ mux-aud3 {
275275 fsl,audmux-port = <2>;
276276 fsl,port-config = <
277277 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
136136 interrupt-parent = <&gpio2>;
137137 interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
138138 reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
139− report-rate-hz = <6>;
139+ report-rate-hz = <60>;
140140 /* settings valid only for Hycon touchscreen */
141141 touchscreen-size-x = <1280>;
142142 touchscreen-size-y = <800>;
arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts+10−0
@@ -18,11 +18,21 @@ · 17 unmodified lines
1818
1919 #include "bcm2712-rpi-5-b-ovl-rp1.dts"
2020
21+/ {
22+ aliases {
23+ ethernet0 = &rp1_eth;
24+ };
25+};
26+
2127 &pcie2 {
2228 #include "rp1-nexus.dtsi"
2329 };
2430
2531 &rp1_eth {
32+ assigned-clocks = <&rp1_clocks RP1_CLK_ETH_TSU>,
33+ <&rp1_clocks RP1_CLK_ETH>;
34+ assigned-clock-rates = <50000000>,
35+ <125000000>;
2636 status = "okay";
2737 phy-mode = "rgmii-id";
2838 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
6767 power-domains = <&pd IMX_SC_R_CSI_0>;
6868 fsl,channel = <0>;
6969 fsl,num-irqs = <32>;
70− status = "disabled";
7170 };
7271
7372 gpio0_mipi_csi0: gpio@58222000 {
@@ -144,7 +143,6 @@ img_subsys: bus@58000000 { · 70 unmodified lines
144143 power-domains = <&pd IMX_SC_R_CSI_1>;
145144 fsl,channel = <0>;
146145 fsl,num-irqs = <32>;
147− status = "disabled";
148146 };
149147
150148 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
1616 ethernet1 = &eqos;
1717 };
1818
19− extcon_usbc: usbc {
20− compatible = "linux,extcon-usb-gpio";
19+ connector {
20+ compatible = "gpio-usb-b-connector", "usb-b-connector";
21+ id-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
22+ label = "Type-C";
2123 pinctrl-names = "default";
2224 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+ };
2433 };
2534
2635 leds {
@@ -244,9 +253,15 @@ · 217 unmodified lines
244253 hnp-disable;
245254 srp-disable;
246255 dr_mode = "otg";
247− extcon = <&extcon_usbc>;
248256 usb-role-switch;
257+ role-switch-default-mode = "peripheral";
249258 status = "okay";
259+
260+ port {
261+ usb3_dwc: endpoint {
262+ remote-endpoint = <&usb_dr_connector>;
263+ };
264+ };
250265 };
251266
252267 &usb_dwc3_1 {
@@ -273,7 +288,6 @@ · 20 unmodified lines
273288 };
274289
275290 &usb3_phy0 {
276− vbus-supply = <&reg_usb1_vbus>;
277291 status = "okay";
278292 };
279293
arch/arm64/boot/dts/freescale/imx95.dtsi+2−1
@@ -1886,7 +1886,7 @@ · 1885 unmodified lines
18861886 assigned-clock-rates = <3600000000>, <100000000>, <10000000>;
18871887 assigned-clock-parents = <0>, <0>,
18881888 <&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>;
1889− msi-map = <0x0 &its 0x98 0x1>;
1889+ msi-map = <0x0 &its 0x10 0x1>;
18901890 power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
18911891 status = "disabled";
18921892 };
@@ -1963,6 +1963,7 @@ · 70 unmodified lines
19631963 assigned-clock-rates = <3600000000>, <100000000>, <10000000>;
19641964 assigned-clock-parents = <0>, <0>,
19651965 <&scmi_clk IMX95_CLK_SYSPLL1_PFD1_DIV2>;
1966+ msi-map = <0x0 &its 0x98 0x1>;
19661967 power-domains = <&scmi_devpd IMX95_PD_HSIO_TOP>;
19671968 status = "disabled";
19681969 };
arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi+1−0
@@ -42,6 +42,7 @@ · 41 unmodified lines
4242 interrupt-parent = <&gpio>;
4343 interrupts = <TEGRA194_MAIN_GPIO(G, 4) IRQ_TYPE_LEVEL_LOW>;
4444 #phy-cells = <0>;
45+ wakeup-source;
4546 };
4647 };
4748 };
arch/arm64/boot/dts/rockchip/rk3328.dtsi+0−1
@@ -598,7 +598,6 @@ · 597 unmodified lines
598598 pinctrl-2 = <&otp_pin>;
599599 resets = <&cru SRST_TSADC>;
600600 reset-names = "tsadc-apb";
601− rockchip,grf = <&grf>;
602601 rockchip,hw-tshut-temp = <100000>;
603602 #thermal-sensor-cells = <1>;
604603 status = "disabled";
arch/arm64/boot/dts/rockchip/rk3399-op1.dtsi+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 * Copyright (c) 2016-2017 Fuzhou Rockchip Electronics Co., Ltd
44 */
55
6−#include "rk3399.dtsi"
6+#include "rk3399-base.dtsi"
77
88 / {
99 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
4545
4646 cam_dovdd_1v8: regulator-cam-dovdd-1v8 {
4747 compatible = "regulator-fixed";
48− gpio = <&pca9670 3 GPIO_ACTIVE_LOW>;
49− regulator-max-microvolt = <1800000>;
50− regulator-min-microvolt = <1800000>;
51− regulator-name = "cam-dovdd-1v8";
52− vin-supply = <&vcc1v8_video>;
48+ gpio = <&pca9670 3 GPIO_ACTIVE_LOW>;
49+ regulator-max-microvolt = <1800000>;
50+ regulator-min-microvolt = <1800000>;
51+ regulator-name = "cam-dovdd-1v8";
52+ vin-supply = <&vcc1v8_video>;
5353 };
5454
5555 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
120120 compatible = "regulator-fixed";
121121 regulator-name = "vcc3v3_pcie";
122122 enable-active-high;
123− gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
123+ gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>;
124124 pinctrl-names = "default";
125125 pinctrl-0 = <&pcie_drv>;
126126 regulator-always-on;
@@ -187,7 +187,7 @@ · 60 unmodified lines
187187 vcc5v0_usb2b: regulator-vcc5v0-usb2b {
188188 compatible = "regulator-fixed";
189189 enable-active-high;
190− gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
190+ gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
191191 pinctrl-names = "default";
192192 pinctrl-0 = <&vcc5v0_usb2b_en>;
193193 regulator-name = "vcc5v0_usb2b";
@@ -199,7 +199,7 @@ · 5 unmodified lines
199199 vcc5v0_usb2t: regulator-vcc5v0-usb2t {
200200 compatible = "regulator-fixed";
201201 enable-active-high;
202− gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
202+ gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
203203 pinctrl-names = "default";
204204 pinctrl-0 = <&vcc5v0_usb2t_en>;
205205 regulator-name = "vcc5v0_usb2t";
arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi+1−1
@@ -789,7 +789,7 @@ · 788 unmodified lines
789789 vccio1-supply = <&vccio_acodec>;
790790 vccio2-supply = <&vcc_1v8>;
791791 vccio3-supply = <&vccio_sd>;
792− vccio4-supply = <&vcc_1v8>;
792+ vccio4-supply = <&vcca1v8_pmu>;
793793 vccio5-supply = <&vcc_1v8>;
794794 vccio6-supply = <&vcc1v8_dvp>;
795795 vccio7-supply = <&vcc_3v3>;
arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts+2−0
@@ -482,6 +482,8 @@ · 481 unmodified lines
482482 };
483483
484484 &i2s1_8ch {
485+ pinctrl-names = "default";
486+ pinctrl-0 = <&i2s1m0_sclktx &i2s1m0_lrcktx &i2s1m0_sdi0 &i2s1m0_sdo0>;
485487 rockchip,trcm-sync-tx-only;
486488 status = "okay";
487489 };
arch/arm64/boot/dts/rockchip/rk3576.dtsi+0−14
@@ -276,12 +276,6 @@ · 275 unmodified lines
276276 opp-microvolt = <900000 900000 950000>;
277277 clock-latency-ns = <40000>;
278278 };
279−
280− opp-2208000000 {
281− opp-hz = /bits/ 64 <2208000000>;
282− opp-microvolt = <950000 950000 950000>;
283− clock-latency-ns = <40000>;
284− };
285279 };
286280
287281 cluster1_opp_table: opp-table-cluster1 {
@@ -348,12 +342,6 @@ · 60 unmodified lines
348342 opp-microvolt = <925000 925000 950000>;
349343 clock-latency-ns = <40000>;
350344 };
351−
352− opp-2304000000 {
353− opp-hz = /bits/ 64 <2304000000>;
354− opp-microvolt = <950000 950000 950000>;
355− clock-latency-ns = <40000>;
356− };
357345 };
358346
359347 gpu_opp_table: opp-table-gpu {
@@ -2561,8 +2549,6 @@ · 2201 unmodified lines
25612549 interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
25622550 pinctrl-names = "default";
25632551 pinctrl-0 = <&i2c9m0_xfer>;
2564− resets = <&cru SRST_I2C9>, <&cru SRST_P_I2C9>;
2565− reset-names = "i2c", "apb";
25662552 #address-cells = <1>;
25672553 #size-cells = <0>;
25682554 status = "disabled";
arch/arm64/boot/dts/rockchip/rk3588-opp.dtsi+1−1
@@ -115,7 +115,7 @@ · 114 unmodified lines
115115 };
116116 };
117117
118− gpu_opp_table: opp-table {
118+ gpu_opp_table: opp-table-gpu {
119119 compatible = "operating-points-v2";
120120
121121 opp-300000000 {
arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi+1−3
@@ -382,14 +382,12 @@ · 381 unmodified lines
382382 cap-mmc-highspeed;
383383 mmc-ddr-1_8v;
384384 mmc-hs200-1_8v;
385− mmc-hs400-1_8v;
386− mmc-hs400-enhanced-strobe;
387385 mmc-pwrseq = <&emmc_pwrseq>;
388386 no-sdio;
389387 no-sd;
390388 non-removable;
391389 pinctrl-names = "default";
392− pinctrl-0 = <&emmc_bus8 &emmc_cmd &emmc_clk &emmc_data_strobe>;
390+ pinctrl-0 = <&emmc_bus8 &emmc_cmd &emmc_clk>;
393391 vmmc-supply = <&vcc_3v3_s3>;
394392 vqmmc-supply = <&vcc_1v8_s3>;
395393 status = "okay";
arch/arm64/boot/dts/rockchip/rk3588j.dtsi+1−1
@@ -66,7 +66,7 @@ · 65 unmodified lines
6666 };
6767 };
6868
69− gpu_opp_table: opp-table {
69+ gpu_opp_table: opp-table-gpu {
7070 compatible = "operating-points-v2";
7171
7272 opp-300000000 {
arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts+2−2
@@ -14,8 +14,8 @@ · 13 unmodified lines
1414 gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
1515 regulator-name = "vcc3v3_pcie20";
1616 regulator-boot-on;
17− regulator-min-microvolt = <1800000>;
18− regulator-max-microvolt = <1800000>;
17+ regulator-min-microvolt = <3300000>;
18+ regulator-max-microvolt = <3300000>;
1919 startup-delay-us = <50000>;
2020 vin-supply = <&vcc5v0_sys>;
2121 };
arch/arm64/configs/defconfig+1−1
@@ -1341,7 +1341,7 @@ CONFIG_COMMON_CLK_RS9_PCIE=y · 1340 unmodified lines
13411341 CONFIG_COMMON_CLK_VC3=y
13421342 CONFIG_COMMON_CLK_VC5=y
13431343 CONFIG_COMMON_CLK_BD718XX=m
1344−CONFIG_CLK_RASPBERRYPI=m
1344+CONFIG_CLK_RASPBERRYPI=y
13451345 CONFIG_CLK_IMX8MM=y
13461346 CONFIG_CLK_IMX8MN=y
13471347 CONFIG_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
10151015 },
10161016 },
10171017 }, {
1018− .id = TEGRA210_MC_SESRD,
1018+ .id = TEGRA210_MC_SESWR,
10191019 .name = "seswr",
10201020 .swgroup = TEGRA_SWGROUP_SE,
10211021 .regs = {
@@ -1079,7 +1079,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { · 57 unmodified lines
10791079 },
10801080 },
10811081 }, {
1082− .id = TEGRA210_MC_ETRR,
1082+ .id = TEGRA210_MC_ETRW,
10831083 .name = "etrw",
10841084 .swgroup = TEGRA_SWGROUP_ETR,
10851085 .regs = {
drivers/reset/reset-imx8mp-audiomix.c+2−2
@@ -14,8 +14,8 @@ · 13 unmodified lines
1414 #include <linux/reset-controller.h>
1515
1616 #define IMX8MP_AUDIOMIX_EARC_RESET_OFFSET 0x200
17−#define IMX8MP_AUDIOMIX_EARC_RESET_MASK BIT(1)
18−#define IMX8MP_AUDIOMIX_EARC_PHY_RESET_MASK BIT(2)
17+#define IMX8MP_AUDIOMIX_EARC_RESET_MASK BIT(0)
18+#define IMX8MP_AUDIOMIX_EARC_PHY_RESET_MASK BIT(1)
1919
2020 #define IMX8MP_AUDIOMIX_DSP_RUNSTALL_OFFSET 0x108
2121 #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
249249 * @cancel_id: [in] Cancellation id, a unique value to identify this request
250250 * @session: [out] Session id
251251 * @ret: [out] return value
252− * @ret_origin [out] origin of the return value
253− * @num_params [in] number of parameters following this struct
252+ * @ret_origin: [out] origin of the return value
253+ * @num_params: [in] number of &struct tee_ioctl_param entries in @params
254+ * @params: array of ioctl parameters
254255 */
255256 struct tee_ioctl_open_session_arg {
256257 __u8 uuid[TEE_IOCTL_UUID_LEN];
@@ -276,14 +277,14 @@ struct tee_ioctl_open_session_arg { · 19 unmodified lines
276277 struct tee_ioctl_buf_data)
277278
278279 /**
279− * struct tee_ioctl_invoke_func_arg - Invokes a function in a Trusted
280− * Application
280+ * struct tee_ioctl_invoke_arg - Invokes a function in a Trusted Application
281281 * @func: [in] Trusted Application function, specific to the TA
282282 * @session: [in] Session id
283283 * @cancel_id: [in] Cancellation id, a unique value to identify this request
284284 * @ret: [out] return value
285− * @ret_origin [out] origin of the return value
286− * @num_params [in] number of parameters following this struct
285+ * @ret_origin: [out] origin of the return value
286+ * @num_params: [in] number of parameters following this struct
287+ * @params: array of ioctl parameters
287288 */
288289 struct tee_ioctl_invoke_arg {
289290 __u32 func;
@@ -338,7 +339,8 @@ struct tee_ioctl_close_session_arg { · 48 unmodified lines
338339 /**
339340 * struct tee_iocl_supp_recv_arg - Receive a request for a supplicant function
340341 * @func: [in] supplicant function
341− * @num_params [in/out] number of parameters following this struct
342+ * @num_params: [in/out] number of &struct tee_ioctl_param entries in @params
343+ * @params: array of ioctl parameters
342344 *
343345 * @num_params is the number of params that tee-supplicant has room to
344346 * receive when input, @num_params is the number of actual params
@@ -363,7 +365,8 @@ struct tee_iocl_supp_recv_arg { · 18 unmodified lines
363365 /**
364366 * struct tee_iocl_supp_send_arg - Send a response to a received request
365367 * @ret: [out] return value
366− * @num_params [in] number of parameters following this struct
368+ * @num_params: [in] number of &struct tee_ioctl_param entries in @params
369+ * @params: array of ioctl parameters
367370 */
368371 struct tee_iocl_supp_send_arg {
369372 __u32 ret;
@@ -454,11 +457,13 @@ struct tee_ioctl_shm_register_fd_data { · 84 unmodified lines
454457 */
455458
456459 /**
457− * struct tee_ioctl_invoke_func_arg - Invokes an object in a Trusted Application
460+ * struct tee_ioctl_object_invoke_arg - Invokes an object in a
461+ * Trusted Application
458462 * @id: [in] Object id
459463 * @op: [in] Object operation, specific to the object
460464 * @ret: [out] return value
461465 * @num_params: [in] number of parameters following this struct
466+ * @params: array of ioctl parameters
462467 */
463468 struct tee_ioctl_object_invoke_arg {
464469 __u64 id;