For 13.2 a downstream USB driver was added (USB_EHCI_HCD_SYNOPSYS) for the Juno board (boo#902632). With 4.6 that driver no longer builds. A check of arch/arm64/boot/dts/arm/juno-base.dtsi indicates that it is using the "generic-ehci" compatible string, i.e. not this driver. Therefore drop these patches: patches.arch/arm64-0001-usb-Add-support-for-Synopsis-H20AHB-EHCI-host-contro.patch patches.arch/arm64-0002-usb-fix-hcd-h20ahb-driver-depends.patch Cc: Alexander Graf <agraf@suse.de> Cc: Andreas Schwab <schwab@suse.de> Signed-off-by: Andreas Färber <afaerber@suse.de> --- config/arm64/default | 1 - config/armv6hl/default | 1 - config/armv7hl/default | 1 - config/armv7hl/lpae | 1 - config/i386/debug | 1 - config/i386/default | 1 - config/i386/pae | 1 - config/ppc64/debug | 1 - config/ppc64/default | 1 - config/ppc64le/debug | 1 - config/ppc64le/default | 1 - config/x86_64/debug | 1 - config/x86_64/default | 1 - ...port-for-Synopsis-H20AHB-EHCI-host-contro.patch | 398 --------------------- ...64-0002-usb-fix-hcd-h20ahb-driver-depends.patch | 37 -- series.conf | 2 - 16 files changed, 450 deletions(-) delete mode 100644 patches.arch/arm64-0001-usb-Add-support-for-Synopsis-H20AHB-EHCI-host-contro.patch delete mode 100644 patches.arch/arm64-0002-usb-fix-hcd-h20ahb-driver-depends.patch diff --git a/config/arm64/default b/config/arm64/default index d923ab1..ee5f798 100644 --- a/config/arm64/default +++ b/config/arm64/default @@ -5426,7 +5426,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m -CONFIG_USB_EHCI_HCD_SYNOPSYS=m CONFIG_USB_EHCI_MSM=m CONFIG_USB_EHCI_TEGRA=m CONFIG_USB_EHCI_EXYNOS=m diff --git a/config/armv6hl/default b/config/armv6hl/default index b7f8612..094e994 100644 --- a/config/armv6hl/default +++ b/config/armv6hl/default @@ -4493,7 +4493,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_MXC=m -# CONFIG_USB_EHCI_HCD_SYNOPSYS is not set # CONFIG_USB_CNS3XXX_EHCI is not set CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OXU210HP_HCD=m diff --git a/config/armv7hl/default b/config/armv7hl/default index 64c4f97..fed88b9 100644 --- a/config/armv7hl/default +++ b/config/armv7hl/default @@ -6146,7 +6146,6 @@ CONFIG_USB_EHCI_HCD_OMAP=m CONFIG_USB_EHCI_HCD_ORION=m CONFIG_USB_EHCI_HCD_SPEAR=m CONFIG_USB_EHCI_HCD_STI=m -# CONFIG_USB_EHCI_HCD_SYNOPSYS is not set CONFIG_USB_EHCI_MSM=m CONFIG_USB_EHCI_TEGRA=m CONFIG_USB_EHCI_EXYNOS=m diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae index 9bc44e7..0faf45d 100644 --- a/config/armv7hl/lpae +++ b/config/armv7hl/lpae @@ -5864,7 +5864,6 @@ CONFIG_USB_EHCI_PCI=m # CONFIG_USB_EHCI_MXC is not set CONFIG_USB_EHCI_HCD_OMAP=m CONFIG_USB_EHCI_HCD_ORION=m -# CONFIG_USB_EHCI_HCD_SYNOPSYS is not set CONFIG_USB_EHCI_MSM=m CONFIG_USB_EHCI_TEGRA=m CONFIG_USB_EHCI_EXYNOS=m diff --git a/config/i386/debug b/config/i386/debug index 0a42eae..d157ad1 100644 --- a/config/i386/debug +++ b/config/i386/debug @@ -5928,7 +5928,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m -# CONFIG_USB_EHCI_HCD_SYNOPSYS is not set CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m diff --git a/config/i386/default b/config/i386/default index e114369..92a85d3 100644 --- a/config/i386/default +++ b/config/i386/default @@ -5968,7 +5968,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m -# CONFIG_USB_EHCI_HCD_SYNOPSYS is not set CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m diff --git a/config/i386/pae b/config/i386/pae index ffe36bb..4b36354 100644 --- a/config/i386/pae +++ b/config/i386/pae @@ -5779,7 +5779,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m -# CONFIG_USB_EHCI_HCD_SYNOPSYS is not set CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m diff --git a/config/ppc64/debug b/config/ppc64/debug index abcb4dc..dfa87c2 100644 --- a/config/ppc64/debug +++ b/config/ppc64/debug @@ -4986,7 +4986,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m -# CONFIG_USB_EHCI_HCD_SYNOPSYS is not set CONFIG_USB_EHCI_HCD_PPC_OF=y CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OXU210HP_HCD=m diff --git a/config/ppc64/default b/config/ppc64/default index b7c3465..5cdad76 100644 --- a/config/ppc64/default +++ b/config/ppc64/default @@ -4975,7 +4975,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m -# CONFIG_USB_EHCI_HCD_SYNOPSYS is not set CONFIG_USB_EHCI_HCD_PPC_OF=y CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OXU210HP_HCD=m diff --git a/config/ppc64le/debug b/config/ppc64le/debug index 5c17e73..22ca4d2 100644 --- a/config/ppc64le/debug +++ b/config/ppc64le/debug @@ -4842,7 +4842,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m -# CONFIG_USB_EHCI_HCD_SYNOPSYS is not set CONFIG_USB_EHCI_HCD_PPC_OF=y CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OXU210HP_HCD=m diff --git a/config/ppc64le/default b/config/ppc64le/default index faf4f74..c84816a 100644 --- a/config/ppc64le/default +++ b/config/ppc64le/default @@ -4831,7 +4831,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m -# CONFIG_USB_EHCI_HCD_SYNOPSYS is not set CONFIG_USB_EHCI_HCD_PPC_OF=y CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OXU210HP_HCD=m diff --git a/config/x86_64/debug b/config/x86_64/debug index eefffdb..65c9fbe 100644 --- a/config/x86_64/debug +++ b/config/x86_64/debug @@ -5756,7 +5756,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m -# CONFIG_USB_EHCI_HCD_SYNOPSYS is not set CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m diff --git a/config/x86_64/default b/config/x86_64/default index ee88fba..d45e292 100644 --- a/config/x86_64/default +++ b/config/x86_64/default @@ -5741,7 +5741,6 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m -# CONFIG_USB_EHCI_HCD_SYNOPSYS is not set CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m diff --git a/patches.arch/arm64-0001-usb-Add-support-for-Synopsis-H20AHB-EHCI-host-contro.patch b/patches.arch/arm64-0001-usb-Add-support-for-Synopsis-H20AHB-EHCI-host-contro.patch deleted file mode 100644 index d80f8de..0000000 --- a/patches.arch/arm64-0001-usb-Add-support-for-Synopsis-H20AHB-EHCI-host-contro.patch +++ /dev/null @@ -1,398 +0,0 @@ -From e6f7fd6d35443f2efebe940e37237b1ad18d3a79 Mon Sep 17 00:00:00 2001 -From: Liviu Dudau <Liviu.Dudau@arm.com> -Date: Tue, 4 Mar 2014 11:03:13 +0000 -Subject: [PATCH 01/10] usb: Add support for Synopsis H20AHB EHCI host - controller. -Patch-mainline: No -References: bnc#902632 - -Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> -Signed-off-by: Alexander Graf <agraf@suse.de> - ---- - drivers/usb/host/Kconfig | 7 + - drivers/usb/host/Makefile | 1 + - drivers/usb/host/ehci-h20ahb.c | 341 +++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 349 insertions(+) - create mode 100644 drivers/usb/host/ehci-h20ahb.c - -diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig -index a8a30b1..4aa17fa 100644 ---- a/drivers/usb/host/Kconfig -+++ b/drivers/usb/host/Kconfig -@@ -188,6 +188,13 @@ config USB_EHCI_HCD_STI - Enable support for the on-chip EHCI controller found on - STMicroelectronics consumer electronics SoC's. - -+config USB_EHCI_HCD_SYNOPSYS -+ tristate "Support for Synopsys Host-AHB USB 2.0 controller" -+ depends on USB_EHCI_HCD -+ ---help--- -+ Enable support for onchip USB controllers based on DesignWare USB 2.0 -+ Host-AHB Controller IP from Synopsys. -+ - config USB_EHCI_HCD_AT91 - tristate "Support for Atmel on-chip EHCI USB controller" - depends on USB_EHCI_HCD && ARCH_AT91 -diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile -index 348c243..cfcae6f 100644 ---- a/drivers/usb/host/Makefile -+++ b/drivers/usb/host/Makefile -@@ -39,6 +39,7 @@ obj-$(CONFIG_USB_EHCI_HCD_OMAP) += ehci-omap.o - obj-$(CONFIG_USB_EHCI_HCD_ORION) += ehci-orion.o - obj-$(CONFIG_USB_EHCI_HCD_SPEAR) += ehci-spear.o - obj-$(CONFIG_USB_EHCI_HCD_STI) += ehci-st.o -+obj-$(CONFIG_USB_EHCI_HCD_SYNOPSYS) += ehci-h20ahb.o - obj-$(CONFIG_USB_EHCI_EXYNOS) += ehci-exynos.o - obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o - obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o -diff --git a/drivers/usb/host/ehci-h20ahb.c b/drivers/usb/host/ehci-h20ahb.c -new file mode 100644 -index 0000000..3ee3c7a ---- /dev/null -+++ b/drivers/usb/host/ehci-h20ahb.c -@@ -0,0 +1,341 @@ -+/* -+ * Copyright (C) 2007-2013 Texas Instruments, Inc. -+ * Author: Vikram Pandita <vikram.pandita@ti.com> -+ * Author: Anand Gadiyar <gadiyar@ti.com> -+ * Author: Keshava Munegowda <keshava_mgowda@ti.com> -+ * Author: Roger Quadros <rogerq@ti.com> -+ * -+ * Copyright (C) 2009 Nokia Corporation -+ * Contact: Felipe Balbi <felipe.balbi@nokia.com> -+ * -+ * Based on ehci-omap.c - driver for USBHOST on OMAP3/4 processors -+ * -+ * This file is subject to the terms and conditions of the GNU General Public -+ * License. See the file COPYING in the main directory of this archive -+ * for more details. -+ * -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/module.h> -+#include <linux/io.h> -+#include <linux/platform_device.h> -+#include <linux/slab.h> -+#include <linux/usb/ulpi.h> -+#include <linux/pm_runtime.h> -+#include <linux/gpio.h> -+#include <linux/clk.h> -+#include <linux/usb.h> -+#include <linux/usb/hcd.h> -+#include <linux/of.h> -+#include <linux/dma-mapping.h> -+ -+#include "ehci.h" -+ -+#define H20AHB_HS_USB_PORTS 1 -+ -+/* EHCI Synopsys-specific Register Set */ -+#define EHCI_INSNREG04 (0xA0) -+#define EHCI_INSNREG04_DISABLE_UNSUSPEND (1 << 5) -+#define EHCI_INSNREG05_ULPI (0xA4) -+#define EHCI_INSNREG05_ULPI_CONTROL_SHIFT 31 -+#define EHCI_INSNREG05_ULPI_PORTSEL_SHIFT 24 -+#define EHCI_INSNREG05_ULPI_OPSEL_SHIFT 22 -+#define EHCI_INSNREG05_ULPI_REGADD_SHIFT 16 -+#define EHCI_INSNREG05_ULPI_EXTREGADD_SHIFT 8 -+#define EHCI_INSNREG05_ULPI_WRDATA_SHIFT 0 -+ -+#define DRIVER_DESC "H20AHB-EHCI Host Controller driver" -+ -+static const char hcd_name[] = "ehci-h20ahb"; -+ -+/*-------------------------------------------------------------------------*/ -+ -+struct h20ahb_hcd { -+ struct usb_phy *phy[H20AHB_HS_USB_PORTS]; /* one PHY for each port */ -+ int nports; -+}; -+ -+static inline void ehci_write(void __iomem *base, u32 reg, u32 val) -+{ -+ __raw_writel(val, base + reg); -+} -+ -+static inline u32 ehci_read(void __iomem *base, u32 reg) -+{ -+ return __raw_readl(base + reg); -+} -+ -+/* configure so an HC device and id are always provided */ -+/* always called with process context; sleeping is OK */ -+ -+static struct hc_driver __read_mostly ehci_h20ahb_hc_driver; -+ -+static const struct ehci_driver_overrides ehci_h20ahb_overrides __initdata = { -+ .extra_priv_size = sizeof(struct h20ahb_hcd), -+}; -+ -+static int ehci_h20ahb_phy_read(struct usb_phy *x, u32 reg) -+{ -+ u32 val = (1 << EHCI_INSNREG05_ULPI_CONTROL_SHIFT) | -+ (1 << EHCI_INSNREG05_ULPI_PORTSEL_SHIFT) | -+ (3 << EHCI_INSNREG05_ULPI_OPSEL_SHIFT) | -+ (reg << EHCI_INSNREG05_ULPI_REGADD_SHIFT); -+ ehci_write(x->io_priv, 0, val); -+ while ((val = ehci_read(x->io_priv, 0)) & -+ (1 << EHCI_INSNREG05_ULPI_CONTROL_SHIFT)); -+ return val & 0xff; -+} -+ -+static int ehci_h20ahb_phy_write(struct usb_phy *x, u32 val, u32 reg) -+{ -+ u32 v = (1 << EHCI_INSNREG05_ULPI_CONTROL_SHIFT) | -+ (1 << EHCI_INSNREG05_ULPI_PORTSEL_SHIFT) | -+ (2 << EHCI_INSNREG05_ULPI_OPSEL_SHIFT) | -+ (reg << EHCI_INSNREG05_ULPI_REGADD_SHIFT) | -+ (val & 0xff); -+ ehci_write(x->io_priv, 0, v); -+ while ((v = ehci_read(x->io_priv, 0)) & -+ (1 << EHCI_INSNREG05_ULPI_CONTROL_SHIFT)); -+ return 0; -+} -+ -+static struct usb_phy_io_ops ehci_h20ahb_phy_io_ops = { -+ .read = ehci_h20ahb_phy_read, -+ .write = ehci_h20ahb_phy_write, -+}; -+ -+ -+/** -+ * ehci_hcd_h20ahb_probe - initialize Synopsis-based HCDs -+ * -+ * Allocates basic resources for this USB host controller, and -+ * then invokes the start() method for the HCD associated with it -+ * through the hotplug entry's driver_data. -+ */ -+static int ehci_hcd_h20ahb_probe(struct platform_device *pdev) -+{ -+ struct device *dev = &pdev->dev; -+ struct resource *res; -+ struct usb_hcd *hcd; -+ void __iomem *regs; -+ int ret; -+ int irq; -+ int i; -+ struct h20ahb_hcd *h20ahb; -+ -+ if (usb_disabled()) -+ return -ENODEV; -+ -+ /* if (!dev->parent) { -+ dev_err(dev, "Missing parent device\n"); -+ return -ENODEV; -+ }*/ -+ -+ /* For DT boot, get platform data from parent. i.e. usbhshost */ -+ /*if (dev->of_node) { -+ pdata = dev_get_platdata(dev->parent); -+ dev->platform_data = pdata; -+ } -+ -+ if (!pdata) { -+ dev_err(dev, "Missing platform data\n"); -+ return -ENODEV; -+ }*/ -+ -+ irq = platform_get_irq(pdev, 0); -+ if (irq < 0) { -+ dev_err(dev, "EHCI irq failed\n"); -+ return -ENODEV; -+ } -+ -+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ regs = devm_ioremap_resource(dev, res); -+ if (IS_ERR(regs)) -+ return PTR_ERR(regs); -+ -+ /* -+ * Right now device-tree probed devices don't get dma_mask set. -+ * Since shared usb code relies on it, set it here for now. -+ * Once we have dma capability bindings this can go away. -+ */ -+ ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32)); -+ if (ret) -+ return ret; -+ -+ ret = -ENODEV; -+ hcd = usb_create_hcd(&ehci_h20ahb_hc_driver, dev, -+ dev_name(dev)); -+ if (!hcd) { -+ dev_err(dev, "Failed to create HCD\n"); -+ return -ENOMEM; -+ } -+ -+ hcd->rsrc_start = res->start; -+ hcd->rsrc_len = resource_size(res); -+ hcd->regs = regs; -+ hcd_to_ehci(hcd)->caps = regs; -+ -+ h20ahb = (struct h20ahb_hcd *)hcd_to_ehci(hcd)->priv; -+ h20ahb->nports = 1; -+ -+ platform_set_drvdata(pdev, hcd); -+ -+ /* get the PHY devices if needed */ -+ for (i = 0 ; i < h20ahb->nports ; i++) { -+ struct usb_phy *phy; -+ -+ /* get the PHY device */ -+#if 0 -+ if (dev->of_node) -+ phy = devm_usb_get_phy_by_phandle(dev, "phys", i); -+ else -+ phy = devm_usb_get_phy_dev(dev, i); -+#endif -+ phy = otg_ulpi_create(&ehci_h20ahb_phy_io_ops, 0); -+ if (IS_ERR(phy)) { -+ ret = PTR_ERR(phy); -+ dev_err(dev, "Can't get PHY device for port %d: %d\n", -+ i, ret); -+ goto err_phy; -+ } -+ phy->dev = dev; -+ usb_add_phy_dev(phy); -+ -+ h20ahb->phy[i] = phy; -+ phy->io_priv = hcd->regs + EHCI_INSNREG05_ULPI; -+ -+#if 0 -+ usb_phy_init(h20ahb->phy[i]); -+ /* bring PHY out of suspend */ -+ usb_phy_set_suspend(h20ahb->phy[i], 0); -+#endif -+ } -+ -+ /* make the first port's phy the one used by hcd as well */ -+ hcd->phy = h20ahb->phy[0]; -+ -+ pm_runtime_enable(dev); -+ pm_runtime_get_sync(dev); -+ -+ /* -+ * An undocumented "feature" in the H20AHB EHCI controller, -+ * causes suspended ports to be taken out of suspend when -+ * the USBCMD.Run/Stop bit is cleared (for example when -+ * we do ehci_bus_suspend). -+ * This breaks suspend-resume if the root-hub is allowed -+ * to suspend. Writing 1 to this undocumented register bit -+ * disables this feature and restores normal behavior. -+ */ -+ ehci_write(regs, EHCI_INSNREG04, -+ EHCI_INSNREG04_DISABLE_UNSUSPEND); -+ -+ ret = usb_add_hcd(hcd, irq, IRQF_SHARED); -+ if (ret) { -+ dev_err(dev, "failed to add hcd with err %d\n", ret); -+ goto err_pm_runtime; -+ } -+ device_wakeup_enable(hcd->self.controller); -+ -+ /* -+ * Bring PHYs out of reset for non PHY modes. -+ * Even though HSIC mode is a PHY-less mode, the reset -+ * line exists between the chips and can be modelled -+ * as a PHY device for reset control. -+ */ -+ for (i = 0; i < h20ahb->nports; i++) { -+ usb_phy_init(h20ahb->phy[i]); -+ /* bring PHY out of suspend */ -+ usb_phy_set_suspend(h20ahb->phy[i], 0); -+ } -+ -+ return 0; -+ -+err_pm_runtime: -+ pm_runtime_put_sync(dev); -+ -+err_phy: -+ for (i = 0; i < h20ahb->nports; i++) { -+ if (h20ahb->phy[i]) -+ usb_phy_shutdown(h20ahb->phy[i]); -+ } -+ -+ usb_put_hcd(hcd); -+ -+ return ret; -+} -+ -+ -+/** -+ * ehci_hcd_h20ahb_remove - shutdown processing for EHCI HCDs -+ * @pdev: USB Host Controller being removed -+ * -+ * Reverses the effect of usb_ehci_hcd_h20ahb_probe(), first invoking -+ * the HCD's stop() method. It is always called from a thread -+ * context, normally "rmmod", "apmd", or something similar. -+ */ -+static int ehci_hcd_h20ahb_remove(struct platform_device *pdev) -+{ -+ struct device *dev = &pdev->dev; -+ struct usb_hcd *hcd = dev_get_drvdata(dev); -+ struct h20ahb_hcd *h20ahb = (struct h20ahb_hcd *)hcd_to_ehci(hcd)->priv; -+ int i; -+ -+ usb_remove_hcd(hcd); -+ -+ for (i = 0; i < h20ahb->nports; i++) { -+ if (h20ahb->phy[i]) -+ usb_phy_shutdown(h20ahb->phy[i]); -+ } -+ -+ usb_put_hcd(hcd); -+ pm_runtime_put_sync(dev); -+ pm_runtime_disable(dev); -+ -+ return 0; -+} -+ -+static const struct of_device_id h20ahb_ehci_dt_ids[] = { -+ { .compatible = "snps,ehci-h20ahb" }, -+ { } -+}; -+ -+MODULE_DEVICE_TABLE(of, h20ahb_ehci_dt_ids); -+ -+static struct platform_driver ehci_hcd_h20ahb_driver = { -+ .probe = ehci_hcd_h20ahb_probe, -+ .remove = ehci_hcd_h20ahb_remove, -+ .shutdown = usb_hcd_platform_shutdown, -+ /*.suspend = ehci_hcd_h20ahb_suspend, */ -+ /*.resume = ehci_hcd_h20ahb_resume, */ -+ .driver = { -+ .name = hcd_name, -+ .of_match_table = h20ahb_ehci_dt_ids, -+ } -+}; -+ -+/*-------------------------------------------------------------------------*/ -+ -+static int __init ehci_h20ahb_init(void) -+{ -+ if (usb_disabled()) -+ return -ENODEV; -+ -+ pr_info("%s: " DRIVER_DESC "\n", hcd_name); -+ -+ ehci_init_driver(&ehci_h20ahb_hc_driver, &ehci_h20ahb_overrides); -+ return platform_driver_register(&ehci_hcd_h20ahb_driver); -+} -+module_init(ehci_h20ahb_init); -+ -+static void __exit ehci_h20ahb_cleanup(void) -+{ -+ platform_driver_unregister(&ehci_hcd_h20ahb_driver); -+} -+module_exit(ehci_h20ahb_cleanup); -+ -+MODULE_ALIAS("platform:ehci-h20ahb"); -+MODULE_AUTHOR("Liviu Dudau <Liviu.Dudau@arm.com>"); -+ -+MODULE_DESCRIPTION(DRIVER_DESC); -+MODULE_LICENSE("GPL"); --- -2.1.0 - diff --git a/patches.arch/arm64-0002-usb-fix-hcd-h20ahb-driver-depends.patch b/patches.arch/arm64-0002-usb-fix-hcd-h20ahb-driver-depends.patch deleted file mode 100644 index 027a8e5..0000000 --- a/patches.arch/arm64-0002-usb-fix-hcd-h20ahb-driver-depends.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7a99ce84c569b42f68908574b89a59370c8b808d Mon Sep 17 00:00:00 2001 -From: Alex Shi <alex.shi@linaro.org> -Date: Thu, 5 Jun 2014 07:58:06 +0100 -Subject: [PATCH 02/10] usb: fix hcd h20ahb driver depends -Patch-mainline: No -References: bnc#902632 - -USB_EHCI_HCD_SYNOPSYS is not only dependent on USB_EHCI_HCD, but -also on USB_PHY. Otherwise kernel build has the following error: - - LD init/built-in.o -Drivers/built-in.o: In function `ehci_hcd_h20ahb_probe': -:(.text+0xb9bb4): undefined reference to `usb_add_phy_dev' - -Signed-off-by: Alex Shi <alex.shi@linaro.org> -Signed-off-by: Alexander Graf <agraf@suse.de> - ---- - drivers/usb/host/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig -index 4aa17fa..a9bf03d 100644 ---- a/drivers/usb/host/Kconfig -+++ b/drivers/usb/host/Kconfig -@@ -190,7 +190,7 @@ config USB_EHCI_HCD_STI - - config USB_EHCI_HCD_SYNOPSYS - tristate "Support for Synopsys Host-AHB USB 2.0 controller" -- depends on USB_EHCI_HCD -+ depends on USB_EHCI_HCD && USB_PHY - ---help--- - Enable support for onchip USB controllers based on DesignWare USB 2.0 - Host-AHB Controller IP from Synopsys. --- -2.1.0 - diff --git a/series.conf b/series.conf index d55909f..4557860 100644 --- a/series.conf +++ b/series.conf @@ -155,8 +155,6 @@ patches.arch/arm-arndale-usb.patch +agraf patches.arch/arm-arndale-dma.patch patches.arch/arm-exynos-dwmmc-modalias.patch - patches.arch/arm64-0001-usb-Add-support-for-Synopsis-H20AHB-EHCI-host-contro.patch - patches.arch/arm64-0002-usb-fix-hcd-h20ahb-driver-depends.patch +needs_update patches.arch/arm64-0004-net-xgbe-Add-A0-silicon-support.patch patches.arch/arm64-0006-arm64-Select-reboot-driver-for-X-Gene-platform.patch patches.arch/arm64-0010-KVM-ARM-Hack-to-enable-VGIC-mapping-on-64k-PAGE_SIZE.patch -- 2.6.6 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org