diff options
| author | Guodong Xu <guodong.xu@linaro.org> | 2013-01-28 13:33:41 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2013-02-21 16:12:37 +0800 |
| commit | ef4829e0288744aac318645f452f998cdf24c1b2 (patch) | |
| tree | 810c67a82176ff0bf86711168f075654484cae0d | |
| parent | f2c2fceffb4ae361318ceb79cf851e4d9ca0e1ca (diff) | |
regulator:hi6421, update dts
| -rw-r--r-- | arch/arm/boot/dts/hi4511.dts | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/arch/arm/boot/dts/hi4511.dts b/arch/arm/boot/dts/hi4511.dts index c3f1b98cdb48..bbd742868663 100644 --- a/arch/arm/boot/dts/hi4511.dts +++ b/arch/arm/boot/dts/hi4511.dts @@ -821,10 +821,10 @@ pinctrl-names = "default"; pinctrl-0 = <&i2c1_pmx_func &i2c1_cfg_func>; }; - }; + }; /* end of amba-bus */ regulators { - compatible = "hisilicon,hi6421","simple-bus"; + compatible = "hisilicon,hi6421", "simple-bus"; reg = <0xfcc00000 0x0180>; /* 0x60 << 2 */ ldo0: ldo@20 { @@ -844,20 +844,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"; @@ -1138,20 +1124,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"; @@ -1239,4 +1211,3 @@ static const u32 on_enable_delay_us[NUM_OF_HI6421_REGULATOR] = { }; }; /* end of regulators */ }; - |