diff mbox

[3/3] ARM: dts: sun8i-q8-common: Add support for SDIO wifi controllers

Message ID 20160826145236.30210-4-hdegoede@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Hans de Goede Aug. 26, 2016, 2:52 p.m. UTC
Most of the sun8i q8 boards have an usb wifi controller, on the
variants which use an USB wifi controller, this will result in a
couple of error msg-s in dmesg when proving the sdio bus and
an used mmc controller.

The best way to deal with wifi on this boards really is to simply
let the kernel auto-detect usb or sdio wifi controllers, so we
will just have to live with the few errors in dmesg.

This has been tested on a23 based q8 tablets with ESP8089, RTL8703AS and
RTL8189FTV wifi controllers.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/arm/boot/dts/sun8i-q8-common.dtsi | 49 ++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

Comments

Maxime Ripard Aug. 29, 2016, 6:56 a.m. UTC | #1
On Fri, Aug 26, 2016 at 04:52:36PM +0200, Hans de Goede wrote:
> Most of the sun8i q8 boards have an usb wifi controller, on the
> variants which use an USB wifi controller, this will result in a
> couple of error msg-s in dmesg when proving the sdio bus and
> an used mmc controller.
> 
> The best way to deal with wifi on this boards really is to simply
> let the kernel auto-detect usb or sdio wifi controllers, so we
> will just have to live with the few errors in dmesg.

No, because that grabs PINs that might or might not be supposed to be
used for that, it leaves clocks and regulators enabled, which draw
power, to no end. And that's even worth since most boards will not use
it.

You can put the definition of the nodes in the DTSI, but the final
status will have to be in the (relevant) DTS.

Maxime
Hans de Goede Aug. 29, 2016, 9:46 a.m. UTC | #2
Hi,

On 29-08-16 08:56, Maxime Ripard wrote:
> On Fri, Aug 26, 2016 at 04:52:36PM +0200, Hans de Goede wrote:
>> Most of the sun8i q8 boards have an usb wifi controller, on the
>> variants which use an USB wifi controller, this will result in a
>> couple of error msg-s in dmesg when proving the sdio bus and
>> an used mmc controller.
>>
>> The best way to deal with wifi on this boards really is to simply
>> let the kernel auto-detect usb or sdio wifi controllers, so we
>> will just have to live with the few errors in dmesg.
>
> No, because that grabs PINs that might or might not be supposed to be
> used for that, it leaves clocks and regulators enabled, which draw
> power, to no end. And that's even worth since most boards will not use
> it.
>
> You can put the definition of the nodes in the DTSI, but the final
> status will have to be in the (relevant) DTS.

This is again the q8-tablet thing where china produces a new variant
every 2 weeks. So we've sun8i-a23-q8-tablet.dts and sun8i-a33-q8-tablet.dts
which try to be generic dts files for these tablets, since creating
a custom dts per variant is madness.

This commit puts the node in sun8i-q8-common.dtsi because the
A23 and A33 are pin compatible and we've tablets where the
only difference is the SoC soldered on there, the use the _exact_
same PCB and components otherwise, so we have all the sun8i q8
stuff in a common place for sun8i-a23-q8-tablet.dts and
sun8i-a33-q8-tablet.dts, those are the only users of this
dtsi file.

You've already merged the bits which handle the variants with
an USB attached wifi module (enabling ehci0 also on boards
where nothing is connected). This is the counter-part for
PCB's which use a sdio wifi module (about 90% of all boards
in my experience). As for turning a regulator on unnecessary,
both the wifi and sdio wifi solution use the same regulator,
so that is already turned on through the usb bits and it
needs to be in either case.

The only downside of this approach is that we either have
the USB controller turned on unnecessarily (in most cases)
or the mmc controller (in the rare A23 tablet which still
uses an USB wifi module).

This all actually fits neatly into the plans to do hardware
autodetection for these tablets which I'm working on, in
this case we can just let the kernel handle things without
additional code (think the beaglebone capemanager) since
both busses are discoverable.

