ARM: dts: sunxi: Enable USB DRC on a bunch of boards

From: Remy van Elst <[email protected]>

Enable the otg/drc usb controller on the A10 OLinuxIno Lime.

Signed-off-by Remy van Elst <[email protected]>

Signed-off-by Hans de Goede <[email protected]>

Enable the otg/drc usb controller on the A10s OLinuxIno Micro.

Note the A10s OlinuxIno Micro always has some voltage on its otg power pin, even if the usb-vbus0-regulator is disabled, the leaked voltage is enough to make vbus-det always report 1, so we do not use vbus-det on this board.

Signed-off-by Hans de Goede <[email protected]>

---
 arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 30 +++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts +4 -0

index 7b26e17..5eebd21 100644
@@ -196,6 +196,10 @@
 	status = "okay";
 };
 
+&otg_sram {
+	status = "okay";
+};
+
 &pio {
 	mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin at 0 {
 		allwinner,pins = "PG1";

From: Mark Janssen <[email protected]>

Enable the otg/drc usb controller on the A13 OLinuxIno.

Signed-off-by Mark Janssen <[email protected]>

Signed-off-by Hans de Goede <[email protected]>

---
 arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

arch/arm/boot/dts/sun5i-a13-olinuxino.dts +11 -0

index 4232400..e659482 100644
@@ -159,6 +159,10 @@
 	status = "okay";
 };
 
+&otg_sram {
+	status = "okay";
+};
+
 &pio {
 	mmc0_cd_pin_olinuxino: mmc0_cd_pin at 0 {
 		allwinner,pins = "PG0";

@@ -174,6 +178,24 @@
 		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 	};
 
+	usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+		allwinner,pins = "PG2";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
+

Enable the otg/drc usb controller on the Ippo Q8H-A33 tablet, for now it is enabled in host-only mode, because true OTG support requires support for detecting and enabling Vbus through the axp221 pmic.

For this to work the Vbus on the port must be enabled by u-boot, or a powered hub must be used.

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.

Signed-off-by Jelle de Jong <[email protected]>

Signed-off-by Hans de Goede <[email protected]>

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

---
 arch/arm/boot/dts/Makefile                       |   3 +-
 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 209 +++++++++++++++++++++++
 2 files changed, 211 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts

arch/arm/boot/dts/Makefile +0 -0

index f830e1f..151a413 100644

arch/arm/boot/dts/Makefile +0 -0

 dtb-$(CONFIG_MACH_SUN8I) += \
 	sun8i-a23-evb.dtb \
 	sun8i-a23-ippo-q8h-v5.dtb \

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts new file +62 -0

new file mode 100644
index 0000000..db4d32c
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2015 Jelle de Jong <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+	model = "Wits Pro A20 DKT";
+	compatible = "wits,pro-a20-dkt", "allwinner,sun7i-a20";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+

Quoted 27 lines · 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.

Signed-off-by Jelle de Jong <[email protected]>

Signed-off-by Hans de Goede <[email protected]>

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

---
 arch/arm/boot/dts/Makefile                       |   3 +-
 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 209 +++++++++++++++++++++++
 2 files changed, 211 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts

arch/arm/boot/dts/Makefile +0 -0

index f830e1f..151a413 100644

arch/arm/boot/dts/Makefile dtb-$(CONFIG_MACH_SUN7I) += \ · line 599

Quoted 6 lines

arch/arm/boot/dts/Makefile +2 -1

@@ -595,7 +595,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

The indentation is off.

Quoted 71 lines

arch/arm/boot/dts/Makefile +0 -0

 dtb-$(CONFIG_MACH_SUN8I) += \
      sun8i-a23-evb.dtb \
      sun8i-a23-ippo-q8h-v5.dtb \

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts new file +62 -0

new file mode 100644
index 0000000..db4d32c
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2015 Jelle de Jong <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+     model = "Wits Pro A20 DKT";
+     compatible = "wits,pro-a20-dkt", "allwinner,sun7i-a20";
+
+     aliases {
+             serial0 = &uart0;
+     };
+
+     chosen {
+             stdout-path = "serial0:115200n8";
+     };
+

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts line 72

Quoted 10 lines

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts new file +10 -0

+     reg_vmmc3: vmmc3 {
+             compatible = "regulator-fixed";
+             pinctrl-names = "default";
+             pinctrl-0 = <&vmmc3_pin_ap6xxx_wl_regon>;
+             regulator-name = "vmmc3";
+             regulator-min-microvolt = <3300000>;
+             regulator-max-microvolt = <3300000>;
+             enable-active-high;
+             gpio = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */
+     };

It's not really vmmc. The reg_on stuff is actually more of a reset
line: when tied to VCC, the WLAN part of the chip and its regulators are enabled, while when it's tied to ground, the WLAN is in reset, and the internal regulators disabled.

So it can be seen as either an active-low reset line, or an active-high regulator for the WiFi part, but VMMC is the power line of the MMC bus itself, which usually is provided by a regulator through the pin 22 of the AP6210, usually tied directly to the 3.3V line.

So you actually have two regulators here: one for vmmc (reg_3v3), and one for reg_on which is the one that you just defined.

Note that it's a bit of a pain for now to support such cases, as there's nothing to tie something from the DT to an SDIO device. I don't have a better solution than marking it always-on at the moment, with a big FIXME comment on top... :/

Quoted 132 lines · Maxime Ripard

Quoted 27 lines · 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.

Signed-off-by Jelle de Jong <[email protected]>

Signed-off-by Hans de Goede <[email protected]>

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

---
  arch/arm/boot/dts/Makefile                       |   3 +-
  arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 209 +++++++++++++++++++++++
  2 files changed, 211 insertions(+), 1 deletion(-)

create mode 100644 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts

arch/arm/boot/dts/Makefile +0 -0

index f830e1f..151a413 100644

arch/arm/boot/dts/Makefile dtb-$(CONFIG_MACH_SUN7I) += \ · line 599

Quoted 6 lines

arch/arm/boot/dts/Makefile +2 -1

@@ -595,7 +595,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

The indentation is off.

Quoted 71 lines

arch/arm/boot/dts/Makefile +0 -0

  dtb-$(CONFIG_MACH_SUN8I) += \
       sun8i-a23-evb.dtb \
       sun8i-a23-ippo-q8h-v5.dtb \

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts new file +62 -0

new file mode 100644
index 0000000..db4d32c
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2015 Jelle de Jong <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+     model = "Wits Pro A20 DKT";
+     compatible = "wits,pro-a20-dkt", "allwinner,sun7i-a20";
+
+     aliases {
+             serial0 = &uart0;
+     };
+
+     chosen {
+             stdout-path = "serial0:115200n8";
+     };
+

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts line 72

Quoted 10 lines

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts new file +10 -0

+     reg_vmmc3: vmmc3 {
+             compatible = "regulator-fixed";
+             pinctrl-names = "default";
+             pinctrl-0 = <&vmmc3_pin_ap6xxx_wl_regon>;
+             regulator-name = "vmmc3";
+             regulator-min-microvolt = <3300000>;
+             regulator-max-microvolt = <3300000>;
+             enable-active-high;
+             gpio = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */
+     };

It's not really vmmc. The reg_on stuff is actually more of a reset
line: when tied to VCC, the WLAN part of the chip and its regulators are enabled, while when it's tied to ground, the WLAN is in reset, and the internal regulators disabled.

So it can be seen as either an active-low reset line, or an active-high regulator for the WiFi part, but VMMC is the power line of the MMC bus itself, which usually is provided by a regulator through the pin 22 of the AP6210, usually tied directly to the 3.3V line.

So you actually have two regulators here: one for vmmc (reg_3v3), and one for reg_on which is the one that you just defined.

Quoted 4 lines

Note that it's a bit of a pain for now to support such cases, as there's nothing to tie something from the DT to an SDIO device. I don't have a better solution than marking it always-on at the moment, with a big FIXME comment on top... :/

One could use the mmc-pwr-seq stuff. I don't know if it has been extended for multiple GPIOs, not that you would need it in this use case.

Quoted 132 lines · Maxime Ripard

Quoted 27 lines · 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.

Signed-off-by Jelle de Jong <[email protected]>

Signed-off-by Hans de Goede <[email protected]>

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

---
  arch/arm/boot/dts/Makefile                       |   3 +-
  arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 209 +++++++++++++++++++++++
  2 files changed, 211 insertions(+), 1 deletion(-)

create mode 100644 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts

arch/arm/boot/dts/Makefile +0 -0

index f830e1f..151a413 100644

arch/arm/boot/dts/Makefile dtb-$(CONFIG_MACH_SUN7I) += \ · line 599

Quoted 6 lines

arch/arm/boot/dts/Makefile +2 -1

@@ -595,7 +595,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

The indentation is off.

Quoted 71 lines

arch/arm/boot/dts/Makefile +0 -0

  dtb-$(CONFIG_MACH_SUN8I) += \
       sun8i-a23-evb.dtb \
       sun8i-a23-ippo-q8h-v5.dtb \

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts new file +62 -0

new file mode 100644
index 0000000..db4d32c
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2015 Jelle de Jong <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+     model = "Wits Pro A20 DKT";
+     compatible = "wits,pro-a20-dkt", "allwinner,sun7i-a20";
+
+     aliases {
+             serial0 = &uart0;
+     };
+
+     chosen {
+             stdout-path = "serial0:115200n8";
+     };
+

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts line 72

Quoted 10 lines

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts new file +10 -0

+     reg_vmmc3: vmmc3 {
+             compatible = "regulator-fixed";
+             pinctrl-names = "default";
+             pinctrl-0 = <&vmmc3_pin_ap6xxx_wl_regon>;
+             regulator-name = "vmmc3";
+             regulator-min-microvolt = <3300000>;
+             regulator-max-microvolt = <3300000>;
+             enable-active-high;
+             gpio = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */
+     };

It's not really vmmc. The reg_on stuff is actually more of a reset
line: when tied to VCC, the WLAN part of the chip and its regulators are enabled, while when it's tied to ground, the WLAN is in reset, and the internal regulators disabled.

So it can be seen as either an active-low reset line, or an active-high regulator for the WiFi part, but VMMC is the power line of the MMC bus itself, which usually is provided by a regulator through the pin 22 of the AP6210, usually tied directly to the 3.3V line.

So you actually have two regulators here: one for vmmc (reg_3v3), and one for reg_on which is the one that you just defined.

Quoted 4 lines

Note that it's a bit of a pain for now to support such cases, as there's nothing to tie something from the DT to an SDIO device. I don't have a better solution than marking it always-on at the moment, with a big FIXME comment on top... :/

One could use the mmc-pwr-seq stuff.

I don't know if it has been
extended for multiple GPIOs, not that you would need it in this use case.

Maybe we ought to fix up the other ones, like the CubieTruck and A31 Hummingbird?

Hi,

Quoted 144 lines · Chen-Yu Tsai

Quoted 141 lines · Maxime Ripard

Quoted 31 lines · 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.

Signed-off-by Jelle de Jong <[email protected]>

Signed-off-by Hans de Goede <[email protected]>

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

---
  arch/arm/boot/dts/Makefile                       |   3 +-
  arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 209
+++++++++++++++++++++++
  2 files changed, 211 insertions(+), 1 deletion(-)

create mode 100644 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts

arch/arm/boot/dts/Makefile +0 -0

index f830e1f..151a413 100644

arch/arm/boot/dts/Makefile dtb-$(CONFIG_MACH_SUN7I) += \ · line 599

Quoted 6 lines

arch/arm/boot/dts/Makefile +2 -1

@@ -595,7 +595,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

The indentation is off.

Quoted 73 lines

arch/arm/boot/dts/Makefile +0 -0

  dtb-$(CONFIG_MACH_SUN8I) += \
       sun8i-a23-evb.dtb \
       sun8i-a23-ippo-q8h-v5.dtb \

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts new file +11 -0

new file mode 100644
index 0000000..db4d32c
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2015 Jelle de Jong <[email protected]>
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of

the
+ * License, or (at your option) any later version.
+ *

+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.

+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person

+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:

+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *

+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.

+ */

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts new file +21 -0

+
+/dts-v1/;
+#include "sun7i-a20.dtsi"
+#include "sunxi-common-regulators.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+     model = "Wits Pro A20 DKT";
+     compatible = "wits,pro-a20-dkt", "allwinner,sun7i-a20";
+
+     aliases {
+             serial0 = &uart0;
+     };
+
+     chosen {
+             stdout-path = "serial0:115200n8";
+     };
+

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts line 72

Quoted 10 lines

arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts new file +10 -0

+     reg_vmmc3: vmmc3 {
+             compatible = "regulator-fixed";
+             pinctrl-names = "default";
+             pinctrl-0 = <&vmmc3_pin_ap6xxx_wl_regon>;
+             regulator-name = "vmmc3";
+             regulator-min-microvolt = <3300000>;
+             regulator-max-microvolt = <3300000>;
+             enable-active-high;
+             gpio = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */
+     };

It's not really vmmc. The reg_on stuff is actually more of a reset
line: when tied to VCC, the WLAN part of the chip and its regulators are enabled, while when it's tied to ground, the WLAN is in reset, and the internal regulators disabled.

So it can be seen as either an active-low reset line, or an active-high regulator for the WiFi part, but VMMC is the power line of the MMC bus itself, which usually is provided by a regulator through the pin 22 of the AP6210, usually tied directly to the 3.3V line.

So you actually have two regulators here: one for vmmc (reg_3v3), and one for reg_on which is the one that you just defined.

Quoted 7 lines

Quoted 4 lines

Note that it's a bit of a pain for now to support such cases, as there's nothing to tie something from the DT to an SDIO device. I don't have a better solution than marking it always-on at the moment, with a big FIXME comment on top... :/

One could use the mmc-pwr-seq stuff.

Good idea, I've just written, tested and posted a patch for this for the cubietruck. I do not have access to the A20 Wits DKT atm, so I will post a new version of this patch with pwrseq support coming Tuesday when I have access to the board again.

Quoted 4 lines

I don't know if it has been

extended for multiple GPIOs, not that you would need it in this use case.

mmc-pwrseq-simple supports multiple reset/enable gpios (by listing them all as reset-gpios and setting GPIO_ACTIVE_LOW/HIGH depending on which value they need to be to activate things).

It also supports listing clocks which need to be enabled. I think that it may be a good idea to use this to also enable the bluetooth bits of the ap6210 module on the cubietruck. I know that the actual bt is interfaced over an uart, and we really should have a mechanism to enable/disable it separately, but for not this seems like a good way to get bluetooth to work.

We should ofcourse add a comment to the dts file that this is not a 100% ideal solution, but other then that I think this should work nicely. Maxime would enabling the bluetooth bits of this sdio module via mmc-pwrseq be acceptable to you?

ChenYu if Maxime acks this solution I hope you can write a patch for this, since you've been working on the bluetooth support before.

Quoted 2 lines

Maybe we ought to fix up the other ones, like the CubieTruck and A31 Hummingbird?

Ack, can you take care of the Hummingbird ? (I don't have one).

mmc-pwrseq-simple supports multiple reset/enable gpios (by listing them all as reset-gpios and setting GPIO_ACTIVE_LOW/HIGH depending on which value they need to be to activate things).

It also supports listing clocks which need to be enabled. I think that it may be a good idea to use this to also enable the bluetooth bits of the ap6210 module on the cubietruck. I know that the actual bt is interfaced over an uart, and we really should have a mechanism to enable/disable it separately, but for not this seems like a good way to get bluetooth to work.

We should ofcourse add a comment to the dts file that this is not a 100% ideal solution, but other then that I think this should work nicely. Maxime would enabling the bluetooth bits of this sdio module via mmc-pwrseq be acceptable to you?

ChenYu if Maxime acks this solution I hope you can write a patch for this, since you've been working on the bluetooth support before.

Quoted 11 lines · Hans de Goede

mmc-pwrseq-simple supports multiple reset/enable gpios (by listing them all as reset-gpios and setting GPIO_ACTIVE_LOW/HIGH depending on which value they need to be to activate things).

It also supports listing clocks which need to be enabled. I think that it may be a good idea to use this to also enable the bluetooth bits of the ap6210 module on the cubietruck. I know that the actual bt is interfaced over an uart, and we really should have a mechanism to enable/disable it separately, but for not this seems like a good way to get bluetooth to work.

Quoted 4 lines

We should ofcourse add a comment to the dts file that this is not a 100% ideal solution, but other then that I think this should work nicely. Maxime would enabling the bluetooth bits of this sdio module via mmc-pwrseq be acceptable to you?

As long as we have some comment on top, yep.

Quoted 2 lines

ChenYu if Maxime acks this solution I hope you can write a patch for this, since you've been working on the bluetooth support before.

Note that I'm in holidays starting today. I plan on doing my pull-requests for 4.3 later today, and will probably not be able to merge any patches during the next two weeks, which mean that your mmc-power seq patch for the cubietruck was probably the last one I was merging for the 4.3 merge window.

Quoted 11 lines · Hans de Goede

mmc-pwrseq-simple supports multiple reset/enable gpios (by listing them all as reset-gpios and setting GPIO_ACTIVE_LOW/HIGH depending on which value they need to be to activate things).

It also supports listing clocks which need to be enabled. I think that it may be a good idea to use this to also enable the bluetooth bits of the ap6210 module on the cubietruck. I know that the actual bt is interfaced over an uart, and we really should have a mechanism to enable/disable it separately, but for not this seems like a good way to get bluetooth to work.

Quoted 4 lines

We should ofcourse add a comment to the dts file that this is not a 100% ideal solution, but other then that I think this should work nicely. Maxime would enabling the bluetooth bits of this sdio module via mmc-pwrseq be acceptable to you?

As long as we have some comment on top, yep.

Quoted 2 lines

ChenYu if Maxime acks this solution I hope you can write a patch for this, since you've been working on the bluetooth support before.

Note that I'm in holidays starting today. I plan on doing my pull-requests for 4.3 later today, and will probably not be able to merge any patches during the next two weeks, which mean that your mmc-power seq patch for the cubietruck was probably the last one I was merging for the 4.3 merge window.

Quoted 4 lines

Note that it's a bit of a pain for now to support such cases, as there's nothing to tie something from the DT to an SDIO device. I don't have a better solution than marking it always-on at the moment, with a big FIXME comment on top... :/

One could use the mmc-pwr-seq stuff. I don't know if it has been extended for multiple GPIOs, not that you would need it in this use case.

Maybe we ought to fix up the other ones, like the CubieTruck and A31 Hummingbird?

Quoted 5 lines · Chen-Yu Tsai

Quoted 4 lines

Note that it's a bit of a pain for now to support such cases, as there's nothing to tie something from the DT to an SDIO device. I don't have a better solution than marking it always-on at the moment, with a big FIXME comment on top... :/

Quoted 3 lines

One could use the mmc-pwr-seq stuff. I don't know if it has been extended for multiple GPIOs, not that you would need it in this use case.

It doesn't really improve the situation. It doesn't handle the regulators, it doesn't allow the real driver to get its resources either, basically, it's just a hack.

Quoted 2 lines

Maybe we ought to fix up the other ones, like the CubieTruck and A31 Hummingbird?

I'll do it.

Quoted 5 lines · Chen-Yu Tsai

Quoted 4 lines

Note that it's a bit of a pain for now to support such cases, as there's nothing to tie something from the DT to an SDIO device. I don't have a better solution than marking it always-on at the moment, with a big FIXME comment on top... :/

Quoted 3 lines

One could use the mmc-pwr-seq stuff. I don't know if it has been extended for multiple GPIOs, not that you would need it in this use case.

It doesn't really improve the situation. It doesn't handle the regulators,

it doesn't allow the real driver to get its resources either, basically, it's just a hack.

Quoted 2 lines

Maybe we ought to fix up the other ones, like the CubieTruck and A31 Hummingbird?

I'll do it.

Hi,

Quoted 10 lines · Maxime Ripard

Quoted 8 lines · Chen-Yu Tsai

Quoted 4 lines

Note that it's a bit of a pain for now to support such cases, as there's nothing to tie something from the DT to an SDIO device. I don't have a better solution than marking it always-on at the moment, with a big FIXME comment on top... :/

One could use the mmc-pwr-seq stuff. I don't know if it has been extended for multiple GPIOs, not that you would need it in this use case.

Quoted 2 lines

It doesn't really improve the situation. It doesn't handle the regulators,

The regulator(s) are already handled by the vmmc and vqmcc regulators of the mmc controller binding.

If more regulators are needed, we can easily extend mmc-pwrseq-simple to support them, or define a whole new powerseq driver.

Quoted 2 lines

it doesn't allow the real driver to get its resources either, basically, it's just a hack.

Not involving the real driver is by design really, the real driver cannot bind / have its probe function called until its sdio interface has been probed which is where the pwrseq driver comes in.

This also allows re-using existing sdio drivers without needing them to be aware of certain board perculiarities

If a special power on (or suspend) order is nescessary a custom pwrseq driver can be created for this, even one which is meant to work in tandem with a specific sdio device driver. The idea is that the device driver will ask the mmc core to powerdown the device for powersaving in certain cases (e.g. suspend) and then the mmc core will call into the powerseq driver.

Granted there may be more complex scenarios where thighter control over the resources is needed, but for now this seems to work really well and it is much better then the deadlock we had before were all solutions were shot down as not flexible enough.