| Message ID | 1413406144-16329-1-git-send-email-zyw@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Chris, On Wed, Oct 15, 2014 at 1:49 PM, <zyw@rock-chips.com> wrote: > From: Chris Zhong <zyw@rock-chips.com> > > add pmu_intmem subnode for suspend, add suspend pinctrl Maybe mention that it's expected that board files will reference the suspend pinctrl as part of the PMIC config?
On Wed, Oct 15, 2014 at 09:49:04PM +0100, zyw@rock-chips.com wrote: > From: Chris Zhong <zyw@rock-chips.com> > > add pmu_intmem subnode for suspend, add suspend pinctrl > > Signed-off-by: Tony Xie <xxx@rock-chips.com> > Signed-off-by: Chris Zhong <zyw@rock-chips.com> > --- > > arch/arm/boot/dts/rk3288.dtsi | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi > index 5950b0a..081af7a 100644 > --- a/arch/arm/boot/dts/rk3288.dtsi > +++ b/arch/arm/boot/dts/rk3288.dtsi > @@ -241,6 +241,11 @@ > status = "disabled"; > }; > > + pmu_intmem@ff720000 { > + compatible = "mmio-sram", "rockchip,rk3288-pmu-sram"; These strings should be the other way around -- the most specific string should be first. Mark.
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 5950b0a..081af7a 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -241,6 +241,11 @@ status = "disabled"; }; + pmu_intmem@ff720000 { + compatible = "mmio-sram", "rockchip,rk3288-pmu-sram"; + reg = <0xff720000 0x4000>; + }; + pmu: power-management@ff730000 { compatible = "rockchip,rk3288-pmu", "syscon"; reg = <0xff730000 0x100>; @@ -421,6 +426,12 @@ bias-disable; }; + sleep { + global_pwroff: global-pwroff { + rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>; + }; + }; + i2c0 { i2c0_xfer: i2c0-xfer { rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_none>,