From b153f26d2c557ca49b5f98d256b3e44bc37244cd Mon Sep 17 00:00:00 2001 From: FUKAUMI Naoki Date: Fri, 9 Sep 2022 19:50:03 +0000 Subject: [PATCH] arm64: dts: rockchip: sort nodes/properties on rk3399-rock-4c-plus sort nodes/properties alphabetically Signed-off-by: FUKAUMI Naoki Link: https://lore.kernel.org/r/20220909195006.127957-3-naoki@radxa.com Signed-off-by: Heiko Stuebner --- .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts index c88a751..fdee9d7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts @@ -23,15 +23,6 @@ stdout-path = "serial2:1500000n8"; }; - sdio_pwrseq: sdio-pwrseq { - compatible = "mmc-pwrseq-simple"; - clocks = <&rk809 1>; - clock-names = "ext_clock"; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_enable_h>; - reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; - }; - clkin_gmac: external-gmac-clock { compatible = "fixed-clock"; clock-frequency = <125000000>; @@ -61,6 +52,15 @@ }; }; + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + clocks = <&rk809 1>; + clock-names = "ext_clock"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_enable_h>; + reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; + }; + vcc_3v3: vcc-3v3-regulator { compatible = "regulator-fixed"; regulator-name = "vcc_3v3"; @@ -71,13 +71,14 @@ vin-supply = <&vcc3v3_sys>; }; - vcc5v0_sys: vcc5v0-sys-regulator { + vcc3v3_phy1: vcc3v3-phy1-regulator { compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; + regulator-name = "vcc3v3_phy1"; regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_3v3>; }; vcc5v0_host1: vcc5v0-host-regulator { @@ -92,6 +93,15 @@ vin-supply = <&vcc5v0_host0_s0>; }; + vcc5v0_sys: vcc5v0-sys-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; + vcc5v0_typec: vcc5v0-typec-regulator { compatible = "regulator-fixed"; enable-active-high; @@ -104,16 +114,6 @@ vin-supply = <&vcc5v0_sys>; }; - vcc3v3_phy1: vcc3v3-phy1-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3_phy1"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - vin-supply = <&vcc_3v3>; - }; - vdd_log: vdd-log-regulator { compatible = "regulator-fixed"; regulator-name = "vdd_log"; @@ -447,8 +447,8 @@ }; &io_domains { - bt656-supply = <&vcc_3v0_s0>; audio-supply = <&vcc_1v8_s0>; + bt656-supply = <&vcc_3v0_s0>; gpio1830-supply = <&vcc_3v0_s0>; sdmmc-supply = <&vcc_sdio_s0>; status = "okay"; -- 2.7.4