Skip to content

Commit 1ed4638

Browse files
committed
Merge tag 'soc-fixes-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC DT and driver fixes from Arnd Bergmann: "Lots of dts fixes for Qualcomm Snapdragon and NXP i.MX platforms, including: - A regression fix for SDHCI controllers on Inforce 6540, and another SDHCI fix on SM8350 - Reenable cluster idle on sm8250 after the the code fix is upstream - multiple fixes for the QMP PHY binding, needing an incompatible dt change - The reserved memory map is updated on Xiaomi Mi 4C and Huawei Nexus 6P, to avoid instabilities caused by use of protected memory regions - Fix i.MX8MP DT for missing GPC Interrupt, power-domain typo and USB clock error - A couple of verdin-imx8mm DT fixes for audio playback support - Fix pca9547 i2c-mux node name for i.MX and Vybrid device trees - Fix an imx93-11x11-evk uSDHC pad setting problem that causes Micron eMMC CMD8 CRC error in HS400ES/HS400 mode The remaining ARM and RISC-V platforms only have very few smaller dts bugfixes this time: - A fix for the SiFive unmatched board's PCI memory space - A revert to fix a regression with GPIO on Marvell Armada - A fix for the UART address on Marvell AC5 - Missing chip-select phandles for stm32 boards - Selecting the correct clock for the sam9x60 memory controller - Amlogic based Odroid-HC4 needs a revert to restore USB functionality. And finally, there are some minor code fixes: - Build fixes for OMAP1, pxa, riscpc, raspberry pi firmware, and zynq firmware - memory controller driver fixes for an OMAP regression and older bugs on tegra, atmel and mvebu - reset controller fixes for ti-sci and uniphier platforms - ARM SCMI firmware fixes for a couple of rare corner cases - Qualcomm platform driver fixes for incorrect error handling and a backwards compatibility fix for the apr driver using older dtb - NXP i.MX SoC driver fixes for HDMI output, error handling in the imx8 soc-id and missing reference counting on older cpuid code" * tag 'soc-fixes-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (60 commits) firmware: zynqmp: fix declarations for gcc-13 ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp151a-prtt1l ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp157c-emstamp-argon ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcom-som ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcor-som ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60 ARM: omap1: fix building gpio15xx ARM: omap1: fix !ARCH_OMAP1_ANY link failures firmware: raspberrypi: Fix type assignment arm64: dts: qcom: msm8992-libra: Fix the memory map arm64: dts: qcom: msm8992: Don't use sfpb mutex PM: AVS: qcom-cpr: Fix an error handling path in cpr_probe() arm64: dts: msm8994-angler: fix the memory map arm64: dts: marvell: AC5/AC5X: Fix address for UART1 ARM: footbridge: drop unnecessary inclusion Revert "ARM: dts: armada-39x: Fix compatible string for gpios" Revert "ARM: dts: armada-38x: Fix compatible string for gpios" ARM: pxa: enable PXA310/PXA320 for DT-only build riscv: dts: sifive: fu740: fix size of pcie 32bit memory soc: qcom: apr: Make qcom,protection-domain optional again ...
2 parents ff83fec + d2c8655 commit 1ed4638

File tree

78 files changed

+262
-286
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+262
-286
lines changed

Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ properties:
3939
qcom,protection-domain:
4040
$ref: /schemas/types.yaml#/definitions/string-array
4141
description: |
42-
Protection domain service name and path for APR service
43-
possible values are::
42+
Protection domain service name and path for APR service (if supported).
43+
Possible values are::
4444
"avs/audio", "msm/adsp/audio_pd".
4545
"kernel/elf_loader", "msm/modem/wlan_pd".
4646
"tms/servreg", "msm/adsp/audio_pd".
@@ -49,6 +49,5 @@ properties:
4949
5050
required:
5151
- reg
52-
- qcom,protection-domain
5352

5453
additionalProperties: true

arch/arm/boot/dts/armada-38x.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@
304304
};
305305

306306
gpio0: gpio@18100 {
307-
compatible = "marvell,armadaxp-gpio",
307+
compatible = "marvell,armada-370-gpio",
308308
"marvell,orion-gpio";
309309
reg = <0x18100 0x40>, <0x181c0 0x08>;
310310
reg-names = "gpio", "pwm";
@@ -323,7 +323,7 @@
323323
};
324324

