diff mbox

[v2,2/4] ARM: dts: sun4i: gemei-g9: Convert to use axp209 regulator nodes

Message ID 1442993914-20295-3-git-send-email-plaes@plaes.org (mailing list archive)
State New, archived
Headers show

Commit Message

Priit Laes Sept. 23, 2015, 7:38 a.m. UTC 
Add regulator nodes for axp209 by including the axp209 dtsi.

Changes in v2:
 - Add the ohci0 node.

Signed-off-by: Priit Laes <plaes@plaes.org>
---
 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 39 ++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

Comments

Julian Calaby Sept. 23, 2015, 11:42 p.m. UTC | #1 
Hi Priit,

On Wed, Sep 23, 2015 at 5:38 PM, Priit Laes <plaes@plaes.org> wrote:
> Add regulator nodes for axp209 by including the axp209 dtsi.
>
> Changes in v2:
>  - Add the ohci0 node.

Firstly, changelog stuff like this should be below the --- under your SOB.

Also, shouldn't enabling the ohci0 node be a separate patch?

Thanks,
Maxime Ripard Sept. 25, 2015, 6:33 a.m. UTC | #2 
On Thu, Sep 24, 2015 at 09:42:33AM +1000, Julian Calaby wrote:
> Hi Priit,
> 
> On Wed, Sep 23, 2015 at 5:38 PM, Priit Laes <plaes@plaes.org> wrote:
> > Add regulator nodes for axp209 by including the axp209 dtsi.
> >
> > Changes in v2:
> >  - Add the ohci0 node.
> 
> Firstly, changelog stuff like this should be below the --- under your SOB.
> 
> Also, shouldn't enabling the ohci0 node be a separate patch?

It should.

Maxime
diff mbox

Patch

diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
index 3f0aeb8..155b11a 100644
--- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
+++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
@@ -72,6 +72,10 @@ 
  *   Touchscreen - gt801_2plus1 @ i2c adapter 2 @ 0x48
  */
 
+&cpu0 {
+	cpu-supply = <&reg_dcdc2>;
+};
+
 &ehci0 {
 	status = "okay";
 };
@@ -86,15 +90,13 @@ 
 	status = "okay";
 
 	axp209: pmic@34 {
-		compatible = "x-powers,axp209";
 		reg = <0x34>;
 		interrupts = <0>;
-
-		interrupt-controller;
-		#interrupt-cells = <1>;
 	};
 };
 
+#include "axp209.dtsi"
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins_a>;
@@ -146,6 +148,35 @@ 
 	status = "okay";
 };
 
+&ohci0 {
+	status = "okay";
+};
+
+&reg_dcdc2 {
+	regulator-always-on;
+	regulator-min-microvolt = <1000000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <1250000>;
+	regulator-max-microvolt = <1250000>;
+	regulator-name = "vdd-int-dll";
+};
+
+&reg_ldo1 {
+	regulator-name = "vdd-rtc";
+};
+
+&reg_ldo2 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "avcc";
+};
+
 &reg_usb1_vbus {
 	status = "okay";
 };