Skip to content

Commit cf38b23

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann: "The main changes are devicetree updates for qualcomm and rockchips arm64 platforms, fixing minor mistakes in SoC and board specific settings: - GPIO settings for Pinephone Pro buttons - Register ranges for rk3576 GPU - Power domains on sc8280xp - Clocks on qcom talos - dtc warnings for extraneous properties, nonstandard node names and undocument identifiers The Tegra210 platform gets a single revert for a devicetree change that caused a 6.19 regression. On 32-bit Arm, we have trivial fixes for Microchip SAMA7 devicetree files and NPCM Kconfig, as well as Andrew Jeffery being officially listed as MAINTAINER for NPCM. A single driver fix is for Qualcomm RPMHD power domains, bringing the driver up to date with a devicetree change that added additional power domains to be enabled" * tag 'soc-fixes-6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (27 commits) MAINTAINERS: Add Andrew as M: to ARM/NUVOTON NPCM ARCHITECTURE MAINTAINERS: update email address for Yixun Lan Revert "arm64: tegra: Add interconnect properties for Tegra210" arm64: dts: rockchip: Drop unsupported properties arm64: dts: rockchip: Fix gpio pinctrl node names arm64: dts: rockchip: Fix pinctrl property typo on rk3326-odroid-go3 arm64: dts: rockchip: Drop "sitronix,st7789v" fallback compatible from rk3568-wolfvision ARM: dts: microchip: sama7d65: fix size-cells property for i2c3 ARM: dts: microchip: sama7d65: fix the ranges property for flx9 arm: npcm: drop unused Kconfig ERRATA symbol arm64: dts: rockchip: Fix wrong register range of rk3576 gpu arm64: dts: rockchip: Configure MCLK for analog sound on NanoPi M5 arm64: dts: rockchip: Fix headphones widget name on NanoPi M5 ARM: dts: microchip: lan966x: Fix the access to the PHYs for pcb8290 arm64: dts: rockchip: remove redundant max-link-speed from nanopi-r4s arm64: dts: rockchip: remove dangerous max-link-speed from helios64 arm64: dts: rockchip: fix unit-address for RK3588 NPU's core1 and core2's IOMMU arm64: dts: rockchip: Fix wifi interrupts flag on Sakura Pi RK3308B arm64: dts: qcom: sm8650: Fix compile warnings in USB controller node arm64: dts: qcom: sm8550: Fix compile warnings in USB controller node ...
2 parents 119d1cb + 0638dc2 commit cf38b23

25 files changed

Lines changed: 50 additions & 61 deletions

‎.mailmap‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#
1313
Aaron Durbin <adurbin@google.com>
1414
Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>
15+
Abel Vesa <abelvesa@kernel.org> <abel.vesa@linaro.org>
1516
Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>
1617
Abhijeet Dharmapurikar <quic_adharmap@quicinc.com> <adharmap@codeaurora.org>
1718
Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
@@ -878,6 +879,8 @@ Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
878879
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
879880
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
880881
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
882+
Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>
883+
Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>
881884
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
882885
Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
883886
Yusuke Goda <goda.yusuke@renesas.com>

‎MAINTAINERS‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3132,6 +3132,7 @@ F: drivers/*/*ma35*
31323132
K: ma35d1
31333133

31343134
ARM/NUVOTON NPCM ARCHITECTURE
3135+
M: Andrew Jeffery <andrew@codeconstruct.com.au>
31353136
M: Avi Fishman <avifishman70@gmail.com>
31363137
M: Tomer Maimon <tmaimon77@gmail.com>
31373138
M: Tali Perry <tali.perry1@gmail.com>
@@ -3140,6 +3141,7 @@ R: Nancy Yuen <yuenn@google.com>
31403141
R: Benjamin Fair <benjaminfair@google.com>
31413142
L: openbmc@lists.ozlabs.org (moderated for non-subscribers)
31423143
S: Supported
3144+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git
31433145
F: Documentation/devicetree/bindings/*/*/*npcm*
31443146
F: Documentation/devicetree/bindings/*/*npcm*
31453147
F: Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml
@@ -22536,7 +22538,7 @@ F: drivers/mailbox/riscv-sbi-mpxy-mbox.c
2253622538
F: include/linux/mailbox/riscv-rpmi-message.h
2253722539

2253822540
RISC-V SPACEMIT SoC Support
22539-
M: Yixun Lan <dlan@gentoo.org>
22541+
M: Yixun Lan <dlan@kernel.org>
2254022542
L: linux-riscv@lists.infradead.org
2254122543
L: spacemit@lists.linux.dev
2254222544
S: Maintained

