diff options
author | buluess.li <buluess.li@rock-chips.com> | 2017-04-07 10:29:26 +0800 |
---|---|---|
committer | Huang, Tao <huangtao@rock-chips.com> | 2017-04-13 19:37:07 +0800 |
commit | 005290906c72c072dabe18398f9affda8c77b89e (patch) | |
tree | 2938980b553d66034e9b4ca4608a598fbbc323eb /arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts | |
parent | 19e1695794ad1815c6b5f696c484c66354d4cafe (diff) |
arm64: dts: rk3399-box: compatible for rev2 board which cpu_b's vdd gpio is different
Change-Id: Ie7088b526a1a384435136933a5f57c957e2bb5b0
Signed-off-by: buluess.li <buluess.li@rock-chips.com>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts')
-rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts index f3b98b3622b9..2fe8cefb6abd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2.dts @@ -49,6 +49,9 @@ }; &pinctrl { + pinctrl-names = "default"; + pinctrl-0 = <&cpt_gpio>; + sdio0 { sdio0_bus1: sdio0-bus1 { rockchip,pins = @@ -106,10 +109,10 @@ }; }; - pmic { - vsel1_gpio: vsel1-gpio { + compat { + cpt_gpio: cpt-gpio { rockchip,pins = - <1 18 RK_FUNC_GPIO &pcfg_pull_up>; + <1 18 RK_FUNC_GPIO &pcfg_output_low>; }; }; }; @@ -144,17 +147,6 @@ status = "okay"; }; -&vdd_cpu_b { - vsel-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>; - fcs,suspend-voltage-selector = <0>; -}; - -&rockchip_suspend { - rockchip,power-ctrl = - <&gpio1 18 GPIO_ACTIVE_LOW>, - <&gpio1 14 GPIO_ACTIVE_HIGH>; -}; - &hdmi { status = "okay"; rockchip,phy-table = |