| Message ID | 1440755679-8266-4-git-send-email-wens@csie.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Aug 28, 2015 at 05:54:36PM +0800, Chen-Yu Tsai wrote: > Now that we have axp221.dtsi describing common axp22x hardware, use > it and reference the nodes instead of declaring the whole tree. > > Also add regulator reference for cpu0 supply. > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > --- > arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 114 ++++++++++++++-------------- > 1 file changed, 56 insertions(+), 58 deletions(-) > > diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts > index d0cfadac0691..d019cb70acec 100644 > --- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts > +++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts > @@ -67,6 +67,10 @@ > }; > }; > > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > &ehci0 { > status = "okay"; > }; > @@ -119,7 +123,7 @@ > &mmc0 { > pinctrl-names = "default"; > pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>; > - vmmc-supply = <&vcc_3v0>; > + vmmc-supply = <®_dcdc1>; > bus-width = <4>; > cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */ > cd-inverted; > @@ -134,7 +138,7 @@ > &mmc1 { > pinctrl-names = "default"; > pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_hummingbird>; > - vmmc-supply = <&vcc_wifi>; > + vmmc-supply = <®_aldo1>; > mmc-pwrseq = <&wifi_pwrseq>; > bus-width = <4>; > non-removable; > @@ -169,65 +173,59 @@ > reg = <0x68>; > interrupt-parent = <&nmi_intc>; > interrupts = <0 IRQ_TYPE_LEVEL_LOW>; > - interrupt-controller; > - #interrupt-cells = <1>; > - dcdc1-supply = <&vcc_3v0>; > - dcdc5-supply = <&vcc_dram>; > - > - regulators { > - x-powers,dcdc-freq = <3000>; > - > - vcc_3v0: dcdc1 { > - regulator-always-on; > - regulator-min-microvolt = <3000000>; > - regulator-max-microvolt = <3000000>; > - regulator-name = "vcc-3v0"; > - }; > - > - vdd_cpu: dcdc2 { > - regulator-always-on; > - regulator-min-microvolt = <700000>; > - regulator-max-microvolt = <1320000>; > - regulator-name = "vdd-cpu"; > - }; > - > - vdd_gpu: dcdc3 { > - regulator-always-on; > - regulator-min-microvolt = <700000>; > - regulator-max-microvolt = <1320000>; > - regulator-name = "vdd-gpu"; > - }; > - > - vdd_sys_dll: dcdc4 { > - regulator-always-on; > - regulator-min-microvolt = <1100000>; > - regulator-max-microvolt = <1100000>; > - regulator-name = "vdd-sys-dll"; > - }; > - > - vcc_dram: dcdc5 { > - regulator-always-on; > - regulator-min-microvolt = <1500000>; > - regulator-max-microvolt = <1500000>; > - regulator-name = "vcc-dram"; > - }; > - > - vcc_wifi: aldo1 { > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - regulator-name = "vcc_wifi"; > - }; > - > - avcc: aldo3 { > - regulator-always-on; > - regulator-min-microvolt = <3000000>; > - regulator-max-microvolt = <3000000>; > - regulator-name = "avcc"; > - }; > - }; > }; > }; > > +#include "axp221.dtsi" > + > +®_aldo1 { > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-name = "vcc-wifi"; > +}; > + > +®_aldo3 { > + regulator-always-on; > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + regulator-name = "avcc"; > +}; > + > +®_dcdc1 { > + regulator-always-on; > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + regulator-name = "vcc-3v0"; > +}; > + > +®_dcdc2 { > + regulator-always-on; > + regulator-min-microvolt = <700000>; > + regulator-max-microvolt = <1320000>; > + regulator-name = "vdd-cpu"; > +}; > + > +®_dcdc3 { > + regulator-always-on; > + regulator-min-microvolt = <700000>; > + regulator-max-microvolt = <1320000>; > + regulator-name = "vdd-gpu"; > +}; I'm know it's just a mechanical change from your part, but is the GPU regulator really need to be always on? Maxime
On Fri, Aug 28, 2015 at 8:32 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > On Fri, Aug 28, 2015 at 05:54:36PM +0800, Chen-Yu Tsai wrote: >> Now that we have axp221.dtsi describing common axp22x hardware, use >> it and reference the nodes instead of declaring the whole tree. >> >> Also add regulator reference for cpu0 supply. >> >> Signed-off-by: Chen-Yu Tsai <wens@csie.org> >> --- >> arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 114 ++++++++++++++-------------- >> 1 file changed, 56 insertions(+), 58 deletions(-) >> >> diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts >> index d0cfadac0691..d019cb70acec 100644 >> --- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts >> +++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts >> @@ -67,6 +67,10 @@ >> }; >> }; >> >> +&cpu0 { >> + cpu-supply = <®_dcdc2>; >> +}; >> + >> &ehci0 { >> status = "okay"; >> }; >> @@ -119,7 +123,7 @@ >> &mmc0 { >> pinctrl-names = "default"; >> pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>; >> - vmmc-supply = <&vcc_3v0>; >> + vmmc-supply = <®_dcdc1>; >> bus-width = <4>; >> cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */ >> cd-inverted; >> @@ -134,7 +138,7 @@ >> &mmc1 { >> pinctrl-names = "default"; >> pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_hummingbird>; >> - vmmc-supply = <&vcc_wifi>; >> + vmmc-supply = <®_aldo1>; >> mmc-pwrseq = <&wifi_pwrseq>; >> bus-width = <4>; >> non-removable; >> @@ -169,65 +173,59 @@ >> reg = <0x68>; >> interrupt-parent = <&nmi_intc>; >> interrupts = <0 IRQ_TYPE_LEVEL_LOW>; >> - interrupt-controller; >> - #interrupt-cells = <1>; >> - dcdc1-supply = <&vcc_3v0>; >> - dcdc5-supply = <&vcc_dram>; >> - >> - regulators { >> - x-powers,dcdc-freq = <3000>; >> - >> - vcc_3v0: dcdc1 { >> - regulator-always-on; >> - regulator-min-microvolt = <3000000>; >> - regulator-max-microvolt = <3000000>; >> - regulator-name = "vcc-3v0"; >> - }; >> - >> - vdd_cpu: dcdc2 { >> - regulator-always-on; >> - regulator-min-microvolt = <700000>; >> - regulator-max-microvolt = <1320000>; >> - regulator-name = "vdd-cpu"; >> - }; >> - >> - vdd_gpu: dcdc3 { >> - regulator-always-on; >> - regulator-min-microvolt = <700000>; >> - regulator-max-microvolt = <1320000>; >> - regulator-name = "vdd-gpu"; >> - }; >> - >> - vdd_sys_dll: dcdc4 { >> - regulator-always-on; >> - regulator-min-microvolt = <1100000>; >> - regulator-max-microvolt = <1100000>; >> - regulator-name = "vdd-sys-dll"; >> - }; >> - >> - vcc_dram: dcdc5 { >> - regulator-always-on; >> - regulator-min-microvolt = <1500000>; >> - regulator-max-microvolt = <1500000>; >> - regulator-name = "vcc-dram"; >> - }; >> - >> - vcc_wifi: aldo1 { >> - regulator-min-microvolt = <3300000>; >> - regulator-max-microvolt = <3300000>; >> - regulator-name = "vcc_wifi"; >> - }; >> - >> - avcc: aldo3 { >> - regulator-always-on; >> - regulator-min-microvolt = <3000000>; >> - regulator-max-microvolt = <3000000>; >> - regulator-name = "avcc"; >> - }; >> - }; >> }; >> }; >> >> +#include "axp221.dtsi" >> + >> +®_aldo1 { >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-name = "vcc-wifi"; >> +}; >> + >> +®_aldo3 { >> + regulator-always-on; >> + regulator-min-microvolt = <3000000>; >> + regulator-max-microvolt = <3000000>; >> + regulator-name = "avcc"; >> +}; >> + >> +®_dcdc1 { >> + regulator-always-on; >> + regulator-min-microvolt = <3000000>; >> + regulator-max-microvolt = <3000000>; >> + regulator-name = "vcc-3v0"; >> +}; >> + >> +®_dcdc2 { >> + regulator-always-on; >> + regulator-min-microvolt = <700000>; >> + regulator-max-microvolt = <1320000>; >> + regulator-name = "vdd-cpu"; >> +}; >> + >> +®_dcdc3 { >> + regulator-always-on; >> + regulator-min-microvolt = <700000>; >> + regulator-max-microvolt = <1320000>; >> + regulator-name = "vdd-gpu"; >> +}; > > I'm know it's just a mechanical change from your part, but is the GPU > regulator really need to be always on? I don't think so. It shouldn't affect anything else, though I can't think of a way to thoroughly test it. Maybe I just disable it for. If anyone complains later on when adding new peripherals they can turn it back on. ChenYu
On Sat, Aug 29, 2015 at 12:47:00AM +0800, Chen-Yu Tsai wrote: > >> +®_dcdc3 { > >> + regulator-always-on; > >> + regulator-min-microvolt = <700000>; > >> + regulator-max-microvolt = <1320000>; > >> + regulator-name = "vdd-gpu"; > >> +}; > > > > I'm know it's just a mechanical change from your part, but is the GPU > > regulator really need to be always on? > > I don't think so. It shouldn't affect anything else, though I can't > think of a way to thoroughly test it. Maybe I just disable it for. > If anyone complains later on when adding new peripherals they can > turn it back on. Sounds good. That also applies to your other patches though. Maxime
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts index d0cfadac0691..d019cb70acec 100644 --- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts +++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts @@ -67,6 +67,10 @@ }; }; +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + &ehci0 { status = "okay"; }; @@ -119,7 +123,7 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>; - vmmc-supply = <&vcc_3v0>; + vmmc-supply = <®_dcdc1>; bus-width = <4>; cd-gpios = <&pio 0 8 GPIO_ACTIVE_HIGH>; /* PA8 */ cd-inverted; @@ -134,7 +138,7 @@ &mmc1 { pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins_a>, <&wifi_reset_pin_hummingbird>; - vmmc-supply = <&vcc_wifi>; + vmmc-supply = <®_aldo1>; mmc-pwrseq = <&wifi_pwrseq>; bus-width = <4>; non-removable; @@ -169,65 +173,59 @@ reg = <0x68>; interrupt-parent = <&nmi_intc>; interrupts = <0 IRQ_TYPE_LEVEL_LOW>; - interrupt-controller; - #interrupt-cells = <1>; - dcdc1-supply = <&vcc_3v0>; - dcdc5-supply = <&vcc_dram>; - - regulators { - x-powers,dcdc-freq = <3000>; - - vcc_3v0: dcdc1 { - regulator-always-on; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - regulator-name = "vcc-3v0"; - }; - - vdd_cpu: dcdc2 { - regulator-always-on; - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1320000>; - regulator-name = "vdd-cpu"; - }; - - vdd_gpu: dcdc3 { - regulator-always-on; - regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1320000>; - regulator-name = "vdd-gpu"; - }; - - vdd_sys_dll: dcdc4 { - regulator-always-on; - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; - regulator-name = "vdd-sys-dll"; - }; - - vcc_dram: dcdc5 { - regulator-always-on; - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <1500000>; - regulator-name = "vcc-dram"; - }; - - vcc_wifi: aldo1 { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-name = "vcc_wifi"; - }; - - avcc: aldo3 { - regulator-always-on; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - regulator-name = "avcc"; - }; - }; }; }; +#include "axp221.dtsi" + +®_aldo1 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-wifi"; +}; + +®_aldo3 { + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "avcc"; +}; + +®_dcdc1 { + regulator-always-on; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "vcc-3v0"; +}; + +®_dcdc2 { + regulator-always-on; + regulator-min-microvolt = <700000>; + regulator-max-microvolt = <1320000>; + regulator-name = "vdd-cpu"; +}; + +®_dcdc3 { + regulator-always-on; + regulator-min-microvolt = <700000>; + regulator-max-microvolt = <1320000>; + regulator-name = "vdd-gpu"; +}; + +®_dcdc4 { + regulator-always-on; + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1100000>; + regulator-name = "vdd-sys-dll"; +}; + +®_dcdc5 { + regulator-always-on; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + regulator-name = "vcc-dram"; +}; + ®_usb1_vbus { gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>; /* PH24 */ status = "okay";
Now that we have axp221.dtsi describing common axp22x hardware, use it and reference the nodes instead of declaring the whole tree. Also add regulator reference for cpu0 supply. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 114 ++++++++++++++-------------- 1 file changed, 56 insertions(+), 58 deletions(-)