diff mbox

[v3,5/9] ARM: dts: sun8i: sinlinx-sina33: Add AXP223 PMIC device and regulator nodes

Message ID 1447691908-25456-6-git-send-email-wens@csie.org (mailing list archive)
State New, archived
Headers show

Commit Message

Chen-Yu Tsai Nov. 16, 2015, 4:38 p.m. UTC 
This board has a X-Powers AXP223 PMIC connected via RSB. Its regulators
provide power to various parts of the SoC and the board.

Also update the regulator supply phandles.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 79 +++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 3 deletions(-)

Comments

Maxime Ripard Nov. 20, 2015, 11:12 a.m. UTC | #1 
Hi,

On Tue, Nov 17, 2015 at 12:38:24AM +0800, Chen-Yu Tsai wrote:
> This board has a X-Powers AXP223 PMIC connected via RSB. Its regulators
> provide power to various parts of the SoC and the board.
> 
> Also update the regulator supply phandles.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
>  arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 79 +++++++++++++++++++++++++-
>  1 file changed, 76 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> index 13ce68f06dd6..91a0fde47fdd 100644
> --- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> +++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
> @@ -68,7 +68,7 @@
>  };
>  
>  &lradc {
> -	vref-supply = <&reg_vcc3v0>;
> +	vref-supply = <&reg_dcdc1>;
>  	status = "okay";
>  
>  	button@200 {
> @@ -96,7 +96,7 @@
>  &mmc0 {
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina33>;
> -	vmmc-supply = <&reg_vcc3v0>;
> +	vmmc-supply = <&reg_dcdc1>;
>  	bus-width = <4>;
>  	cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
>  	cd-inverted;
> @@ -106,7 +106,7 @@
>  &mmc2 {
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&mmc2_8bit_pins>;
> -	vmmc-supply = <&reg_vcc3v0>;
> +	vmmc-supply = <&reg_dcdc1>;
>  	bus-width = <8>;
>  	non-removable;
>  	status = "okay";
> @@ -132,6 +132,79 @@
>  
>  &r_rsb {
>  	status = "okay";
> +
> +	axp22x: pmic@3e3 {
> +		compatible = "x-powers,axp223";
> +		reg = <0x3e3>;
> +		interrupt-parent = <&nmi_intc>;
> +		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
> +		eldoin-supply = <&reg_dcdc1>;
> +	};
> +};
> +
> +#include "axp22x.dtsi"
> +
> +&reg_aldo1 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <3000000>;
> +	regulator-max-microvolt = <3000000>;
> +	regulator-name = "vcc-io";
> +};
> +
> +&reg_aldo2 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <2350000>;
> +	regulator-max-microvolt = <2650000>;
> +	regulator-name = "vdd-dll";
> +};
> +
> +&reg_aldo3 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <2700000>;
> +	regulator-max-microvolt = <3300000>;
> +	regulator-name = "vcc-pll-avcc";
> +};
> +
> +&reg_dc5ldo {
> +	regulator-always-on;
> +	regulator-min-microvolt = <900000>;
> +	regulator-max-microvolt = <1400000>;
> +	regulator-name = "vdd-cpus";
> +};
> +
> +&reg_dcdc1 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <3000000>;
> +	regulator-max-microvolt = <3000000>;
> +	regulator-name = "vcc-3v0";
> +};
> +
> +&reg_dcdc2 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <900000>;
> +	regulator-max-microvolt = <1400000>;
> +	regulator-name = "vdd-sys";
> +};
> +
> +&reg_dcdc3 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <900000>;
> +	regulator-max-microvolt = <1400000>;
> +	regulator-name = "vdd-cpu";
> +};
> +
> +&reg_dcdc5 {
> +	regulator-always-on;
> +	regulator-min-microvolt = <1500000>;
> +	regulator-max-microvolt = <1500000>;
> +	regulator-name = "vcc-dram";
> +};
> +
> +&reg_rtc_ldo {
> +	regulator-always-on;
> +	regulator-min-microvolt = <3000000>;
> +	regulator-max-microvolt = <3000000>;
> +	regulator-name = "vcc-rtc";
>  };

Isn't this supposed to be in the AXP DTSI?

