[PATCH 1/4] ARM: dts: sun5i: Enable otg on the auxtex t004

[PATCH 1/4] ARM: dts: sun5i: Enable otg on the auxtex t004

[Hans de Goede]

The auxtek t004 has its otg usb vbus hardwired to 5v (likely in case
people use it to power the board instead of the dedicated power micro
usb connector), it does have an id pin, so it allows full otg
functionality.

Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
index e15d1ef..7ddebce 100644
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
@@ -130,7 +130,18 @@
 	status = "okay";
 };
 
+&otg_sram {
+	status = "okay";
+};
+
 &pio {
+	usb0_id_detect_pin: usb0_id_detect_pin@0 {
+		allwinner,pins = "PG12";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
+
 	mmc0_cd_pin_t004: mmc0_cd_pin@0 {
 		allwinner,pins = "PG1";
 		allwinner,function = "gpio_in";
@@ -164,11 +175,19 @@
 	status = "okay";
 };
 
+&usb_otg {
+	dr_mode = "otg";
+	status = "okay";
+};
+
 &usb1_vbus_pin_a {
 	allwinner,pins = "PG13";
 };
 
 &usbphy {
+	pinctrl-names = "default";
+	pinctrl-0 = <&usb0_id_detect_pin>;
+	usb0_id_det-gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
 	usb1_vbus-supply = <&reg_usb1_vbus>;
 	status = "okay";
 };
-- 
2.7.4

[PATCH 2/4] ARM: dts: sun5i: Enable otg on the mk802

[Hans de Goede]

Enable the otg controller, the id pin is not connected so enable
it in peripheral only mode.

Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/sun5i-a10s-mk802.dts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
index 46ff940..0bb5755 100644
--- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
@@ -87,6 +87,10 @@
 	status = "okay";
 };
 
+&otg_sram {
+	status = "okay";
+};
+
 &pio {
 	led_pins_mk802: led_pins@0 {
 		allwinner,pins = "PB2";
@@ -122,6 +126,11 @@
 	status = "okay";
 };
 
+&usb_otg {
+	dr_mode = "peripheral";
+	status = "okay";
+};
+
 &usbphy {
 	usb1_vbus-supply = <&reg_usb1_vbus>;
 	status = "okay";
-- 
2.7.4

Re: [PATCH 2/4] ARM: dts: sun5i: Enable otg on the mk802

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 377 bytes --]

On Wed, Jun 29, 2016 at 08:47:00PM +0200, Hans de Goede wrote:
> Enable the otg controller, the id pin is not connected so enable
> it in peripheral only mode.
> 
> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Applied, thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[PATCH 3/4] ARM: dts: sun5i: Add axp152 pmic node to mk802

[Hans de Goede]

Add a node describing the axp152 pmic to the mk802 dts, note there are
no regulator nodes as we do not yet support the regulators on the
axp152.

Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/sun5i-a10s-mk802.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
index 0bb5755..04120e1 100644
--- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
@@ -73,6 +73,20 @@
 	status = "okay";
 };
 
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0_pins_a>;
+	status = "okay";
+
+	axp152: pmic@30 {
+		compatible = "x-powers,axp152";
+		reg = <0x30>;
+		interrupts = <0>;
+		interrupt-controller;
+		#interrupt-cells = <1>;
+	};
+};
+
 &mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_mk802>;
-- 
2.7.4

Re: [PATCH 3/4] ARM: dts: sun5i: Add axp152 pmic node to mk802

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

On Wed, Jun 29, 2016 at 08:47:01PM +0200, Hans de Goede wrote:
> Add a node describing the axp152 pmic to the mk802 dts, note there are
> no regulator nodes as we do not yet support the regulators on the
> axp152.
> 
> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Applied, thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[PATCH 4/4] ARM: dts: sun5i: Add mmc1 / sdio-wifi node to mk802

[Hans de Goede]

The a10s mk802 uses a rtl8189es sdio wifi chip, add a node enabling
the mmc1 controller, this enables using the wifi chip (together with
an out of tree sdio driver for it).

Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/sun5i-a10s-mk802.dts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
index 04120e1..c84ac00 100644
--- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
@@ -97,6 +97,15 @@
 	status = "okay";
 };
 
+&mmc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins_a>;
+	vmmc-supply = <&reg_vcc3v3>;
+	bus-width = <4>;
+	non-removable;
+	status = "okay";
+};
+
 &ohci0 {
 	status = "okay";
 };
-- 
2.7.4

Re: [PATCH 4/4] ARM: dts: sun5i: Add mmc1 / sdio-wifi node to mk802

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 452 bytes --]

