usb: host: Drop [e-o]hci-sunxi drivers
authorJagan Teki <jagan@amarulasolutions.com>
Tue, 10 Jul 2018 17:59:36 +0000 (23:29 +0530)
committerJagan Teki <jagan@amarulasolutions.com>
Fri, 18 Jan 2019 16:49:09 +0000 (22:19 +0530)
Now Allwinner platform is all set to use Generic USB
controller drivers, so remove the legacy sunxi drivers.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
drivers/usb/host/Makefile
drivers/usb/host/ehci-sunxi.c [deleted file]
drivers/usb/host/ohci-sunxi.c [deleted file]
scripts/config_whitelist.txt

index 948683a..6aa574f 100644 (file)
@@ -15,7 +15,6 @@ obj-$(CONFIG_USB_OHCI_DA8XX) += ohci-da8xx.o
 obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
 obj-$(CONFIG_USB_SL811HS) += sl811-hcd.o
 obj-$(CONFIG_USB_OHCI_EP93XX) += ohci-ep93xx.o
-obj-$(CONFIG_USB_OHCI_SUNXI) += ohci-sunxi.o
 obj-$(CONFIG_USB_OHCI_LPC32XX) += ohci-lpc32xx.o
 obj-$(CONFIG_USB_OHCI_GENERIC) += ohci-generic.o
 
@@ -37,7 +36,6 @@ obj-$(CONFIG_USB_EHCI_MARVELL) += ehci-marvell.o
 obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o
 obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o
 obj-$(CONFIG_USB_EHCI_SPEAR) += ehci-spear.o
-obj-$(CONFIG_USB_EHCI_SUNXI) += ehci-sunxi.o
 obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o
 obj-$(CONFIG_USB_EHCI_VCT) += ehci-vct.o
 obj-$(CONFIG_USB_EHCI_VF) += ehci-vf.o
