forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

ARM: dts: add a alias for rockchip_suspend

Browse source 
Since we need overwrite this rockchip_suspend node in sub dts file,
sometimes. Add a alias for before it.

Change-Id: I6d951d1c0bfff1cde619906eb9f11256d057a9fe
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
This commit is contained in:
Chris Zhong 2015-09-15 09:29:44 +08:00 • committed by Gerrit Code Review
commit 7650349d79
8 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/rk3036.dtsi
View file

@ -735,7 +735,7 @@
interrupt-names = "vpu_mmu";
};
rockchip_suspend {
rockchip_suspend: rockchip_suspend {
rockchip,ctrbits = <
(0
//|RKPM_CTR_PWR_DMNS

12
arch/arm/boot/dts/rk3126-86v.dts
View file

@ -24,12 +24,12 @@
usb_control {
compatible = "rockchip,rk3126-usb-control";
//host_drv_gpio = <&gpio2 GPIO_B4 GPIO_ACTIVE_LOW>;
//otg_drv_gpio = <&gpio2 GPIO_B6 GPIO_ACTIVE_LOW>;
//otg_drv_gpio = <&gpio2 GPIO_B6 GPIO_ACTIVE_LOW>;
rockchip,remote_wakeup;
rockchip,usb_irq_wakeup;
};
wireless-wlan {
compatible = "wlan-platdata";
@ -50,9 +50,9 @@
//WIFI,reset_gpio = <&gpio0 GPIO_A2 GPIO_ACTIVE_LOW>;
status = "okay";
};
rockchip_suspend {
};
rockchip_suspend: rockchip_suspend {
rockchip,ctrbits = <
(0
|RKPM_CTR_PWR_DMNS
@ -68,7 +68,7 @@
>;
rockchip,pmic-suspend_gpios = <0>;
};
chosen {
bootargs = "vmalloc=496M cma=4M rockchip_jtag";
};

3
arch/arm/boot/dts/rk3126-sdk.dts
View file

@ -39,7 +39,8 @@
satus = "okay";
};
rockchip_suspend {
rockchip_suspend: rockchip_suspend {
rockchip,ctrbits = <
(0
|RKPM_CTR_PWR_DMNS

2
arch/arm/boot/dts/rk3128-86v.dts
View file

@ -69,7 +69,7 @@
status = "okay";
};
rockchip_suspend {
rockchip_suspend: rockchip_suspend {
rockchip,ctrbits = <
(0
|RKPM_CTR_PWR_DMNS

3
arch/arm/boot/dts/rk3128-box-rk88.dts
View file

@ -93,7 +93,8 @@
/*0 - Normal, 1 - Force Host, 2 - Force Device*/
rockchip,usb-mode = <1>;
};
rockchip_suspend {
rockchip_suspend: rockchip_suspend {
rockchip,ctrbits = <
(0
|RKPM_CTR_PWR_DMNS

3
arch/arm/boot/dts/rk3128-box.dts
View file

@ -90,7 +90,8 @@
/*0 - Normal, 1 - Force Host, 2 - Force Device*/
// rockchip,usb-mode = <1>;
};
rockchip_suspend {
rockchip_suspend: rockchip_suspend {
rockchip,ctrbits = <
(0
|RKPM_CTR_PWR_DMNS

13
arch/arm/boot/dts/rk3188.dtsi
View file

@ -501,23 +501,24 @@
<&clk_gpu 200000000>, <&aclk_lcdc0 300000000>,
<&aclk_lcdc1 300000000>;
};
rockchip_suspend {
rockchip_suspend: rockchip_suspend {
//compatible = "rockchip,rkpm_suspend";
// define value is in dt-bindint/suspend/rockchip-pm.h
rockchip,ctrbits = <
rockchip,ctrbits = <
(
RKPM_CTR_PWR_DMNS
|RKPM_CTR_GTCLKS
|RKPM_CTR_PLLS
|RKPM_CTR_SYSCLK_DIV
)
>;
>;
rockchip,pmic-gpios=<
RKPM_PINGPIO_BITS_OUTPUT(GPIO0_A0,RKPM_GPIO_OUT_L)
RKPM_PINGPIO_BITS_INTPUT(GPIO0_A1,RKPM_GPIO_PULL_UP)
RKPM_PINGPIO_BITS_OUTPUT(GPIO0_A0,RKPM_GPIO_OUT_L)
RKPM_PINGPIO_BITS_INTPUT(GPIO0_A1,RKPM_GPIO_PULL_UP)
>;
};
fb: fb{
compatible = "rockchip,rk-fb";
rockchip,disp-mode = <DUAL>;

2
arch/arm/boot/dts/rk3288.dtsi
View file

@ -1272,7 +1272,7 @@
interrupt-names = "isp_mmu";
};
rockchip_suspend {
rockchip_suspend: rockchip_suspend {
rockchip,ctrbits = <
(0
|RKPM_CTR_PWR_DMNS