ARM: OMAP2+: Remove omap4 ocp2scp pdata

This is omap4+ only and no longer needed as omap4+ can be booted
using device tree.

Also remove the related pdata handling from the driver and the
now unneeded platform_data/omap_ocp2scp.h.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
Reviewed-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

2 files changed, 0 insertions, 99 deletions

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 350116906f18..721da484d8ec 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -20,7 +20,6 @@
 #include <linux/of.h>
 #include <linux/pinctrl/machine.h>
 #include <linux/platform_data/omap4-keypad.h>
-#include <linux/platform_data/omap_ocp2scp.h>
 #include <linux/wl12xx.h>
 
 #include <asm/mach-types.h>
@@ -515,82 +514,6 @@ static void omap_init_vout(void)
 static inline void omap_init_vout(void) {}
 #endif
 
-#if defined(CONFIG_OMAP_OCP2SCP) || defined(CONFIG_OMAP_OCP2SCP_MODULE)
-static int count_ocp2scp_devices(struct omap_ocp2scp_dev *ocp2scp_dev)
-{
-        int cnt = 0;
-
-        while (ocp2scp_dev->drv_name != NULL) {
-                cnt++;
-                ocp2scp_dev++;
-        }
-
-        return cnt;
-}
-
-static void __init omap_init_ocp2scp(void)
-{
-        struct omap_hwmod       *oh;
-        struct platform_device  *pdev;
-        int                     bus_id = -1, dev_cnt = 0, i;
-        struct omap_ocp2scp_dev *ocp2scp_dev;
-        const char              *oh_name, *name;
-        struct omap_ocp2scp_platform_data *pdata;
-
-        if (!cpu_is_omap44xx())
-                return;
-
-        oh_name = "ocp2scp_usb_phy";
-        name    = "omap-ocp2scp";
-
-        oh = omap_hwmod_lookup(oh_name);
-        if (!oh) {
-                pr_err("%s: could not find omap_hwmod for %s\n", __func__,
-                                                                oh_name);
-                return;
-        }
-
-        pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
-        if (!pdata) {
-                pr_err("%s: No memory for ocp2scp pdata\n", __func__);
-                return;
-        }
-
-        ocp2scp_dev = oh->dev_attr;
-        dev_cnt = count_ocp2scp_devices(ocp2scp_dev);
-
-        if (!dev_cnt) {
-                pr_err("%s: No devices connected to ocp2scp\n", __func__);
-                kfree(pdata);
-                return;
-        }
-
-        pdata->devices = kzalloc(sizeof(struct omap_ocp2scp_dev *)
-                                        * dev_cnt, GFP_KERNEL);
-        if (!pdata->devices) {
-                pr_err("%s: No memory for ocp2scp pdata devices\n", __func__);
-                kfree(pdata);
-                return;
-        }
-
-        for (i = 0; i < dev_cnt; i++, ocp2scp_dev++)
-                pdata->devices[i] = ocp2scp_dev;
-
-        pdata->dev_cnt  = dev_cnt;
-
-        pdev = omap_device_build(name, bus_id, oh, pdata, sizeof(*pdata));
-        if (IS_ERR(pdev)) {
-                pr_err("Could not build omap_device for %s %s\n",
-                                                name, oh_name);
-                kfree(pdata->devices);
-                kfree(pdata);
-                return;
-        }
-}
-#else
-static inline void omap_init_ocp2scp(void) { }
-#endif
-
 #if IS_ENABLED(CONFIG_WL12XX)
 
 static struct wl12xx_platform_data wl12xx __initdata;
@@ -655,7 +578,6 @@ static int __init omap2_init_devices(void)
         omap_init_sti();
         omap_init_rng();
         omap_init_vout();
-        omap_init_ocp2scp();
 
         return 0;
 }
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 848b6dc67590..d6dd70728c61 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -21,7 +21,6 @@
 #include <linux/io.h>
 #include <linux/platform_data/gpio-omap.h>
 #include <linux/power/smartreflex.h>
-#include <linux/platform_data/omap_ocp2scp.h>
 #include <linux/i2c-omap.h>
 
 #include <linux/omap-dma.h>
@@ -2695,25 +2694,6 @@ static struct omap_hwmod_class omap44xx_ocp2scp_hwmod_class = {
         .sysc   = &omap44xx_ocp2scp_sysc,
 };
 
-/* ocp2scp dev_attr */
-static struct resource omap44xx_usb_phy_and_pll_addrs[] = {
-        {
-                .name           = "usb_phy",
-                .start          = 0x4a0ad080,
-                .end            = 0x4a0ae000,
-                .flags          = IORESOURCE_MEM,
-        },
-        { }
-};
-
-static struct omap_ocp2scp_dev ocp2scp_dev_attr[] = {
-        {
-                .drv_name       = "omap-usb2",
-                .res            = omap44xx_usb_phy_and_pll_addrs,
-        },
-        { }
-};
-
 /* ocp2scp_usb_phy */
 static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = {
         .name           = "ocp2scp_usb_phy",
@@ -2737,7 +2717,6 @@ static struct omap_hwmod omap44xx_ocp2scp_usb_phy_hwmod = {
                         .modulemode   = MODULEMODE_HWCTRL,
                 },
         },
-        .dev_attr       = ocp2scp_dev_attr,
 };
 
 /*