325325
gpio1: gpio@18140 {
326-
compatible = "marvell,armadaxp-gpio",
326+
compatible = "marvell,armada-370-gpio",
327327
"marvell,orion-gpio";
328328
reg = <0x18140 0x40>, <0x181c8 0x08>;
329329
reg-names = "gpio", "pwm";

arch/arm/boot/dts/armada-39x.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
};
214214

215215
gpio0: gpio@18100 {
216-
compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio";
216+
compatible = "marvell,orion-gpio";
217217
reg = <0x18100 0x40>;
218218
ngpios = <32>;
219219
gpio-controller;
@@ -227,7 +227,7 @@
227227
};
228228

229229
gpio1: gpio@18140 {
230-
compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio";
230+
compatible = "marvell,orion-gpio";
231231
reg = <0x18140 0x40>;
232232
ngpios = <28>;
233233
gpio-controller;

arch/arm/boot/dts/imx53-ppd.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@
488488
scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
489489
status = "okay";
490490

491-
i2c-switch@70 {
491+
i2c-mux@70 {
492492
compatible = "nxp,pca9547";
493493
#address-cells = <1>;
494494
#size-cells = <0>;

arch/arm/boot/dts/imx6qdl-gw560x.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,6 @@
632632
&uart1 {
633633
pinctrl-names = "default";
634634
pinctrl-0 = <&pinctrl_uart1>;
635-
uart-has-rtscts;
636635
rts-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
637636
status = "okay";
638637
};

arch/arm/boot/dts/imx6ul-pico-dwarf.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
};
3333

3434
&i2c2 {
35-
clock_frequency = <100000>;
35+
clock-frequency = <100000>;
3636
pinctrl-names = "default";
3737
pinctrl-0 = <&pinctrl_i2c2>;
3838
status = "okay";

arch/arm/boot/dts/imx7d-pico-dwarf.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
};
3333

3434
&i2c1 {
35-
clock_frequency = <100000>;
35+
clock-frequency = <100000>;
3636
pinctrl-names = "default";
3737
pinctrl-0 = <&pinctrl_i2c1>;
3838
status = "okay";
@@ -52,7 +52,7 @@
5252
};
5353

5454
&i2c4 {
55-
clock_frequency = <100000>;
55+
clock-frequency = <100000>;
5656
pinctrl-names = "default";
5757
pinctrl-0 = <&pinctrl_i2c1>;
5858
status = "okay";

arch/arm/boot/dts/imx7d-pico-nymph.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
};
4444

4545
&i2c1 {
46-
clock_frequency = <100000>;
46+
clock-frequency = <100000>;
4747
pinctrl-names = "default";
4848
pinctrl-0 = <&pinctrl_i2c1>;
4949
status = "okay";
@@ -64,7 +64,7 @@
6464
};
6565

6666
&i2c2 {
67-
clock_frequency = <100000>;
67+
clock-frequency = <100000>;
6868
pinctrl-names = "default";
6969
pinctrl-0 = <&pinctrl_i2c2>;
7070
status = "okay";

arch/arm/boot/dts/qcom-apq8084-ifc6540.dts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
serial@f995e000 {
2020
status = "okay";
2121
};
22+
};
23+
};
2224

23-
sdhci@f9824900 {
24-
bus-width = <8>;
25-
non-removable;
26-
status = "okay";
27-
};
25+
&sdhc_1 {
26+
bus-width = <8>;
27+
non-removable;
28+
status = "okay";
29+
};
2830

29-
sdhci@f98a4900 {
30-
cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>;
31-
bus-width = <4>;
32-
};
33-
};
31+
&sdhc_2 {
32+
cd-gpios = <&tlmm 122 GPIO_ACTIVE_LOW>;
33+
bus-width = <4>;
3434
};

arch/arm/boot/dts/qcom-apq8084.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@
421421
status = "disabled";
422422
};
423423

424-
mmc@f9824900 {
424+
sdhc_1: mmc@f9824900 {
425425
compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";
426426
reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;
427427
reg-names = "hc", "core";
@@ -434,7 +434,7 @@
434434
status = "disabled";
435435
};
436436

437-
mmc@f98a4900 {
437+
sdhc_2: mmc@f98a4900 {
438438
compatible = "qcom,apq8084-sdhci", "qcom,sdhci-msm-v4";
439439
reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;
440440
reg-names = "hc", "core";

0 commit comments

Comments
 (0)