Unverified Commit e7c12167 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.5-rockchip-dtsfixes1' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 6e6d847a ebceec27

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

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ 
		regulator-name = "vdd_core";

		regulator-min-microvolt = <827000>;

		regulator-max-microvolt = <1340000>;

		regulator-init-microvolt = <1015000>;

		regulator-settling-time-up-us = <250>;

		regulator-always-on;

		regulator-boot-on;

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

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ 
		regulator-name = "vdd_core";

		regulator-min-microvolt = <827000>;

		regulator-max-microvolt = <1340000>;

		regulator-init-microvolt = <1015000>;

		regulator-settling-time-up-us = <250>;

		regulator-always-on;

		regulator-boot-on;

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

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ 
		compatible = "brcm,bcm4329-fmac";

		reg = <1>;

		interrupt-parent = <&gpio0>;

		interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;

		interrupts = <RK_PA3 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "host-wake";

		pinctrl-names = "default";

		pinctrl-0 = <&wifi_host_wake_l>;

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

+0 −1
Original line number Diff line number Diff line
@@ -375,7 +375,6 @@ 
			vcc_sdio: LDO_REG4 {

				regulator-always-on;

				regulator-boot-on;

				regulator-init-microvolt = <3000000>;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-name = "vcc_sdio";

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

+1 −2
Original line number Diff line number Diff line
@@ -548,9 +548,8 @@ 
&sdhci {

	max-frequency = <150000000>;

	bus-width = <8>;

	mmc-hs400-1_8v;

	mmc-hs200-1_8v;

	non-removable;

	mmc-hs400-enhanced-strobe;

	status = "okay";

};