usb: sunxi: ehci: get rid of ifdefs

We can use compatibles instead.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>

diff --git a/drivers/usb/host/ehci-sunxi.c b/drivers/usb/host/ehci-sunxi.c
index 360efc9116086f2b021bdfe1b471516a5a3fb104..35fbe033311bb7e284cbc9c00fcd96af7c7f98c2 100644 (file)
--- a/drivers/usb/host/ehci-sunxi.c
+++ b/drivers/usb/host/ehci-sunxi.c
@@ -22,11 +22,17 @@
 #define AHB_CLK_DIST           1
 #endif
 
+struct ehci_sunxi_cfg {
+       bool has_reset;
+       u32 extra_ahb_gate_mask;
+};
+
 struct ehci_sunxi_priv {
        struct ehci_ctrl ehci;
        struct sunxi_ccm_reg *ccm;
        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)
@@ -38,6 +44,7 @@ static int ehci_usb_probe(struct udevice *dev)
        int extra_ahb_gate_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);
@@ -72,18 +79,15 @@ no_phy:
         * clocks resp. phys.
         */
        priv->ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0;
-#if defined(CONFIG_MACH_SUNXI_H3_H5) || defined(CONFIG_MACH_SUN50I)
-       extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_OHCI0;
-#endif
+       extra_ahb_gate_mask = priv->cfg->extra_ahb_gate_mask;
        priv->ahb_gate_mask <<= phys * AHB_CLK_DIST;
        extra_ahb_gate_mask <<= phys * AHB_CLK_DIST;
 
        setbits_le32(&priv->ccm->ahb_gate0,
                     priv->ahb_gate_mask | extra_ahb_gate_mask);
-#ifdef CONFIG_SUNXI_GEN_SUN6I
-       setbits_le32(&priv->ccm->ahb_reset0_cfg,
-                    priv->ahb_gate_mask | extra_ahb_gate_mask);
-#endif
+       if (priv->cfg->has_reset)
+               setbits_le32(&priv->ccm->ahb_reset0_cfg,
+                            priv->ahb_gate_mask | extra_ahb_gate_mask);
 
        hcor = (struct ehci_hcor *)((uintptr_t)hccr +
                                    HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
@@ -108,25 +112,64 @@ static int ehci_usb_remove(struct udevice *dev)
        if (ret)
                return ret;
 
-#ifdef CONFIG_SUNXI_GEN_SUN6I
-       clrbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask);
-#endif
+       if (priv->cfg->has_reset)
+               clrbits_le32(&priv->ccm->ahb_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,
+};
+
+static const struct ehci_sunxi_cfg sun8i_h3_cfg = {
+       .has_reset = true,
+       .extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_OHCI0,
+};
+
 static const struct udevice_id ehci_usb_ids[] = {
-       { .compatible = "allwinner,sun4i-a10-ehci", },
-       { .compatible = "allwinner,sun5i-a13-ehci", },
-       { .compatible = "allwinner,sun6i-a31-ehci", },
-       { .compatible = "allwinner,sun7i-a20-ehci", },
-       { .compatible = "allwinner,sun8i-a23-ehci", },
-       { .compatible = "allwinner,sun8i-a83t-ehci", },
-       { .compatible = "allwinner,sun8i-h3-ehci",  },
-       { .compatible = "allwinner,sun9i-a80-ehci", },
-       { .compatible = "allwinner,sun50i-a64-ehci", },
-       { }
+       {
+               .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)&sun6i_a31_cfg,
+       },
+       {
+               .compatible = "allwinner,sun50i-a64-ehci",
+               .data = (ulong)&sun8i_h3_cfg,
+       },
+       { /* sentinel */ }
 };
 
 U_BOOT_DRIVER(ehci_sunxi) = {