Once we have the q8-hardwaremgr I'm working on and hope
to post an RFC of soon, we could even make that turn off
the unused controller (as a future enhancement).

I hope this explains things.

Regards,

Hans
Maxime Ripard Sept. 1, 2016, 8:37 p.m. UTC | #3
Hi Hans,

On Mon, Aug 29, 2016 at 11:46:14AM +0200, Hans de Goede wrote:
> On 29-08-16 08:56, Maxime Ripard wrote:
> >On Fri, Aug 26, 2016 at 04:52:36PM +0200, Hans de Goede wrote:
> >>Most of the sun8i q8 boards have an usb wifi controller, on the
> >>variants which use an USB wifi controller, this will result in a
> >>couple of error msg-s in dmesg when proving the sdio bus and
> >>an used mmc controller.
> >>
> >>The best way to deal with wifi on this boards really is to simply
> >>let the kernel auto-detect usb or sdio wifi controllers, so we
> >>will just have to live with the few errors in dmesg.
> >
> >No, because that grabs PINs that might or might not be supposed to be
> >used for that, it leaves clocks and regulators enabled, which draw
> >power, to no end. And that's even worth since most boards will not use
> >it.
> >
> >You can put the definition of the nodes in the DTSI, but the final
> >status will have to be in the (relevant) DTS.
> 
> This is again the q8-tablet thing where china produces a new variant
> every 2 weeks. So we've sun8i-a23-q8-tablet.dts and sun8i-a33-q8-tablet.dts
> which try to be generic dts files for these tablets, since creating
> a custom dts per variant is madness.

This is almost unrelated, and probably some wishful thinking, but I'd
really prefer to support *one* board properly, with all its features,
rather than supporting every random Allwinner device with half baked
support, because no one ever updated the DT, or there's simply no
driver. But hey, I can't force you to work on something either :)

> This commit puts the node in sun8i-q8-common.dtsi because the
> A23 and A33 are pin compatible and we've tablets where the
> only difference is the SoC soldered on there, the use the _exact_
> same PCB and components otherwise, so we have all the sun8i q8
> stuff in a common place for sun8i-a23-q8-tablet.dts and
> sun8i-a33-q8-tablet.dts, those are the only users of this
> dtsi file.
> 
> You've already merged the bits which handle the variants with
> an USB attached wifi module (enabling ehci0 also on boards
> where nothing is connected). This is the counter-part for
> PCB's which use a sdio wifi module (about 90% of all boards
> in my experience).

I'm confused. Are most boards using an USB wifi chip, like you were
stating in your commit log, or an SDIO wifi chip like you just said?

> As for turning a regulator on unnecessary, both the wifi and sdio
> wifi solution use the same regulator, so that is already turned on
> through the usb bits and it needs to be in either case.

Ok, so indeed, that's not as bad as it sounds.

> The only downside of this approach is that we either have
> the USB controller turned on unnecessarily (in most cases)
> or the mmc controller (in the rare A23 tablet which still
> uses an USB wifi module).
> 
> This all actually fits neatly into the plans to do hardware
> autodetection for these tablets which I'm working on, in
> this case we can just let the kernel handle things without
> additional code (think the beaglebone capemanager) since
> both busses are discoverable.
> 
> Once we have the q8-hardwaremgr I'm working on and hope
> to post an RFC of soon, we could even make that turn off
> the unused controller (as a future enhancement).

If that's on your to-do-list, that's fine by me.

Maxime
Hans de Goede Sept. 3, 2016, 11:33 a.m. UTC | #4
Hi Maxime,

