diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-03 14:35:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-03 14:35:32 -0400 |
commit | b3b49114c80e799af8b08c0c6d1ff886ea843f03 (patch) | |
tree | f59b3dd1d589d1010f55f1d44c808fad7b5f0318 /arch/arm/boot/dts/tegra20-whistler.dts | |
parent | 1ccfd5eaf8f0135a0ce030728d1739e0eea4e3ce (diff) | |
parent | b9a1048137f4ae43ee90f61a3f34f0efe863cfeb (diff) |
Merge tag 'usb-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB patches from Greg KH:
"Here's the big USB driver pull request for 3.12-rc1
Lots of USB driver fixes and updates. Nothing major, just the normal
xhci, gadget, and other driver changes. Full details in the shortlog"
* tag 'usb-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (352 commits)
usbcore: fix incorrect type in assignment in descriptors_changed()
usbcore: compare and release one bos descriptor in usb_reset_and_verify_device()
ehci: remove debugging statement with ehci statistics in ehci_stop()
ehci: remove duplicate debug_async_open() prototype in ehci-dbg.c
ehci: enable debugging code when CONFIG_DYNAMIC_DEBUG is set
ehci: remove ehci_vdbg() verbose debugging statements
Documentation sysfs-bus-usb: Document which files are used by libusb
Documentation sysfs-bus-usb: Document the speed file used by libusb
Documentation sysfs-bus-usb: Move files with known users to stable
USB: fix build error when CONFIG_PM_SLEEP isn't enabled
usb: r8a66597-hcd: use platform_{get,set}_drvdata()
usb: phy-tegra-usb: use platform_{get,set}_drvdata()
usb: acm gadget: Null termintate strings table
dma: cppi41: off by one in desc_to_chan()
xhci: Fix warning introduced by disabling runtime PM.
dev-core: fix build break when DEBUG is enabled
USB: OHCI: Allow runtime PM without system sleep
usb: ohci-at91: remove unnecessary dev_set_drvdata()
usb: renesas_usbhs: use platform_{get,set}_drvdata()
usb: fotg210-udc: use platform_{get,set}_drvdata()
...
Diffstat (limited to 'arch/arm/boot/dts/tegra20-whistler.dts')
-rw-r--r-- | arch/arm/boot/dts/tegra20-whistler.dts | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts index a3d0ebad78a1..c703197dca6e 100644 --- a/arch/arm/boot/dts/tegra20-whistler.dts +++ b/arch/arm/boot/dts/tegra20-whistler.dts | |||
@@ -509,7 +509,6 @@ | |||
509 | 509 | ||
510 | usb@c5000000 { | 510 | usb@c5000000 { |
511 | status = "okay"; | 511 | status = "okay"; |
512 | nvidia,vbus-gpio = <&tca6416 0 GPIO_ACTIVE_HIGH>; | ||
513 | }; | 512 | }; |
514 | 513 | ||
515 | usb-phy@c5000000 { | 514 | usb-phy@c5000000 { |
@@ -519,7 +518,6 @@ | |||
519 | 518 | ||
520 | usb@c5008000 { | 519 | usb@c5008000 { |
521 | status = "okay"; | 520 | status = "okay"; |
522 | nvidia,vbus-gpio = <&tca6416 1 GPIO_ACTIVE_HIGH>; | ||
523 | }; | 521 | }; |
524 | 522 | ||
525 | usb-phy@c5008000 { | 523 | usb-phy@c5008000 { |