usb: ulpi: add indicator configuration function

Allows for easy configuration of the VBUS indicator related ULPI
config bits.

Also move the external indicator setup from ulpi_set_vbus() to
the new function.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>

diff --git a/drivers/usb/ulpi/ulpi.c b/drivers/usb/ulpi/ulpi.c
index dde2585c58b8419465278701b925de8858a9430b..23b59e740f12b2aa5ba968d0516513e24d1293b9 100644 (file)
--- a/drivers/usb/ulpi/ulpi.c
+++ b/drivers/usb/ulpi/ulpi.c
@@ -106,20 +106,44 @@ int ulpi_select_transceiver(struct ulpi_viewport *ulpi_vp, unsigned speed)
        return ulpi_write(ulpi_vp, &ulpi->function_ctrl, val);
 }
 
-int ulpi_set_vbus(struct ulpi_viewport *ulpi_vp, int on, int ext_power,
-                       int ext_ind)
+int ulpi_set_vbus(struct ulpi_viewport *ulpi_vp, int on, int ext_power)
 {
        u32 flags = ULPI_OTG_DRVVBUS;
        u8 *reg = on ? &ulpi->otg_ctrl_set : &ulpi->otg_ctrl_clear;
 
        if (ext_power)
                flags |= ULPI_OTG_DRVVBUS_EXT;
-       if (ext_ind)
-               flags |= ULPI_OTG_EXTVBUSIND;
 
        return ulpi_write(ulpi_vp, reg, flags);
 }
 
+int ulpi_set_vbus_indicator(struct ulpi_viewport *ulpi_vp, int external,
+                       int passthu, int complement)
+{
+       u32 flags, val;
+       u8 *reg;
+
+       reg = external ? &ulpi->otg_ctrl_set : &ulpi->otg_ctrl_clear;
+       val = ulpi_write(ulpi_vp, reg, ULPI_OTG_EXTVBUSIND);
+       if (val)
+               return val;
+
+       flags = passthu ? ULPI_IFACE_PASSTHRU : 0;
+       flags |= complement ? ULPI_IFACE_EXTVBUS_COMPLEMENT : 0;
+
+       val = ulpi_read(ulpi_vp, &ulpi->iface_ctrl);
+       if (val == ULPI_ERROR)
+               return val;
+
+       val = val & ~(ULPI_IFACE_PASSTHRU & ULPI_IFACE_EXTVBUS_COMPLEMENT);
+       val |= flags;
+       val = ulpi_write(ulpi_vp, &ulpi->iface_ctrl, val);
+       if (val)
+               return val;
+
+       return 0;
+}
+
 int ulpi_set_pd(struct ulpi_viewport *ulpi_vp, int enable)
 {
        u32 val = ULPI_OTG_DP_PULLDOWN | ULPI_OTG_DM_PULLDOWN;

diff --git a/include/usb/ulpi.h b/include/usb/ulpi.h
index 9a75c24bdd146d0364fb949a98afd29872175b11..99166c44a08c053386028113952e81acbf3ad24d 100644 (file)
--- a/include/usb/ulpi.h
+++ b/include/usb/ulpi.h
@@ -61,8 +61,17 @@ int ulpi_select_transceiver(struct ulpi_viewport *ulpi_vp, unsigned speed);
  *
  * returns 0 on success, ULPI_ERROR on failure.
  */
-int ulpi_set_vbus(struct ulpi_viewport *ulpi_vp,
-                       int on, int ext_power, int ext_ind);
+int ulpi_set_vbus(struct ulpi_viewport *ulpi_vp, int on, int ext_power);
+
+/*
+ * Configure VBUS indicator
+ * @external           - external VBUS over-current indicator is used
+ * @passthru           - disables ANDing of internal VBUS comparator
+ *                    with external VBUS input
+ * @complement         - inverts the external VBUS input
+ */
+int ulpi_set_vbus_indicator(struct ulpi_viewport *ulpi_vp, int external,
+                       int passthru, int complement);
 
 /*
  * Enable/disable pull-down resistors on D+ and D- USB lines.