usb: ehci: Fix register access

[u-boot] / drivers / usb / host / ehci-exynos.c

diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index 3ca4c5c3312680522ac1a32d017b7ac815256d84..66b4de0b2d05d7a33ca6a11acabeb8fdf1d2537a 100644 (file)
--- a/drivers/usb/host/ehci-exynos.c
+++ b/drivers/usb/host/ehci-exynos.c
@@ -4,20 +4,7 @@
  * Copyright (C) 2012 Samsung Electronics Co.Ltd
  *     Vivek Gautam <gautam.vivek@samsung.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -29,6 +16,7 @@
 #include <asm/arch/ehci.h>
 #include <asm/arch/system.h>
 #include <asm/arch/power.h>
+#include <asm/gpio.h>
 #include <asm-generic/errno.h>
 #include <linux/compat.h>
 #include "ehci.h"
@@ -42,11 +30,16 @@ DECLARE_GLOBAL_DATA_PTR;
  */
 struct exynos_ehci {
        struct exynos_usb_phy *usb;
-       unsigned int *hcd;
+       struct ehci_hccr *hcd;
+       struct fdt_gpio_state vbus_gpio;
 };
 
+static struct exynos_ehci exynos;
+
+#ifdef CONFIG_OF_CONTROL
 static int exynos_usb_parse_dt(const void *blob, struct exynos_ehci *exynos)
 {
+       fdt_addr_t addr;
        unsigned int node;
        int depth;
 
@@ -59,12 +52,17 @@ static int exynos_usb_parse_dt(const void *blob, struct exynos_ehci *exynos)
        /*
         * Get the base address for EHCI controller from the device node
         */
-       exynos->hcd = (unsigned int *)fdtdec_get_addr(blob, node, "reg");
-       if (exynos->hcd == NULL) {
+       addr = fdtdec_get_addr(blob, node, "reg");
+       if (addr == FDT_ADDR_T_NONE) {
                debug("Can't get the EHCI register address\n");
                return -ENXIO;
        }
 
+       exynos->hcd = (struct ehci_hccr *)addr;
+
+       /* Vbus gpio */
+       fdtdec_decode_gpio(blob, node, "samsung,vbus-gpio", &exynos->vbus_gpio);
+
        depth = 0;
        node = fdtdec_next_compatible_subnode(blob, node,
                                        COMPAT_SAMSUNG_EXYNOS_USB_PHY, &depth);
@@ -85,6 +83,7 @@ static int exynos_usb_parse_dt(const void *blob, struct exynos_ehci *exynos)
 
        return 0;
 }
+#endif
 
 /* Setup the EHCI host controller. */
 static void setup_usb_phy(struct exynos_usb_phy *usb)
@@ -142,22 +141,30 @@ static void reset_usb_phy(struct exynos_usb_phy *usb)
  * Create the appropriate control structures to manage
  * a new EHCI host controller.
  */
-int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
+int ehci_hcd_init(int index, enum usb_init_type init,
+               struct ehci_hccr **hccr, struct ehci_hcor **hcor)
 {
-       struct exynos_ehci *exynos = NULL;
+       struct exynos_ehci *ctx = &exynos;
 
-       exynos = (struct exynos_ehci *)
-                       kzalloc(sizeof(struct exynos_ehci), GFP_KERNEL);
-       if (!exynos) {
-               debug("failed to allocate exynos ehci context\n");
-               return -ENOMEM;
+#ifdef CONFIG_OF_CONTROL
+       if (exynos_usb_parse_dt(gd->fdt_blob, ctx)) {
+               debug("Unable to parse device tree for ehci-exynos\n");
+               return -ENODEV;
        }
+#else
+       ctx->usb = (struct exynos_usb_phy *)samsung_get_base_usb_phy();
+       ctx->hcd = (struct ehci_hccr *)samsung_get_base_usb_ehci();
+#endif
 
-       exynos_usb_parse_dt(gd->fdt_blob, exynos);
+#ifdef CONFIG_OF_CONTROL
+       /* setup the Vbus gpio here */
+       if (!fdtdec_setup_gpio(&ctx->vbus_gpio))
+               gpio_direction_output(ctx->vbus_gpio.gpio, 1);
+#endif
 
-       setup_usb_phy(exynos->usb);
+       setup_usb_phy(ctx->usb);
 
-       *hccr = (struct ehci_hccr *)(exynos->hcd);
+       *hccr = ctx->hcd;
        *hcor = (struct ehci_hcor *)((uint32_t) *hccr
                                + HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
 
@@ -165,8 +172,6 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
                (uint32_t)*hccr, (uint32_t)*hcor,
                (uint32_t)HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
 
-       kfree(exynos);
-
        return 0;
 }
 
@@ -176,20 +181,9 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
  */
 int ehci_hcd_stop(int index)
 {
-       struct exynos_ehci *exynos = NULL;
-
-       exynos = (struct exynos_ehci *)
-                       kzalloc(sizeof(struct exynos_ehci), GFP_KERNEL);
-       if (!exynos) {
-               debug("failed to allocate exynos ehci context\n");
-               return -ENOMEM;
-       }
-
-       exynos_usb_parse_dt(gd->fdt_blob, exynos);
-
-       reset_usb_phy(exynos->usb);
+       struct exynos_ehci *ctx = &exynos;
 
-       kfree(exynos);
+       reset_usb_phy(ctx->usb);
 
        return 0;
 }