Skip to content

Commit 4f72a26

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "All the changes this time are minor devicetree corrections, the majority being for 64-bit Rockchip SoC support. These are a couple of corrections for properties that are in violation of the binding, some that put the machine into safer operating points for the eMMC and thermal settings, and missing properties that prevented rk356x PCIe and ethernet from working correctly. The changes for amlogic and mediatek address incorrect properties that were preventing the display support on MT8195 and the MMC support on various Meson SoCs from working correctly. The stihxxx-b2120 change fixes the GPIO polarity for the DVB tuner to allow this to be used correctly after a futre driver change, though it has no effect on older kernels" * tag 'soc-fixes-6.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: arm64: dts: meson-gx: Make mmc host controller interrupts level-sensitive arm64: dts: meson-g12-common: Make mmc host controller interrupts level-sensitive arm64: dts: meson-axg: Make mmc host controller interrupts level-sensitive ARM: dts: stihxxx-b2120: fix polarity of reset line of tsin0 port arm64: dts: mediatek: mt8195: Fix vdosys* compatible strings arm64: dts: rockchip: align rk3399 DMC OPP table with bindings arm64: dts: rockchip: set sdmmc0 speed to sd-uhs-sdr50 on rock-3a arm64: dts: rockchip: fix probe of analog sound card on rock-3a arm64: dts: rockchip: add missing #interrupt-cells to rk356x pcie2x1 arm64: dts: rockchip: fix input enable pinconf on rk3399 ARM: dts: rockchip: add power-domains property to dp node on rk3288 arm64: dts: rockchip: add io domain setting to rk3566-box-demo arm64: dts: rockchip: remove unsupported property from sdmmc2 for rock-3a arm64: dts: rockchip: drop unused LED mode property from rk3328-roc-cc arm64: dts: rockchip: reduce thermal limits on rk3399-pinephone-pro arm64: dts: rockchip: use correct reset names for rk3399 crypto nodes
2 parents 8e9a842 + bc6772b commit 4f72a26

File tree

13 files changed

+37
-20
lines changed

13 files changed

+37
-20
lines changed

‎arch/arm/boot/dts/rk3288.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,6 +1181,7 @@
11811181
clock-names = "dp", "pclk";
11821182
phys = <&edp_phy>;
11831183
phy-names = "dp";
1184+
power-domains = <&power RK3288_PD_VIO>;
11841185
resets = <&cru SRST_EDP>;
11851186
reset-names = "dp";
11861187
rockchip,grf = <&grf>;

‎arch/arm/boot/dts/stihxxx-b2120.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
tsin-num = <0>;
179179
serial-not-parallel;
180180
i2c-bus = <&ssc2>;
181-
reset-gpios = <&pio15 4 GPIO_ACTIVE_HIGH>;
181+
reset-gpios = <&pio15 4 GPIO_ACTIVE_LOW>;
182182
dvb-card = <STV0367_TDA18212_NIMA_1>;
183183
};
184184
};

