Skip to content

Commit da60d15

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann: "Over the Christmas break a couple of devicetree fixes came in for Rockchips, Qualcomm and NXP/i.MX. These add some missing board specific properties, address build time warnings, The USB/TOG supoprt on X1 Elite regressed, so two earlier DT changes get reverted for now. Aside from the devicetree fixes, there is One build fix for the stm32 firewall driver, and a defconfig change to enable SPDIF support for i.MX" * tag 'soc-fixes-6.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: firewall: remove misplaced semicolon from stm32_firewall_get_firewall arm64: dts: rockchip: add hevc power domain clock to rk3328 arm64: dts: rockchip: Fix the SD card detection on NanoPi R6C/R6S arm64: dts: qcom: sa8775p: fix the secure device bootup issue Revert "arm64: dts: qcom: x1e80100: enable OTG on USB-C controllers" Revert "arm64: dts: qcom: x1e80100-crd: enable otg on usb ports" arm64: dts: qcom: x1e80100: Fix up BAR space size for PCIe6a Revert "arm64: dts: qcom: x1e78100-t14s: enable otg on usb-c ports" ARM: dts: imxrt1050: Fix clocks for mmc ARM: imx_v6_v7_defconfig: enable SND_SOC_SPDIF arm64: dts: imx95: correct the address length of netcmix_blk_ctrl arm64: dts: imx8-ss-audio: add fallback compatible string fsl,imx6ull-esai for esai arm64: dts: rockchip: rename rfkill label for Radxa ROCK 5B arm64: dts: rockchip: add reset-names for combphy on rk3568 arm64: dts: qcom: sa8775p: Fix the size of 'addr_space' regions
2 parents 77a903c + 5391c5d commit da60d15

File tree

15 files changed

+36
-15
lines changed

15 files changed

+36
-15
lines changed

‎arch/arm/boot/dts/nxp/imx/imxrt1050.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
reg = <0x402c0000 0x4000>;
8888
interrupts = <110>;
8989
clocks = <&clks IMXRT1050_CLK_IPG_PDOF>,
90-
<&clks IMXRT1050_CLK_OSC>,
90+
<&clks IMXRT1050_CLK_AHB_PODF>,
9191
<&clks IMXRT1050_CLK_USDHC1>;
9292
clock-names = "ipg", "ahb", "per";
9393
bus-width = <4>;

‎arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ CONFIG_SND_SOC_IMX_SGTL5000=y
323323
CONFIG_SND_SOC_FSL_ASOC_CARD=y
324324
CONFIG_SND_SOC_AC97_CODEC=y
325325
CONFIG_SND_SOC_CS42XX8_I2C=y
326+
CONFIG_SND_SOC_SPDIF=y
326327
CONFIG_SND_SOC_TLV320AIC3X_I2C=y
327328
CONFIG_SND_SOC_WM8960=y
328329
CONFIG_SND_SOC_WM8962=y

‎arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ audio_subsys: bus@59000000 {
165165
};
166166

167167
esai0: esai@59010000 {
168-
compatible = "fsl,imx8qm-esai";
168+
compatible = "fsl,imx8qm-esai", "fsl,imx6ull-esai";
169169
reg = <0x59010000 0x10000>;
170170
interrupts = <GIC_SPI 409 IRQ_TYPE_LEVEL_HIGH>;
171171
clocks = <&esai0_lpcg IMX_LPCG_CLK_4>,

‎arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
};
135135

