USB: ohci-nxp: Use isp1301 driver

ohci-nxp duplicates the isp1301 driver. This patch removes this code and makes
ohci-nxp use the new separate isp1301 driver instead.

Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/devicetree/bindings/usb/ohci-nxp.txt b/Documentation/devicetree/bindings/usb/ohci-nxp.txt
index b5c36319e63413f707989892488db1a4f6fa0b0d..71e28c1017eddd93421c2b13ff81fdc2f685ce5b 100644 (file)
--- a/Documentation/devicetree/bindings/usb/ohci-nxp.txt
+++ b/Documentation/devicetree/bindings/usb/ohci-nxp.txt
@@ -5,12 +5,20 @@ Required properties:
 - reg: physical base address of the controller and length of memory mapped
   region.
 - interrupts: The OHCI interrupt
+- transceiver: phandle of the associated ISP1301 device - this is necessary for
+               the UDC controller for connecting to the USB physical layer
 
 Example (LPC32xx):
 
+       isp1301: usb-transceiver@2c {
+               compatible = "nxp,isp1301";
+               reg = <0x2c>;
+       };
+
        ohci@31020000 {
                compatible = "nxp,ohci-nxp";
                reg = <0x31020000 0x300>;
                interrupt-parent = <&mic>;
                interrupts = <0x3b 0>;
+               transceiver = <&isp1301>;
        };

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 896fc91c54ab15d9909d5ed5fc3026563bb526d1..684a7bba930701de53d23d6084563a285e6aed76 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -292,6 +292,7 @@ config USB_OHCI_HCD
        depends on USB && USB_ARCH_HAS_OHCI
        select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
        select USB_OTG_UTILS if ARCH_OMAP
+       select USB_ISP1301 if ARCH_LPC32XX || ARCH_PNX4008
        ---help---
          The Open Host Controller Interface (OHCI) is a standard for accessing
          USB 1.1 host controller hardware.  It does more in hardware than Intel's

diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c
index bf542e7e2b1c8f3e03650350d6edc0b9d1998776..1e364ec962fb90ea75573c92fc6a92ec6b25612c 100644 (file)
--- a/drivers/usb/host/ohci-nxp.c
+++ b/drivers/usb/host/ohci-nxp.c
@@ -23,6 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
 #include <linux/of.h>
+#include <linux/usb/isp1301.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -58,54 +59,6 @@
 #define TRANSPARENT_I2C_EN     (1 << 7)
 #define HOST_EN                        (1 << 0)
 
-/* ISP1301 USB transceiver I2C registers */
-#define        ISP1301_MODE_CONTROL_1          0x04    /* u8 read, set, +1 clear */
-
-#define        MC1_SPEED_REG           (1 << 0)
-#define        MC1_SUSPEND_REG         (1 << 1)
-#define        MC1_DAT_SE0             (1 << 2)
-#define        MC1_TRANSPARENT         (1 << 3)
-#define        MC1_BDIS_ACON_EN        (1 << 4)
-#define        MC1_OE_INT_EN           (1 << 5)
-#define        MC1_UART_EN             (1 << 6)
-#define        MC1_MASK                0x7f
-
-#define        ISP1301_MODE_CONTROL_2          0x12    /* u8 read, set, +1 clear */
-
-#define        MC2_GLOBAL_PWR_DN       (1 << 0)
-#define        MC2_SPD_SUSP_CTRL       (1 << 1)
-#define        MC2_BI_DI               (1 << 2)
-#define        MC2_TRANSP_BDIR0        (1 << 3)
-#define        MC2_TRANSP_BDIR1        (1 << 4)
-#define        MC2_AUDIO_EN            (1 << 5)
-#define        MC2_PSW_EN              (1 << 6)
-#define        MC2_EN2V7               (1 << 7)
-
-#define        ISP1301_OTG_CONTROL_1           0x06    /* u8 read, set, +1 clear */
-#      define  OTG1_DP_PULLUP          (1 << 0)
-#      define  OTG1_DM_PULLUP          (1 << 1)
-#      define  OTG1_DP_PULLDOWN        (1 << 2)
-#      define  OTG1_DM_PULLDOWN        (1 << 3)
-#      define  OTG1_ID_PULLDOWN        (1 << 4)
-#      define  OTG1_VBUS_DRV           (1 << 5)
-#      define  OTG1_VBUS_DISCHRG       (1 << 6)
-#      define  OTG1_VBUS_CHRG          (1 << 7)
-#define        ISP1301_OTG_STATUS              0x10    /* u8 readonly */
-#      define  OTG_B_SESS_END          (1 << 6)
-#      define  OTG_B_SESS_VLD          (1 << 7)
-
-#define ISP1301_I2C_ADDR 0x2C
-
-#define ISP1301_I2C_MODE_CONTROL_1 0x4
-#define ISP1301_I2C_MODE_CONTROL_2 0x12
-#define ISP1301_I2C_OTG_CONTROL_1 0x6
-#define ISP1301_I2C_OTG_CONTROL_2 0x10
-#define ISP1301_I2C_INTERRUPT_SOURCE 0x8
-#define ISP1301_I2C_INTERRUPT_LATCH 0xA
-#define ISP1301_I2C_INTERRUPT_FALLING 0xC
-#define ISP1301_I2C_INTERRUPT_RISING 0xE
-#define ISP1301_I2C_REG_CLEAR_ADDR 1
-
 /* On LPC32xx, those are undefined */
 #ifndef start_int_set_falling_edge
 #define start_int_set_falling_edge(irq)
