Skip to content

Commit 2e1b3cc

Browse files
torvaldstorvalds
committed
Merge tag 'arm-fixes-6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann: "Where the last set of fixes was mostly drivers, this time the devicetree changes all come at once, targeting mostly the Rockchips, Qualcomm and NXP platforms. The Qualcomm bugfixes target the Snapdragon X Elite laptops, specifically problems with PCIe and NVMe support to improve reliability, and a boot regresion on msm8939. Also for Snapdragon platforms, there are a number of correctness changes in the several platform specific device drivers, but none of these are as impactful. On the NXP i.MX platform, the fixes are all for 64-bit i.MX8 variants, correcting individual entries in the devicetree that were incorrect and causing the media, video, mmc and spi drivers to misbehave in minor ways. The Arm SCMI firmware driver gets fixes for a use-after-free bug and for correctly parsing firmware information. On the RISC-V side, there are three minor devicetree fixes for starfive and sophgo, again addressing only minor mistakes. One device driver patch fixes a problem with spurious interrupt handling" * tag 'arm-fixes-6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (63 commits) firmware: arm_scmi: Use vendor string in max-rx-timeout-ms dt-bindings: firmware: arm,scmi: Add missing vendor string riscv: dts: Replace deprecated snps,nr-gpios property for snps,dw-apb-gpio-port devices arm64: dts: rockchip: Correct GPIO polarity on brcm BT nodes arm64: dts: rockchip: Drop invalid clock-names from es8388 codec nodes ARM: dts: rockchip: Fix the realtek audio codec on rk3036-kylin ARM: dts: rockchip: Fix the spi controller on rk3036 ARM: dts: rockchip: drop grf reference from rk3036 hdmi ARM: dts: rockchip: fix rk3036 acodec node arm64: dts: rockchip: remove orphaned pinctrl-names from pinephone pro soc: qcom: pmic_glink: Handle GLINK intent allocation rejections rpmsg: glink: Handle rejected intent request better arm64: dts: qcom: x1e80100: fix PCIe5 interconnect arm64: dts: qcom: x1e80100: fix PCIe4 interconnect arm64: dts: qcom: x1e80100: Fix up BAR spaces MAINTAINERS: invert Misc RISC-V SoC Support's pattern soc: qcom: socinfo: fix revision check in qcom_socinfo_probe() arm64: dts: qcom: x1e80100-qcp: fix nvme regulator boot glitch arm64: dts: qcom: x1e80100-microsoft-romulus: fix nvme regulator boot glitch arm64: dts: qcom: x1e80100-yoga-slim7x: fix nvme regulator boot glitch ...
2 parents 557329b + bbfbb57 commit 2e1b3cc

Some content is hidden

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

59 files changed

+213
-158
lines changed

‎Documentation/devicetree/bindings/firmware/arm,scmi.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ properties:
124124
atomic mode of operation, even if requested.
125125
default: 0
126126

127-
max-rx-timeout-ms:
127+
arm,max-rx-timeout-ms:
128128
description:
129129
An optional time value, expressed in milliseconds, representing the
130130
transport maximum timeout value for the receive channel. The value should

‎MAINTAINERS

+5-7
Original file line numberDiff line numberDiff line change
@@ -2852,7 +2852,7 @@ F: Documentation/devicetree/bindings/arm/qcom.yaml
28522852
F: Documentation/devicetree/bindings/bus/qcom*
28532853
F: Documentation/devicetree/bindings/cache/qcom,llcc.yaml
28542854
F: Documentation/devicetree/bindings/firmware/qcom,scm.yaml
2855-
F: Documentation/devicetree/bindings/reserved-memory/qcom
2855+
F: Documentation/devicetree/bindings/reserved-memory/qcom*
28562856
F: Documentation/devicetree/bindings/soc/qcom/
28572857
F: arch/arm/boot/dts/qcom/
28582858
F: arch/arm/configs/qcom_defconfig
@@ -19846,12 +19846,10 @@ L: [email protected]
1984619846
S: Maintained
1984719847
Q: https://patchwork.kernel.org/project/linux-riscv/list/
1984819848
T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
19849-
F: Documentation/devicetree/bindings/riscv/
19850-
F: arch/riscv/boot/dts/
19851-
X: arch/riscv/boot/dts/allwinner/
19852-
X: arch/riscv/boot/dts/renesas/
19853-
X: arch/riscv/boot/dts/sophgo/
19854-
X: arch/riscv/boot/dts/thead/
19849+
F: arch/riscv/boot/dts/canaan/
19850+
F: arch/riscv/boot/dts/microchip/
19851+
F: arch/riscv/boot/dts/sifive/
19852+
F: arch/riscv/boot/dts/starfive/
1985519853