On 01-09-16 22:37, Maxime Ripard wrote:
> Hi Hans,
>
> On Mon, Aug 29, 2016 at 11:46:14AM +0200, Hans de Goede wrote:
>> On 29-08-16 08:56, Maxime Ripard wrote:
>>> On Fri, Aug 26, 2016 at 04:52:36PM +0200, Hans de Goede wrote:
>>>> Most of the sun8i q8 boards have an usb wifi controller, on the
>>>> variants which use an USB wifi controller, this will result in a
>>>> couple of error msg-s in dmesg when proving the sdio bus and
>>>> an used mmc controller.
>>>>
>>>> The best way to deal with wifi on this boards really is to simply
>>>> let the kernel auto-detect usb or sdio wifi controllers, so we
>>>> will just have to live with the few errors in dmesg.
>>>
>>> No, because that grabs PINs that might or might not be supposed to be
>>> used for that, it leaves clocks and regulators enabled, which draw
>>> power, to no end. And that's even worth since most boards will not use
>>> it.
>>>
>>> You can put the definition of the nodes in the DTSI, but the final
>>> status will have to be in the (relevant) DTS.
>>
>> This is again the q8-tablet thing where china produces a new variant
>> every 2 weeks. So we've sun8i-a23-q8-tablet.dts and sun8i-a33-q8-tablet.dts
>> which try to be generic dts files for these tablets, since creating
>> a custom dts per variant is madness.
>
> This is almost unrelated, and probably some wishful thinking, but I'd
> really prefer to support *one* board properly, with all its features,
> rather than supporting every random Allwinner device with half baked
> support, because no one ever updated the DT, or there's simply no
> driver. But hey, I can't force you to work on something either :)

The q8 tablets are somewhat special, to the end consumer they
are one board, but they differ a lot per badge. These are 40 (or less)
usd tablets, which get whatever wifi / touchscreen-controller /
accelerometer which is cheapest on the Chenzen market when the
badge gets produces.

For the end user to actually figure out what is in there requires
opening the tablet, or poking around with adb to learn the exact
internals / drivers used by android.

I actually own 10 of these (3 a13, 5 a23, 2 a33) and have access
to 2 more a33 models which friends of me have, and they are *all*
different. For a list of all tablets I've see:
https://github.com/jwrdegoede/sunxi-fedora-scripts/blob/master/hansg-tablet-info

Given the price of these they are really nice to thinker with /
turn into a little normal linux touch device, so I would like to
support them as best as we can in a somewhat user-friendly
way. Also see the RFC patch for the q8-hardwaremgr I posted
recently. In the end these tablets are the "*one* board"
which I'm trying to support properly, except that they are
only one board on the outside not on the outside.

TL;DR: q8 tablets are special, but also quite popular and
I would like to support them properly, which requires
some special handling.

>> This commit puts the node in sun8i-q8-common.dtsi because the
>> A23 and A33 are pin compatible and we've tablets where the
>> only difference is the SoC soldered on there, the use the _exact_
>> same PCB and components otherwise, so we have all the sun8i q8
>> stuff in a common place for sun8i-a23-q8-tablet.dts and
>> sun8i-a33-q8-tablet.dts, those are the only users of this
>> dtsi file.
>>
>> You've already merged the bits which handle the variants with
>> an USB attached wifi module (enabling ehci0 also on boards
>> where nothing is connected). This is the counter-part for
>> PCB's which use a sdio wifi module (about 90% of all boards
>> in my experience).
>
> I'm confused. Are most boards using an USB wifi chip, like you were
> stating in your commit log, or an SDIO wifi chip like you just said?

My bad, the commit msg. is wrong of the 9 sun8i q8 tablets I've
access to only 1 uses usb wifi.

So the first part of the commit msg should read
"Most of the sun8i q8 boards have a sdio wifi controller"

