Commit 9bf59d77 authored by FUKAUMI Naoki's avatar FUKAUMI Naoki Committed by sanglipeng
Browse files

arm64: dts: rockchip: sort nodes/properties on rk3399-rock-4 

stable inclusion
from stable-v5.10.192
commit 70626b93d6eb81ce15260728e4f312e94e46b2de
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I933RF

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=70626b93d6eb81ce15260728e4f312e94e46b2de



--------------------------------

[ Upstream commit 06c5b569 ]

sort nodes/properties alphabetically

Signed-off-by: default avatarFUKAUMI Naoki <naoki@radxa.com>
Link: https://lore.kernel.org/r/20220909195006.127957-5-naoki@radxa.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Stable-dep-of: cee57275 ("arm64: dts: rockchip: Disable HS400 for eMMC on ROCK Pi 4")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 12d98bfc

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

+61 −63
Original line number Diff line number Diff line
@@ -54,32 +54,33 @@ 
		};

	};



	vcc12v_dcin: dc-12v {

	vbus_typec: vbus-typec-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc12v_dcin";

		enable-active-high;

		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&vcc5v0_typec_en>;

		regulator-name = "vbus_typec";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		vin-supply = <&vcc5v0_sys>;

	};



	vcc5v0_sys: vcc-sys {

	vcc12v_dcin: dc-12v {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_sys";

		regulator-name = "vcc12v_dcin";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&vcc12v_dcin>;

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

	};



	vcc_0v9: vcc-0v9 {

	vcc3v3_lan: vcc3v3-lan-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc_0v9";

		regulator-name = "vcc3v3_lan";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <900000>;

		regulator-max-microvolt = <900000>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc3v3_sys>;

	};
@@ -116,24 +117,23 @@ 
		vin-supply = <&vcc5v0_sys>;

	};



	vbus_typec: vbus-typec-regulator {

	vcc5v0_sys: vcc-sys {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&vcc5v0_typec_en>;

		regulator-name = "vbus_typec";

		regulator-name = "vcc5v0_sys";

		regulator-always-on;

		vin-supply = <&vcc5v0_sys>;

		regulator-boot-on;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&vcc12v_dcin>;

	};



	vcc3v3_lan: vcc3v3-lan-regulator {

	vcc_0v9: vcc-0v9 {

		compatible = "regulator-fixed";

		regulator-name = "vcc3v3_lan";

		regulator-name = "vcc_0v9";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-min-microvolt = <900000>;

		regulator-max-microvolt = <900000>;

		vin-supply = <&vcc3v3_sys>;

	};
@@ -493,21 +493,10 @@ 
};



&io_domains {

	status = "okay";



	bt656-supply = <&vcc_3v0>;

	audio-supply = <&vcca1v8_codec>;

	sdmmc-supply = <&vcc_sdio>;

	bt656-supply = <&vcc_3v0>;

	gpio1830-supply = <&vcc_3v0>;

};



&pmu_io_domains {

	status = "okay";



	pmu1830-supply = <&vcc_3v0>;

};



&pcie_phy {

	sdmmc-supply = <&vcc_sdio>;

	status = "okay";

};
@@ -523,6 +512,10 @@ 
	status = "okay";

};



&pcie_phy {

	status = "okay";

};



&pinctrl {

	bt {

		bt_enable_h: bt-enable-h {
@@ -544,6 +537,20 @@ 
		};

	};



	pmic {

		pmic_int_l: pmic-int-l {

			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		vsel1_pin: vsel1-pin {

			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;

		};



		vsel2_pin: vsel2-pin {

			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;

		};

	};



	sdio0 {

		sdio0_bus4: sdio0-bus4 {

			rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
@@ -561,20 +568,6 @@ 
		};

	};



	pmic {

		pmic_int_l: pmic-int-l {

			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		vsel1_pin: vsel1-pin {

			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;

		};



		vsel2_pin: vsel2-pin {

			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;

		};

	};



	usb-typec {

		vcc5v0_typec_en: vcc5v0-typec-en {

			rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -598,6 +591,11 @@ 
	};

};



&pmu_io_domains {

	pmu1830-supply = <&vcc_3v0>;

	status = "okay";

};



&pwm2 {

	status = "okay";

};
@@ -608,6 +606,14 @@ 
	vref-supply = <&vcc_1v8>;

};



&sdhci {

	bus-width = <8>;

	mmc-hs400-1_8v;

	mmc-hs400-enhanced-strobe;

	non-removable;

	status = "okay";

};



&sdio0 {

	#address-cells = <1>;

	#size-cells = <0>;
@@ -635,14 +641,6 @@ 
	status = "okay";

};



&sdhci {

	bus-width = <8>;

	mmc-hs400-1_8v;

	mmc-hs400-enhanced-strobe;

	non-removable;

	status = "okay";

};



&spdif {



	spdif_p0: port {
@@ -724,13 +722,13 @@ 
	status = "okay";

};



&usbdrd_dwc3_0 {

&usbdrd3_1 {

	status = "okay";

	dr_mode = "host";

};



&usbdrd3_1 {

&usbdrd_dwc3_0 {

	status = "okay";

	dr_mode = "host";

};



&usbdrd_dwc3_1 {