Merge branch 'master' of git://git.denx.de/u-boot-arm

[oweals/u-boot.git] / drivers / usb / gadget / s3c_udc_otg.c

diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c
index 6b922d26674004b5e8d8da7c5d443adbf5f57b7f..ba17a04265ebbbb11a06679874ed9ef23f35fa1a 100644 (file)
--- a/drivers/usb/gadget/s3c_udc_otg.c
+++ b/drivers/usb/gadget/s3c_udc_otg.c
@@ -15,29 +15,15 @@
  * Marek Szyprowski <m.szyprowski@samsung.com>
  * Lukasz Majewski <l.majewski@samsumg.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
-
+#undef DEBUG
 #include <common.h>
 #include <asm/errno.h>
 #include <linux/list.h>
 #include <malloc.h>
 
 #include <linux/usb/ch9.h>
-#include <usbdescriptors.h>
 #include <linux/usb/gadget.h>
 
 #include <asm/byteorder.h>
@@ -54,19 +40,11 @@
 
 #define OTG_DMA_MODE           1
 
-#undef DEBUG_S3C_UDC_SETUP
-#undef DEBUG_S3C_UDC_EP0
-#undef DEBUG_S3C_UDC_ISR
-#undef DEBUG_S3C_UDC_OUT_EP
-#undef DEBUG_S3C_UDC_IN_EP
-#undef DEBUG_S3C_UDC
-
-/* #define DEBUG_S3C_UDC_SETUP */
-/* #define DEBUG_S3C_UDC_EP0 */
-/* #define DEBUG_S3C_UDC_ISR */
-/* #define DEBUG_S3C_UDC_OUT_EP */
-/* #define DEBUG_S3C_UDC_IN_EP */
-/* #define DEBUG_S3C_UDC */
+#define DEBUG_SETUP 0
+#define DEBUG_EP0 0
+#define DEBUG_ISR 0
+#define DEBUG_OUT_EP 0
+#define DEBUG_IN_EP 0
 
 #include <usb/s3c_udc.h>
 
@@ -133,6 +111,19 @@ static void nuke(struct s3c_ep *ep, int status);
 static int s3c_udc_set_halt(struct usb_ep *_ep, int value);
 static void s3c_udc_set_nak(struct s3c_ep *ep);
 
+void set_udc_gadget_private_data(void *p)
+{
+       debug_cond(DEBUG_SETUP != 0,
+                  "%s: the_controller: 0x%p, p: 0x%p\n", __func__,
+                  the_controller, p);
+       the_controller->gadget.dev.device_data = p;
+}
+
+void *get_udc_gadget_private_data(struct usb_gadget *gadget)
+{
+       return gadget->dev.device_data;
+}
+
 static struct usb_ep_ops s3c_ep_ops = {
        .enable = s3c_ep_enable,
        .disable = s3c_ep_disable,
@@ -176,8 +167,13 @@ void otg_phy_init(struct s3c_udc *dev)
                writel((readl(&phy->phypwr) &~(OTG_DISABLE_0 | ANALOG_PWRDOWN)
                        &~FORCE_SUSPEND_0), &phy->phypwr);
 
-       writel((readl(&phy->phyclk) &~(ID_PULLUP0 | COMMON_ON_N0)) |
-              CLK_SEL_24MHZ, &phy->phyclk); /* PLL 24Mhz */
+       if (s5p_cpu_id == 0x4412)
+               writel((readl(&phy->phyclk) & ~(EXYNOS4X12_ID_PULLUP0 |
+                       EXYNOS4X12_COMMON_ON_N0)) | EXYNOS4X12_CLK_SEL_24MHZ,
+                      &phy->phyclk); /* PLL 24Mhz */
+       else
+               writel((readl(&phy->phyclk) & ~(ID_PULLUP0 | COMMON_ON_N0)) |
+                      CLK_SEL_24MHZ, &phy->phyclk); /* PLL 24Mhz */
 
        writel((readl(&phy->rstcon) &~(LINK_SW_RST | PHYLNK_SW_RST))
               | PHY_SW_RST0, &phy->rstcon);
@@ -217,7 +213,7 @@ void otg_phy_off(struct s3c_udc *dev)
  */
 static void udc_disable(struct s3c_udc *dev)
 {
-       DEBUG_SETUP("%s: %p\n", __func__, dev);
+       debug_cond(DEBUG_SETUP != 0, "%s: %p\n", __func__, dev);
 
        udc_set_address(dev, 0);
 
@@ -235,7 +231,7 @@ static void udc_reinit(struct s3c_udc *dev)
 {
        unsigned int i;
 
-       DEBUG_SETUP("%s: %p\n", __func__, dev);
+       debug_cond(DEBUG_SETUP != 0, "%s: %p\n", __func__, dev);
 
        /* device/ep0 records init */
        INIT_LIST_HEAD(&dev->gadget.ep_list);
@@ -266,12 +262,13 @@ static void udc_reinit(struct s3c_udc *dev)
  */
 static int udc_enable(struct s3c_udc *dev)
 {
-       DEBUG_SETUP("%s: %p\n", __func__, dev);
+       debug_cond(DEBUG_SETUP != 0, "%s: %p\n", __func__, dev);
 
        otg_phy_init(dev);
        reconfig_usbd();
 
-       DEBUG_SETUP("S3C USB 2.0 OTG Controller Core Initialized : 0x%x\n",
+       debug_cond(DEBUG_SETUP != 0,
+                  "S3C USB 2.0 OTG Controller Core Initialized : 0x%x\n",
                    readl(&reg->gintmsk));
 
        dev->gadget.speed = USB_SPEED_UNKNOWN;
@@ -288,7 +285,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
        int retval = 0;
        unsigned long flags;
 
-       DEBUG_SETUP("%s: %s\n", __func__, "no name");
+       debug_cond(DEBUG_SETUP != 0, "%s: %s\n", __func__, "no name");
 
        if (!driver
            || (driver->speed != USB_SPEED_FULL
@@ -312,7 +309,8 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
 
        retval = driver->bind(&dev->gadget);
        if (retval) {
-               DEBUG_SETUP("%s: bind to driver --> error %d\n",
+               debug_cond(DEBUG_SETUP != 0,
+                          "%s: bind to driver --> error %d\n",
                            dev->gadget.name, retval);
                dev->driver = 0;
                return retval;
@@ -320,7 +318,8 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
 
        enable_irq(IRQ_OTG);
 
-       DEBUG_SETUP("Registered gadget driver %s\n", dev->gadget.name);
+       debug_cond(DEBUG_SETUP != 0,
+                  "Registered gadget driver %s\n", dev->gadget.name);
        udc_enable(dev);
 
        return 0;
@@ -378,7 +377,7 @@ static void done(struct s3c_ep *ep, struct s3c_request *req, int status)
        /* don't modify queue heads during completion callback */
        ep->stopped = 1;
 
-#ifdef DEBUG_S3C_UDC
+#ifdef DEBUG
        printf("calling complete callback\n");
        {
                int i, len = req->req.length;