[U-Boot] [PATCH v2 1/7] sunxi: gpio: Indentation fix

[U-Boot] [PATCH v2 1/7] sunxi: gpio: Indentation fix

[Paul Kocialkowski]

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 arch/arm/include/asm/arch-sunxi/gpio.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h
index f2c247d..a66e45c 100644
--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ b/arch/arm/include/asm/arch-sunxi/gpio.h
@@ -84,7 +84,7 @@ struct sunxi_gpio_reg {
 #define GPIO_CFG_INDEX(pin)	(((pin) & 0x1f) >> 3)
 #define GPIO_CFG_OFFSET(pin)	((((pin) & 0x1f) & 0x7) << 2)
 
-#define GPIO_DRV_INDEX(pin)   (((pin) & 0x1f) >> 4)
+#define GPIO_DRV_INDEX(pin)	(((pin) & 0x1f) >> 4)
 #define GPIO_DRV_OFFSET(pin)	((((pin) & 0x1f) & 0xf) << 1)
 
 #define GPIO_PULL_INDEX(pin)	(((pin) & 0x1f) >> 4)
@@ -194,7 +194,7 @@ enum sunxi_gpio_number {
 #define SUN8I_GPL3_R_UART_RX	2
 
 #define SUN9I_GPN0_R_RSB_SCK	3
-#define SUN9I_GPN1_R_RSB_SDA    3
+#define SUN9I_GPN1_R_RSB_SDA	3
 
 /* GPIO pin pull-up/down config */
 #define SUNXI_GPIO_PULL_DISABLE	0
-- 
1.9.1

[U-Boot] [PATCH v2 2/7] power: axp221: Virtual VBUS detect and enable GPIOs to replace separate logic

[Paul Kocialkowski]

This converts the VBUS detection and enable logic to GPIO instead of separate
axp functions and checks that have to be used aside usual GPIO functions.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 arch/arm/include/asm/arch-sunxi/gpio.h |  4 ++
 drivers/gpio/sunxi_gpio.c              |  6 +++
 drivers/power/axp221.c                 | 75 ++++++++++++++++++++--------------
 include/axp221.h                       | 14 +++----
 4 files changed, 60 insertions(+), 39 deletions(-)

diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h
index a66e45c..3a4b8c3 100644
--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ b/arch/arm/include/asm/arch-sunxi/gpio.h
@@ -201,6 +201,10 @@ enum sunxi_gpio_number {
 #define SUNXI_GPIO_PULL_UP	1
 #define SUNXI_GPIO_PULL_DOWN	2
 
+/* Virtual AXP0 GPIOs */
+#define SUNXI_GPIO_AXP0_VBUS_DETECT	8
+#define SUNXI_GPIO_AXP0_VBUS_ENABLE	9
+
 void sunxi_gpio_set_cfgbank(struct sunxi_gpio *pio, int bank_offset, u32 val);
 void sunxi_gpio_set_cfgpin(u32 pin, u32 val);
 int sunxi_gpio_get_cfgbank(struct sunxi_gpio *pio, int bank_offset);
diff --git a/drivers/gpio/sunxi_gpio.c b/drivers/gpio/sunxi_gpio.c
index 6296092..c66aa51 100644
--- a/drivers/gpio/sunxi_gpio.c
+++ b/drivers/gpio/sunxi_gpio.c
@@ -125,6 +125,12 @@ int sunxi_name_to_gpio(const char *name)
 #ifdef AXP_GPIO
 	if (strncasecmp(name, "AXP0-", 5) == 0) {
 		name += 5;
+		if (strcmp(name, "VBUS-DETECT") == 0)
+			return SUNXI_GPIO_AXP0_START +
+				SUNXI_GPIO_AXP0_VBUS_DETECT;
+		if (strcmp(name, "VBUS-ENABLE") == 0)
+			return SUNXI_GPIO_AXP0_START +
+				SUNXI_GPIO_AXP0_VBUS_ENABLE;
 		pin = simple_strtol(name, &eptr, 10);
 		if (!*name || *eptr)
 			return -1;
diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
index c2c3988..f758a75 100644
--- a/drivers/power/axp221.c
+++ b/drivers/power/axp221.c
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <asm/arch/p2wi.h>
 #include <asm/arch/rsb.h>
+#include <asm/arch/gpio.h>
 #include <axp221.h>
 
 /*
@@ -385,54 +386,66 @@ int axp221_get_sid(unsigned int *sid)
 	return 0;
 }
 
-int axp_get_vbus(void)
+int axp_gpio_direction_input(unsigned int pin)
 {
-	int ret;
-	u8 val;
-
-	ret = axp221_init();
-	if (ret)
-		return ret;
-
-	ret = pmic_bus_read(AXP221_POWER_STATUS, &val);
-	if (ret)
-		return ret;
-
-	return (val & AXP221_POWER_STATUS_VBUS_USABLE) ? 1 : 0;
+	switch (pin) {
+	case SUNXI_GPIO_AXP0_VBUS_DETECT:
+		return 0;
+	default:
+		return -EINVAL;
+	}
 }
 
-static int axp_drivebus_setup(void)
+int axp_gpio_direction_output(unsigned int pin, unsigned int val)
 {
 	int ret;
 
-	ret = axp221_init();
-	if (ret)
-		return ret;
+	switch (pin) {
+	case SUNXI_GPIO_AXP0_VBUS_ENABLE:
+		ret = axp221_clrbits(AXP221_MISC_CTRL,
+				     AXP221_MISC_CTRL_N_VBUSEN_FUNC);
+		if (ret)
+			return ret;
 
-	/* Set N_VBUSEN pin to output / DRIVEBUS function */
-	return axp221_clrbits(AXP221_MISC_CTRL, AXP221_MISC_CTRL_N_VBUSEN_FUNC);
+		return axp_gpio_set_value(pin, val);
+	default:
+		return -EINVAL;
+	}
 }
 
-int axp_drivebus_enable(void)
+int axp_gpio_get_value(unsigned int pin)
 {
 	int ret;
+	u8 val;
 
-	ret = axp_drivebus_setup();
-	if (ret)
-		return ret;
+	switch (pin) {
+	case SUNXI_GPIO_AXP0_VBUS_DETECT:
+		ret = pmic_bus_read(AXP221_POWER_STATUS, &val);
+		if (ret)
+			return ret;
 
-	/* Set DRIVEBUS high */
-	return axp221_setbits(AXP221_VBUS_IPSOUT, AXP221_VBUS_IPSOUT_DRIVEBUS);
+		return !!(val & AXP221_POWER_STATUS_VBUS_USABLE);
+	default:
+		return -EINVAL;
+	}
 }
 
-int axp_drivebus_disable(void)
+int axp_gpio_set_value(unsigned int pin, unsigned int val)
 {
 	int ret;
 
-	ret = axp_drivebus_setup();
-	if (ret)
-		return ret;
+	switch (pin) {
+	case SUNXI_GPIO_AXP0_VBUS_ENABLE:
+		if (val)
+			ret = axp221_setbits(AXP221_VBUS_IPSOUT,
+					     AXP221_VBUS_IPSOUT_DRIVEBUS);
+		else
+			ret = axp221_clrbits(AXP221_VBUS_IPSOUT,
+					     AXP221_VBUS_IPSOUT_DRIVEBUS);
 
-	/* Set DRIVEBUS low */
-	return axp221_clrbits(AXP221_VBUS_IPSOUT, AXP221_VBUS_IPSOUT_DRIVEBUS);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
 }
diff --git a/include/axp221.h b/include/axp221.h
index be6058e..0aac04d 100644
--- a/include/axp221.h
+++ b/include/axp221.h
@@ -62,11 +62,7 @@
 /* Page 1 addresses */
 #define AXP221_SID		0x20
 
-/* We support vbus detection */
-#define AXP_VBUS_DETECT
-
-/* We support drivebus control */
-#define AXP_DRIVEBUS
+#define AXP_GPIO
 
 int axp221_set_dcdc1(unsigned int mvolt);
 int axp221_set_dcdc2(unsigned int mvolt);
@@ -83,6 +79,8 @@ int axp221_set_aldo3(unsigned int mvolt);
 int axp221_set_eldo(int eldo_num, unsigned int mvolt);
 int axp221_init(void);
 int axp221_get_sid(unsigned int *sid);
-int axp_get_vbus(void);
-int axp_drivebus_enable(void);
-int axp_drivebus_disable(void);
+
+int axp_gpio_direction_input(unsigned int pin);
+int axp_gpio_direction_output(unsigned int pin, unsigned int val);
+int axp_gpio_get_value(unsigned int pin);
+int axp_gpio_set_value(unsigned int pin, unsigned int val);
-- 
1.9.1

[U-Boot] [PATCH v2 3/7] sunxi: usb: Drop AXP-sepcific VBUS detection and drive logic

[Paul Kocialkowski]

VBUS detection and enable is now be used with virtual AXP GPIOs, so all the USB
code has to use GPIO in every case and let sunxi_gpio do the heavy lifting.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 arch/arm/cpu/armv7/sunxi/usbc.c | 17 ---------------
 configs/Ippo_q8h_v1_2_defconfig |  4 ++--
 configs/Ippo_q8h_v5_defconfig   |  4 ++--
 drivers/usb/musb-new/sunxi.c    | 48 ++++++++++++++++-------------------------
 4 files changed, 23 insertions(+), 50 deletions(-)

diff --git a/arch/arm/cpu/armv7/sunxi/usbc.c b/arch/arm/cpu/armv7/sunxi/usbc.c
index 14de9f9..4d8a9a1 100644
--- a/arch/arm/cpu/armv7/sunxi/usbc.c
+++ b/arch/arm/cpu/armv7/sunxi/usbc.c
@@ -80,12 +80,6 @@ static struct sunxi_usbc_hcd {
 
 static int enabled_hcd_count;
 
-static bool use_axp_drivebus(int index)
-{
-	return index == 0 &&
-	       strcmp(CONFIG_USB0_VBUS_PIN, "axp_drivebus") == 0;
-}
-
 void *sunxi_usbc_get_io_base(int index)
 {
 	switch (index) {
@@ -102,9 +96,6 @@ void *sunxi_usbc_get_io_base(int index)
 
 static int get_vbus_gpio(int index)
 {
-	if (use_axp_drivebus(index))
-		return -1;
-
 	switch (index) {
 	case 0: return sunxi_name_to_gpio(CONFIG_USB0_VBUS_PIN);
 	case 1: return sunxi_name_to_gpio(CONFIG_USB1_VBUS_PIN);
@@ -251,10 +242,6 @@ void sunxi_usbc_vbus_enable(int index)
 {
 	struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index];
 
-#ifdef AXP_DRIVEBUS
-	if (use_axp_drivebus(index))
-		axp_drivebus_enable();
-#endif
 	if (sunxi_usbc->gpio_vbus != -1)
 		gpio_direction_output(sunxi_usbc->gpio_vbus, 1);
 }
@@ -263,10 +250,6 @@ void sunxi_usbc_vbus_disable(int index)
 {
 	struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index];
 
-#ifdef AXP_DRIVEBUS
-	if (use_axp_drivebus(index))
-		axp_drivebus_disable();
-#endif
 	if (sunxi_usbc->gpio_vbus != -1)
 		gpio_direction_output(sunxi_usbc->gpio_vbus, 0);
 }
diff --git a/configs/Ippo_q8h_v1_2_defconfig b/configs/Ippo_q8h_v1_2_defconfig
index 0c88edd..e003b4c 100644
--- a/configs/Ippo_q8h_v1_2_defconfig
+++ b/configs/Ippo_q8h_v1_2_defconfig
@@ -2,8 +2,8 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 CONFIG_FDTFILE="sun8i-a23-ippo-q8h-v1.2.dtb"
 CONFIG_USB_MUSB_SUNXI=y
-CONFIG_USB0_VBUS_PIN="axp_drivebus"
-CONFIG_USB0_VBUS_DET="axp_vbus_detect"
+CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE"
+CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
 CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:87,ri:167,up:31,lo:13,hs:1,vs:1,sync:3,vmode:0"
 CONFIG_VIDEO_LCD_DCLK_PHASE=0
 CONFIG_VIDEO_LCD_POWER="PH7"
diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig
index 16ba03b..87d898e 100644
--- a/configs/Ippo_q8h_v5_defconfig
+++ b/configs/Ippo_q8h_v5_defconfig
@@ -2,8 +2,8 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5"
 CONFIG_FDTFILE="sun8i-a23-ippo-q8h-v5.dtb"
 CONFIG_USB_MUSB_SUNXI=y
-CONFIG_USB0_VBUS_PIN="axp_drivebus"
-CONFIG_USB0_VBUS_DET="axp_vbus_detect"
+CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE"
+CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
 CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:87,ri:168,up:31,lo:13,hs:1,vs:1,sync:3,vmode:0"
 CONFIG_VIDEO_LCD_DCLK_PHASE=0
 CONFIG_VIDEO_LCD_POWER="PH7"
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 90aaec6..8049944 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -238,38 +238,28 @@ static int sunxi_musb_init(struct musb *musb)
 	if (is_host_enabled(musb)) {
 		int vbus_det = sunxi_name_to_gpio(CONFIG_USB0_VBUS_DET);
 
-#ifdef AXP_VBUS_DETECT
-		if (!strcmp(CONFIG_USB0_VBUS_DET, "axp_vbus_detect")) {
-			err = axp_get_vbus();
-			if (err < 0)
-				return err;
-		} else {
-#endif
-			if (vbus_det == -1) {
-				eprintf("Error invalid Vusb-det pin\n");
-				return -EINVAL;
-			}
-
-			err = gpio_request(vbus_det, "vbus0_det");
-			if (err)
-				return err;
-
-			err = gpio_direction_input(vbus_det);
-			if (err) {
-				gpio_free(vbus_det);
-				return err;
-			}
-
-			err = gpio_get_value(vbus_det);
-			if (err < 0) {
-				gpio_free(vbus_det);
-				return -EIO;
-			}
+		if (vbus_det == -1) {
+			eprintf("Error invalid Vusb-det pin\n");
+			return -EINVAL;
+		}
+
+		err = gpio_request(vbus_det, "vbus0_det");
+		if (err)
+			return err;
 
+		err = gpio_direction_input(vbus_det);
+		if (err) {
 			gpio_free(vbus_det);
-#ifdef AXP_VBUS_DETECT
+			return err;
 		}
-#endif
+
+		err = gpio_get_value(vbus_det);
+		if (err < 0) {
+			gpio_free(vbus_det);
+			return -EIO;
+		}
+
+		gpio_free(vbus_det);
 
 		if (err) {
 			eprintf("Error: A charger is plugged into the OTG\n");
-- 
1.9.1

[U-Boot] [PATCH v2 4/7] power: axp209: VBUS detection support

[Paul Kocialkowski]

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 drivers/power/axp209.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c
index 4565398..e1cbba9 100644
--- a/drivers/power/axp209.c
+++ b/drivers/power/axp209.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <i2c.h>
+#include <asm/arch/gpio.h>
 #include <axp209.h>
 
 enum axp209_reg {
@@ -31,6 +32,7 @@ enum axp209_reg {
 };
 
 #define AXP209_POWER_STATUS_ON_BY_DC	(1 << 0)
+#define AXP209_POWER_STATUS_VBUS_USABLE	(1 << 4)
 
 #define AXP209_IRQ5_PEK_UP		(1 << 6)
 #define AXP209_IRQ5_PEK_DOWN		(1 << 5)
@@ -205,6 +207,9 @@ static u8 axp209_get_gpio_ctrl_reg(unsigned int pin)
 
 int axp_gpio_direction_input(unsigned int pin)
 {
+	if (pin == SUNXI_GPIO_AXP0_VBUS_DETECT)
+		return 0;
+
 	u8 reg = axp209_get_gpio_ctrl_reg(pin);
 	/* GPIO3 is "special" */
 	u8 val = (pin == 3) ? AXP209_GPIO3_INPUT : AXP209_GPIO_INPUT;
@@ -232,7 +237,10 @@ int axp_gpio_get_value(unsigned int pin)
 	u8 val, mask;
 	int rc;
 
-	if (pin == 3) {
+	if (pin == SUNXI_GPIO_AXP0_VBUS_DETECT) {
+		rc = axp209_read(AXP209_POWER_STATUS, &val);
+		mask = AXP209_POWER_STATUS_VBUS_USABLE;
+	} else if (pin == 3) {
 		rc = axp209_read(AXP209_GPIO3_CTRL, &val);
 		mask = 1;
 	} else {
-- 
1.9.1

[U-Boot] [PATCH v2 5/7] sunxi: common VBUS detection logic in usbc

[Paul Kocialkowski]

VBUS detection could be needed not only by the musb code (to prevent host mode),
but also by e.g. gadget drivers to start only when a cable is connected.

In addition, this allows more flexibility in vbus detection, as it could easily
be extended to other USBC indexes. Eventually, this would help making musb
support independent from a hardcoded USB controller index (0).

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 arch/arm/cpu/armv7/sunxi/usbc.c        | 47 +++++++++++++++++++++++++++++++---
 arch/arm/include/asm/arch-sunxi/usbc.h |  1 +
 board/sunxi/Kconfig                    |  1 -
 drivers/usb/musb-new/sunxi.c           | 35 +++++--------------------
 4 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/arch/arm/cpu/armv7/sunxi/usbc.c b/arch/arm/cpu/armv7/sunxi/usbc.c
index 4d8a9a1..d2c6f23 100644
--- a/arch/arm/cpu/armv7/sunxi/usbc.c
+++ b/arch/arm/cpu/armv7/sunxi/usbc.c
@@ -41,6 +41,7 @@ static struct sunxi_usbc_hcd {
 	int usb_rst_mask;
 	int ahb_clk_mask;
 	int gpio_vbus;
+	int gpio_vbus_det;
 	int irq;
 	int id;
 } sunxi_usbc_hcd[] = {
@@ -104,6 +105,14 @@ static int get_vbus_gpio(int index)
 	return -1;
 }
 
+static int get_vbus_detect_gpio(int index)
+{
+	switch (index) {
+	case 0: return sunxi_name_to_gpio(CONFIG_USB0_VBUS_DET);
+	}
+	return -1;
+}
+
 static void usb_phy_write(struct sunxi_usbc_hcd *sunxi_usbc, int addr,
 			  int data, int len)
 {
@@ -176,22 +185,31 @@ static void sunxi_usb_passby(struct sunxi_usbc_hcd *sunxi_usbc, int enable)
 int sunxi_usbc_request_resources(int index)
 {
 	struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index];
+	int ret = 0;
 
 	sunxi_usbc->gpio_vbus = get_vbus_gpio(index);
 	if (sunxi_usbc->gpio_vbus != -1)
-		return gpio_request(sunxi_usbc->gpio_vbus, "usbc_vbus");
+		ret |= gpio_request(sunxi_usbc->gpio_vbus, "usbc_vbus");
+
+	sunxi_usbc->gpio_vbus_det = get_vbus_detect_gpio(index);
+	if (sunxi_usbc->gpio_vbus_det != -1)
+		ret |= gpio_request(sunxi_usbc->gpio_vbus_det, "usbc_vbus_det");
 
-	return 0;
+	return ret;
 }
 
 int sunxi_usbc_free_resources(int index)
 {
 	struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index];
+	int ret = 0;
 
 	if (sunxi_usbc->gpio_vbus != -1)
-		return gpio_free(sunxi_usbc->gpio_vbus);
+		ret |= gpio_free(sunxi_usbc->gpio_vbus);
 
-	return 0;
+	if (sunxi_usbc->gpio_vbus_det != -1)
+		ret |= gpio_free(sunxi_usbc->gpio_vbus_det);
+
+	return ret;
 }
 
 void sunxi_usbc_enable(int index)
@@ -253,3 +271,24 @@ void sunxi_usbc_vbus_disable(int index)
 	if (sunxi_usbc->gpio_vbus != -1)
 		gpio_direction_output(sunxi_usbc->gpio_vbus, 0);
 }
+
+int sunxi_usbc_vbus_detect(int index)
+{
+	struct sunxi_usbc_hcd *sunxi_usbc = &sunxi_usbc_hcd[index];
+	int err;
+
+	if (sunxi_usbc->gpio_vbus_det == -1) {
+		eprintf("Error: invalid vbus detection pin\n");
+		return -1;
+	}
+
+	err = gpio_direction_input(sunxi_usbc->gpio_vbus_det);
+	if (err)
+		return err;
+
+	err = gpio_get_value(sunxi_usbc->gpio_vbus_det);
+	if (err < 0)
+		return err;
+
+	return err;
+}
diff --git a/arch/arm/include/asm/arch-sunxi/usbc.h b/arch/arm/include/asm/arch-sunxi/usbc.h
index cb538cd..67281ec 100644
--- a/arch/arm/include/asm/arch-sunxi/usbc.h
+++ b/arch/arm/include/asm/arch-sunxi/usbc.h
@@ -20,3 +20,4 @@ void sunxi_usbc_enable(int index);
 void sunxi_usbc_disable(int index);
 void sunxi_usbc_vbus_enable(int index);
 void sunxi_usbc_vbus_disable(int index);
+int sunxi_usbc_vbus_detect(int index);
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 9d0eb91..5639321 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -225,7 +225,6 @@ config USB0_VBUS_PIN
 
 config USB0_VBUS_DET
 	string "Vbus detect pin for usb0 (otg)"
-	depends on USB_MUSB_SUNXI
 	default ""
 	---help---
 	Set the Vbus detect pin for usb0 (otg). This takes a string in the
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 8049944..c9a6a16 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -235,42 +235,19 @@ static int sunxi_musb_init(struct musb *musb)
 
 	pr_debug("%s():\n", __func__);
 
-	if (is_host_enabled(musb)) {
-		int vbus_det = sunxi_name_to_gpio(CONFIG_USB0_VBUS_DET);
-
-		if (vbus_det == -1) {
-			eprintf("Error invalid Vusb-det pin\n");
-			return -EINVAL;
-		}
-
-		err = gpio_request(vbus_det, "vbus0_det");
-		if (err)
-			return err;
-
-		err = gpio_direction_input(vbus_det);
-		if (err) {
-			gpio_free(vbus_det);
-			return err;
-		}
-
-		err = gpio_get_value(vbus_det);
-		if (err < 0) {
-			gpio_free(vbus_det);
-			return -EIO;
-		}
-
-		gpio_free(vbus_det);
+	err = sunxi_usbc_request_resources(0);
+	if (err)
+		return err;
 
+	if (is_host_enabled(musb)) {
+		err = sunxi_usbc_vbus_detect(0);
 		if (err) {
 			eprintf("Error: A charger is plugged into the OTG\n");
+			sunxi_usbc_free_resources(0);
 			return -EIO;
 		}
 	}
 
-	err = sunxi_usbc_request_resources(0);
-	if (err)
-		return err;
-
 	musb->isr = sunxi_musb_interrupt;
 	sunxi_usbc_enable(0);
 
-- 
1.9.1

[U-Boot] [PATCH v2 6/7] sunxi: USB download gadget cable detection

[Paul Kocialkowski]

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 board/sunxi/board.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index e1891d1..becdc8b 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -241,6 +241,13 @@ static struct musb_hdrc_platform_data musb_plat = {
 };
 #endif
 
+#ifdef CONFIG_USB_GADGET
+int g_dnl_board_usb_cable_connected(void)
+{
+	return sunxi_usbc_vbus_detect(0);
+}
+#endif
+
 #ifdef CONFIG_MISC_INIT_R
 int misc_init_r(void)
 {
-- 
1.9.1

[U-Boot] [PATCH v2 7/7] sunxi: Ainol AW1 support

[Paul Kocialkowski]

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 board/sunxi/MAINTAINERS     |  5 +++++
 configs/Ainol_AW1_defconfig | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 configs/Ainol_AW1_defconfig

diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index ef3c937..e486458 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -50,6 +50,11 @@ S:	Maintained
 F:	board/sunxi/dram_a20_olinuxino_l2.c
 F:	configs/A20-OLinuXino-Lime2_defconfig
 
+AINOL AW1 BOARD
+M:	Paul Kocialkowski <contact@paulk.fr>
+S:	Maintained
+F:	configs/Ainol_AW1_defconfig
+
 AMPE A76 BOARD
 M:	Paul Kocialkowski <contact@paulk.fr>
 S:	Maintained
diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
new file mode 100644
index 0000000..1c3b942
--- /dev/null
+++ b/configs/Ainol_AW1_defconfig
@@ -0,0 +1,16 @@
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_FDTFILE="sun7i-a20-ainol-aw1.dtb"
+CONFIG_USB_MUSB_SUNXI=y
+CONFIG_USB0_VBUS_PIN="PB9"
+CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
+CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:40000,le:87,ri:112,up:38,lo:141,hs:1,vs:1,sync:3,vmode:0"
+CONFIG_VIDEO_LCD_POWER="PH8"
+CONFIG_VIDEO_LCD_BL_EN="PH7"
+CONFIG_VIDEO_LCD_BL_PWM="PB2"
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN7I=y
+CONFIG_DRAM_CLK=432
+CONFIG_DRAM_ZQ=123
+CONFIG_DRAM_EMR1=4
-- 
1.9.1

[U-Boot] [PATCH v2 7/7] sunxi: Ainol AW1 support

[Chen-Yu Tsai]

Hi,

On Mon, Mar 23, 2015 at 1:07 AM, Paul Kocialkowski <contact@paulk.fr> wrote:

Maybe a slight description of the board/device?

ChenYu

> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
> ---
>  board/sunxi/MAINTAINERS     |  5 +++++
>  configs/Ainol_AW1_defconfig | 16 ++++++++++++++++
>  2 files changed, 21 insertions(+)
>  create mode 100644 configs/Ainol_AW1_defconfig
>
> diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
> index ef3c937..e486458 100644
> --- a/board/sunxi/MAINTAINERS
> +++ b/board/sunxi/MAINTAINERS
> @@ -50,6 +50,11 @@ S:   Maintained
>  F:     board/sunxi/dram_a20_olinuxino_l2.c
>  F:     configs/A20-OLinuXino-Lime2_defconfig
>
> +AINOL AW1 BOARD
> +M:     Paul Kocialkowski <contact@paulk.fr>
> +S:     Maintained
> +F:     configs/Ainol_AW1_defconfig
> +
>  AMPE A76 BOARD
>  M:     Paul Kocialkowski <contact@paulk.fr>
>  S:     Maintained
> diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
> new file mode 100644
> index 0000000..1c3b942
> --- /dev/null
> +++ b/configs/Ainol_AW1_defconfig
> @@ -0,0 +1,16 @@
> +CONFIG_SPL=y
> +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
> +CONFIG_FDTFILE="sun7i-a20-ainol-aw1.dtb"
> +CONFIG_USB_MUSB_SUNXI=y
> +CONFIG_USB0_VBUS_PIN="PB9"
> +CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
> +CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:40000,le:87,ri:112,up:38,lo:141,hs:1,vs:1,sync:3,vmode:0"
> +CONFIG_VIDEO_LCD_POWER="PH8"
> +CONFIG_VIDEO_LCD_BL_EN="PH7"
> +CONFIG_VIDEO_LCD_BL_PWM="PB2"
> +CONFIG_ARM=y
> +CONFIG_ARCH_SUNXI=y
> +CONFIG_MACH_SUN7I=y
> +CONFIG_DRAM_CLK=432
> +CONFIG_DRAM_ZQ=123
> +CONFIG_DRAM_EMR1=4
> --
> 1.9.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v2 7/7] sunxi: Ainol AW1 support

[Hans de Goede]

Hi,

On 23-03-15 08:09, Chen-Yu Tsai wrote:
> Hi,
>
> On Mon, Mar 23, 2015 at 1:07 AM, Paul Kocialkowski <contact@paulk.fr> wrote:
>
> Maybe a slight description of the board/device?

Yes please, note no need to send a new version if you reply
with a short description I can add that while merging these.

This version of the patch-set looks good, so I plan to merge it
as is (assuming tests on the a23 tablet I've turn out ok).

Not sure yet when exactly I will get around to merging this,
that should happen sometime during this week.

Regards,

Hans




>
> ChenYu
>
>> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
>> ---
>>   board/sunxi/MAINTAINERS     |  5 +++++
>>   configs/Ainol_AW1_defconfig | 16 ++++++++++++++++
>>   2 files changed, 21 insertions(+)
>>   create mode 100644 configs/Ainol_AW1_defconfig
>>
>> diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
>> index ef3c937..e486458 100644
>> --- a/board/sunxi/MAINTAINERS
>> +++ b/board/sunxi/MAINTAINERS
>> @@ -50,6 +50,11 @@ S:   Maintained
>>   F:     board/sunxi/dram_a20_olinuxino_l2.c
>>   F:     configs/A20-OLinuXino-Lime2_defconfig
>>
>> +AINOL AW1 BOARD
>> +M:     Paul Kocialkowski <contact@paulk.fr>
>> +S:     Maintained
>> +F:     configs/Ainol_AW1_defconfig
>> +
>>   AMPE A76 BOARD
>>   M:     Paul Kocialkowski <contact@paulk.fr>
>>   S:     Maintained
>> diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
>> new file mode 100644
>> index 0000000..1c3b942
>> --- /dev/null
>> +++ b/configs/Ainol_AW1_defconfig
>> @@ -0,0 +1,16 @@
>> +CONFIG_SPL=y
>> +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
>> +CONFIG_FDTFILE="sun7i-a20-ainol-aw1.dtb"
>> +CONFIG_USB_MUSB_SUNXI=y
>> +CONFIG_USB0_VBUS_PIN="PB9"
>> +CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
>> +CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:40000,le:87,ri:112,up:38,lo:141,hs:1,vs:1,sync:3,vmode:0"
>> +CONFIG_VIDEO_LCD_POWER="PH8"
>> +CONFIG_VIDEO_LCD_BL_EN="PH7"
>> +CONFIG_VIDEO_LCD_BL_PWM="PB2"
>> +CONFIG_ARM=y
>> +CONFIG_ARCH_SUNXI=y
>> +CONFIG_MACH_SUN7I=y
>> +CONFIG_DRAM_CLK=432
>> +CONFIG_DRAM_ZQ=123
>> +CONFIG_DRAM_EMR1=4
>> --
>> 1.9.1
>>
>> _______________________________________________
>> U-Boot mailing list
>> U-Boot at lists.denx.de
>> http://lists.denx.de/mailman/listinfo/u-boot
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

[U-Boot] [PATCH v2 7/7] sunxi: Ainol AW1 support

[Hans de Goede]

Hi,

On 23-03-15 08:09, Chen-Yu Tsai wrote:
> Hi,
>
> On Mon, Mar 23, 2015 at 1:07 AM, Paul Kocialkowski <contact@paulk.fr> wrote:
>
> Maybe a slight description of the board/device?

Never mind I've just merged this in my local tree, adding a short description
myself based on (and pointing to): http://linux-sunxi.org/Ainol_AW1

I'll push this to next once tested.

Regards,

Hans

>
> ChenYu
>
>> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
>> ---
>>   board/sunxi/MAINTAINERS     |  5 +++++
>>   configs/Ainol_AW1_defconfig | 16 ++++++++++++++++
>>   2 files changed, 21 insertions(+)
>>   create mode 100644 configs/Ainol_AW1_defconfig
>>
>> diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
>> index ef3c937..e486458 100644
>> --- a/board/sunxi/MAINTAINERS
>> +++ b/board/sunxi/MAINTAINERS
>> @@ -50,6 +50,11 @@ S:   Maintained
>>   F:     board/sunxi/dram_a20_olinuxino_l2.c
>>   F:     configs/A20-OLinuXino-Lime2_defconfig
>>
>> +AINOL AW1 BOARD
>> +M:     Paul Kocialkowski <contact@paulk.fr>
>> +S:     Maintained
>> +F:     configs/Ainol_AW1_defconfig
>> +
>>   AMPE A76 BOARD
>>   M:     Paul Kocialkowski <contact@paulk.fr>
>>   S:     Maintained
>> diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
>> new file mode 100644
>> index 0000000..1c3b942
>> --- /dev/null
>> +++ b/configs/Ainol_AW1_defconfig
>> @@ -0,0 +1,16 @@
>> +CONFIG_SPL=y
>> +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
>> +CONFIG_FDTFILE="sun7i-a20-ainol-aw1.dtb"
>> +CONFIG_USB_MUSB_SUNXI=y
>> +CONFIG_USB0_VBUS_PIN="PB9"
>> +CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
>> +CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:40000,le:87,ri:112,up:38,lo:141,hs:1,vs:1,sync:3,vmode:0"
>> +CONFIG_VIDEO_LCD_POWER="PH8"
>> +CONFIG_VIDEO_LCD_BL_EN="PH7"
>> +CONFIG_VIDEO_LCD_BL_PWM="PB2"
>> +CONFIG_ARM=y
>> +CONFIG_ARCH_SUNXI=y
>> +CONFIG_MACH_SUN7I=y
>> +CONFIG_DRAM_CLK=432
>> +CONFIG_DRAM_ZQ=123
>> +CONFIG_DRAM_EMR1=4
>> --
>> 1.9.1
>>
>> _______________________________________________
>> U-Boot mailing list
>> U-Boot at lists.denx.de
>> http://lists.denx.de/mailman/listinfo/u-boot
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

[U-Boot] [PATCH v2 1/7] sunxi: gpio: Indentation fix

[Hans de Goede]

Hi,

Thanks for the patches, I had to make this fixup (squashed) to fix
vbus detect to work on axp221:

-------------------------- drivers/gpio/sunxi_gpio.c --------------------------
index 6296092..670af0c 100644
@@ -21,6 +21,9 @@
  #ifdef CONFIG_AXP209_POWER
  #include <axp209.h>
  #endif
+#ifdef CONFIG_AXP221_POWER
+#include <axp221.h>
+#endif

  DECLARE_GLOBAL_DATA_PTR;

Other then that + adding a small
blurb with some info on the Ainol AW1 board this set has been
merged as is.

The entire set has been queued up in u-boot-sunxi/next for upstream merging.

Regards,

Hans


On 22-03-15 18:07, Paul Kocialkowski wrote:
> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
> ---
>   arch/arm/include/asm/arch-sunxi/gpio.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h
> index f2c247d..a66e45c 100644
> --- a/arch/arm/include/asm/arch-sunxi/gpio.h
> +++ b/arch/arm/include/asm/arch-sunxi/gpio.h
> @@ -84,7 +84,7 @@ struct sunxi_gpio_reg {
>   #define GPIO_CFG_INDEX(pin)	(((pin) & 0x1f) >> 3)
>   #define GPIO_CFG_OFFSET(pin)	((((pin) & 0x1f) & 0x7) << 2)
>
> -#define GPIO_DRV_INDEX(pin)   (((pin) & 0x1f) >> 4)
> +#define GPIO_DRV_INDEX(pin)	(((pin) & 0x1f) >> 4)
>   #define GPIO_DRV_OFFSET(pin)	((((pin) & 0x1f) & 0xf) << 1)
>
>   #define GPIO_PULL_INDEX(pin)	(((pin) & 0x1f) >> 4)
> @@ -194,7 +194,7 @@ enum sunxi_gpio_number {
>   #define SUN8I_GPL3_R_UART_RX	2
>
>   #define SUN9I_GPN0_R_RSB_SCK	3
> -#define SUN9I_GPN1_R_RSB_SDA    3
> +#define SUN9I_GPN1_R_RSB_SDA	3
>
>   /* GPIO pin pull-up/down config */
>   #define SUNXI_GPIO_PULL_DISABLE	0
>

[U-Boot] [PATCH v2 7/7] sunxi: Ainol AW1 support

[Paul Kocialkowski]

Le lundi 23 mars 2015 ? 15:25 +0100, Hans de Goede a ?crit :
> Hi,
> 
> On 23-03-15 08:09, Chen-Yu Tsai wrote:
> > Hi,
> >
> > On Mon, Mar 23, 2015 at 1:07 AM, Paul Kocialkowski <contact@paulk.fr> wrote:
> >
> > Maybe a slight description of the board/device?
> 
> Never mind I've just merged this in my local tree, adding a short description
> myself based on (and pointing to): http://linux-sunxi.org/Ainol_AW1

Okay, I'm back home just now. For the record, I don't write device
descriptions because that information is is available on the linux-sunxi
wiki. Although, I understand it is only informative here, I also don't
want to be adding any kind of marketing stuff to the commit message. 

> I'll push this to next once tested.

Thanks! All those commits have been build-tested with MAKEALL -s sunxi.

> Regards,
> 
> Hans
> 
> >
> > ChenYu
> >
> >> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
> >> ---
> >>   board/sunxi/MAINTAINERS     |  5 +++++
> >>   configs/Ainol_AW1_defconfig | 16 ++++++++++++++++
> >>   2 files changed, 21 insertions(+)
> >>   create mode 100644 configs/Ainol_AW1_defconfig
> >>
> >> diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
> >> index ef3c937..e486458 100644
> >> --- a/board/sunxi/MAINTAINERS
> >> +++ b/board/sunxi/MAINTAINERS
> >> @@ -50,6 +50,11 @@ S:   Maintained
> >>   F:     board/sunxi/dram_a20_olinuxino_l2.c
> >>   F:     configs/A20-OLinuXino-Lime2_defconfig
> >>
> >> +AINOL AW1 BOARD
> >> +M:     Paul Kocialkowski <contact@paulk.fr>
> >> +S:     Maintained
> >> +F:     configs/Ainol_AW1_defconfig
> >> +
> >>   AMPE A76 BOARD
> >>   M:     Paul Kocialkowski <contact@paulk.fr>
> >>   S:     Maintained
> >> diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig
> >> new file mode 100644
> >> index 0000000..1c3b942
> >> --- /dev/null
> >> +++ b/configs/Ainol_AW1_defconfig
> >> @@ -0,0 +1,16 @@
> >> +CONFIG_SPL=y
> >> +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
> >> +CONFIG_FDTFILE="sun7i-a20-ainol-aw1.dtb"
> >> +CONFIG_USB_MUSB_SUNXI=y
> >> +CONFIG_USB0_VBUS_PIN="PB9"
> >> +CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
> >> +CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:40000,le:87,ri:112,up:38,lo:141,hs:1,vs:1,sync:3,vmode:0"
> >> +CONFIG_VIDEO_LCD_POWER="PH8"
> >> +CONFIG_VIDEO_LCD_BL_EN="PH7"
> >> +CONFIG_VIDEO_LCD_BL_PWM="PB2"
> >> +CONFIG_ARM=y
> >> +CONFIG_ARCH_SUNXI=y
> >> +CONFIG_MACH_SUN7I=y
> >> +CONFIG_DRAM_CLK=432
> >> +CONFIG_DRAM_ZQ=123
> >> +CONFIG_DRAM_EMR1=4
> >> --
> >> 1.9.1
> >>
> >> _______________________________________________
> >> U-Boot mailing list
> >> U-Boot at lists.denx.de
> >> http://lists.denx.de/mailman/listinfo/u-boot
> > _______________________________________________
> > U-Boot mailing list
> > U-Boot at lists.denx.de
> > http://lists.denx.de/mailman/listinfo/u-boot
> >

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150323/30a1e731/attachment.sig>

[U-Boot] [PATCH v2 1/7] sunxi: gpio: Indentation fix

[Paul Kocialkowski]

Le lundi 23 mars 2015 ? 17:21 +0100, Hans de Goede a ?crit :
> Hi,
> 
> Thanks for the patches, I had to make this fixup (squashed) to fix
> vbus detect to work on axp221:
> 
> -------------------------- drivers/gpio/sunxi_gpio.c --------------------------
> index 6296092..670af0c 100644
> @@ -21,6 +21,9 @@
>   #ifdef CONFIG_AXP209_POWER
>   #include <axp209.h>
>   #endif
> +#ifdef CONFIG_AXP221_POWER
> +#include <axp221.h>
> +#endif
> 
>   DECLARE_GLOBAL_DATA_PTR;
> 
> Other then that + adding a small
> blurb with some info on the Ainol AW1 board this set has been
> merged as is.

Oh you're right, I forgot that one!

> The entire set has been queued up in u-boot-sunxi/next for upstream merging.

Thanks a lot!

> Regards,
> 
> Hans
> 
> 
> On 22-03-15 18:07, Paul Kocialkowski wrote:
> > Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
> > ---
> >   arch/arm/include/asm/arch-sunxi/gpio.h | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h
> > index f2c247d..a66e45c 100644
> > --- a/arch/arm/include/asm/arch-sunxi/gpio.h
> > +++ b/arch/arm/include/asm/arch-sunxi/gpio.h
> > @@ -84,7 +84,7 @@ struct sunxi_gpio_reg {
> >   #define GPIO_CFG_INDEX(pin)	(((pin) & 0x1f) >> 3)
> >   #define GPIO_CFG_OFFSET(pin)	((((pin) & 0x1f) & 0x7) << 2)
> >
> > -#define GPIO_DRV_INDEX(pin)   (((pin) & 0x1f) >> 4)
> > +#define GPIO_DRV_INDEX(pin)	(((pin) & 0x1f) >> 4)
> >   #define GPIO_DRV_OFFSET(pin)	((((pin) & 0x1f) & 0xf) << 1)
> >
> >   #define GPIO_PULL_INDEX(pin)	(((pin) & 0x1f) >> 4)
> > @@ -194,7 +194,7 @@ enum sunxi_gpio_number {
> >   #define SUN8I_GPL3_R_UART_RX	2
> >
> >   #define SUN9I_GPN0_R_RSB_SCK	3
> > -#define SUN9I_GPN1_R_RSB_SDA    3
> > +#define SUN9I_GPN1_R_RSB_SDA	3
> >
> >   /* GPIO pin pull-up/down config */
> >   #define SUNXI_GPIO_PULL_DISABLE	0
> >

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150323/a6dd4cfd/attachment.sig>