diff options
author | Randy Li <randy.li@rock-chips.com> | 2017-04-21 10:29:02 +0800 |
---|---|---|
committer | Randy Li <randy.li@rock-chips.com> | 2017-04-21 10:53:34 +0800 |
commit | 30625c8db914f0d63a3fbae0ac0729879d9727fa (patch) | |
tree | f5b310b0a9ee6885d3de3b608c1f2fe9dd17573e /arch/arm64/boot/dts/rockchip/rk3328-evb.dts | |
parent | e93def8f85c2109e46e2a7ae9bd32da9caa51594 (diff) |
ARM64: rockchip: dts: re-order the nodes for RK3328 EVB
I re-order all the merged nodes in alphabetic order.
Change-Id: I677259b1ec3cd8463c8ef557a9c1f0afbef66318
Signed-off-by: Randy Li <randy.li@rock-chips.com>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip/rk3328-evb.dts')
-rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 234 |
1 files changed, 117 insertions, 117 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts index 74ae0f86b4b8..1e28e1e18532 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts @@ -70,13 +70,6 @@ #clock-cells = <0>; }; - vcc_phy: vcc-phy-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc_phy"; - regulator-always-on; - regulator-boot-on; - }; - sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; pinctrl-names = "default"; @@ -91,15 +84,6 @@ reset-gpios = <&gpio1 18 GPIO_ACTIVE_LOW>; }; - wireless-wlan { - compatible = "wlan-platdata"; - rockchip,grf = <&grf>; - wifi_chip_type = "ap6354"; - sdio_vref = <1800>; - WIFI,host_wake_irq = <&gpio1 19 GPIO_ACTIVE_HIGH>; - status = "okay"; - }; - sound { compatible = "simple-audio-card"; simple-audio-card,format = "i2s"; @@ -128,19 +112,25 @@ compatible = "linux,spdif-dit"; #sound-dai-cells = <0>; }; -}; -&i2s1 { - #sound-dai-cells = <0>; - status = "okay"; -}; + vcc_phy: vcc-phy-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc_phy"; + regulator-always-on; + regulator-boot-on; + }; -&codec { - #sound-dai-cells = <0>; - status = "okay"; + wireless-wlan { + compatible = "wlan-platdata"; + rockchip,grf = <&grf>; + wifi_chip_type = "ap6354"; + sdio_vref = <1800>; + WIFI,host_wake_irq = <&gpio1 19 GPIO_ACTIVE_HIGH>; + status = "okay"; + }; }; -&spdif { +&codec { #sound-dai-cells = <0>; status = "okay"; }; @@ -149,35 +139,6 @@ cpu-supply = <&vdd_arm>; }; -&sdio { - bus-width = <4>; - cap-sd-highspeed; - cap-sdio-irq; - disable-wp; - keep-power-in-suspend; - max-frequency = <150000000>; - mmc-pwrseq = <&sdio_pwrseq>; - non-removable; - num-slots = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>; - supports-sdio; - status = "okay"; -}; - -&sdmmc { - bus-width = <4>; - cap-mmc-highspeed; - cap-sd-highspeed; - disable-wp; - max-frequency = <150000000>; - num-slots = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>; - supports-sd; - status = "okay"; -}; - &emmc { bus-width = <8>; cap-mmc-highspeed; @@ -211,69 +172,6 @@ mali-supply = <&vdd_logic>; }; -&io_domains { - status = "okay"; - - vccio1-supply = <&vcc_io>; - vccio2-supply = <&vcc_18emmc>; - vccio3-supply = <&vcc_io>; - vccio4-supply = <&vdd_18>; - vccio5-supply = <&vcc_io>; - vccio6-supply = <&vcc_io>; - pmuio-supply = <&vcc_io>; -}; - -&tsadc { - status = "okay"; -}; - -&u2phy { - otg-vbus-gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>; - status = "okay"; - - u2phy_host: host-port { - status = "okay"; - }; - - u2phy_otg: otg-port { - status = "okay"; - }; -}; - -&u3phy { - vbus-drv-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; - status = "okay"; -}; - -&u3phy_utmi { - status = "okay"; -}; - -&u3phy_pipe { - status = "okay"; -}; - -&usb20_otg { - dr_mode = "peripheral"; - status = "okay"; -}; - -&usb_host0_ehci { - status = "okay"; -}; - -&usb_host0_ohci { - status = "okay"; -}; - -&usbdrd3 { - status = "okay"; -}; - -&usbdrd_dwc3 { - status = "okay"; -}; - &i2c1 { status = "okay"; @@ -409,6 +307,23 @@ }; }; +&i2s1 { + #sound-dai-cells = <0>; + status = "okay"; +}; + +&io_domains { + status = "okay"; + + vccio1-supply = <&vcc_io>; + vccio2-supply = <&vcc_18emmc>; + vccio3-supply = <&vcc_io>; + vccio4-supply = <&vdd_18>; + vccio5-supply = <&vcc_io>; + vccio6-supply = <&vcc_io>; + pmuio-supply = <&vcc_io>; +}; + &pinctrl { pmic { pmic_int_l: pmic-int-l { @@ -424,3 +339,88 @@ }; }; }; + +&sdio { + bus-width = <4>; + cap-sd-highspeed; + cap-sdio-irq; + disable-wp; + keep-power-in-suspend; + max-frequency = <150000000>; + mmc-pwrseq = <&sdio_pwrseq>; + non-removable; + num-slots = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>; + supports-sdio; + status = "okay"; +}; + +&sdmmc { + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + disable-wp; + max-frequency = <150000000>; + num-slots = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>; + supports-sd; + status = "okay"; +}; + +&spdif { + #sound-dai-cells = <0>; + status = "okay"; +}; + +&tsadc { + status = "okay"; +}; + +&u2phy { + otg-vbus-gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>; + status = "okay"; + + u2phy_host: host-port { + status = "okay"; + }; + + u2phy_otg: otg-port { + status = "okay"; + }; +}; + +&u3phy { + vbus-drv-gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&u3phy_utmi { + status = "okay"; +}; + +&u3phy_pipe { + status = "okay"; +}; + +&usb20_otg { + dr_mode = "peripheral"; + status = "okay"; +}; + +&usb_host0_ehci { + status = "okay"; +}; + +&usb_host0_ohci { + status = "okay"; +}; + +&usbdrd3 { + status = "okay"; +}; + +&usbdrd_dwc3 { + status = "okay"; +}; |