From ccc87547dd4dd21a7e6d0e5688a7bec69116dbd3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=AE=B8=E7=9B=9B=E9=A3=9E?= Date: Fri, 28 Nov 2014 09:51:09 +0800 Subject: [PATCH] rk312xdts: reconfiguration the rk3126-sdk.dts MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: 许盛飞 --- arch/arm/boot/dts/rk3126-sdk.dts | 22 +++++++++++++++++++++- arch/arm/boot/dts/rk312x.dtsi | 13 ------------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts index 3ed08e3c3a6c..56266e2cf0aa 100755 --- a/arch/arm/boot/dts/rk3126-sdk.dts +++ b/arch/arm/boot/dts/rk3126-sdk.dts @@ -34,7 +34,27 @@ //vref_pmu_enable_level = <1>; //1->HIGH, 0->LOW satus = "okay"; - }; + }; + rockchip_suspend { + rockchip,ctrbits = < + (0 + |RKPM_CTR_PWR_DMNS + |RKPM_CTR_GTCLKS + |RKPM_CTR_PLLS + |RKPM_CTR_ARMOFF_LPMD + |RKPM_CTR_DDR + |RKPM_CTR_IDLESRAM_MD + |RKPM_CTR_DDR + |RKPM_CTR_BUS_IDLE + //|RKPM_CTR_VOLTS + //|RKPM_CTR_VOL_PWM1 + //|RKPM_CTR_VOL_PWM2 + ) + >; + rockchip,pmic-suspend_gpios = < + GPIO1_A1 + >; + }; }; &fb { diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi index be0fd3a8aa63..875a2f2374ac 100755 --- a/arch/arm/boot/dts/rk312x.dtsi +++ b/arch/arm/boot/dts/rk312x.dtsi @@ -992,17 +992,4 @@ }; }; }; - rockchip_suspend { - rockchip,ctrbits = < - (0 - |RKPM_CTR_PWR_DMNS - |RKPM_CTR_GTCLKS - |RKPM_CTR_PLLS - |RKPM_CTR_ARMOFF_LPMD - ) - >; - rockchip,pmic-suspend_gpios = < - GPIO1_A1 - >; - }; }; -- 2.34.1