From f1a03635a445a7ddb3d359d10c178ac3234eec5f Mon Sep 17 00:00:00 2001 From: "Huang, Tao" Date: Tue, 28 Feb 2017 19:21:50 +0800 Subject: [PATCH] arm64: dts: rockchip: reorder pinctrl of pwm nodes for rk3368 keep order as upstream. Change-Id: I069ec407292922a72900c34b32c3d67f5cdf0a3b Signed-off-by: Huang, Tao --- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 44 ++++++++++++------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi index bb0eff749308..a857f982630e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi @@ -1237,6 +1237,28 @@ }; }; + pwm0 { + pwm0_pin: pwm0-pin { + rockchip,pins = <3 8 RK_FUNC_2 &pcfg_pull_none>; + }; + + vop_pwm_pin: vop-pwm { + rockchip,pins = <3 8 RK_FUNC_3 &pcfg_pull_none>; + }; + }; + + pwm1 { + pwm1_pin: pwm1-pin { + rockchip,pins = <0 8 RK_FUNC_2 &pcfg_pull_none>; + }; + }; + + pwm3 { + pwm3_pin: pwm3-pin { + rockchip,pins = <3 29 RK_FUNC_3 &pcfg_pull_none>; + }; + }; + sdio0 { sdio0_bus1: sdio0-bus1 { rockchip,pins = <2 28 RK_FUNC_1 &pcfg_pull_up>; @@ -1432,28 +1454,6 @@ }; }; - pwm0 { - pwm0_pin: pwm0-pin { - rockchip,pins = <3 8 RK_FUNC_2 &pcfg_pull_none>; - }; - - vop_pwm_pin: vop-pwm { - rockchip,pins = <3 8 RK_FUNC_3 &pcfg_pull_none>; - }; - }; - - pwm1 { - pwm1_pin: pwm1-pin { - rockchip,pins = <0 8 RK_FUNC_2 &pcfg_pull_none>; - }; - }; - - pwm3 { - pwm3_pin: pwm3-pin { - rockchip,pins = <3 29 RK_FUNC_3 &pcfg_pull_none>; - }; - }; - lcdc { lcdc_lcdc: lcdc-lcdc { rockchip,pins = -- 2.34.1