aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorDorian Snyder <dastin1015@gmail.com>2013-06-12 02:24:45 -0700
committerDorian Snyder <dastin1015@gmail.com>2013-06-20 00:06:04 -0700
commit4b2308ce699b9c599dd6e6acf57ac11f483381d9 (patch)
tree4c31179b06d094887b1c8ca70264cf8f184a5981 /drivers/usb/core
parent855d6a6c1f7c54ef073caac3f6c5f9b1ed72eb4d (diff)
downloadkernel_samsung_smdk4412-4b2308ce699b9c599dd6e6acf57ac11f483381d9.zip
kernel_samsung_smdk4412-4b2308ce699b9c599dd6e6acf57ac11f483381d9.tar.gz
kernel_samsung_smdk4412-4b2308ce699b9c599dd6e6acf57ac11f483381d9.tar.bz2
d710: initial support for the Epic 4G Touch (SPH-D710)
Change-Id: Iafbd9fb45253b02d539ac0ba114f57b3bf9eeed4
Diffstat (limited to 'drivers/usb/core')
-rw-r--r--drivers/usb/core/quirks.c6
-rw-r--r--drivers/usb/core/sec-dock.h7
2 files changed, 9 insertions, 4 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index df6cfa4..5da45eb 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -173,9 +173,11 @@ static const struct usb_device_id usb_quirk_list[] = {
{ USB_DEVICE(0x04cc, 0x2333), .driver_info = USB_QUIRK_HSIC_TUNE },
/* Qualcomm MDM9x15 */
- { USB_DEVICE(0x05c6, 0x9048), .driver_info = USB_QUIRK_HSIC_TUNE },
+ { USB_DEVICE(0x05c6, 0x9048),
+ .driver_info = USB_QUIRK_HSIC_TUNE | USB_QUIRK_NO_DPM_RESUME},
- { USB_DEVICE(0x05c6, 0x904C), .driver_info = USB_QUIRK_HSIC_TUNE },
+ { USB_DEVICE(0x05c6, 0x904C),
+ .driver_info = USB_QUIRK_HSIC_TUNE | USB_QUIRK_NO_DPM_RESUME},
{ } /* terminating entry must be last */
};
diff --git a/drivers/usb/core/sec-dock.h b/drivers/usb/core/sec-dock.h
index 73c4ea6..4fdf351 100644
--- a/drivers/usb/core/sec-dock.h
+++ b/drivers/usb/core/sec-dock.h
@@ -23,7 +23,8 @@ static struct usb_device_id battery_notify_exception_table[] = {
{ USB_DEVICE(0x1519, 0x0020), }, /* HSIC Device */
{ USB_DEVICE(0x05c6, 0x904c), }, /* Qualcomm modem */
{ USB_DEVICE(0x05c6, 0x9008), }, /* Qualcomm modem */
-{ USB_DEVICE(0x08bb, 0x27c4), }, /* TI USB Audio DAC */
+{ USB_DEVICE(0x08bb, 0x2704), }, /* TI USB Audio DAC 1 */
+{ USB_DEVICE(0x08bb, 0x27c4), }, /* TI USB Audio DAC 2 */
{ } /* Terminating entry */
};
@@ -79,7 +80,9 @@ static int call_battery_notify(struct usb_device *dev, bool bOnOff)
/* Smart Dock hub must be skipped */
if ((le16_to_cpu(dev->descriptor.idVendor) == 0x1a40 &&
- le16_to_cpu(dev->descriptor.idProduct) == 0x0101)) {
+ le16_to_cpu(dev->descriptor.idProduct) == 0x0101) ||
+ (le16_to_cpu(dev->descriptor.idVendor) == 0x0424 &&
+ le16_to_cpu(dev->descriptor.idProduct) == 0x2514)) {
if (bOnOff)
is_smartdock = 1;
else