Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB patches from Greg Kroah-Hartman: "Here's the big USB merge for 3.9-rc1 Nothing major, lots of gadget fixes, and of course, xhci stuff. All of this has been in linux-next for a while, with the exception of the last 3 patches, which were reverts of patches in the tree that caused problems, they went in yesterday." * tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (190 commits) Revert "USB: EHCI: make ehci-vt8500 a separate driver" Revert "USB: EHCI: make ehci-orion a separate driver" Revert "USB: update host controller Kconfig entries" USB: update host controller Kconfig entries USB: EHCI: make ehci-orion a separate driver USB: EHCI: make ehci-vt8500 a separate driver USB: usb-storage: unusual_devs update for Super TOP SATA bridge USB: ehci-omap: Fix autoloading of module USB: ehci-omap: Don't free gpios that we didn't request USB: option: add Huawei "ACM" devices using protocol = vendor USB: serial: fix null-pointer dereferences on disconnect USB: option: add Yota / Megafon M100-1 4g modem drivers/usb: add missing GENERIC_HARDIRQS dependencies USB: storage: properly handle the endian issues of idProduct testusb: remove all mentions of 'usbfs' usb: gadget: imx_udc: make it depend on BROKEN usb: omap_control_usb: fix compile warning ARM: OMAP: USB: Add phy binding information ARM: OMAP2: MUSB: Specify omap4 has mailbox ARM: OMAP: devices: create device for usb part of control module ...
This commit is contained in:
27
include/linux/platform_data/samsung-usbphy.h
Normal file
27
include/linux/platform_data/samsung-usbphy.h
Normal file
@@ -0,0 +1,27 @@
|
||||
/*
|
||||
* Copyright (C) 2012 Samsung Electronics Co.Ltd
|
||||
* http://www.samsung.com/
|
||||
* Author: Praveen Paneri <p.paneri@samsung.com>
|
||||
*
|
||||
* Defines platform data for samsung usb phy driver.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*/
|
||||
|
||||
#ifndef __SAMSUNG_USBPHY_PLATFORM_H
|
||||
#define __SAMSUNG_USBPHY_PLATFORM_H
|
||||
|
||||
/**
|
||||
* samsung_usbphy_data - Platform data for USB PHY driver.
|
||||
* @pmu_isolation: Function to control usb phy isolation in PMU.
|
||||
*/
|
||||
struct samsung_usbphy_data {
|
||||
void (*pmu_isolation)(int on);
|
||||
};
|
||||
|
||||
extern void samsung_usbphy_set_pdata(struct samsung_usbphy_data *pd);
|
||||
|
||||
#endif /* __SAMSUNG_USBPHY_PLATFORM_H */
|
19
include/linux/platform_data/usb3503.h
Normal file
19
include/linux/platform_data/usb3503.h
Normal file
@@ -0,0 +1,19 @@
|
||||
#ifndef __USB3503_H__
|
||||
#define __USB3503_H__
|
||||
|
||||
#define USB3503_I2C_NAME "usb3503"
|
||||
|
||||
enum usb3503_mode {
|
||||
USB3503_MODE_UNKNOWN,
|
||||
USB3503_MODE_HUB,
|
||||
USB3503_MODE_STANDBY,
|
||||
};
|
||||
|
||||
struct usb3503_platform_data {
|
||||
enum usb3503_mode initial_mode;
|
||||
int gpio_intn;
|
||||
int gpio_connect;
|
||||
int gpio_reset;
|
||||
};
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user