Skip to contentSkip to conversation

ARM: dts: axp209: Add usb_power_supply child node to the ax209 node

PATCH New Hans de Goede 3 participants 14 messages Sep 22, 2015 – Oct 11, 2015

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/6 ARM: dts: axp209: Add usb_power_supply child node to the ax209 node

Add a node representing the usb power supply part of the axp209 pmic, note that the usb power supply and the (to be added later) ac power supply will each have their own child-node, so that they can be separately specified as power-supply for other nodes using a power-supply property with a phandle pointing to the right axp209 child-node.

---
 arch/arm/boot/dts/axp209.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/boot/dts/axp209.dtsi +5 -0
index 24c935c..051ab3b 100644
@@ -89,4 +89,9 @@
 			regulator-name = "ldo5";
 		};
 	};
+
+	usb_power_supply: usb_power_supply {
+		compatible = "x-powers,axp202-usb-power-supply";
+		status = "disabled";
+	};
 };
Signature · 1 line
2.4.3
#1 lore raw

PATCH 2/6 ARM: dts: sun7i: Enable USB DRC on Bananapi

Enable the otg/drc usb controller on the Bananapi.

---
 arch/arm/boot/dts/sun7i-a20-bananapi.dts | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
arch/arm/boot/dts/sun7i-a20-bananapi.dts +29 -0
index 74382f3..61436ad 100644
@@ -159,7 +159,18 @@
 	status = "okay";
 };
 
+&otg_sram {
+	status = "okay";
+};
+
 &pio {
+	usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+		allwinner,pins = "PH4";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
+
 	mmc0_cd_pin_bananapi: mmc0_cd_pin at 0 {
 		allwinner,pins = "PH10";
 		allwinner,function = "gpio_in";
@@ -209,6 +220,10 @@
 	regulator-name = "avcc";
 };
 
+&reg_usb0_vbus {
+	status = "okay";
+};
+
 &reg_usb1_vbus {
 	status = "okay";
 };
@@ -243,7 +258,21 @@
 	status = "okay";
 };
 
