diff options
| author | David Mosberger-Tang <davidm@egauge.net> | 2014-05-29 20:23:55 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-29 22:19:30 +0400 |
| commit | 4055e5e54ecea4a41edec42f6bd4ee274892e872 (patch) | |
| tree | 2120dec626ae5440b5def392fcfdda06821bbfdc | |
| parent | 05dfa5c9bc37933181b619e42ec0eeb41ef31362 (diff) | |
| download | linux-4055e5e54ecea4a41edec42f6bd4ee274892e872.tar.xz | |
usb: host: max3421-hcd: Allow platform-data to specify Vbus polarity
Signed-off-by: Davidm Mosberger <davidm@egauge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/host/max3421-hcd.c | 6 | ||||
| -rw-r--r-- | include/linux/platform_data/max3421-hcd.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c index ccb1bc42b4d2..fd3ed994fa4d 100644 --- a/drivers/usb/host/max3421-hcd.c +++ b/drivers/usb/host/max3421-hcd.c @@ -1717,7 +1717,8 @@ max3421_hub_control(struct usb_hcd *hcd, u16 type_req, u16 value, u16 index, break; case USB_PORT_FEAT_POWER: dev_dbg(hcd->self.controller, "power-off\n"); - max3421_gpout_set_value(hcd, pdata->vbus_gpout, 0); + max3421_gpout_set_value(hcd, pdata->vbus_gpout, + !pdata->vbus_active_level); /* FALLS THROUGH */ default: max3421_hcd->port_status &= ~(1 << value); @@ -1766,7 +1767,8 @@ max3421_hub_control(struct usb_hcd *hcd, u16 type_req, u16 value, u16 index, case USB_PORT_FEAT_POWER: dev_dbg(hcd->self.controller, "power-on\n"); max3421_hcd->port_status |= USB_PORT_STAT_POWER; - max3421_gpout_set_value(hcd, pdata->vbus_gpout, 1); + max3421_gpout_set_value(hcd, pdata->vbus_gpout, + pdata->vbus_active_level); break; case USB_PORT_FEAT_RESET: max3421_reset_port(hcd); diff --git a/include/linux/platform_data/max3421-hcd.h b/include/linux/platform_data/max3421-hcd.h index 4ad459605d87..0303d1970084 100644 --- a/include/linux/platform_data/max3421-hcd.h +++ b/include/linux/platform_data/max3421-hcd.h @@ -18,6 +18,7 @@ */ struct max3421_hcd_platform_data { u8 vbus_gpout; /* pin controlling Vbus */ + u8 vbus_active_level; /* level that turns on power */ }; #endif /* MAX3421_HCD_PLAT_H_INCLUDED */ |