From 64be1e46bd14835e6934f48afdabdc605a229bc2 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Mon, 30 Nov 2020 10:37:04 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3566-evb1-ddr4-v10: Sort the nodes alphabetically And clean up. Signed-off-by: Tao Huang Change-Id: I8eafbbd9f2356ffaa5a849a8a1d80c4ccd753530 --- .../dts/rockchip/rk3566-evb1-ddr4-v10.dtsi | 51 +++++-------------- 1 file changed, 13 insertions(+), 38 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi index c7d5e485dc7f..856531adbe7a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi @@ -101,30 +101,6 @@ pinctrl-0 = <&lcd1_rst_gpio>; }; -/* - * power-supply should switche to vcc3v3_lcd1_n - * when mipi panel is connected to dsi1. - */ ->1x { - power-supply = <&vcc3v3_lcd0_n>; -}; - -&sdio_pwrseq { - compatible = "mmc-pwrseq-simple"; - clocks = <&rk809 1>; - clock-names = "ext_clock"; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_enable_h>; - - /* - * On the module itself this is one of these (depending - * on the actual card populated): - * - SDIO_RESET_L_WL_REG_ON - * - PDN (power down when low) - */ - reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; -}; - &gmac0 { phy-mode = "rgmii"; clock_in_out = "output"; @@ -152,6 +128,14 @@ status = "okay"; }; +/* + * power-supply should switche to vcc3v3_lcd1_n + * when mipi panel is connected to dsi1. + */ +>1x { + power-supply = <&vcc3v3_lcd0_n>; +}; + &i2s3_2ch { status = "disabled"; }; @@ -223,21 +207,7 @@ enable-active-high; }; -&wireless_wlan { - compatible = "wlan-platdata"; - rockchip,grf = <&grf>; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_host_wake_irq>; - wifi_chip_type = "ap6398s"; - WIFI,host_wake_irq = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; - status = "okay"; -}; - &wireless_bluetooth { - compatible = "bluetooth-platdata"; - clocks = <&rk809 1>; - clock-names = "ext_clock"; - //wifi-bt-power-toggle; uart_rts_gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m1_rtsn>; @@ -248,6 +218,11 @@ status = "okay"; }; +&wireless_wlan { + pinctrl-names = "default"; + pinctrl-0 = <&wifi_host_wake_irq>; +}; + &pinctrl { headphone { hp_det: hp-det {