1985619854
RISC-V PMU DRIVERS
1985719855
M: Atish Patra <[email protected]>

‎arch/arm/boot/dts/rockchip/rk3036-kylin.dts

+2-2
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,8 @@
325325
&i2c2 {
326326
status = "okay";
327327

328-
rt5616: rt5616@1b {
329-
compatible = "rt5616";
328+
rt5616: audio-codec@1b {
329+
compatible = "realtek,rt5616";
330330
reg = <0x1b>;
331331
clocks = <&cru SCLK_I2S_OUT>;
332332
clock-names = "mclk";

‎arch/arm/boot/dts/rockchip/rk3036.dtsi

+7-7
Original file line numberDiff line numberDiff line change
@@ -384,12 +384,13 @@
384384
};
385385
};
386386

387-
acodec: acodec-ana@20030000 {
388-
compatible = "rk3036-codec";
387+
acodec: audio-codec@20030000 {
388+
compatible = "rockchip,rk3036-codec";
389389
reg = <0x20030000 0x4000>;
390-
rockchip,grf = <&grf>;
391390
clock-names = "acodec_pclk";
392391
clocks = <&cru PCLK_ACODEC>;
392+
rockchip,grf = <&grf>;
393+
#sound-dai-cells = <0>;
393394
status = "disabled";
394395
};
395396

@@ -399,7 +400,6 @@
399400
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
400401
clocks = <&cru PCLK_HDMI>;
401402
clock-names = "pclk";
402-
rockchip,grf = <&grf>;
403403
pinctrl-names = "default";
404404
pinctrl-0 = <&hdmi_ctl>;
405405
#sound-dai-cells = <0>;
@@ -553,11 +553,11 @@
553553
};
554554

555555
spi: spi@20074000 {
556-
compatible = "rockchip,rockchip-spi";
556+
compatible = "rockchip,rk3036-spi";
557557
reg = <0x20074000 0x1000>;
558558
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
559-
clocks = <&cru PCLK_SPI>, <&cru SCLK_SPI>;
560-
clock-names = "apb-pclk","spi_pclk";
559+
clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>;
560+
clock-names = "spiclk", "apb_pclk";
561561
dmas = <&pdma 8>, <&pdma 9>;
562562
dma-names = "tx", "rx";
563563
pinctrl-names = "default";

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@ lvds0_subsys: bus@56240000 {
1414
compatible = "fsl,imx8qxp-lpcg";
1515
reg = <0x56243000 0x4>;
1616
#clock-cells = <1>;
17-
clock-output-names = "mipi1_lis_lpcg_ipg_clk";
17+
clock-output-names = "lvds0_lis_lpcg_ipg_clk";
1818
power-domains = <&pd IMX_SC_R_MIPI_1>;
1919
};
2020

2121
qm_lvds0_pwm_lpcg: qxp_mipi1_pwm_lpcg: clock-controller@5624300c {
2222
compatible = "fsl,imx8qxp-lpcg";
2323
reg = <0x5624300c 0x4>;
2424
#clock-cells = <1>;
25-
clock-output-names = "mipi1_pwm_lpcg_clk",
26-
"mipi1_pwm_lpcg_ipg_clk",
27-
"mipi1_pwm_lpcg_32k_clk";
25+
clock-output-names = "lvds0_pwm_lpcg_clk",
26+
"lvds0_pwm_lpcg_ipg_clk",
27+
"lvds0_pwm_lpcg_32k_clk";
2828
power-domains = <&pd IMX_SC_R_MIPI_1_PWM_0>;
2929
};
3030

3131
qm_lvds0_i2c0_lpcg: qxp_mipi1_i2c0_lpcg: clock-controller@56243010 {
3232
compatible = "fsl,imx8qxp-lpcg";
3333
reg = <0x56243010 0x4>;
3434
#clock-cells = <1>;
35-
clock-output-names = "mipi1_i2c0_lpcg_clk",
36-
"mipi1_i2c0_lpcg_ipg_clk";
35+
clock-output-names = "lvds0_i2c0_lpcg_clk",
36+
"lvds0_i2c0_lpcg_ipg_clk";
3737
power-domains = <&pd IMX_SC_R_MIPI_1_I2C_0>;
3838
};
3939

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ vpu: vpu@2c000000 {
1515
mu_m0: mailbox@2d000000 {
1616
compatible = "fsl,imx6sx-mu";
1717
reg = <0x2d000000 0x20000>;
18-
interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
18+
interrupts = <GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH>;
1919
#mbox-cells = <2>;
2020
power-domains = <&pd IMX_SC_R_VPU_MU_0>;
2121
status = "disabled";
@@ -24,7 +24,7 @@ vpu: vpu@2c000000 {
2424
mu1_m0: mailbox@2d020000 {
2525
compatible = "fsl,imx6sx-mu";
2626
reg = <0x2d020000 0x20000>;
27-
interrupts = <GIC_SPI 470 IRQ_TYPE_LEVEL_HIGH>;
27+
interrupts = <GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>;
2828
#mbox-cells = <2>;
2929
power-domains = <&pd IMX_SC_R_VPU_MU_1>;
3030
status = "disabled";

‎arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts

+12
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,18 @@
218218
};
219219
};
220220

221+
&media_blk_ctrl {
222+
/*
223+
* The LVDS panel on this device uses 72.4 MHz pixel clock,
224+
* set IMX8MP_VIDEO_PLL1 to 72.4 * 7 = 506.8 MHz so the LDB
225+
* serializer and LCDIFv3 scanout engine can reach accurate
226+
* pixel clock of exactly 72.4 MHz.
227+
*/
228+
assigned-clock-rates = <500000000>, <200000000>,
229+
<0>, <0>, <500000000>,
230+
<506800000>;
231+
};
232+
221233
&snvs_pwrkey {
222234
status = "okay";
223235
};

‎arch/arm64/boot/dts/freescale/imx8mp-skov-revb-mi1010ait-1cp1.dts

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
assigned-clock-rates = <500000000>, <200000000>, <0>,
7272
/* IMX8MP_CLK_MEDIA_DISP2_PIX = pixelclk of lvds panel */
7373
<68900000>,
74+
<500000000>,
7475
/* IMX8MP_VIDEO_PLL1 = IMX8MP_CLK_MEDIA_LDB * 2 */
7576
<964600000>;
7677
};

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@
12611261
compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc";
12621262
reg = <0x30b40000 0x10000>;
12631263
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
1264-
clocks = <&clk IMX8MP_CLK_DUMMY>,
1264+
clocks = <&clk IMX8MP_CLK_IPG_ROOT>,
12651265
<&clk IMX8MP_CLK_NAND_USDHC_BUS>,
12661266
<&clk IMX8MP_CLK_USDHC1_ROOT>;
12671267
clock-names = "ipg", "ahb", "per";
@@ -1275,7 +1275,7 @@
12751275
compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc";
12761276
reg = <0x30b50000 0x10000>;
12771277
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
1278-
clocks = <&clk IMX8MP_CLK_DUMMY>,
1278+
clocks = <&clk IMX8MP_CLK_IPG_ROOT>,
12791279
<&clk IMX8MP_CLK_NAND_USDHC_BUS>,
12801280
<&clk IMX8MP_CLK_USDHC2_ROOT>;
12811281
clock-names = "ipg", "ahb", "per";
@@ -1289,7 +1289,7 @@
12891289
compatible = "fsl,imx8mp-usdhc", "fsl,imx8mm-usdhc", "fsl,imx7d-usdhc";
12901290
reg = <0x30b60000 0x10000>;
12911291
interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
1292-
clocks = <&clk IMX8MP_CLK_DUMMY>,
1292+
clocks = <&clk IMX8MP_CLK_IPG_ROOT>,
12931293
<&clk IMX8MP_CLK_NAND_USDHC_BUS>,
12941294
<&clk IMX8MP_CLK_USDHC3_ROOT>;
12951295
clock-names = "ipg", "ahb", "per";

‎arch/arm64/boot/dts/freescale/imx8qxp-ss-vpu.dtsi

+8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
* Author: Alexander Stein
66
*/
77

8+
&mu_m0 {
9+
interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
10+
};
11+
12+
&mu1_m0 {
13+
interrupts = <GIC_SPI 470 IRQ_TYPE_LEVEL_HIGH>;
14+
};
15+
816
&vpu_core0 {
917
reg = <0x2d040000 0x10000>;
1018
};

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@
384384
};
385385

386386
flexspi2: spi@29810000 {
387-
compatible = "nxp,imx8mm-fspi";
387+
compatible = "nxp,imx8ulp-fspi";
388388
reg = <0x29810000 0x10000>, <0x60000000 0x10000000>;
389389
reg-names = "fspi_base", "fspi_mmap";
390390
#address-cells = <1>;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248

249249
smd-edge {
250250
interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
251-
mboxes = <&apcs1_mbox 0>;
251+
qcom,ipc = <&apcs1_mbox 8 0>;
252252
qcom,smd-edge = <15>;
253253

254254
rpm_requests: rpm-requests {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1973,7 +1973,7 @@
19731973

19741974
clocks = <&gcc GCC_PCIE_1_PIPE_CLK>,
19751975
<&gcc GCC_PCIE_1_PIPE_CLK_SRC>,
1976-
<&pcie1_phy>,
1976+
<&pcie1_phy QMP_PCIE_PIPE_CLK>,
19771977
<&rpmhcc RPMH_CXO_CLK>,
19781978
<&gcc GCC_PCIE_1_AUX_CLK>,
19791979
<&gcc GCC_PCIE_1_CFG_AHB_CLK>,

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

+2
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,8 @@
139139

140140
pinctrl-0 = <&nvme_reg_en>;
141141
pinctrl-names = "default";
142+
143+
regulator-boot-on;
142144
};
143145

144146
vph_pwr: regulator-vph-pwr {

‎arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts

+2
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@
134134

135135
pinctrl-0 = <&nvme_reg_en>;
136136
pinctrl-names = "default";
137+
138+
regulator-boot-on;
137139
};
138140
};
139141

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,9 @@
177177
compatible = "qcom,x1e80100-sndcard";
178178
model = "X1E80100-CRD";
179179
audio-routing = "WooferLeft IN", "WSA WSA_SPK1 OUT",
180-
"TwitterLeft IN", "WSA WSA_SPK2 OUT",
180+
"TweeterLeft IN", "WSA WSA_SPK2 OUT",
181181
"WooferRight IN", "WSA2 WSA_SPK2 OUT",
182-
"TwitterRight IN", "WSA2 WSA_SPK2 OUT",
182+
"TweeterRight IN", "WSA2 WSA_SPK2 OUT",
183183
"IN1_HPHL", "HPHL_OUT",
184184
"IN2_HPHR", "HPHR_OUT",
185185
"AMIC2", "MIC BIAS2",
@@ -300,6 +300,8 @@
300300

301301
pinctrl-names = "default";
302302
pinctrl-0 = <&nvme_reg_en>;
303+
304+
regulator-boot-on;
303305
};
304306

305307
vreg_wwan: regulator-wwan {
@@ -933,7 +935,7 @@
933935
reg = <0 1>;
934936
reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
935937
#sound-dai-cells = <0>;
936-
sound-name-prefix = "TwitterLeft";
938+
sound-name-prefix = "TweeterLeft";
937939
vdd-1p8-supply = <&vreg_l15b_1p8>;
938940
vdd-io-supply = <&vreg_l12b_1p2>;
939941
qcom,port-mapping = <4 5 6 7 11 13>;
@@ -986,7 +988,7 @@
986988
reg = <0 1>;
987989
reset-gpios = <&lpass_tlmm 13 GPIO_ACTIVE_LOW>;
988990
#sound-dai-cells = <0>;
989-
sound-name-prefix = "TwitterRight";
991+
sound-name-prefix = "TweeterRight";
990992
vdd-1p8-supply = <&vreg_l15b_1p8>;
991993
vdd-io-supply = <&vreg_l12b_1p2>;
992994
qcom,port-mapping = <4 5 6 7 11 13>;

‎arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts

+2
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@
205205

206206
pinctrl-0 = <&nvme_reg_en>;
207207
pinctrl-names = "default";
208+
209+
regulator-boot-on;
208210
};
209211
};
210212

‎arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi

+2
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@
164164

165165
pinctrl-0 = <&nvme_reg_en>;
166166
pinctrl-names = "default";
167+
168+
regulator-boot-on;
167169
};
168170
};
169171

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

+2
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,8 @@
253253

254254
pinctrl-names = "default";
255255
pinctrl-0 = <&nvme_reg_en>;
256+
257+
regulator-boot-on;
256258
};
257259
};
258260

0 commit comments

Comments
 (0)