From: Greg Kroah-Hartman Date: Tue, 4 Feb 2014 16:53:14 +0000 (-0800) Subject: remove usb-dwc3-fix-the-glue-drivers-using-the-nop-phy.patch from 3.10 and 3.12 trees X-Git-Tag: v3.4.79~1^2~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7c91a1cea16ebe1a44641c11f2c02592f8bb387;p=thirdparty%2Fkernel%2Fstable-queue.git remove usb-dwc3-fix-the-glue-drivers-using-the-nop-phy.patch from 3.10 and 3.12 trees It broke the build --- diff --git a/queue-3.10/series b/queue-3.10/series index c7ed43bb2ec..ef9af12e52a 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -10,7 +10,6 @@ x86-x32-correct-invalid-use-of-user-timespec-in-the-kernel.patch x86-efi-fix-off-by-one-bug-in-efi-boot-services-reservation.patch x86-add-check-for-number-of-available-vectors-before-cpu-down.patch kvm-x86-limit-pit-timer-frequency.patch -usb-dwc3-fix-the-glue-drivers-using-the-nop-phy.patch usb-pl2303-fix-data-corruption-on-termios-updates.patch usb-option-add-new-zte-3g-modem-pids-to-option-driver.patch usb-serial-add-support-for-iball-3.5g-connect-usb-modem.patch diff --git a/queue-3.10/usb-dwc3-fix-the-glue-drivers-using-the-nop-phy.patch b/queue-3.10/usb-dwc3-fix-the-glue-drivers-using-the-nop-phy.patch deleted file mode 100644 index f24f18bc9bc..00000000000 --- a/queue-3.10/usb-dwc3-fix-the-glue-drivers-using-the-nop-phy.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 13518673f1419f2667985a6fca4543e44143408b Mon Sep 17 00:00:00 2001 -From: Heikki Krogerus -Date: Wed, 18 Dec 2013 16:41:25 +0200 -Subject: usb: dwc3: fix the glue drivers using the nop phy - -From: Heikki Krogerus - -commit 13518673f1419f2667985a6fca4543e44143408b upstream. - -The reset_gpio member of the usb_phy_gen_xceiv_platform_data -structure needs the have negative value or phy-generic's -probe will fail unless DT is used. 0 is a valid gpio number. - -This fixes an issue where phy-generic fails to probe with -message: "usb_phy_gen_xceiv.0: Error requesting RESET GPIO 0". - -Signed-off-by: Heikki Krogerus -Signed-off-by: Felipe Balbi -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/dwc3/dwc3-exynos.c | 1 + - drivers/usb/dwc3/dwc3-pci.c | 1 + - 2 files changed, 2 insertions(+) - ---- a/drivers/usb/dwc3/dwc3-exynos.c -+++ b/drivers/usb/dwc3/dwc3-exynos.c -@@ -46,6 +46,7 @@ static int dwc3_exynos_register_phys(str - - exynos->usb2_phy = pdev; - pdata.type = USB_PHY_TYPE_USB2; -+ pdata.gpio_reset = -1; - - ret = platform_device_add_data(exynos->usb2_phy, &pdata, sizeof(pdata)); - if (ret) ---- a/drivers/usb/dwc3/dwc3-pci.c -+++ b/drivers/usb/dwc3/dwc3-pci.c -@@ -72,6 +72,7 @@ static int dwc3_pci_register_phys(struct - - glue->usb2_phy = pdev; - pdata.type = USB_PHY_TYPE_USB2; -+ pdata.gpio_reset = -1; - - ret = platform_device_add_data(glue->usb2_phy, &pdata, sizeof(pdata)); - if (ret) diff --git a/queue-3.12/series b/queue-3.12/series index ed1d4927d07..5717146872f 100644 --- a/queue-3.12/series +++ b/queue-3.12/series @@ -15,7 +15,6 @@ usb-chipidea-add-freescale-imx28-special-write-register-method.patch usb-chipidea-imx-set-ci_hdrc_imx28_write_fix-for-imx28.patch usb-chipidea-need-to-mask-int_status-when-write-otgsc.patch usb-chipidea-udc-using-multo-at-td-as-real-mult-value-for-iso-tx.patch -usb-dwc3-fix-the-glue-drivers-using-the-nop-phy.patch usb-pl2303-fix-data-corruption-on-termios-updates.patch usb-option-add-new-zte-3g-modem-pids-to-option-driver.patch usb-serial-add-support-for-iball-3.5g-connect-usb-modem.patch diff --git a/queue-3.12/usb-dwc3-fix-the-glue-drivers-using-the-nop-phy.patch b/queue-3.12/usb-dwc3-fix-the-glue-drivers-using-the-nop-phy.patch deleted file mode 100644 index 6172641dc17..00000000000 --- a/queue-3.12/usb-dwc3-fix-the-glue-drivers-using-the-nop-phy.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 13518673f1419f2667985a6fca4543e44143408b Mon Sep 17 00:00:00 2001 -From: Heikki Krogerus -Date: Wed, 18 Dec 2013 16:41:25 +0200 -Subject: usb: dwc3: fix the glue drivers using the nop phy - -From: Heikki Krogerus - -commit 13518673f1419f2667985a6fca4543e44143408b upstream. - -The reset_gpio member of the usb_phy_gen_xceiv_platform_data -structure needs the have negative value or phy-generic's -probe will fail unless DT is used. 0 is a valid gpio number. - -This fixes an issue where phy-generic fails to probe with -message: "usb_phy_gen_xceiv.0: Error requesting RESET GPIO 0". - -Signed-off-by: Heikki Krogerus -Signed-off-by: Felipe Balbi -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/dwc3/dwc3-exynos.c | 1 + - drivers/usb/dwc3/dwc3-pci.c | 1 + - 2 files changed, 2 insertions(+) - ---- a/drivers/usb/dwc3/dwc3-exynos.c -+++ b/drivers/usb/dwc3/dwc3-exynos.c -@@ -50,6 +50,7 @@ static int dwc3_exynos_register_phys(str - - exynos->usb2_phy = pdev; - pdata.type = USB_PHY_TYPE_USB2; -+ pdata.gpio_reset = -1; - - ret = platform_device_add_data(exynos->usb2_phy, &pdata, sizeof(pdata)); - if (ret) ---- a/drivers/usb/dwc3/dwc3-pci.c -+++ b/drivers/usb/dwc3/dwc3-pci.c -@@ -52,6 +52,7 @@ static int dwc3_pci_register_phys(struct - - glue->usb2_phy = pdev; - pdata.type = USB_PHY_TYPE_USB2; -+ pdata.gpio_reset = -1; - - ret = platform_device_add_data(glue->usb2_phy, &pdata, sizeof(pdata)); - if (ret)