>> As for turning a regulator on unnecessary, both the wifi and sdio
>> wifi solution use the same regulator, so that is already turned on
>> through the usb bits and it needs to be in either case.
>
> Ok, so indeed, that's not as bad as it sounds.
>
>> The only downside of this approach is that we either have
>> the USB controller turned on unnecessarily (in most cases)
>> or the mmc controller (in the rare A23 tablet which still
>> uses an USB wifi module).
>>
>> This all actually fits neatly into the plans to do hardware
>> autodetection for these tablets which I'm working on, in
>> this case we can just let the kernel handle things without
>> additional code (think the beaglebone capemanager) since
>> both busses are discoverable.
>>
>> Once we have the q8-hardwaremgr I'm working on and hope
>> to post an RFC of soon, we could even make that turn off
>> the unused controller (as a future enhancement).
>
> If that's on your to-do-list, that's fine by me.

I've just added it to my to-do list :)

So I assume with that done, that you are ok with taking this
patch now ? Please fixup the commit msg mistake, or let
me know if you want a v2.

Regards,

Hans
Maxime Ripard Sept. 5, 2016, 7:58 p.m. UTC | #5
Hi,

On Sat, Sep 03, 2016 at 01:33:50PM +0200, Hans de Goede wrote:
> >On Mon, Aug 29, 2016 at 11:46:14AM +0200, Hans de Goede wrote:
> >>On 29-08-16 08:56, Maxime Ripard wrote:
> >>>On Fri, Aug 26, 2016 at 04:52:36PM +0200, Hans de Goede wrote:
> >>>>Most of the sun8i q8 boards have an usb wifi controller, on the
> >>>>variants which use an USB wifi controller, this will result in a
> >>>>couple of error msg-s in dmesg when proving the sdio bus and
> >>>>an used mmc controller.
> >>>>
> >>>>The best way to deal with wifi on this boards really is to simply
> >>>>let the kernel auto-detect usb or sdio wifi controllers, so we
> >>>>will just have to live with the few errors in dmesg.
> >>>
> >>>No, because that grabs PINs that might or might not be supposed to be
> >>>used for that, it leaves clocks and regulators enabled, which draw
> >>>power, to no end. And that's even worth since most boards will not use
> >>>it.
> >>>
> >>>You can put the definition of the nodes in the DTSI, but the final
> >>>status will have to be in the (relevant) DTS.
> >>
> >>This is again the q8-tablet thing where china produces a new variant
> >>every 2 weeks. So we've sun8i-a23-q8-tablet.dts and sun8i-a33-q8-tablet.dts
> >>which try to be generic dts files for these tablets, since creating
> >>a custom dts per variant is madness.
> >
> >This is almost unrelated, and probably some wishful thinking, but I'd
> >really prefer to support *one* board properly, with all its features,
> >rather than supporting every random Allwinner device with half baked
> >support, because no one ever updated the DT, or there's simply no
> >driver. But hey, I can't force you to work on something either :)
> 
> The q8 tablets are somewhat special, to the end consumer they
> are one board, but they differ a lot per badge. These are 40 (or less)
> usd tablets, which get whatever wifi / touchscreen-controller /
> accelerometer which is cheapest on the Chenzen market when the
> badge gets produces.
> 
> For the end user to actually figure out what is in there requires
> opening the tablet, or poking around with adb to learn the exact
> internals / drivers used by android.
> 
> I actually own 10 of these (3 a13, 5 a23, 2 a33) and have access
> to 2 more a33 models which friends of me have, and they are *all*
> different. For a list of all tablets I've see:
> https://github.com/jwrdegoede/sunxi-fedora-scripts/blob/master/hansg-tablet-info
> 
> Given the price of these they are really nice to thinker with /
> turn into a little normal linux touch device, so I would like to
> support them as best as we can in a somewhat user-friendly
> way. Also see the RFC patch for the q8-hardwaremgr I posted
> recently. In the end these tablets are the "*one* board"
> which I'm trying to support properly, except that they are
> only one board on the outside not on the outside.
> 
> TL;DR: q8 tablets are special, but also quite popular and
> I would like to support them properly, which requires
> some special handling.
> 
> >>This commit puts the node in sun8i-q8-common.dtsi because the
> >>A23 and A33 are pin compatible and we've tablets where the
> >>only difference is the SoC soldered on there, the use the _exact_
> >>same PCB and components otherwise, so we have all the sun8i q8
> >>stuff in a common place for sun8i-a23-q8-tablet.dts and
> >>sun8i-a33-q8-tablet.dts, those are the only users of this
> >>dtsi file.
> >>
> >>You've already merged the bits which handle the variants with
> >>an USB attached wifi module (enabling ehci0 also on boards
> >>where nothing is connected). This is the counter-part for
> >>PCB's which use a sdio wifi module (about 90% of all boards
> >>in my experience).
> >
> >I'm confused. Are most boards using an USB wifi chip, like you were
> >stating in your commit log, or an SDIO wifi chip like you just said?
> 
> My bad, the commit msg. is wrong of the 9 sun8i q8 tablets I've
> access to only 1 uses usb wifi.
> 
> So the first part of the commit msg should read
> "Most of the sun8i q8 boards have a sdio wifi controller"
> 
> >>As for turning a regulator on unnecessary, both the wifi and sdio
> >>wifi solution use the same regulator, so that is already turned on
> >>through the usb bits and it needs to be in either case.
> >
> >Ok, so indeed, that's not as bad as it sounds.
> >
> >>The only downside of this approach is that we either have
> >>the USB controller turned on unnecessarily (in most cases)
> >>or the mmc controller (in the rare A23 tablet which still
> >>uses an USB wifi module).
> >>
> >>This all actually fits neatly into the plans to do hardware
> >>autodetection for these tablets which I'm working on, in
> >>this case we can just let the kernel handle things without
> >>additional code (think the beaglebone capemanager) since
> >>both busses are discoverable.
> >>
> >>Once we have the q8-hardwaremgr I'm working on and hope
> >>to post an RFC of soon, we could even make that turn off
> >>the unused controller (as a future enhancement).
> >
> >If that's on your to-do-list, that's fine by me.
> 
> I've just added it to my to-do list :)
> 
> So I assume with that done, that you are ok with taking this
> patch now ? Please fixup the commit msg mistake, or let
> me know if you want a v2.