‎arch/arm64/boot/dts/amlogic/meson-axg.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1886,7 +1886,7 @@
18861886
sd_emmc_b: sd@5000 {
18871887
compatible = "amlogic,meson-axg-mmc";
18881888
reg = <0x0 0x5000 0x0 0x800>;
1889-
interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
1889+
interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;
18901890
status = "disabled";
18911891
clocks = <&clkc CLKID_SD_EMMC_B>,
18921892
<&clkc CLKID_SD_EMMC_B_CLK0>,
@@ -1898,7 +1898,7 @@
18981898
sd_emmc_c: mmc@7000 {
18991899
compatible = "amlogic,meson-axg-mmc";
19001900
reg = <0x0 0x7000 0x0 0x800>;
1901-
interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
1901+
interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;
19021902
status = "disabled";
19031903
clocks = <&clkc CLKID_SD_EMMC_C>,
19041904
<&clkc CLKID_SD_EMMC_C_CLK0>,

‎arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2324,7 +2324,7 @@
23242324
sd_emmc_a: sd@ffe03000 {
23252325
compatible = "amlogic,meson-axg-mmc";
23262326
reg = <0x0 0xffe03000 0x0 0x800>;
2327-
interrupts = <GIC_SPI 189 IRQ_TYPE_EDGE_RISING>;
2327+
interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
23282328
status = "disabled";
23292329
clocks = <&clkc CLKID_SD_EMMC_A>,
23302330
<&clkc CLKID_SD_EMMC_A_CLK0>,
@@ -2336,7 +2336,7 @@
23362336
sd_emmc_b: sd@ffe05000 {
23372337
compatible = "amlogic,meson-axg-mmc";
23382338
reg = <0x0 0xffe05000 0x0 0x800>;
2339-
interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>;
2339+
interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>;
23402340
status = "disabled";
23412341
clocks = <&clkc CLKID_SD_EMMC_B>,
23422342
<&clkc CLKID_SD_EMMC_B_CLK0>,
@@ -2348,7 +2348,7 @@
23482348
sd_emmc_c: mmc@ffe07000 {
23492349
compatible = "amlogic,meson-axg-mmc";
23502350
reg = <0x0 0xffe07000 0x0 0x800>;
2351-
interrupts = <GIC_SPI 191 IRQ_TYPE_EDGE_RISING>;
2351+
interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
23522352
status = "disabled";
23532353
clocks = <&clkc CLKID_SD_EMMC_C>,
23542354
<&clkc CLKID_SD_EMMC_C_CLK0>,

‎arch/arm64/boot/dts/amlogic/meson-gx.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -603,21 +603,21 @@
603603
sd_emmc_a: mmc@70000 {
604604
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
605605
reg = <0x0 0x70000 0x0 0x800>;
606-
interrupts = <GIC_SPI 216 IRQ_TYPE_EDGE_RISING>;
606+
interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
607607
status = "disabled";
608608
};
609609

610610
sd_emmc_b: mmc@72000 {
611611
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
612612
reg = <0x0 0x72000 0x0 0x800>;
613-
interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
613+
interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;
614614
status = "disabled";
615615
};
616616

617617
sd_emmc_c: mmc@74000 {
618618
compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc";
619619
reg = <0x0 0x74000 0x0 0x800>;
620-
interrupts = <GIC_SPI 218 IRQ_TYPE_EDGE_RISING>;
620+
interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;
621621
status = "disabled";
622622
};
623623
};

‎arch/arm64/boot/dts/mediatek/mt8195.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2146,7 +2146,7 @@
21462146
};
21472147

21482148
vdosys0: syscon@1c01a000 {
2149-
compatible = "mediatek,mt8195-mmsys", "syscon";
2149+
compatible = "mediatek,mt8195-vdosys0", "mediatek,mt8195-mmsys", "syscon";
21502150
reg = <0 0x1c01a000 0 0x1000>;
21512151
mboxes = <&gce0 0 CMDQ_THR_PRIO_4>;
21522152
#clock-cells = <1>;
@@ -2292,7 +2292,7 @@
22922292
};
22932293

22942294
vdosys1: syscon@1c100000 {
2295-
compatible = "mediatek,mt8195-mmsys", "syscon";
2295+
compatible = "mediatek,mt8195-vdosys1", "syscon";
22962296
reg = <0 0x1c100000 0 0x1000>;
22972297
#clock-cells = <1>;
22982298
};

‎arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,13 @@
9696
linux,default-trigger = "heartbeat";
9797
gpios = <&rk805 1 GPIO_ACTIVE_LOW>;
9898
default-state = "on";
99-
mode = <0x23>;
10099
};
101100

102101
user_led: led-1 {
103102
label = "firefly:yellow:user";
104103
linux,default-trigger = "mmc1";
105104
gpios = <&rk805 0 GPIO_ACTIVE_LOW>;
106105
default-state = "off";
107-
mode = <0x05>;
108106
};
109107
};
110108
};

‎arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
};
112112
};
113113

114-
dmc_opp_table: dmc_opp_table {
114+
dmc_opp_table: opp-table-3 {
115115
compatible = "operating-points-v2";
116116

117117
opp00 {

‎arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,13 @@
104104
};
105105
};
106106

107+
&cpu_alert0 {
108+
temperature = <65000>;
109+
};
110+
&cpu_alert1 {
111+
temperature = <68000>;
112+
};
113+
107114
&cpu_l0 {
108115
cpu-supply = <&vdd_cpu_l>;
109116
};

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@
589589
clocks = <&cru HCLK_M_CRYPTO0>, <&cru HCLK_S_CRYPTO0>, <&cru SCLK_CRYPTO0>;
590590
clock-names = "hclk_master", "hclk_slave", "sclk";
591591
resets = <&cru SRST_CRYPTO0>, <&cru SRST_CRYPTO0_S>, <&cru SRST_CRYPTO0_M>;
592-
reset-names = "master", "lave", "crypto";
592+
reset-names = "master", "slave", "crypto-rst";
593593
};
594594

595595
crypto1: crypto@ff8b8000 {
@@ -599,7 +599,7 @@
599599
clocks = <&cru HCLK_M_CRYPTO1>, <&cru HCLK_S_CRYPTO1>, <&cru SCLK_CRYPTO1>;
600600
clock-names = "hclk_master", "hclk_slave", "sclk";
601601
resets = <&cru SRST_CRYPTO1>, <&cru SRST_CRYPTO1_S>, <&cru SRST_CRYPTO1_M>;
602-
reset-names = "master", "slave", "crypto";
602+
reset-names = "master", "slave", "crypto-rst";
603603
};
604604

605605
i2c1: i2c@ff110000 {
@@ -2241,13 +2241,11 @@
22412241
pcfg_input_pull_up: pcfg-input-pull-up {
22422242
input-enable;
22432243
bias-pull-up;
2244-
drive-strength = <2>;
22452244
};
22462245

22472246
pcfg_input_pull_down: pcfg-input-pull-down {
22482247
input-enable;
22492248
bias-pull-down;
2250-
drive-strength = <2>;
22512249
};
22522250

22532251
clock {

0 commit comments

Comments
 (0)