‎arch/arm/boot/dts/microchip/lan966x-pcb8290.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
&mdio0 {
5555
pinctrl-0 = <&miim_a_pins>;
5656
pinctrl-names = "default";
57+
reset-gpios = <&gpio 53 GPIO_ACTIVE_LOW>;
5758
status = "okay";
5859

5960
ext_phy0: ethernet-phy@7 {

‎arch/arm/boot/dts/microchip/sama7d65.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@
527527
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
528528
clocks = <&pmc PMC_TYPE_PERIPHERAL 37>;
529529
#address-cells = <1>;
530-
#size-cells = <1>;
530+
#size-cells = <0>;
531531
dmas = <&dma0 AT91_XDMAC_DT_PERID(12)>,
532532
<&dma0 AT91_XDMAC_DT_PERID(11)>;
533533
dma-names = "tx", "rx";
@@ -676,7 +676,7 @@
676676
flx9: flexcom@e2820000 {
677677
compatible = "microchip,sama7d65-flexcom", "atmel,sama5d2-flexcom";
678678
reg = <0xe2820000 0x200>;
679-
ranges = <0x0 0xe281c000 0x800>;
679+
ranges = <0x0 0xe2820000 0x800>;
680680
clocks = <&pmc PMC_TYPE_PERIPHERAL 43>;
681681
#address-cells = <1>;
682682
#size-cells = <1>;

‎arch/arm/mach-npcm/Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ config ARCH_NPCM7XX
3030
select ARM_ERRATA_764369 if SMP
3131
select ARM_ERRATA_720789
3232
select ARM_ERRATA_754322
33-
select ARM_ERRATA_794072
3433
select PL310_ERRATA_588369
3534
select PL310_ERRATA_727915
3635
select MFD_SYSCON

‎arch/arm64/boot/dts/nvidia/tegra210.dtsi‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -202,19 +202,6 @@
202202

203203
nvidia,outputs = <&dsia &dsib &sor0 &sor1>;
204204
nvidia,head = <0>;
205-
206-
interconnects = <&mc TEGRA210_MC_DISPLAY0A &emc>,
207-
<&mc TEGRA210_MC_DISPLAY0B &emc>,
208-
<&mc TEGRA210_MC_DISPLAY0C &emc>,
209-
<&mc TEGRA210_MC_DISPLAYHC &emc>,
210-
<&mc TEGRA210_MC_DISPLAYD &emc>,
211-
<&mc TEGRA210_MC_DISPLAYT &emc>;
212-
interconnect-names = "wina",
213-
"winb",
214-
"winc",
215-
"cursor",
216-
"wind",
217-
"wint";
218205
};
219206

220207
dc@54240000 {
@@ -230,15 +217,6 @@
230217

231218
nvidia,outputs = <&dsia &dsib &sor0 &sor1>;
232219
nvidia,head = <1>;
233-
234-
interconnects = <&mc TEGRA210_MC_DISPLAY0AB &emc>,
235-
<&mc TEGRA210_MC_DISPLAY0BB &emc>,
236-
<&mc TEGRA210_MC_DISPLAY0CB &emc>,
237-
<&mc TEGRA210_MC_DISPLAYHCB &emc>;
238-
interconnect-names = "wina",
239-
"winb",
240-
"winc",
241-
"cursor";
242220
};
243221

244222
dsia: dsi@54300000 {
@@ -1052,7 +1030,6 @@
10521030

10531031
#iommu-cells = <1>;
10541032
#reset-cells = <1>;
1055-
#interconnect-cells = <1>;
10561033
};
10571034

10581035
emc: external-memory-controller@7001b000 {
@@ -1066,7 +1043,6 @@
10661043
nvidia,memory-controller = <&mc>;
10671044
operating-points-v2 = <&emc_icc_dvfs_opp_table>;
10681045

1069-
#interconnect-cells = <0>;
10701046
#cooling-cells = <2>;
10711047
};
10721048

‎arch/arm64/boot/dts/qcom/sc8280xp.dtsi‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5788,8 +5788,12 @@
57885788
clocks = <&rpmhcc RPMH_CXO_CLK>;
57895789
clock-names = "xo";
57905790

5791-
power-domains = <&rpmhpd SC8280XP_NSP>;
5792-
power-domain-names = "nsp";
5791+
power-domains = <&rpmhpd SC8280XP_NSP>,
5792+
<&rpmhpd SC8280XP_CX>,
5793+
<&rpmhpd SC8280XP_MXC>;
5794+
power-domain-names = "nsp",
5795+
"cx",
5796+
"mxc";
57935797

57945798
memory-region = <&pil_nsp0_mem>;
57955799

@@ -5919,8 +5923,12 @@
59195923
clocks = <&rpmhcc RPMH_CXO_CLK>;
59205924
clock-names = "xo";
59215925

5922-
power-domains = <&rpmhpd SC8280XP_NSP>;
5923-
power-domain-names = "nsp";
5926+
power-domains = <&rpmhpd SC8280XP_NSP>,
5927+
<&rpmhpd SC8280XP_CX>,
5928+
<&rpmhpd SC8280XP_MXC>;
5929+
power-domain-names = "nsp",
5930+
"cx",
5931+
"mxc";
59245932

59255933
memory-region = <&pil_nsp1_mem>;
59265934

‎arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
};
3232

3333
&display_panel {
34-
status = "okay";
34+
compatible = "samsung,sofef00-ams628nw01", "samsung,sofef00";
3535

36-
compatible = "samsung,sofef00";
36+
status = "okay";
3737
};
3838

3939
&bq27441_fg {

‎arch/arm64/boot/dts/qcom/sm8550.dtsi‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4133,8 +4133,6 @@
41334133
usb_1: usb@a600000 {
41344134
compatible = "qcom,sm8550-dwc3", "qcom,snps-dwc3";
41354135
reg = <0x0 0x0a600000 0x0 0xfc100>;
4136-
#address-cells = <1>;
4137-
#size-cells = <0>;
41384136

41394137
clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
41404138
<&gcc GCC_USB30_PRIM_MASTER_CLK>,

‎arch/arm64/boot/dts/qcom/sm8650.dtsi‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5150,9 +5150,6 @@
51505150

51515151
dma-coherent;
51525152

5153-
#address-cells = <1>;
5154-
#size-cells = <0>;
5155-
51565153
status = "disabled";
51575154

51585155
ports {

0 commit comments

Comments
 (0)