Yeah, I just applied it and fixed the commit log.

Thanks!
Maxime
diff mbox

Patch

diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi
index 60fa958..29f837a 100644
--- a/arch/arm/boot/dts/sun8i-q8-common.dtsi
+++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi
@@ -42,10 +42,59 @@ 
 #include "sunxi-reference-design-tablet.dtsi"
 #include "sun8i-reference-design-tablet.dtsi"
 
+/ {
+	aliases {
+		serial0 = &r_uart;
+		/* Make u-boot set mac-address for wifi without an eeprom */
+		ethernet0 = &sdio_wifi;
+	};
+
+	wifi_pwrseq: wifi_pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		/*
+		 * Q8 boards use various PL# pins as wifi-en. On other boards
+		 * these may be connected to a wifi module output pin. To avoid
+		 * short-circuits we configure these as inputs with pull-ups via
+		 * pinctrl, instead of listing them as active-low reset-gpios.
+		 */
+		pinctrl-names = "default";
+		pinctrl-0 = <&wifi_pwrseq_pin_q8>;
+		/* The esp8089 needs 200 ms after driving wifi-en high */
+		post-power-on-delay-ms = <200>;
+	};
+};
+
 &ehci0 {
 	status  = "okay";
 };
 
+&mmc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins_a>;
+	vmmc-supply = <&reg_dldo1>;
+	mmc-pwrseq = <&wifi_pwrseq>;
+	bus-width = <4>;
+	non-removable;
+	status = "okay";
+
+	sdio_wifi: sdio_wifi@1 {
+		reg = <1>;
+	};
+};
+
+&mmc1_pins_a {
+	allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+};
+
+&r_pio {
+	wifi_pwrseq_pin_q8: wifi_pwrseq_pin@0 {
+		allwinner,pins = "PL6", "PL7", "PL11";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
+};
+
 &usbphy {
 	usb1_vbus-supply = <&reg_dldo1>;
 };