@@ -115,41 +68,12 @@
 #define start_int_umask(irq)
 #endif
 
-static struct i2c_driver isp1301_driver;
 static struct i2c_client *isp1301_i2c_client;
 
 extern int usb_disabled(void);
 
 static struct clk *usb_clk;
 
-static const unsigned short normal_i2c[] =
-    { ISP1301_I2C_ADDR, ISP1301_I2C_ADDR + 1, I2C_CLIENT_END };
-
-static int isp1301_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
-{
-       return 0;
-}
-
-static int isp1301_remove(struct i2c_client *client)
-{
-       return 0;
-}
-
-static const struct i2c_device_id isp1301_id[] = {
-       { "isp1301_nxp", 0 },
-       { }
-};
-
-static struct i2c_driver isp1301_driver = {
-       .driver = {
-               .name = "isp1301_nxp",
-       },
-       .probe = isp1301_probe,
-       .remove = isp1301_remove,
-       .id_table = isp1301_id,
-};
-
 static void isp1301_configure_pnx4008(void)
 {
        /* PNX4008 only supports DAT_SE0 USB mode */
@@ -373,11 +297,22 @@ static int __devinit usb_hcd_nxp_probe(struct platform_device *pdev)
        struct usb_hcd *hcd = 0;
        struct ohci_hcd *ohci;
        const struct hc_driver *driver = &ohci_nxp_hc_driver;
-       struct i2c_adapter *i2c_adap;
-       struct i2c_board_info i2c_info;
        struct resource *res;
-
        int ret = 0, irq;
+       struct device_node *isp1301_node;
+
+       if (pdev->dev.of_node) {
+               isp1301_node = of_parse_phandle(pdev->dev.of_node,
+                                               "transceiver", 0);
+       } else {
+               isp1301_node = NULL;
+       }
+
+       isp1301_i2c_client = isp1301_get_client(isp1301_node);
+       if (!isp1301_i2c_client) {
+               ret = -EPROBE_DEFER;
+               goto out;
+       }
 
        pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
        pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
@@ -392,28 +327,6 @@ static int __devinit usb_hcd_nxp_probe(struct platform_device *pdev)
        /* Enable AHB slave USB clock, needed for further USB clock control */
        __raw_writel(USB_SLAVE_HCLK_EN | PAD_CONTROL_LAST_DRIVEN, USB_CTRL);
 
-       ret = i2c_add_driver(&isp1301_driver);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to add ISP1301 driver\n");
-               goto out;
-       }
-       i2c_adap = i2c_get_adapter(2);
-       if (!i2c_adap) {
-               dev_err(&pdev->dev, "failed on i2c_get_adapter");
-               goto out_i2c_driver;
-       }
-
-       memset(&i2c_info, 0, sizeof(struct i2c_board_info));
-       strlcpy(i2c_info.type, "isp1301_nxp", I2C_NAME_SIZE);
-       isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info,
-                                                  normal_i2c, NULL);
-       i2c_put_adapter(i2c_adap);
-       if (!isp1301_i2c_client) {
-               dev_err(&pdev->dev, "failed to connect I2C to ISP1301 USB Transceiver\n");
-               ret = -ENODEV;
-               goto out_i2c_driver;
-       }
-
        isp1301_configure();
 
        /* Enable USB PLL */
@@ -495,10 +408,7 @@ out3:
 out2:
        clk_put(usb_clk);
 out1:
-       i2c_unregister_device(isp1301_i2c_client);
        isp1301_i2c_client = NULL;
-out_i2c_driver:
-       i2c_del_driver(&isp1301_driver);
 out:
        return ret;
 }
@@ -516,7 +426,6 @@ static int usb_hcd_nxp_remove(struct platform_device *pdev)
        clk_put(usb_clk);
        i2c_unregister_device(isp1301_i2c_client);
        isp1301_i2c_client = NULL;
-       i2c_del_driver(&isp1301_driver);
 
        platform_set_drvdata(pdev, NULL);