136136
esai1: esai@59810000 {
137-
compatible = "fsl,imx8qm-esai";
137+
compatible = "fsl,imx8qm-esai", "fsl,imx6ull-esai";
138138
reg = <0x59810000 0x10000>;
139139
interrupts = <GIC_SPI 411 IRQ_TYPE_LEVEL_HIGH>;
140140
clocks = <&esai1_lpcg IMX_LPCG_CLK_0>,

‎arch/arm64/boot/dts/freescale/imx95.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1673,7 +1673,7 @@
16731673

16741674
netcmix_blk_ctrl: syscon@4c810000 {
16751675
compatible = "nxp,imx95-netcmix-blk-ctrl", "syscon";
1676-
reg = <0x0 0x4c810000 0x0 0x10000>;
1676+
reg = <0x0 0x4c810000 0x0 0x8>;
16771677
#clock-cells = <1>;
16781678
clocks = <&scmi_clk IMX95_CLK_BUSNETCMIX>;
16791679
assigned-clocks = <&scmi_clk IMX95_CLK_BUSNETCMIX>;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2440,6 +2440,7 @@
24402440

24412441
qcom,cmb-element-bits = <32>;
24422442
qcom,cmb-msrs-num = <32>;
2443+
status = "disabled";
24432444

24442445
out-ports {
24452446
port {
@@ -6092,7 +6093,7 @@
60926093
<0x0 0x40000000 0x0 0xf20>,
60936094
<0x0 0x40000f20 0x0 0xa8>,
60946095
<0x0 0x40001000 0x0 0x4000>,
6095-
<0x0 0x40200000 0x0 0x100000>,
6096+
<0x0 0x40200000 0x0 0x1fe00000>,
60966097
<0x0 0x01c03000 0x0 0x1000>,
60976098
<0x0 0x40005000 0x0 0x2000>;
60986099
reg-names = "parf", "dbi", "elbi", "atu", "addr_space",
@@ -6250,7 +6251,7 @@
62506251
<0x0 0x60000000 0x0 0xf20>,
62516252
<0x0 0x60000f20 0x0 0xa8>,
62526253
<0x0 0x60001000 0x0 0x4000>,
6253-
<0x0 0x60200000 0x0 0x100000>,
6254+
<0x0 0x60200000 0x0 0x1fe00000>,
62546255
<0x0 0x01c13000 0x0 0x1000>,
62556256
<0x0 0x60005000 0x0 0x2000>;
62566257
reg-names = "parf", "dbi", "elbi", "atu", "addr_space",

‎arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,10 @@
773773
status = "okay";
774774
};
775775

776+
&usb_1_ss0_dwc3 {
777+
dr_mode = "host";
778+
};
779+
776780
&usb_1_ss0_dwc3_hs {
777781
remote-endpoint = <&pmic_glink_ss0_hs_in>;
778782
};
@@ -801,6 +805,10 @@
801805
status = "okay";
802806
};
803807

808+
&usb_1_ss1_dwc3 {
809+
dr_mode = "host";
810+
};
811+
804812
&usb_1_ss1_dwc3_hs {
805813
remote-endpoint = <&pmic_glink_ss1_hs_in>;
806814
};

‎arch/arm64/boot/dts/qcom/x1e80100-crd.dts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,6 +1197,10 @@
11971197
status = "okay";
11981198
};
11991199

1200+
&usb_1_ss0_dwc3 {
1201+
dr_mode = "host";
1202+
};
1203+
12001204
&usb_1_ss0_dwc3_hs {
12011205
remote-endpoint = <&pmic_glink_ss0_hs_in>;
12021206
};
@@ -1225,6 +1229,10 @@
12251229
status = "okay";
12261230
};
12271231

1232+
&usb_1_ss1_dwc3 {
1233+
dr_mode = "host";
1234+
};
1235+
12281236
&usb_1_ss1_dwc3_hs {
12291237
remote-endpoint = <&pmic_glink_ss1_hs_in>;
12301238
};
@@ -1253,6 +1261,10 @@
12531261
status = "okay";
12541262
};
12551263

1264+
&usb_1_ss2_dwc3 {
1265+
dr_mode = "host";
1266+
};
1267+
12561268
&usb_1_ss2_dwc3_hs {
12571269
remote-endpoint = <&pmic_glink_ss2_hs_in>;
12581270
};

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2924,7 +2924,7 @@
29242924
#address-cells = <3>;
29252925
#size-cells = <2>;
29262926
ranges = <0x01000000 0x0 0x00000000 0x0 0x70200000 0x0 0x100000>,
2927-
<0x02000000 0x0 0x70300000 0x0 0x70300000 0x0 0x1d00000>;
2927+
<0x02000000 0x0 0x70300000 0x0 0x70300000 0x0 0x3d00000>;
29282928
bus-range = <0x00 0xff>;
29292929

29302930
dma-coherent;
@@ -4066,8 +4066,6 @@
40664066

40674067
dma-coherent;
40684068

4069-
usb-role-switch;
4070-
40714069
ports {
40724070
#address-cells = <1>;
40734071
#size-cells = <0>;
@@ -4321,8 +4319,6 @@
43214319

43224320
dma-coherent;
43234321

4324-
usb-role-switch;
4325-
43264322
ports {
43274323
#address-cells = <1>;
43284324
#size-cells = <0>;
@@ -4421,8 +4417,6 @@
44214417

44224418
dma-coherent;
44234419

4424-
usb-role-switch;
4425-
44264420
ports {
44274421
#address-cells = <1>;
44284422
#size-cells = <0>;

‎arch/arm64/boot/dts/rockchip/rk3328.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@
333333

334334
power-domain@RK3328_PD_HEVC {
335335
reg = <RK3328_PD_HEVC>;
336+
clocks = <&cru SCLK_VENC_CORE>;
336337
#power-domain-cells = <0>;
337338
};
338339
power-domain@RK3328_PD_VIDEO {

0 commit comments

Comments
 (0)