Unverified Commit 81b7cf86 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'v6.15-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes

Removal of operating-points above what the rk3588j soc is rated for, and
a number of smaller fixes: Turing RK1 fan can spin down again, fixed pins,
pinmuxing and clocks and some devicetree-correctnes improvements.

* tag 'v6.15-rockchip-dtsfixes1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: fix Sige5 RTC interrupt pin
  arm64: dts: rockchip: Assign RT5616 MCLK rate on rk3588-friendlyelec-cm3588
  arm64: dts: rockchip: Align wifi node name with bindings in CB2
  arm64: dts: rockchip: Fix mmc-pwrseq clock name on rock-pi-4
  arm64: dts: rockchip: Use "regulator-fixed" for btreg on px30-engicam for vcc3v3-btreg
  arm64: dts: rockchip: Add pinmuxing for eMMC on QNAP TS433
  arm64: dts: rockchip: Remove overdrive-mode OPPs from RK3588J SoC dtsi
  arm64: dts: rockchip: Allow Turing RK1 cooling fan to spin down

Link: https://lore.kernel.org/r/2923598.88bMQJbFj6@diego


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2ef5c66c 4bf593be

arch/arm64/boot/dts/rockchip/px30-engicam-common.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ sdio_pwrseq: sdio-pwrseq { 
	};



	vcc3v3_btreg: vcc3v3-btreg {

		compatible = "regulator-gpio";

		compatible = "regulator-fixed";

		enable-active-high;

		pinctrl-names = "default";

		pinctrl-0 = <&bt_enable_h>;
@@ -39,7 +39,6 @@ vcc3v3_btreg: vcc3v3-btreg { 
		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		states = <3300000 0x0>;

	};



	vcc3v3_rf_aux_mod: regulator-vcc3v3-rf-aux-mod {

arch/arm64/boot/dts/rockchip/px30-engicam-ctouch2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -26,5 +26,5 @@ &sdio_pwrseq { 
};



&vcc3v3_btreg {

	enable-gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>;

	gpios = <&gpio1 RK_PC3 GPIO_ACTIVE_HIGH>;

};

arch/arm64/boot/dts/rockchip/px30-engicam-px30-core-edimm2.2.dts

+1 −1
Original line number Diff line number Diff line
@@ -39,5 +39,5 @@ &sdio_pwrseq { 
};



&vcc3v3_btreg {

	enable-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;

	gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;

};

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ led-0 { 
	sdio_pwrseq: sdio-pwrseq {

		compatible = "mmc-pwrseq-simple";

		clocks = <&rk808 1>;

		clock-names = "lpo";

		clock-names = "ext_clock";

		pinctrl-names = "default";

		pinctrl-0 = <&wifi_enable_h>;

		reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;

arch/arm64/boot/dts/rockchip/rk3566-bigtreetech-cb2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ &sdmmc1 { 
	rockchip,default-sample-phase = <90>;

	status = "okay";



	sdio-wifi@1 {

	wifi@1 {

		compatible = "brcm,bcm4329-fmac";

		reg = <1>;

		interrupt-parent = <&gpio2>;