diff options
| author | Guodong Xu <guodong.xu@linaro.org> | 2013-01-28 13:33:41 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2013-01-28 13:33:41 +0800 |
| commit | ff4b17e15879a788cd2febbe7dc03299ebbe6047 (patch) | |
| tree | 139f4039ec743905cad14ac9f63d3ef1d9a4f5c0 | |
| parent | 7d52999aa807775cb1f62516498b9255102c7e56 (diff) | |
regulator:hi6421, update dtstopic-regulator
| -rw-r--r-- | arch/arm/boot/dts/hi4511.dts | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/arch/arm/boot/dts/hi4511.dts b/arch/arm/boot/dts/hi4511.dts index bc3b9b0d25df..e05aed34d9b9 100644 --- a/arch/arm/boot/dts/hi4511.dts +++ b/arch/arm/boot/dts/hi4511.dts @@ -768,10 +768,12 @@ pinctrl-single,bias-disable = <2 0 3>; }; }; - }; + +/* still in "amba-bus" */ + }; /* end of amba-bus */ regulators { - compatible = "hisilicon,hi6421","simple-bus"; + compatible = "hisilicon,hi6421", "simple-bus"; reg = <0xfcc00000 0x0180>; /* 0x60 << 2 */ ldo0: ldo@20 { @@ -791,20 +793,6 @@ hisilicon,hi6421-enable-time-us = <250>; }; - -static const u32 on_off_delay_us[NUM_OF_HI6421_REGULATOR] = { - 10000, 10000, 20000, 20000, 20000, 20000, 20000, 20000, 20000, 40000, 40000, /* LDO0 ~ 10 */ - 40000, 40000,40000, 40000,40000, 40000,40000, 40000,40000, 40000, 40000, /* LDO_11 ~ LDO20 ,LDO_AUDIO */ - 20000, 20000, 100, 20000, 20000, 20000 /* BUCK0 ~ 5*/ -}; - -static const u32 on_enable_delay_us[NUM_OF_HI6421_REGULATOR] = { - 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, /* LDO0 ~ 10 */ - 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, /* LDO_11 ~ LDO20 ,LDO_AUDIO */ - 300, 300, 250, 250, 250, 250 /* BUCK0 ~ 5*/ -}; - - ldo1: ldo@21 { compatible = "hisilicon,hi6421-ldo"; regulator-name = "LDO1"; @@ -1085,20 +1073,6 @@ static const u32 on_enable_delay_us[NUM_OF_HI6421_REGULATOR] = { <3200000>, <3300000>; }; - - -static const u32 on_off_delay_us[NUM_OF_HI6421_REGULATOR] = { - 10000, 10000, 20000, 20000, 20000, 20000, 20000, 20000, 20000, 40000, 40000, /* LDO0 ~ 10 */ - 40000, 40000,40000, 40000,40000, 40000,40000, 40000,40000, 40000, 40000, /* LDO_11 ~ LDO20 ,LDO_AUDIO */ - 20000, 20000, 100, 20000, 20000, 20000 /* BUCK0 ~ 5*/ -}; - -static const u32 on_enable_delay_us[NUM_OF_HI6421_REGULATOR] = { - 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, /* LDO0 ~ 10 */ - 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, /* LDO_11 ~ LDO20 ,LDO_AUDIO */ - 300, 300, 250, 250, 250, 250 /* BUCK0 ~ 5*/ -}; - buck0: buck@0c { compatible = "hisilicon,hi6421-buck012"; regulator-name = "BUCK0"; @@ -1185,5 +1159,7 @@ static const u32 on_enable_delay_us[NUM_OF_HI6421_REGULATOR] = { <1800000>, <1900000>; }; }; /* end of regulators */ + + }; |