+&usb_otg {
+	dr_mode = "otg";
+	status = "okay";
+};
+
+&usb_power_supply {
+	status = "okay";
+};
+
 &usbphy {
+	pinctrl-names = "default";
+	pinctrl-0 = <&usb0_id_detect_pin>;
+	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
+	usb0_vbus_power-supply = <&usb_power_supply>;
+	usb0_vbus-supply = <&reg_usb0_vbus>;
 	usb1_vbus-supply = <&reg_usb1_vbus>;
 	usb2_vbus-supply = <&reg_usb2_vbus>;
 	status = "okay";
Signature · 1 line
2.4.3
#2 lore raw

PATCH 2/6 ARM: dts: sun7i: Enable USB DRC on Bananapi

Quoted 1 line · Hans de Goede

Enable the otg/drc usb controller on the Bananapi.

would something similar apply to the a20 olimex olinuxino micro/lime2 boards?

is there some documentation how to port devicetree improvements/new features to all boards or to at least help with that? i think you did some workshop like that?

i think i have seen other features being added only to some boards? pwm backlight?
audio output?
but my understanding of all of this is really very limited.

thanks,
Jens

Signature · 2 lines
Prisirah - Building digital photo frames for family and friends using
open-source hardware. http://karme.de/prisirah/
#3 lore raw

PATCH 2/6 ARM: dts: sun7i: Enable USB DRC on Bananapi

Hi,

Quoted 6 lines · Jens Thiele
Quoted 1 line · Hans de Goede

Enable the otg/drc usb controller on the Bananapi.

would something similar apply to the a20 olimex olinuxino micro/lime2 boards?

a20 olimex olinuxino micro already has this in 4.3-rc1, see:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts

a20 olimex olinuxino lime2 support is pending:

https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?h=sunxi/dt-for-4.4&id=9ff5052f7561068207c2b0e7590ad8ca5765f2cc

Regards,

Hans

Quoted 13 lines

is there some documentation how to port devicetree improvements/new features to all boards or to at least help with that? i think you did some workshop like that?

i think i have seen other features being added only to some boards? pwm backlight?
audio output?
but my understanding of all of this is really very limited.

thanks,
Jens

#4 lore raw

PATCH 2/6 ARM: dts: sun7i: Enable USB DRC on Bananapi

In reply to Hans de Goede
Quoted 3 lines · Hans de Goede

Enable the otg/drc usb controller on the Bananapi.

Applied all the other patches but this one.

Since we dropped the patch adding the regulators support on the Bananapi until we figure out why the board crash, it doesn't compile anymore.

Thanks!
Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150929/a64e5db6/attachment.sig>
#5 lore raw

[linux-sunxi] Re: [PATCH 2/6] ARM: dts: sun7i: Enable USB DRC on Bananapi

Hi,

Quoted 6 lines · Maxime Ripard
Quoted 3 lines · Hans de Goede

Enable the otg/drc usb controller on the Bananapi.

Applied all the other patches but this one.

Thanks, seems you did not push this to your git.kernel.org repo though ?

Quoted 3 lines

Since we dropped the patch adding the regulators support on the Bananapi until we figure out why the board crash, it doesn't compile anymore.

How about me doing a v2 of the regulators patch which removes the

&cpu0 {
         cpu-supply = <&reg_dcdc2>;
};

So that we do not get cpu voltage scaling, then the regulator changes should be a NOP, everything should just keep the u-boot set voltages, and we can enable oth support.

And then when we've figured out a safe way to enable cpu voltage scaling we can do so with a follow up patch ?

Is that a plan ? If so say yes and I'll do a v2 of these patches :)

Regards,

Hans

#6 lore raw

[linux-sunxi] Re: [PATCH 2/6] ARM: dts: sun7i: Enable USB DRC on Bananapi

Hi,

Quoted 11 lines · Hans de Goede

Hi,

Quoted 6 lines · Maxime Ripard
Quoted 3 lines · Hans de Goede

Enable the otg/drc usb controller on the Bananapi.

Applied all the other patches but this one.

Thanks, seems you did not push this to your git.kernel.org repo though ?

I think I did, but maybe not at the time you sent the mail.

Quoted 10 lines
Quoted 3 lines

Since we dropped the patch adding the regulators support on the Bananapi until we figure out why the board crash, it doesn't compile anymore.

How about me doing a v2 of the regulators patch which removes the

&cpu0 {
        cpu-supply = <&reg_dcdc2>;
};
Quoted 8 lines

So that we do not get cpu voltage scaling, then the regulator changes should be a NOP, everything should just keep the u-boot set voltages, and we can enable oth support.

And then when we've figured out a safe way to enable cpu voltage scaling we can do so with a follow up patch ?

Is that a plan ? If so say yes and I'll do a v2 of these patches :)

Yep, it sounds like a good plan :)

Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151001/f0ed65c4/attachment-0001.sig>
#7 lore raw

[linux-sunxi] Re: [PATCH 2/6] ARM: dts: sun7i: Enable USB DRC on Bananapi

Hi,

Quoted 31 lines · Maxime Ripard

Hi,

Quoted 11 lines · Hans de Goede

Hi,

Quoted 6 lines · Maxime Ripard
Quoted 3 lines · Hans de Goede

Enable the otg/drc usb controller on the Bananapi.

Applied all the other patches but this one.

Thanks, seems you did not push this to your git.kernel.org repo though ?

I think I did, but maybe not at the time you sent the mail.

Quoted 14 lines
Quoted 3 lines

Since we dropped the patch adding the regulators support on the Bananapi until we figure out why the board crash, it doesn't compile anymore.

How about me doing a v2 of the regulators patch which removes the

&cpu0 {
         cpu-supply = <&reg_dcdc2>;
};

So that we do not get cpu voltage scaling, then the regulator changes should be a NOP, everything should just keep the u-boot set voltages, and we can enable oth support.

Quoted 6 lines
Quoted 4 lines

And then when we've figured out a safe way to enable cpu voltage scaling we can do so with a follow up patch ?

Is that a plan ? If so say yes and I'll do a v2 of these patches :)

Yep, it sounds like a good plan :)

With the new v3 of the regulators patch with the corrected opp-s which was just send this should no longer be necessary, can you apply the original "ARM: dts: sun7i: Enable USB DRC on Bananapi" after applying v3 of the regulators patch please ?

Regards,

Hans

#8 lore raw

[linux-sunxi] Re: [PATCH 2/6] ARM: dts: sun7i: Enable USB DRC on Bananapi

Quoted 37 lines · Hans de Goede

Hi,

Quoted 34 lines · Maxime Ripard

Hi,

Quoted 11 lines · Hans de Goede

Hi,

Quoted 6 lines · Maxime Ripard
Quoted 3 lines · Hans de Goede

