Skip to content

Commit e7c1216

Browse files
arndbarndb
committed
Merge tag 'v6.5-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes
Correct wifi interrupt flags for some boards, fixed wifi on Rock PI4, disabled hs400 speeds for some boards having problems with data intergrity and some dt property/styling fixes. * tag 'v6.5-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Fix Wifi/Bluetooth on ROCK Pi 4 boards arm64: dts: rockchip: minor whitespace cleanup around '=' arm64: dts: rockchip: Disable HS400 for eMMC on ROCK 4C+ arm64: dts: rockchip: Disable HS400 for eMMC on ROCK Pi 4 arm64: dts: rockchip: add missing space before { on indiedroid nova arm64: dts: rockchip: correct wifi interrupt flag in Box Demo arm64: dts: rockchip: correct wifi interrupt flag in Rock Pi 4B arm64: dts: rockchip: correct wifi interrupt flag in eaidk-610 arm64: dts: rockchip: Drop invalid regulator-init-microvolt property Link: https://lore.kernel.org/r/4519945.8hzESeGDPO@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 6e6d847 + ebceec2 commit e7c1216

27 files changed

Lines changed: 22 additions & 69 deletions

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,14 @@
291291
};
292292
power-domain@PX30_PD_MMC_NAND {
293293
reg = <PX30_PD_MMC_NAND>;
294-
clocks = <&cru HCLK_NANDC>,
295-
<&cru HCLK_EMMC>,
296-
<&cru HCLK_SDIO>,
297-
<&cru HCLK_SFC>,
298-
<&cru SCLK_EMMC>,
299-
<&cru SCLK_NANDC>,
300-
<&cru SCLK_SDIO>,
301-
<&cru SCLK_SFC>;
294+
clocks = <&cru HCLK_NANDC>,
295+
<&cru HCLK_EMMC>,
296+
<&cru HCLK_SDIO>,
297+
<&cru HCLK_SFC>,
298+
<&cru SCLK_EMMC>,
299+
<&cru SCLK_NANDC>,
300+
<&cru SCLK_SDIO>,
301+
<&cru SCLK_SFC>;
302302
pm_qos = <&qos_emmc>, <&qos_nand>,
303303
<&qos_sdio>, <&qos_sfc>;
304304
#power-domain-cells = <0>;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
regulator-name = "vdd_core";
107107
regulator-min-microvolt = <827000>;
108108
regulator-max-microvolt = <1340000>;
109-
regulator-init-microvolt = <1015000>;
110109
regulator-settling-time-up-us = <250>;
111110
regulator-always-on;
112111
regulator-boot-on;

‎arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
regulator-name = "vdd_core";
106106
regulator-min-microvolt = <827000>;
107107
regulator-max-microvolt = <1340000>;
108-
regulator-init-microvolt = <1015000>;
109108
regulator-settling-time-up-us = <250>;
110109
regulator-always-on;
111110
regulator-boot-on;

‎arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@
773773
compatible = "brcm,bcm4329-fmac";
774774
reg = <1>;
775775
interrupt-parent = <&gpio0>;
776-
interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
776+
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
777777
interrupt-names = "host-wake";
778778
pinctrl-names = "default";
779779
pinctrl-0 = <&wifi_host_wake_l>;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@
375375
vcc_sdio: LDO_REG4 {
376376
regulator-always-on;
377377
regulator-boot-on;
378-
regulator-init-microvolt = <3000000>;
379378
regulator-min-microvolt = <1800000>;
380379
regulator-max-microvolt = <3300000>;
381380
regulator-name = "vcc_sdio";

‎arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,9 +548,8 @@
548548
&sdhci {
549549
max-frequency = <150000000>;
550550
bus-width = <8>;
551-
mmc-hs400-1_8v;
551+
mmc-hs200-1_8v;
552552
non-removable;
553-
mmc-hs400-enhanced-strobe;
554553
status = "okay";
555554
};
556555

‎arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
sdio_pwrseq: sdio-pwrseq {
4646
compatible = "mmc-pwrseq-simple";
4747
clocks = <&rk808 1>;
48-
clock-names = "ext_clock";
48+
clock-names = "lpo";
4949
pinctrl-names = "default";
5050
pinctrl-0 = <&wifi_enable_h>;
5151
reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
@@ -645,9 +645,9 @@
645645
};
646646

647647
&sdhci {
648+
max-frequency = <150000000>;
648649
bus-width = <8>;
649-
mmc-hs400-1_8v;
650-
mmc-hs400-enhanced-strobe;
650+
mmc-hs200-1_8v;
651651
non-removable;
652652
status = "okay";
653653
};

‎arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
compatible = "brcm,bcm4329-fmac";
3232
reg = <1>;
3333
interrupt-parent = <&gpio0>;
34-
interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
34+
interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;
3535
interrupt-names = "host-wake";
3636
pinctrl-names = "default";
3737
pinctrl-0 = <&wifi_host_wake_l>;

‎arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@
356356
regulator-boot-on;
357357
regulator-min-microvolt = <500000>;
358358
regulator-max-microvolt = <1350000>;
359-
regulator-init-microvolt = <900000>;
360359
regulator-ramp-delay = <6001>;
361360
regulator-initial-mode = <0x2>;
362361
regulator-name = "vdd_logic";
@@ -371,7 +370,6 @@
371370
regulator-boot-on;
372371
regulator-min-microvolt = <500000>;
373372
regulator-max-microvolt = <1350000>;
374-
regulator-init-microvolt = <900000>;
375373
regulator-ramp-delay = <6001>;
376374
regulator-initial-mode = <0x2>;
377375
regulator-name = "vdd_gpu";
@@ -533,7 +531,6 @@
533531
regulator-boot-on;
534532
regulator-min-microvolt = <712500>;
535533
regulator-max-microvolt = <1390000>;
536-
regulator-init-microvolt = <900000>;
537534
regulator-name = "vdd_cpu";
538535
regulator-ramp-delay = <2300>;
539536
vin-supply = <&vcc_sys>;

‎arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239

240240
&gmac1 {
241241
assigned-clocks = <&cru SCLK_GMAC1_RX_TX>, <&cru SCLK_GMAC1>;
242-
assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&gmac1_clkin>;
242+
assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>, <&gmac1_clkin>;
243243
phy-mode = "rgmii";
244244
clock_in_out = "input";
245245
pinctrl-names = "default";
@@ -416,7 +416,7 @@
416416
compatible = "brcm,bcm4329-fmac";
417417
reg = <1>;
418418
interrupt-parent = <&gpio2>;
419-
interrupts = <RK_PB2 GPIO_ACTIVE_HIGH>;
419+
interrupts = <RK_PB2 IRQ_TYPE_LEVEL_HIGH>;
420420
interrupt-names = "host-wake";
421421
pinctrl-names = "default";
422422
pinctrl-0 = <&wifi_host_wake_h>;

0 commit comments

Comments
 (0)