1 files changed, 45 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 626f3ea3142f..b6cc233214d7 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -20,6 +20,7 @@
 #include <linux/pinctrl/machine.h>
 #include <linux/platform_data/omap4-keypad.h>
 #include <linux/platform_data/omap_ocp2scp.h>
+#include <linux/usb/omap_control_usb.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
@@ -254,6 +255,49 @@ static inline void omap_init_camera(void)
 #endif
 }
 
+#if IS_ENABLED(CONFIG_OMAP_CONTROL_USB)
+static struct omap_control_usb_platform_data omap4_control_usb_pdata = {
+        .type = 1,
+};
+
+struct resource omap4_control_usb_res[] = {
+        {
+                .name   = "control_dev_conf",
+                .start  = 0x4a002300,
+                .end    = 0x4a002303,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .name   = "otghs_control",
+                .start  = 0x4a00233c,
+                .end    = 0x4a00233f,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device omap4_control_usb = {
+        .name = "omap-control-usb",
+        .id = -1,
+        .dev = {
+                .platform_data = &omap4_control_usb_pdata,
+        },
+        .num_resources = 2,
+        .resource = omap4_control_usb_res,
+};
+
+static inline void __init omap_init_control_usb(void)
+{
+        if (!cpu_is_omap44xx())
+                return;
+
+        if (platform_device_register(&omap4_control_usb))
+                pr_err("Error registering omap_control_usb device\n");
+}
+
+#else
+static inline void omap_init_control_usb(void) { }
+#endif /* CONFIG_OMAP_CONTROL_USB */
+
 int __init omap4_keyboard_init(struct omap4_keypad_platform_data
                         *sdp4430_keypad_data, struct omap_board_data *bdata)
 {
@@ -721,6 +765,7 @@ static int __init omap2_init_devices(void)
         omap_init_mbox();
         /* If dtb is there, the devices will be created dynamically */
         if (!of_have_populated_dt()) {
+                omap_init_control_usb();
                 omap_init_dmic();
                 omap_init_mcpdm();
                 omap_init_mcspi();