diff --git a/drivers/usb/host/ehci-sunxi.c b/drivers/usb/host/ehci-sunxi.c
deleted file mode 100644 (file)
index 7a79931..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Sunxi ehci glue
- *
- * Copyright (C) 2015 Hans de Goede <hdegoede@redhat.com>
- * Copyright (C) 2014 Roman Byshko <rbyshko@gmail.com>
- *
- * Based on code from
- * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
- */
-
-#include <common.h>
-#include <asm/arch/clock.h>
-#include <asm/io.h>
-#include <dm.h>
-#include "ehci.h"
-#include <generic-phy.h>
-
-#ifdef CONFIG_SUNXI_GEN_SUN4I
-#define BASE_DIST              0x8000
-#define AHB_CLK_DIST           2
-#else
-#define BASE_DIST              0x1000
-#define AHB_CLK_DIST           1
-#endif
-
-#define SUN6I_AHB_RESET0_CFG_OFFSET 0x2c0
-#define SUN9I_AHB_RESET0_CFG_OFFSET 0x5a0
-
-struct ehci_sunxi_cfg {
-       bool has_reset;
-       u32 extra_ahb_gate_mask;
-       u32 reset0_cfg_offset;
-};
-
-struct ehci_sunxi_priv {
-       struct ehci_ctrl ehci;
-       struct sunxi_ccm_reg *ccm;
-       u32 *reset0_cfg;
-       int ahb_gate_mask; /* Mask of ahb_gate0 clk gate bits for this hcd */
-       struct phy phy;
-       const struct ehci_sunxi_cfg *cfg;
-};
-
-static int ehci_usb_probe(struct udevice *dev)
-{
-       struct usb_platdata *plat = dev_get_platdata(dev);
-       struct ehci_sunxi_priv *priv = dev_get_priv(dev);
-       struct ehci_hccr *hccr = (struct ehci_hccr *)devfdt_get_addr(dev);
-       struct ehci_hcor *hcor;
-       int extra_ahb_gate_mask = 0;
-       u8 reg_mask = 0;
-       int phys, ret;
-
-       priv->cfg = (const struct ehci_sunxi_cfg *)dev_get_driver_data(dev);
-       priv->ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
-       if (IS_ERR(priv->ccm))
-               return PTR_ERR(priv->ccm);
-
-       priv->reset0_cfg = (void *)priv->ccm +
-                                  priv->cfg->reset0_cfg_offset;
-
-       phys = dev_count_phandle_with_args(dev, "phys", "#phy-cells");
-       if (phys < 0) {
-               phys = 0;
-               goto no_phy;
-       }
-
-       ret = generic_phy_get_by_name(dev, "usb", &priv->phy);
-       if (ret) {
-               pr_err("failed to get %s usb PHY\n", dev->name);
-               return ret;
-       }
-
-       ret = generic_phy_init(&priv->phy);
-       if (ret) {
-               pr_err("failed to init %s USB PHY\n", dev->name);
-               return ret;
-       }
-
-       ret = generic_phy_power_on(&priv->phy);
-       if (ret) {
-               pr_err("failed to power on %s USB PHY\n", dev->name);
-               return ret;
-       }
-
-no_phy:
-       /*
-        * This should go away once we've moved to the driver model for
-        * clocks resp. phys.
-        */
-       reg_mask = ((uintptr_t)hccr - SUNXI_USB1_BASE) / BASE_DIST;
-       priv->ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0;
-       extra_ahb_gate_mask = priv->cfg->extra_ahb_gate_mask;
-       priv->ahb_gate_mask <<= reg_mask * AHB_CLK_DIST;
-       extra_ahb_gate_mask <<= reg_mask * AHB_CLK_DIST;
-
-       setbits_le32(&priv->ccm->ahb_gate0,
-                    priv->ahb_gate_mask | extra_ahb_gate_mask);
-       if (priv->cfg->has_reset)
-               setbits_le32(priv->reset0_cfg,
-                            priv->ahb_gate_mask | extra_ahb_gate_mask);
-
-       hcor = (struct ehci_hcor *)((uintptr_t)hccr +
-                                   HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
-
-       return ehci_register(dev, hccr, hcor, NULL, 0, plat->init_type);
-}
-
-static int ehci_usb_remove(struct udevice *dev)
-{
-       struct ehci_sunxi_priv *priv = dev_get_priv(dev);
-       int ret;
-
-       if (generic_phy_valid(&priv->phy)) {
-               ret = generic_phy_exit(&priv->phy);
-               if (ret) {
-                       pr_err("failed to exit %s USB PHY\n", dev->name);
-                       return ret;
-               }
-       }
-
-       ret = ehci_deregister(dev);
-       if (ret)
-               return ret;
-
-       if (priv->cfg->has_reset)
-               clrbits_le32(priv->reset0_cfg, priv->ahb_gate_mask);
-       clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask);
-
-       return 0;
-}
-
-static const struct ehci_sunxi_cfg sun4i_a10_cfg = {
-       .has_reset = false,
-};
-
-static const struct ehci_sunxi_cfg sun6i_a31_cfg = {
-       .has_reset = true,
-       .reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET,
-};
-
-static const struct ehci_sunxi_cfg sun8i_h3_cfg = {
-       .has_reset = true,
-       .extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_OHCI0,
-       .reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET,
-};
-
-static const struct ehci_sunxi_cfg sun9i_a80_cfg = {
-       .has_reset = true,
-       .reset0_cfg_offset = SUN9I_AHB_RESET0_CFG_OFFSET,
-};
-
-static const struct udevice_id ehci_usb_ids[] = {
-       {
-               .compatible = "allwinner,sun4i-a10-ehci",
-               .data = (ulong)&sun4i_a10_cfg,
-       },
-       {
-               .compatible = "allwinner,sun5i-a13-ehci",
-               .data = (ulong)&sun4i_a10_cfg,
-       },
-       {
-               .compatible = "allwinner,sun6i-a31-ehci",
-               .data = (ulong)&sun6i_a31_cfg,
-       },
-       {
-               .compatible = "allwinner,sun7i-a20-ehci",
-               .data = (ulong)&sun4i_a10_cfg,
-       },
-       {
-               .compatible = "allwinner,sun8i-a23-ehci",
-               .data = (ulong)&sun6i_a31_cfg,
-       },
-       {
-               .compatible = "allwinner,sun8i-a83t-ehci",
-               .data = (ulong)&sun6i_a31_cfg,
-       },
-       {
-               .compatible = "allwinner,sun8i-h3-ehci",
-               .data = (ulong)&sun8i_h3_cfg,
-       },
-       {
-               .compatible = "allwinner,sun9i-a80-ehci",
-               .data = (ulong)&sun9i_a80_cfg,
-       },
-       {
-               .compatible = "allwinner,sun50i-a64-ehci",
-               .data = (ulong)&sun8i_h3_cfg,
-       },
-       { /* sentinel */ }
-};
-
-U_BOOT_DRIVER(ehci_sunxi) = {
-       .name   = "ehci_sunxi",
-       .id     = UCLASS_USB,
-       .of_match = ehci_usb_ids,
-       .probe = ehci_usb_probe,
-       .remove = ehci_usb_remove,
-       .ops    = &ehci_usb_ops,
-       .platdata_auto_alloc_size = sizeof(struct usb_platdata),
-       .priv_auto_alloc_size = sizeof(struct ehci_sunxi_priv),
-       .flags  = DM_FLAG_ALLOC_PRIV_DMA,
-};
diff --git a/drivers/usb/host/ohci-sunxi.c b/drivers/usb/host/ohci-sunxi.c
deleted file mode 100644 (file)
index bb3c247..0000000
+++ /dev/null
@@ -1,233 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Sunxi ohci glue
- *
- * Copyright (C) 2015 Hans de Goede <hdegoede@redhat.com>
- *
- * Based on code from
- * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
- */
-
-#include <common.h>
-#include <asm/arch/clock.h>
-#include <asm/io.h>
-#include <dm.h>
-#include <usb.h>
-#include "ohci.h"
-#include <generic-phy.h>
-
-#ifdef CONFIG_SUNXI_GEN_SUN4I
-#define BASE_DIST              0x8000
-#define AHB_CLK_DIST           2
-#else
-#define BASE_DIST              0x1000
-#define AHB_CLK_DIST           1
-#endif
-
-#define SUN6I_AHB_RESET0_CFG_OFFSET 0x2c0
-#define SUN9I_AHB_RESET0_CFG_OFFSET 0x5a0
-
-struct ohci_sunxi_cfg {
-       bool has_reset;
-       u32 extra_ahb_gate_mask;
-       u32 extra_usb_gate_mask;
-       u32 reset0_cfg_offset;
-};
-
-struct ohci_sunxi_priv {
-       ohci_t ohci;
-       struct sunxi_ccm_reg *ccm;
-       u32 *reset0_cfg;
-       int ahb_gate_mask; /* Mask of ahb_gate0 clk gate bits for this hcd */
-       int usb_gate_mask; /* Mask of usb_clk_cfg clk gate bits for this hcd */
-       struct phy phy;
-       const struct ohci_sunxi_cfg *cfg;
-};
-
-static fdt_addr_t last_ohci_addr = 0;
-
-static int ohci_usb_probe(struct udevice *dev)
-{
-       struct usb_bus_priv *bus_priv = dev_get_uclass_priv(dev);
-       struct ohci_sunxi_priv *priv = dev_get_priv(dev);
-       struct ohci_regs *regs = (struct ohci_regs *)devfdt_get_addr(dev);
-       int extra_ahb_gate_mask = 0;
-       u8 reg_mask = 0;
-       int phys, ret;
-
-       if ((fdt_addr_t)regs > last_ohci_addr)
-               last_ohci_addr = (fdt_addr_t)regs;
-
-       priv->cfg = (const struct ohci_sunxi_cfg *)dev_get_driver_data(dev);
-       priv->ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
-       if (IS_ERR(priv->ccm))
-               return PTR_ERR(priv->ccm);
-
-       priv->reset0_cfg = (void *)priv->ccm +
-                                  priv->cfg->reset0_cfg_offset;
-
-       phys = dev_count_phandle_with_args(dev, "phys", "#phy-cells");
-       if (phys < 0) {
-               phys = 0;
-               goto no_phy;
-       }
-
-       ret = generic_phy_get_by_name(dev, "usb", &priv->phy);
-       if (ret) {
-               pr_err("failed to get %s usb PHY\n", dev->name);
-               return ret;
-       }
-
-       ret = generic_phy_init(&priv->phy);
-       if (ret) {
-               pr_err("failed to init %s USB PHY\n", dev->name);
-               return ret;
-       }
-
-       ret = generic_phy_power_on(&priv->phy);
-       if (ret) {
-               pr_err("failed to power on %s USB PHY\n", dev->name);
-               return ret;
-       }
-
-no_phy:
-       bus_priv->companion = true;
-
-       /*
-        * This should go away once we've moved to the driver model for
-        * clocks resp. phys.
-        */
-       reg_mask = ((uintptr_t)regs - (SUNXI_USB1_BASE + 0x400)) / BASE_DIST;
-       priv->ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_OHCI0;
-       extra_ahb_gate_mask = priv->cfg->extra_ahb_gate_mask;
-       priv->usb_gate_mask = CCM_USB_CTRL_OHCI0_CLK;
-       priv->ahb_gate_mask <<= reg_mask * AHB_CLK_DIST;
-       extra_ahb_gate_mask <<= reg_mask * AHB_CLK_DIST;
-       priv->usb_gate_mask <<= reg_mask;
-
-       setbits_le32(&priv->ccm->ahb_gate0,
-                    priv->ahb_gate_mask | extra_ahb_gate_mask);
-       setbits_le32(&priv->ccm->usb_clk_cfg,
-                    priv->usb_gate_mask | priv->cfg->extra_usb_gate_mask);
-       if (priv->cfg->has_reset)
-               setbits_le32(priv->reset0_cfg,
-                            priv->ahb_gate_mask | extra_ahb_gate_mask);
-
-       return ohci_register(dev, regs);
-}
-
-static int ohci_usb_remove(struct udevice *dev)
-{
-       struct ohci_sunxi_priv *priv = dev_get_priv(dev);
-       fdt_addr_t base_addr = devfdt_get_addr(dev);
-       int ret;
-
-       if (generic_phy_valid(&priv->phy)) {
-               ret = generic_phy_exit(&priv->phy);
-               if (ret) {
-                       pr_err("failed to exit %s USB PHY\n", dev->name);
-                       return ret;
-               }
-       }
-
-       ret = ohci_deregister(dev);
-       if (ret)
-               return ret;
-
-       if (priv->cfg->has_reset)
-               clrbits_le32(priv->reset0_cfg, priv->ahb_gate_mask);
-       /*
-        * On the A64 CLK_USB_OHCI0 is the parent of CLK_USB_OHCI1, so
-        * we have to wait with bringing down any clock until the last
-        * OHCI controller is removed.
-        */
-       if (!priv->cfg->extra_usb_gate_mask || base_addr == last_ohci_addr) {
-               u32 usb_gate_mask = priv->usb_gate_mask;
-
-               usb_gate_mask |= priv->cfg->extra_usb_gate_mask;
-               clrbits_le32(&priv->ccm->usb_clk_cfg, usb_gate_mask);
-       }
-
-       clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask);
-
-       return 0;
-}
-
-static const struct ohci_sunxi_cfg sun4i_a10_cfg = {
-       .has_reset = false,
-};
-
-static const struct ohci_sunxi_cfg sun6i_a31_cfg = {
-       .has_reset = true,
-       .reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET,
-};
-
-static const struct ohci_sunxi_cfg sun8i_h3_cfg = {
-       .has_reset = true,
-       .extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0,
-       .reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET,
-};
-
-static const struct ohci_sunxi_cfg sun9i_a80_cfg = {
-       .has_reset = true,
-       .reset0_cfg_offset = SUN9I_AHB_RESET0_CFG_OFFSET,
-};
-
-static const struct ohci_sunxi_cfg sun50i_a64_cfg = {
-       .has_reset = true,
-       .extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0,
-       .extra_usb_gate_mask = CCM_USB_CTRL_OHCI0_CLK,
-       .reset0_cfg_offset = SUN6I_AHB_RESET0_CFG_OFFSET,
-};
-
-static const struct udevice_id ohci_usb_ids[] = {
-       {
-               .compatible = "allwinner,sun4i-a10-ohci",
-               .data = (ulong)&sun4i_a10_cfg,
-       },
-       {
-               .compatible = "allwinner,sun5i-a13-ohci",
-               .data = (ulong)&sun4i_a10_cfg,
-       },
-       {
-               .compatible = "allwinner,sun6i-a31-ohci",
-               .data = (ulong)&sun6i_a31_cfg,
-       },
-       {
-               .compatible = "allwinner,sun7i-a20-ohci",
-               .data = (ulong)&sun4i_a10_cfg,
-       },
-       {
-               .compatible = "allwinner,sun8i-a23-ohci",
-               .data = (ulong)&sun6i_a31_cfg,
-       },
-       {
-               .compatible = "allwinner,sun8i-a83t-ohci",
-               .data = (ulong)&sun6i_a31_cfg,
-       },
-       {
-               .compatible = "allwinner,sun8i-h3-ohci",
-               .data = (ulong)&sun8i_h3_cfg,
-       },
-       {
-               .compatible = "allwinner,sun9i-a80-ohci",
-               .data = (ulong)&sun9i_a80_cfg,
-       },
-       {
-               .compatible = "allwinner,sun50i-a64-ohci",
-               .data = (ulong)&sun50i_a64_cfg,
-       },
-       { /* sentinel */ }
-};
-
-U_BOOT_DRIVER(usb_ohci) = {
-       .name   = "ohci_sunxi",
-       .id     = UCLASS_USB,
-       .of_match = ohci_usb_ids,
-       .probe = ohci_usb_probe,
-       .remove = ohci_usb_remove,
-       .ops    = &ohci_usb_ops,
-       .platdata_auto_alloc_size = sizeof(struct usb_platdata),
-       .priv_auto_alloc_size = sizeof(struct ohci_sunxi_priv),
-       .flags  = DM_FLAG_ALLOC_PRIV_DMA,
-};
index 527050d..ed651c2 100644 (file)
@@ -4542,7 +4542,6 @@ CONFIG_USB_EHCI_MX5
 CONFIG_USB_EHCI_MXC
 CONFIG_USB_EHCI_MXS
 CONFIG_USB_EHCI_SPEAR
-CONFIG_USB_EHCI_SUNXI
 CONFIG_USB_EHCI_TEGRA
 CONFIG_USB_EHCI_TXFIFO_THRESH
 CONFIG_USB_EHCI_VCT
@@ -4580,7 +4579,6 @@ CONFIG_USB_MUSB_TUSB6010
 CONFIG_USB_OHCI_EP93XX
 CONFIG_USB_OHCI_LPC32XX
 CONFIG_USB_OHCI_NEW
-CONFIG_USB_OHCI_SUNXI
 CONFIG_USB_OTG
 CONFIG_USB_OTG_BLACKLIST_HUB
 CONFIG_USB_PHY_TYPE