Thanks!
Maxime
Chen-Yu Tsai Nov. 20, 2015, 5:24 p.m. UTC | #2 
On Fri, Nov 20, 2015 at 7:12 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Hi,
>
> On Tue, Nov 17, 2015 at 12:38:24AM +0800, Chen-Yu Tsai wrote:
>> This board has a X-Powers AXP223 PMIC connected via RSB. Its regulators
>> provide power to various parts of the SoC and the board.
>>
>> Also update the regulator supply phandles.
>>
>> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
>> ---
>>  arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 79 +++++++++++++++++++++++++-
>>  1 file changed, 76 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
>> index 13ce68f06dd6..91a0fde47fdd 100644
>> --- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
>> +++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
>> @@ -68,7 +68,7 @@
>>  };
>>
>>  &lradc {
>> -     vref-supply = <&reg_vcc3v0>;
>> +     vref-supply = <&reg_dcdc1>;
>>       status = "okay";
>>
>>       button@200 {
>> @@ -96,7 +96,7 @@
>>  &mmc0 {
>>       pinctrl-names = "default";
>>       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina33>;
>> -     vmmc-supply = <&reg_vcc3v0>;
>> +     vmmc-supply = <&reg_dcdc1>;
>>       bus-width = <4>;
>>       cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
>>       cd-inverted;
>> @@ -106,7 +106,7 @@
>>  &mmc2 {
>>       pinctrl-names = "default";
>>       pinctrl-0 = <&mmc2_8bit_pins>;
>> -     vmmc-supply = <&reg_vcc3v0>;
>> +     vmmc-supply = <&reg_dcdc1>;
>>       bus-width = <8>;
>>       non-removable;
>>       status = "okay";
>> @@ -132,6 +132,79 @@
>>
>>  &r_rsb {
>>       status = "okay";
>> +
>> +     axp22x: pmic@3e3 {
>> +             compatible = "x-powers,axp223";
>> +             reg = <0x3e3>;
>> +             interrupt-parent = <&nmi_intc>;
>> +             interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
>> +             eldoin-supply = <&reg_dcdc1>;
>> +     };
>> +};
>> +
>> +#include "axp22x.dtsi"
>> +
>> +&reg_aldo1 {
>> +     regulator-always-on;
>> +     regulator-min-microvolt = <3000000>;
>> +     regulator-max-microvolt = <3000000>;
>> +     regulator-name = "vcc-io";
>> +};
>> +
>> +&reg_aldo2 {
>> +     regulator-always-on;
>> +     regulator-min-microvolt = <2350000>;
>> +     regulator-max-microvolt = <2650000>;
>> +     regulator-name = "vdd-dll";
>> +};
>> +
>> +&reg_aldo3 {
>> +     regulator-always-on;
>> +     regulator-min-microvolt = <2700000>;
>> +     regulator-max-microvolt = <3300000>;
>> +     regulator-name = "vcc-pll-avcc";
>> +};
>> +
>> +&reg_dc5ldo {
>> +     regulator-always-on;
>> +     regulator-min-microvolt = <900000>;
>> +     regulator-max-microvolt = <1400000>;
>> +     regulator-name = "vdd-cpus";
>> +};
>> +
>> +&reg_dcdc1 {
>> +     regulator-always-on;
>> +     regulator-min-microvolt = <3000000>;
>> +     regulator-max-microvolt = <3000000>;
>> +     regulator-name = "vcc-3v0";
>> +};
>> +
>> +&reg_dcdc2 {
>> +     regulator-always-on;
>> +     regulator-min-microvolt = <900000>;
>> +     regulator-max-microvolt = <1400000>;
>> +     regulator-name = "vdd-sys";
>> +};
>> +
>> +&reg_dcdc3 {
>> +     regulator-always-on;
>> +     regulator-min-microvolt = <900000>;
>> +     regulator-max-microvolt = <1400000>;
>> +     regulator-name = "vdd-cpu";
>> +};
>> +
>> +&reg_dcdc5 {
>> +     regulator-always-on;
>> +     regulator-min-microvolt = <1500000>;
>> +     regulator-max-microvolt = <1500000>;
>> +     regulator-name = "vcc-dram";
>> +};
>> +
>> +&reg_rtc_ldo {
>> +     regulator-always-on;
>> +     regulator-min-microvolt = <3000000>;
>> +     regulator-max-microvolt = <3000000>;
>> +     regulator-name = "vcc-rtc";
>>  };
>
> Isn't this supposed to be in the AXP DTSI?

Are you referring to &reg_rtc_ldo? Yes, it should. I'll do a new version.

Thanks
ChenYu
Maxime Ripard Nov. 22, 2015, 7:46 p.m. UTC | #3 
On Sat, Nov 21, 2015 at 01:24:24AM +0800, Chen-Yu Tsai wrote:
> >> +&reg_rtc_ldo {
> >> +     regulator-always-on;
> >> +     regulator-min-microvolt = <3000000>;
> >> +     regulator-max-microvolt = <3000000>;
> >> +     regulator-name = "vcc-rtc";
> >>  };
> >
> > Isn't this supposed to be in the AXP DTSI?
> 
> Are you referring to &reg_rtc_ldo?

Yep :)

> Yes, it should. I'll do a new version.

Great, thanks!
Maxime
diff mbox

Patch

diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index 13ce68f06dd6..91a0fde47fdd 100644
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -68,7 +68,7 @@ 
 };
 
 &lradc {
-	vref-supply = <&reg_vcc3v0>;
+	vref-supply = <&reg_dcdc1>;
 	status = "okay";
 
 	button@200 {
@@ -96,7 +96,7 @@ 
 &mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina33>;
-	vmmc-supply = <&reg_vcc3v0>;
+	vmmc-supply = <&reg_dcdc1>;
 	bus-width = <4>;
 	cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
 	cd-inverted;
@@ -106,7 +106,7 @@ 
 &mmc2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc2_8bit_pins>;
-	vmmc-supply = <&reg_vcc3v0>;
+	vmmc-supply = <&reg_dcdc1>;
 	bus-width = <8>;
 	non-removable;
 	status = "okay";
@@ -132,6 +132,79 @@ 
 
 &r_rsb {
 	status = "okay";
+
+	axp22x: pmic@3e3 {
+		compatible = "x-powers,axp223";
+		reg = <0x3e3>;
+		interrupt-parent = <&nmi_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		eldoin-supply = <&reg_dcdc1>;
+	};
+};
+
+#include "axp22x.dtsi"
+
+&reg_aldo1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-io";
+};
+
+&reg_aldo2 {
+	regulator-always-on;
+	regulator-min-microvolt = <2350000>;
+	regulator-max-microvolt = <2650000>;
+	regulator-name = "vdd-dll";
+};
+
+&reg_aldo3 {
+	regulator-always-on;
+	regulator-min-microvolt = <2700000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-name = "vcc-pll-avcc";
+};
+
+&reg_dc5ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpus";
+};
+
+&reg_dcdc1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-3v0";
+};
+
+&reg_dcdc2 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-sys";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc5 {
+	regulator-always-on;
+	regulator-min-microvolt = <1500000>;
+	regulator-max-microvolt = <1500000>;
+	regulator-name = "vcc-dram";
+};
+
+&reg_rtc_ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-rtc";
 };
 
 &uart0 {