Enable the otg/drc usb controller on the Bananapi.

Applied all the other patches but this one.

Thanks, seems you did not push this to your git.kernel.org repo though ?

I think I did, but maybe not at the time you sent the mail.

Quoted 17 lines
Quoted 3 lines

Since we dropped the patch adding the regulators support on the Bananapi until we figure out why the board crash, it doesn't compile anymore.

How about me doing a v2 of the regulators patch which removes the

&cpu0 {
        cpu-supply = <&reg_dcdc2>;
};

So that we do not get cpu voltage scaling, then the regulator changes should be a NOP, everything should just keep the u-boot set voltages, and we can enable oth support.

And then when we've figured out a safe way to enable cpu voltage scaling we can do so with a follow up patch ?

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

Is that a plan ? If so say yes and I'll do a v2 of these patches :)

Yep, it sounds like a good plan :)

With the new v3 of the regulators patch with the corrected opp-s which was just send this should no longer be necessary, can you apply the original "ARM: dts: sun7i: Enable USB DRC on Bananapi" after applying v3 of the regulators patch please ?

Sure, I just did it.

Thanks!
Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151011/72f8cd2d/attachment.sig>
#9 lore raw

PATCH 2/6 ARM: dts: sun7i: Enable USB DRC on Bananapi

In reply to Hans de Goede
Quoted 3 lines · Hans de Goede

Enable the otg/drc usb controller on the Bananapi.

Applied, thanks!

Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151011/5f2a2d8a/attachment.sig>
#10 lore raw

PATCH 3/6 ARM: dts: sun7i: Enable USB DRC on orangepi-mini

In reply to Hans de Goede

Enable the otg/drc usb controller on the orangepi-mini.

---
 arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 29 +++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts +29 -0
index 73cd81ee..4f65664 100644
@@ -156,7 +156,18 @@
 	status = "okay";
 };
 
+&otg_sram {
+	status = "okay";
+};
+
 &pio {
+	usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+		allwinner,pins = "PH4";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
+
 	mmc0_cd_pin_orangepi: mmc0_cd_pin at 0 {
 		allwinner,pins = "PH10";
 		allwinner,function = "gpio_in";
@@ -225,6 +236,10 @@
 	regulator-name = "avcc";
 };
 
+&reg_usb0_vbus {
+	status = "okay";
+};
+
 &reg_usb1_vbus {
 	pinctrl-0 = <&usb1_vbus_pin_bananapro>;
 	gpio = <&pio 7 26 GPIO_ACTIVE_HIGH>; /* PH26 */
@@ -243,7 +258,21 @@
 	status = "okay";
 };
 
+&usb_otg {
+	dr_mode = "otg";
+	status = "okay";
+};
+
+&usb_power_supply {
+	status = "okay";
+};
+
 &usbphy {
+	pinctrl-names = "default";
+	pinctrl-0 = <&usb0_id_detect_pin>;
+	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
+	usb0_vbus_power-supply = <&usb_power_supply>;
+	usb0_vbus-supply = <&reg_usb0_vbus>;
 	usb1_vbus-supply = <&reg_usb1_vbus>;
 	usb2_vbus-supply = <&reg_usb2_vbus>;
 	status = "okay";
Signature · 1 line
2.4.3
#11 lore raw

PATCH 4/6 ARM: dts: sun7i: Enable USB DRC on the Orange pi

In reply to Hans de Goede

From: Reinder de Haan <[email protected]>

Add usb otg support for Orange pi, based on Orange pi mini.

---
 arch/arm/boot/dts/sun7i-a20-orangepi.dts | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
arch/arm/boot/dts/sun7i-a20-orangepi.dts +29 -0
index 55a06ce..71125bf 100644
@@ -141,7 +141,18 @@
 	status = "okay";
 };
 
+&otg_sram {
+	status = "okay";
+};
+
 &pio {
+	usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+		allwinner,pins = "PH4";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
+
 	mmc0_cd_pin_orangepi: mmc0_cd_pin at 0 {
 		allwinner,pins = "PH10";
 		allwinner,function = "gpio_in";
@@ -203,6 +214,10 @@
 	regulator-name = "avcc";
 };
 
+&reg_usb0_vbus {
+	status = "okay";
+};
+
 &reg_usb1_vbus {
 	pinctrl-0 = <&usb1_vbus_pin_bananapro>;
 	gpio = <&pio 7 26 GPIO_ACTIVE_HIGH>; /* PH26 */
@@ -221,7 +236,21 @@
 	status = "okay";
 };
 
+&usb_otg {
+	dr_mode = "otg";
+	status = "okay";
+};
+
+&usb_power_supply {
+	status = "okay";
+};
+
 &usbphy {
+	pinctrl-names = "default";
+	pinctrl-0 = <&usb0_id_detect_pin>;
+	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
+	usb0_vbus_power-supply = <&usb_power_supply>;
+	usb0_vbus-supply = <&reg_usb0_vbus>;
 	usb1_vbus-supply = <&reg_usb1_vbus>;
 	usb2_vbus-supply = <&reg_usb2_vbus>;
 	status = "okay";
Signature · 1 line
2.4.3
#12 lore raw

PATCH 5/6 ARM: dts: sun7i: Enable USB DRC on Wexler TAB7200

In reply to Hans de Goede

From: Aleksei Mamlin <[email protected]>

Enable the otg/drc usb controller on the Wexler TAB7200 tablet.

---
 arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 33 +++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts +32 -1
index 83c6d3f..78239ad 100644
@@ -86,6 +86,8 @@
 	};
 };
 
+#include "axp209.dtsi"
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins_a>;
@@ -135,7 +137,18 @@
 	status = "okay";
 };
 