On Wed, Jun 29, 2016 at 08:47:02PM +0200, Hans de Goede wrote:
> The a10s mk802 uses a rtl8189es sdio wifi chip, add a node enabling
> the mmc1 controller, this enables using the wifi chip (together with
> an out of tree sdio driver for it).
> 
> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Applied, thanks!

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [PATCH 1/4] ARM: dts: sun5i: Enable otg on the auxtex t004

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 635 bytes --]

Hi,

On Wed, Jun 29, 2016 at 08:46:59PM +0200, Hans de Goede wrote:
> The auxtek t004 has its otg usb vbus hardwired to 5v (likely in case
> people use it to power the board instead of the dedicated power micro
> usb connector), it does have an id pin, so it allows full otg
> functionality.

I don't really get what you're saying here. Is the VBUS hardcoded to
5V, without any way to switch it, or it is not wired at all?

In the former case, how can one of the PMIC output be related to the
board power input?

Thanks,
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: Re: [PATCH 1/4] ARM: dts: sun5i: Enable otg on the auxtex t004

[Hans de Goede]

Hi,

On 29-06-16 22:38, Maxime Ripard wrote:
> Hi,
>
> On Wed, Jun 29, 2016 at 08:46:59PM +0200, Hans de Goede wrote:
>> The auxtek t004 has its otg usb vbus hardwired to 5v (likely in case
>> people use it to power the board instead of the dedicated power micro
>> usb connector), it does have an id pin, so it allows full otg
>> functionality.
>
> I don't really get what you're saying here. Is the VBUS hardcoded to
> 5V, without any way to switch it, or it is not wired at all?

It is hardwired to 5v, quoting from my commit msg
"has its otg usb vbus hardwired to 5v"

> In the former case, how can one of the PMIC output be related to the
> board power input?

I believe it is not wired to the pmic output, but to the pmic 5v input.

Regards,

Hans

Re: Re: [PATCH 1/4] ARM: dts: sun5i: Enable otg on the auxtex t004

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 986 bytes --]

On Thu, Jun 30, 2016 at 11:45:00AM +0200, Hans de Goede wrote:
> Hi,
> 
> On 29-06-16 22:38, Maxime Ripard wrote:
> >Hi,
> >
> >On Wed, Jun 29, 2016 at 08:46:59PM +0200, Hans de Goede wrote:
> >>The auxtek t004 has its otg usb vbus hardwired to 5v (likely in case
> >>people use it to power the board instead of the dedicated power micro
> >>usb connector), it does have an id pin, so it allows full otg
> >>functionality.
> >
> >I don't really get what you're saying here. Is the VBUS hardcoded to
> >5V, without any way to switch it, or it is not wired at all?
> 
> It is hardwired to 5v, quoting from my commit msg
> "has its otg usb vbus hardwired to 5v"
> 
> >In the former case, how can one of the PMIC output be related to the
> >board power input?
> 
> I believe it is not wired to the pmic output, but to the pmic 5v input.

Weird. Ok, I just applied it.

Thanks
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: Re: [PATCH 1/4] ARM: dts: sun5i: Enable otg on the auxtex t004

[Hans de Goede]

Hi,

On 05-07-16 08:54, Maxime Ripard wrote:
> On Thu, Jun 30, 2016 at 11:45:00AM +0200, Hans de Goede wrote:
>> Hi,
>>
>> On 29-06-16 22:38, Maxime Ripard wrote:
>>> Hi,
>>>
>>> On Wed, Jun 29, 2016 at 08:46:59PM +0200, Hans de Goede wrote:
>>>> The auxtek t004 has its otg usb vbus hardwired to 5v (likely in case
>>>> people use it to power the board instead of the dedicated power micro
>>>> usb connector), it does have an id pin, so it allows full otg
>>>> functionality.
>>>
>>> I don't really get what you're saying here. Is the VBUS hardcoded to
>>> 5V, without any way to switch it, or it is not wired at all?
>>
>> It is hardwired to 5v, quoting from my commit msg
>> "has its otg usb vbus hardwired to 5v"
>>
>>> In the former case, how can one of the PMIC output be related to the
>>> board power input?
>>
>> I believe it is not wired to the pmic output, but to the pmic 5v input.
>
> Weird.

This is an a10s based hdmi stick, with a axp152 pmic, which does
not have separate ac-in / vbus-in and the matching ips out and
selection logic. So I guess that when using this pmic boards just
wire all the dcdc vin-s to 5v. As said this hdmi dongle has 2 micro-usb
connectors one for power only and one for otg. I believe that also
want to be able to power the dongle from just the otg (e.g. when
connected to a pc), at which point wiring its 5v to the 5v of
the micro-usb power connector aka THE 5v line is pretty much the
only thing they can do. Note this is all based on observation,
no schematics available.

> Ok, I just applied it.

Thanks.

Regards,

Hans