Skip to contentSkip to conversation

ARM: dts: sun5i: inet98v_rev2 fix regulator for the usb wifi

PATCH New Hans de Goede 2 participants 4 messages Aug 27, 2015 – Aug 28, 2015

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

cover ARM: dts: sun5i: inet98v_rev2 fix regulator for the usb wifi

Hi Maxime,

Here is a fixup patch for the patch adding a dts for the inet98v_rev2.

I'm not sure if you've merged the original patch yet, hence I'm sending this as a follow-up patch. If you've not yet merged the original patch feel free to squash this fix in.

Regards,

Hans

#1 lore raw

PATCH 1/1 ARM: dts: sun5i: inet98v_rev2 fix regulator for the usb wifi module

The usb-wifi module is not connected to a gpio controller regulator (as is typical on sunxi boards), instead is it connected to ldo3.

This commit fixes the us_phy usb1_vbus-supply setting thereby making sure that we power the usb-wifi and that it can be used.

This commit also removes the wrong and now unused bits which refer to the gpio controlled reg_usb1_vbus.

---
 arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts +1 -10
index 6d466a2..6fa54b6 100644
@@ -201,11 +201,6 @@
 	status = "okay";
 };
 
-&reg_usb1_vbus {
-	gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */
-	status = "okay";
-};
-
 &uart1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart1_pins_b>;
@@ -221,16 +216,12 @@
 	allwinner,pins = "PG12";
 };
 
-&usb1_vbus_pin_a {
-	allwinner,pins = "PG11";
-};
-
 &usbphy {
 	pinctrl-names = "default";
 	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
 	usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
 	usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
 	usb0_vbus-supply = <&reg_usb0_vbus>;
-	usb1_vbus-supply = <&reg_usb1_vbus>;
+	usb1_vbus-supply = <&reg_ldo3>;
 	status = "okay";
 };
Signature · 1 line
2.4.3
#2 lore raw

cover ARM: dts: sun5i: inet98v_rev2 fix regulator for the usb wifi

In reply to Hans de Goede

Hi Hans,

Quoted 7 lines · Hans de Goede

Hi Maxime,

Here is a fixup patch for the patch adding a dts for the inet98v_rev2.

I'm not sure if you've merged the original patch yet, hence I'm sending this as a follow-up patch. If you've not yet merged the original patch feel free to squash this fix in.

Have you ever submitted that first patch in the first place?

I'm don't have the DTS file you're patching in my tree, and I don't see any email and/or patch relating to that board.

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/20150828/5f0413b6/attachment.sig>
#3 lore raw

cover ARM: dts: sun5i: inet98v_rev2 fix regulator for the usb wifi

Hi,

Quoted 7 lines · Maxime Ripard

Hi Hans,

Quoted 4 lines · Hans de Goede

Hi Maxime,

Here is a fixup patch for the patch adding a dts for the inet98v_rev2.

Quoted 8 lines
Quoted 3 lines

I'm not sure if you've merged the original patch yet, hence I'm sending this as a follow-up patch. If you've not yet merged the original patch feel free to squash this fix in.

Have you ever submitted that first patch in the first place?

I'm don't have the DTS file you're patching in my tree, and I don't see any email and/or patch relating to that board.

Oh, I thought I had posted it, ah well. I'll do a v2 (which I guess really is v1 then) with the fix squashed in.

Regards,

Hans