Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
...
+50
-61
+3
.mailmap
+3
.mailmap
···
12
12
#
13
13
Aaron Durbin <adurbin@google.com>
14
14
Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>
15
+
Abel Vesa <abelvesa@kernel.org> <abel.vesa@linaro.org>
15
16
Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>
16
17
Abhijeet Dharmapurikar <quic_adharmap@quicinc.com> <adharmap@codeaurora.org>
17
18
Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
···
879
878
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
880
879
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
881
880
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
881
+
Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>
882
+
Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>
882
883
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
883
884
Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
884
885
Yusuke Goda <goda.yusuke@renesas.com>
+3
-1
MAINTAINERS
+3
-1
MAINTAINERS
···
3132
3132
K: ma35d1
3133
3133
3134
3134
ARM/NUVOTON NPCM ARCHITECTURE
3135
+
M: Andrew Jeffery <andrew@codeconstruct.com.au>
3135
3136
M: Avi Fishman <avifishman70@gmail.com>
3136
3137
M: Tomer Maimon <tmaimon77@gmail.com>
3137
3138
M: Tali Perry <tali.perry1@gmail.com>
···
3141
3140
R: Benjamin Fair <benjaminfair@google.com>
3142
3141
L: openbmc@lists.ozlabs.org (moderated for non-subscribers)
3143
3142
S: Supported
3143
+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git
3144
3144
F: Documentation/devicetree/bindings/*/*/*npcm*
3145
3145
F: Documentation/devicetree/bindings/*/*npcm*
3146
3146
F: Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml
···
22538
22536
F: include/linux/mailbox/riscv-rpmi-message.h
22539
22537
22540
22538
RISC-V SPACEMIT SoC Support
22541
-
M: Yixun Lan <dlan@gentoo.org>
22539
+
M: Yixun Lan <dlan@kernel.org>
22542
22540
L: linux-riscv@lists.infradead.org
22543
22541
L: spacemit@lists.linux.dev
22544
22542
S: Maintained
+1
arch/arm/boot/dts/microchip/lan966x-pcb8290.dts
+1
arch/arm/boot/dts/microchip/lan966x-pcb8290.dts
+2
-2
arch/arm/boot/dts/microchip/sama7d65.dtsi
+2
-2
arch/arm/boot/dts/microchip/sama7d65.dtsi
···
527
527
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
528
528
clocks = <&pmc PMC_TYPE_PERIPHERAL 37>;
529
529
#address-cells = <1>;
530
-
#size-cells = <1>;
530
+
#size-cells = <0>;
531
531
dmas = <&dma0 AT91_XDMAC_DT_PERID(12)>,
532
532
<&dma0 AT91_XDMAC_DT_PERID(11)>;
533
533
dma-names = "tx", "rx";
···
676
676
flx9: flexcom@e2820000 {
677
677
compatible = "microchip,sama7d65-flexcom", "atmel,sama5d2-flexcom";
678
678
reg = <0xe2820000 0x200>;
679
-
ranges = <0x0 0xe281c000 0x800>;
679
+
ranges = <0x0 0xe2820000 0x800>;
680
680
clocks = <&pmc PMC_TYPE_PERIPHERAL 43>;
681
681
#address-cells = <1>;
682
682
#size-cells = <1>;
-1
arch/arm/mach-npcm/Kconfig
-1
arch/arm/mach-npcm/Kconfig
-24
arch/arm64/boot/dts/nvidia/tegra210.dtsi
-24
arch/arm64/boot/dts/nvidia/tegra210.dtsi
···
202
202
203
203
nvidia,outputs = <&dsia &dsib &sor0 &sor1>;
204
204
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";
218
205
};
219
206
220
207
dc@54240000 {
···
217
230
218
231
nvidia,outputs = <&dsia &dsib &sor0 &sor1>;
219
232
nvidia,head = <1>;
220
-
221
-
interconnects = <&mc TEGRA210_MC_DISPLAY0AB &emc>,
222
-
<&mc TEGRA210_MC_DISPLAY0BB &emc>,
223
-
<&mc TEGRA210_MC_DISPLAY0CB &emc>,
224
-
<&mc TEGRA210_MC_DISPLAYHCB &emc>;
225
-
interconnect-names = "wina",
226
-
"winb",
227
-
"winc",
228
-
"cursor";
229
233
};
230
234
231
235
dsia: dsi@54300000 {
···
1030
1052
1031
1053
#iommu-cells = <1>;
1032
1054
#reset-cells = <1>;
1033
-
#interconnect-cells = <1>;
1034
1055
};
1035
1056
1036
1057
emc: external-memory-controller@7001b000 {
···
1043
1066
nvidia,memory-controller = <&mc>;
1044
1067
operating-points-v2 = <&emc_icc_dvfs_opp_table>;
1045
1068
1046
-
#interconnect-cells = <0>;
1047
1069
#cooling-cells = <2>;
1048
1070
};
1049
1071
+12
-4
arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+12
-4
arch/arm64/boot/dts/qcom/sc8280xp.dtsi
···
5788
5788
clocks = <&rpmhcc RPMH_CXO_CLK>;
5789
5789
clock-names = "xo";
5790
5790
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";
5793
5797
5794
5798
memory-region = <&pil_nsp0_mem>;
5795
5799
···
5923
5919
clocks = <&rpmhcc RPMH_CXO_CLK>;
5924
5920
clock-names = "xo";
5925
5921
5926
-
power-domains = <&rpmhpd SC8280XP_NSP>;
5927
-
power-domain-names = "nsp";
5922
+
power-domains = <&rpmhpd SC8280XP_NSP>,
5923
+
<&rpmhpd SC8280XP_CX>,
5924
+
<&rpmhpd SC8280XP_MXC>;
5925
+
power-domain-names = "nsp",
5926
+
"cx",
5927
+
"mxc";
5928
5928
5929
5929
memory-region = <&pil_nsp1_mem>;
5930
5930
+2
-2
arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts
+2
-2
arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts
-2
arch/arm64/boot/dts/qcom/sm8550.dtsi
-2
arch/arm64/boot/dts/qcom/sm8550.dtsi
···
4133
4133
usb_1: usb@a600000 {
4134
4134
compatible = "qcom,sm8550-dwc3", "qcom,snps-dwc3";
4135
4135
reg = <0x0 0x0a600000 0x0 0xfc100>;
4136
-
#address-cells = <1>;
4137
-
#size-cells = <0>;
4138
4136
4139
4137
clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
4140
4138
<&gcc GCC_USB30_PRIM_MASTER_CLK>,
-3
arch/arm64/boot/dts/qcom/sm8650.dtsi
-3
arch/arm64/boot/dts/qcom/sm8650.dtsi
+2
-2
arch/arm64/boot/dts/qcom/talos.dtsi
+2
-2
arch/arm64/boot/dts/qcom/talos.dtsi
···
1399
1399
<&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
1400
1400
<&gcc GCC_UFS_PHY_AHB_CLK>,
1401
1401
<&gcc GCC_UFS_PHY_UNIPRO_CORE_CLK>,
1402
-
<&gcc GCC_UFS_PHY_ICE_CORE_CLK>,
1403
1402
<&rpmhcc RPMH_CXO_CLK>,
1404
1403
<&gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>,
1405
-
<&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>;
1404
+
<&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>,
1405
+
<&gcc GCC_UFS_PHY_ICE_CORE_CLK>;
1406
1406
clock-names = "core_clk",
1407
1407
"bus_aggr_clk",
1408
1408
"iface_clk",
+1
-1
arch/arm64/boot/dts/rockchip/rk3308-sakurapi-rk3308b.dts
+1
-1
arch/arm64/boot/dts/rockchip/rk3308-sakurapi-rk3308b.dts
···
199
199
compatible = "brcm,bcm43455-fmac", "brcm,bcm4329-fmac";
200
200
reg = <1>;
201
201
interrupt-parent = <&gpio0>;
202
-
interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
202
+
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
203
203
interrupt-names = "host-wake";
204
204
pinctrl-names = "default";
205
205
pinctrl-0 = <&wifi_host_wake>;
+2
-1
arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts
+2
-1
arch/arm64/boot/dts/rockchip/rk3326-odroid-go3.dts
-2
arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
-2
arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
-1
arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
-1
arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi
-1
arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-1
arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+2
-2
arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
+2
-2
arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
···
40
40
button-up {
41
41
label = "Volume Up";
42
42
linux,code = <KEY_VOLUMEUP>;
43
-
press-threshold-microvolt = <100000>;
43
+
press-threshold-microvolt = <2000>;
44
44
};
45
45
46
46
button-down {
47
47
label = "Volume Down";
48
48
linux,code = <KEY_VOLUMEDOWN>;
49
-
press-threshold-microvolt = <600000>;
49
+
press-threshold-microvolt = <300000>;
50
50
};
51
51
};
52
52
+1
-1
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+1
-1
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+2
-2
arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
+2
-2
arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
···
529
529
rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
530
530
};
531
531
532
-
vsel1_gpio: vsel1-gpio {
532
+
vsel1_gpio: vsel1-gpio-pin {
533
533
rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
534
534
};
535
535
536
-
vsel2_gpio: vsel2-gpio {
536
+
vsel2_gpio: vsel2-gpio-pin {
537
537
rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
538
538
};
539
539
};
+1
-2
arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display-vz.dtso
+1
-2
arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display-vz.dtso
+8
-4
arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts
+8
-4
arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts
···
201
201
pinctrl-names = "default";
202
202
pinctrl-0 = <&hp_det_l>;
203
203
204
+
simple-audio-card,bitclock-master = <&masterdai>;
204
205
simple-audio-card,format = "i2s";
205
206
simple-audio-card,hp-det-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>;
206
207
simple-audio-card,mclk-fs = <256>;
···
212
211
"Headphones", "HPOR",
213
212
"IN1P", "Microphone Jack";
214
213
simple-audio-card,widgets =
215
-
"Headphone", "Headphone Jack",
214
+
"Headphone", "Headphones",
216
215
"Microphone", "Microphone Jack";
217
216
218
217
simple-audio-card,codec {
219
218
sound-dai = <&rt5616>;
220
219
};
221
220
222
-
simple-audio-card,cpu {
221
+
masterdai: simple-audio-card,cpu {
223
222
sound-dai = <&sai2>;
223
+
system-clock-frequency = <12288000>;
224
224
};
225
225
};
226
226
};
···
729
727
rt5616: audio-codec@1b {
730
728
compatible = "realtek,rt5616";
731
729
reg = <0x1b>;
732
-
assigned-clocks = <&cru CLK_SAI2_MCLKOUT>;
730
+
assigned-clocks = <&cru CLK_SAI2_MCLKOUT_TO_IO>;
733
731
assigned-clock-rates = <12288000>;
734
-
clocks = <&cru CLK_SAI2_MCLKOUT>;
732
+
clocks = <&cru CLK_SAI2_MCLKOUT_TO_IO>;
735
733
clock-names = "mclk";
734
+
pinctrl-0 = <&sai2m0_mclk>;
735
+
pinctrl-names = "default";
736
736
#sound-dai-cells = <0>;
737
737
};
738
738
};
+1
-1
arch/arm64/boot/dts/rockchip/rk3576.dtsi
+1
-1
arch/arm64/boot/dts/rockchip/rk3576.dtsi
···
1261
1261
1262
1262
gpu: gpu@27800000 {
1263
1263
compatible = "rockchip,rk3576-mali", "arm,mali-bifrost";
1264
-
reg = <0x0 0x27800000 0x0 0x200000>;
1264
+
reg = <0x0 0x27800000 0x0 0x20000>;
1265
1265
assigned-clocks = <&scmi_clk SCMI_CLK_GPU>;
1266
1266
assigned-clock-rates = <198000000>;
1267
1267
clocks = <&cru CLK_GPU>;
+2
-2
arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+2
-2
arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
···
1200
1200
status = "disabled";
1201
1201
};
1202
1202
1203
-
rknn_mmu_1: iommu@fdac9000 {
1203
+
rknn_mmu_1: iommu@fdaca000 {
1204
1204
compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu";
1205
1205
reg = <0x0 0xfdaca000 0x0 0x100>;
1206
1206
interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH 0>;
···
1230
1230
status = "disabled";
1231
1231
};
1232
1232
1233
-
rknn_mmu_2: iommu@fdad9000 {
1233
+
rknn_mmu_2: iommu@fdada000 {
1234
1234
compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu";
1235
1235
reg = <0x0 0xfdada000 0x0 0x100>;
1236
1236
interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH 0>;
+4
drivers/pmdomain/qcom/rpmhpd.c
+4
drivers/pmdomain/qcom/rpmhpd.c
···
246
246
[SC8280XP_MMCX_AO] = &mmcx_ao,
247
247
[SC8280XP_MX] = &mx,
248
248
[SC8280XP_MX_AO] = &mx_ao,
249
+
[SC8280XP_MXC] = &mxc,
250
+
[SC8280XP_MXC_AO] = &mxc_ao,
249
251
[SC8280XP_NSP] = &nsp,
250
252
};
251
253
···
702
700
[SC8280XP_MMCX_AO] = &mmcx_ao,
703
701
[SC8280XP_MX] = &mx,
704
702
[SC8280XP_MX_AO] = &mx_ao,
703
+
[SC8280XP_MXC] = &mxc,
704
+
[SC8280XP_MXC_AO] = &mxc_ao,
705
705
[SC8280XP_NSP] = &nsp,
706
706
[SC8280XP_QPHY] = &qphy,
707
707
};