-#include "axp209.dtsi"
+&otg_sram {
+	status = "okay";
+};
+
+&pio {
+	usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+		allwinner,pins = "PH4";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
+};
 
 &reg_dcdc2 {
 	regulator-always-on;
@@ -162,6 +175,10 @@
 	regulator-name = "avcc";
 };
 
+&reg_usb0_vbus {
+	status = "okay";
+};
+
 &reg_usb1_vbus {
 	status = "okay";
 };
@@ -176,7 +193,21 @@
 	status = "okay";
 };
 
+&usb_otg {
+	dr_mode = "otg";
+	status = "okay";
+};
+
+&usb_power_supply {
+	status = "okay";
+};
+
 &usbphy {
+	pinctrl-names = "default";
+	pinctrl-0 = <&usb0_id_detect_pin>;
+	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
+	usb0_vbus_power-supply = <&usb_power_supply>;
+	usb0_vbus-supply = <&reg_usb0_vbus>;
 	usb1_vbus-supply = <&reg_usb1_vbus>;
 	usb2_vbus-supply = <&reg_usb2_vbus>;
 	status = "okay";
Signature · 1 line
2.4.3
#13 lore raw

PATCH 6/6 ARM: dts: sun7i: Add dts file for Wits Pro A20 DKT

In reply to Hans de Goede

From: Jelle de Jong <[email protected]>

The Wits Pro A20 DKT is an A20 Development KiT with 1G RAM, 4G NAND, sdio wifi, 1Gbit ethernet, 1024x768 lcd screen with ft5x_ts touchscreen and a ton of IO connectors.

Note there seem to be multiple sdcard slots on the board (4 in total), but other then mmc0 none of these are hooked up by default, there is a ton of dip-switches which likely allow hooking some of these up, but the documentation of the board only describes the use of a fraction of them, so for now we only support mmc0.

[hdegoede at redhat.com: Use pwrseq instead of a regulator for the wifi-en pin]
[hdegoede at redhat.com: Add support for OOB irq for the sdio wifi]

---
Also see: http://www.merrii.com/en/pla_d.asp?id=163

Changes in v2:
-Use mmc-pwrseq-simple instead of a regulator for the wifi-en pin -Add support for OOB irq for the sdio wifi

---
 arch/arm/boot/dts/Makefile                       |   3 +-
 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 226 +++++++++++++++++++++++
 2 files changed, 228 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
arch/arm/boot/dts/Makefile +2 -1
index a8b4ef1..63c4765 100644
@@ -625,7 +625,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \
 	sun7i-a20-orangepi-mini.dtb \
 	sun7i-a20-pcduino3.dtb \
 	sun7i-a20-pcduino3-nano.dtb \
-	sun7i-a20-wexler-tab7200.dtb
+	sun7i-a20-wexler-tab7200.dtb \
+	sun7i-a20-wits-pro-a20-dkt.dtb
 dtb-$(CONFIG_MACH_SUN8I) += \
 	sun8i-a23-evb.dtb \
 	sun8i-a23-gt90h-v4.dtb \
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts new file +226 -0

226 lines not on this page · raw message

Signature · 1 line
2.4.3