diff options
| author | Olof Johansson | 2012-05-10 08:43:04 +0200 |
|---|---|---|
| committer | Olof Johansson | 2012-05-10 08:43:04 +0200 |
| commit | 7488185d0777ef84be7b365b08037fc7213010f6 (patch) | |
| tree | c23a3db331693f783228c2f5afb38fed26ac1205 /include | |
| parent | Merge tag 'pinctrl-mergebase-20120418' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | pinctrl: tegra: error reporting cleanup (diff) | |
| download | kernel-qcow2-linux-7488185d0777ef84be7b365b08037fc7213010f6.tar.gz kernel-qcow2-linux-7488185d0777ef84be7b365b08037fc7213010f6.tar.xz kernel-qcow2-linux-7488185d0777ef84be7b365b08037fc7213010f6.zip | |
Merge branch 'for-3.5/gpio-pinmux' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/pinctrl
By Stephen Warren
via Stephen Warren
* 'for-3.5/gpio-pinmux' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
pinctrl: tegra: error reporting cleanup
pinctrl: tegra: debugfs enhancements
pinctrl: tegra: refactor probe handling
ARM: dt: tegra20: add pinmux to device tree
ARM: dt: tegra cardhu: add pinmux to device tree
ARM: tegra: Remove pre-pinctrl pinmux driver
ARM: tegra: Switch to new pinctrl driver
gpio: tegra: Hide tegra_gpio_enable/disable()
ARM: tegra: seaboard: Don't gpio_request() ISL29018_IRQ
gpio: tegra: configure pins during irq_set_type
ARM: tegra: Remove VBUS_GPIO handling from board files
usb: ehci-tegra: Add vbus_gpio to platform data
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/tegra_usb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/platform_data/tegra_usb.h b/include/linux/platform_data/tegra_usb.h index 6bca5b569acb..66c673fef408 100644 --- a/include/linux/platform_data/tegra_usb.h +++ b/include/linux/platform_data/tegra_usb.h @@ -26,6 +26,7 @@ struct tegra_ehci_platform_data { /* power down the phy on bus suspend */ int power_down_on_bus_suspend; void *phy_config; + int vbus_gpio; }; #endif /* _TEGRA_USB_H_ */ |