* omap_hwmod_2420_data.c - hardware modules present on the OMAP2420 chips
  *
  * Copyright (C) 2009-2011 Nokia Corporation
+ * Copyright (C) 2012 Texas Instruments, Inc.
  * Paul Walmsley
  *
  * This program is free software; you can redistribute it and/or modify
        .user   = OCP_USER_MPU,
 };
 
-/* Slave interfaces on the L3 interconnect */
-static struct omap_hwmod_ocp_if *omap2420_l3_main_slaves[] = {
-       &omap2420_mpu__l3_main,
-};
-
 /* DSS -> l3 */
 static struct omap_hwmod_ocp_if omap2420_dss__l3 = {
        .master         = &omap2420_dss_core_hwmod,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* Master interfaces on the L3 interconnect */
-static struct omap_hwmod_ocp_if *omap2420_l3_main_masters[] = {
-       &omap2420_l3_main__l4_core,
-};
-
 /* L3 */
 static struct omap_hwmod omap2420_l3_main_hwmod = {
        .name           = "l3_main",
        .class          = &l3_hwmod_class,
-       .masters        = omap2420_l3_main_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2420_l3_main_masters),
-       .slaves         = omap2420_l3_main_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_l3_main_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* Slave interfaces on the L4_CORE interconnect */
-static struct omap_hwmod_ocp_if *omap2420_l4_core_slaves[] = {
-       &omap2420_l3_main__l4_core,
-};
-
-/* Master interfaces on the L4_CORE interconnect */
-static struct omap_hwmod_ocp_if *omap2420_l4_core_masters[] = {
-       &omap2420_l4_core__l4_wkup,
-       &omap2_l4_core__uart1,
-       &omap2_l4_core__uart2,
-       &omap2_l4_core__uart3,
-       &omap2420_l4_core__i2c1,
-       &omap2420_l4_core__i2c2
-};
-
 /* L4 CORE */
 static struct omap_hwmod omap2420_l4_core_hwmod = {
        .name           = "l4_core",
        .class          = &l4_hwmod_class,
-       .masters        = omap2420_l4_core_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2420_l4_core_masters),
-       .slaves         = omap2420_l4_core_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_l4_core_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
-/* Slave interfaces on the L4_WKUP interconnect */
-static struct omap_hwmod_ocp_if *omap2420_l4_wkup_slaves[] = {
-       &omap2420_l4_core__l4_wkup,
-};
-
-/* Master interfaces on the L4_WKUP interconnect */
-static struct omap_hwmod_ocp_if *omap2420_l4_wkup_masters[] = {
-};
-
 /* L4 WKUP */
 static struct omap_hwmod omap2420_l4_wkup_hwmod = {
        .name           = "l4_wkup",
        .class          = &l4_hwmod_class,
-       .masters        = omap2420_l4_wkup_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2420_l4_wkup_masters),
-       .slaves         = omap2420_l4_wkup_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_l4_wkup_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
-/* Master interfaces on the MPU device */
-static struct omap_hwmod_ocp_if *omap2420_mpu_masters[] = {
-       &omap2420_mpu__l3_main,
-};
-
 /* MPU */
 static struct omap_hwmod omap2420_mpu_hwmod = {
        .name           = "mpu",
        .class          = &mpu_hwmod_class,
        .main_clk       = "mpu_ck",
-       .masters        = omap2420_mpu_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2420_mpu_masters),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-static struct omap_hwmod_ocp_if *omap2420_iva_masters[] = {
-       &omap2420_l3__iva,
-};
-
 /*
  * IVA2 (IVA2)
  */
 static struct omap_hwmod omap2420_iva_hwmod = {
        .name           = "iva",
        .class          = &iva_hwmod_class,
-       .masters        = omap2420_iva_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2420_iva_masters),
 };
 
 /* always-on timers dev attribute */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer1 slave port */
-static struct omap_hwmod_ocp_if *omap2420_timer1_slaves[] = {
-       &omap2420_l4_wkup__timer1,
-};
-
 /* timer1 hwmod */
 static struct omap_hwmod omap2420_timer1_hwmod = {
        .name           = "timer1",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2420_timer1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_timer1_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer2 slave port */
-static struct omap_hwmod_ocp_if *omap2420_timer2_slaves[] = {
-       &omap2420_l4_core__timer2,
-};
-
 /* timer2 hwmod */
 static struct omap_hwmod omap2420_timer2_hwmod = {
        .name           = "timer2",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2420_timer2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_timer2_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer3 slave port */
-static struct omap_hwmod_ocp_if *omap2420_timer3_slaves[] = {
-       &omap2420_l4_core__timer3,
-};
-
 /* timer3 hwmod */
 static struct omap_hwmod omap2420_timer3_hwmod = {
        .name           = "timer3",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2420_timer3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_timer3_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer4 slave port */
-static struct omap_hwmod_ocp_if *omap2420_timer4_slaves[] = {
-       &omap2420_l4_core__timer4,
-};
-
 /* timer4 hwmod */
 static struct omap_hwmod omap2420_timer4_hwmod = {
        .name           = "timer4",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2420_timer4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_timer4_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer5 slave port */
-static struct omap_hwmod_ocp_if *omap2420_timer5_slaves[] = {
-       &omap2420_l4_core__timer5,
-};
-
 /* timer5 hwmod */
 static struct omap_hwmod omap2420_timer5_hwmod = {
        .name           = "timer5",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2420_timer5_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_timer5_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer6 slave port */
-static struct omap_hwmod_ocp_if *omap2420_timer6_slaves[] = {
-       &omap2420_l4_core__timer6,
-};
-
 /* timer6 hwmod */
 static struct omap_hwmod omap2420_timer6_hwmod = {
        .name           = "timer6",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2420_timer6_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_timer6_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer7 slave port */
-static struct omap_hwmod_ocp_if *omap2420_timer7_slaves[] = {
-       &omap2420_l4_core__timer7,
-};
-
 /* timer7 hwmod */
 static struct omap_hwmod omap2420_timer7_hwmod = {
        .name           = "timer7",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2420_timer7_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_timer7_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer8 slave port */
-static struct omap_hwmod_ocp_if *omap2420_timer8_slaves[] = {
-       &omap2420_l4_core__timer8,
-};
-
 /* timer8 hwmod */
 static struct omap_hwmod omap2420_timer8_hwmod = {
        .name           = "timer8",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2420_timer8_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_timer8_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer9 slave port */
-static struct omap_hwmod_ocp_if *omap2420_timer9_slaves[] = {
-       &omap2420_l4_core__timer9,
-};
-
 /* timer9 hwmod */
 static struct omap_hwmod omap2420_timer9_hwmod = {
        .name           = "timer9",
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap2420_timer9_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_timer9_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer10 slave port */
-static struct omap_hwmod_ocp_if *omap2420_timer10_slaves[] = {
-       &omap2420_l4_core__timer10,
-};
-
 /* timer10 hwmod */
 static struct omap_hwmod omap2420_timer10_hwmod = {
        .name           = "timer10",
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap2420_timer10_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_timer10_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer11 slave port */
-static struct omap_hwmod_ocp_if *omap2420_timer11_slaves[] = {
-       &omap2420_l4_core__timer11,
-};
-
 /* timer11 hwmod */
 static struct omap_hwmod omap2420_timer11_hwmod = {
        .name           = "timer11",
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap2420_timer11_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_timer11_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer12 slave port */
-static struct omap_hwmod_ocp_if *omap2420_timer12_slaves[] = {
-       &omap2420_l4_core__timer12,
-};
-
 /* timer12 hwmod */
 static struct omap_hwmod omap2420_timer12_hwmod = {
        .name           = "timer12",
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap2420_timer12_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_timer12_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* wd_timer2 */
-static struct omap_hwmod_ocp_if *omap2420_wd_timer2_slaves[] = {
-       &omap2420_l4_wkup__wd_timer2,
-};
-
 static struct omap_hwmod omap2420_wd_timer2_hwmod = {
        .name           = "wd_timer2",
        .class          = &omap2xxx_wd_timer_hwmod_class,
                        .idlest_idle_bit = OMAP24XX_ST_MPU_WDT_SHIFT,
                },
        },
-       .slaves         = omap2420_wd_timer2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_wd_timer2_slaves),
 };
 
 /* UART1 */
 
-static struct omap_hwmod_ocp_if *omap2420_uart1_slaves[] = {
-       &omap2_l4_core__uart1,
-};
-
 static struct omap_hwmod omap2420_uart1_hwmod = {
        .name           = "uart1",
        .mpu_irqs       = omap2_uart1_mpu_irqs,
                        .idlest_idle_bit = OMAP24XX_EN_UART1_SHIFT,
                },
        },
-       .slaves         = omap2420_uart1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_uart1_slaves),
        .class          = &omap2_uart_class,
 };
 
 /* UART2 */
 
-static struct omap_hwmod_ocp_if *omap2420_uart2_slaves[] = {
-       &omap2_l4_core__uart2,
-};
-
 static struct omap_hwmod omap2420_uart2_hwmod = {
        .name           = "uart2",
        .mpu_irqs       = omap2_uart2_mpu_irqs,
                        .idlest_idle_bit = OMAP24XX_EN_UART2_SHIFT,
                },
        },
-       .slaves         = omap2420_uart2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_uart2_slaves),
        .class          = &omap2_uart_class,
 };
 
 /* UART3 */
 
-static struct omap_hwmod_ocp_if *omap2420_uart3_slaves[] = {
-       &omap2_l4_core__uart3,
-};
-
 static struct omap_hwmod omap2420_uart3_hwmod = {
        .name           = "uart3",
        .mpu_irqs       = omap2_uart3_mpu_irqs,
                        .idlest_idle_bit = OMAP24XX_EN_UART3_SHIFT,
                },
        },
-       .slaves         = omap2420_uart3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_uart3_slaves),
        .class          = &omap2_uart_class,
 };
 
 /* dss */
-/* dss master ports */
-static struct omap_hwmod_ocp_if *omap2420_dss_masters[] = {
-       &omap2420_dss__l3,
-};
 
 /* l4_core -> dss */
 static struct omap_hwmod_ocp_if omap2420_l4_core__dss = {
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dss slave ports */
-static struct omap_hwmod_ocp_if *omap2420_dss_slaves[] = {
-       &omap2420_l4_core__dss,
-};
-
 static struct omap_hwmod_opt_clk dss_opt_clks[] = {
        /*
         * The DSS HW needs all DSS clocks enabled during reset. The dss_core
        },
        .opt_clks       = dss_opt_clks,
        .opt_clks_cnt = ARRAY_SIZE(dss_opt_clks),
-       .slaves         = omap2420_dss_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_dss_slaves),
-       .masters        = omap2420_dss_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2420_dss_masters),
        .flags          = HWMOD_NO_IDLEST | HWMOD_CONTROL_OPT_CLKS_IN_RESET,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dss_dispc slave ports */
-static struct omap_hwmod_ocp_if *omap2420_dss_dispc_slaves[] = {
-       &omap2420_l4_core__dss_dispc,
-};
-
 static struct omap_hwmod omap2420_dss_dispc_hwmod = {
        .name           = "dss_dispc",
        .class          = &omap2_dispc_hwmod_class,
                        .idlest_stdby_bit = OMAP24XX_ST_DSS_SHIFT,
                },
        },
-       .slaves         = omap2420_dss_dispc_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_dss_dispc_slaves),
        .flags          = HWMOD_NO_IDLEST,
        .dev_attr       = &omap2_3_dss_dispc_dev_attr
 };
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dss_rfbi slave ports */
-static struct omap_hwmod_ocp_if *omap2420_dss_rfbi_slaves[] = {
-       &omap2420_l4_core__dss_rfbi,
-};
-
 static struct omap_hwmod_opt_clk dss_rfbi_opt_clks[] = {
        { .role = "ick", .clk = "dss_ick" },
 };
        },
        .opt_clks       = dss_rfbi_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(dss_rfbi_opt_clks),
-       .slaves         = omap2420_dss_rfbi_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_dss_rfbi_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dss_venc slave ports */
-static struct omap_hwmod_ocp_if *omap2420_dss_venc_slaves[] = {
-       &omap2420_l4_core__dss_venc,
-};
-
 static struct omap_hwmod omap2420_dss_venc_hwmod = {
        .name           = "dss_venc",
        .class          = &omap2_venc_hwmod_class,
                        .module_offs = CORE_MOD,
                },
        },
-       .slaves         = omap2420_dss_venc_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_dss_venc_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
 
 /* I2C1 */
 
-static struct omap_hwmod_ocp_if *omap2420_i2c1_slaves[] = {
-       &omap2420_l4_core__i2c1,
-};
-
 static struct omap_hwmod omap2420_i2c1_hwmod = {
        .name           = "i2c1",
        .mpu_irqs       = omap2_i2c1_mpu_irqs,
                        .idlest_idle_bit = OMAP2420_ST_I2C1_SHIFT,
                },
        },
-       .slaves         = omap2420_i2c1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_i2c1_slaves),
        .class          = &i2c_class,
        .dev_attr       = &i2c_dev_attr,
        .flags          = HWMOD_16BIT_REG,
 
 /* I2C2 */
 
-static struct omap_hwmod_ocp_if *omap2420_i2c2_slaves[] = {
-       &omap2420_l4_core__i2c2,
-};
-
 static struct omap_hwmod omap2420_i2c2_hwmod = {
        .name           = "i2c2",
        .mpu_irqs       = omap2_i2c2_mpu_irqs,
                        .idlest_idle_bit = OMAP2420_ST_I2C2_SHIFT,
                },
        },
-       .slaves         = omap2420_i2c2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_i2c2_slaves),
        .class          = &i2c_class,
        .dev_attr       = &i2c_dev_attr,
        .flags          = HWMOD_16BIT_REG,
 };
 
 /* gpio1 */
-static struct omap_hwmod_ocp_if *omap2420_gpio1_slaves[] = {
-       &omap2420_l4_wkup__gpio1,
-};
-
 static struct omap_hwmod omap2420_gpio1_hwmod = {
        .name           = "gpio1",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP24XX_ST_GPIOS_SHIFT,
                },
        },
-       .slaves         = omap2420_gpio1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_gpio1_slaves),
        .class          = &omap2xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
 
 /* gpio2 */
-static struct omap_hwmod_ocp_if *omap2420_gpio2_slaves[] = {
-       &omap2420_l4_wkup__gpio2,
-};
-
 static struct omap_hwmod omap2420_gpio2_hwmod = {
        .name           = "gpio2",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP24XX_ST_GPIOS_SHIFT,
                },
        },
-       .slaves         = omap2420_gpio2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_gpio2_slaves),
        .class          = &omap2xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
 
 /* gpio3 */
-static struct omap_hwmod_ocp_if *omap2420_gpio3_slaves[] = {
-       &omap2420_l4_wkup__gpio3,
-};
-
 static struct omap_hwmod omap2420_gpio3_hwmod = {
        .name           = "gpio3",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP24XX_ST_GPIOS_SHIFT,
                },
        },
-       .slaves         = omap2420_gpio3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_gpio3_slaves),
        .class          = &omap2xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
 
 /* gpio4 */
-static struct omap_hwmod_ocp_if *omap2420_gpio4_slaves[] = {
-       &omap2420_l4_wkup__gpio4,
-};
-
 static struct omap_hwmod omap2420_gpio4_hwmod = {
        .name           = "gpio4",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP24XX_ST_GPIOS_SHIFT,
                },
        },
-       .slaves         = omap2420_gpio4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_gpio4_slaves),
        .class          = &omap2xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dma_system master ports */
-static struct omap_hwmod_ocp_if *omap2420_dma_system_masters[] = {
-       &omap2420_dma_system__l3,
-};
-
 /* l4_core -> dma_system */
 static struct omap_hwmod_ocp_if omap2420_l4_core__dma_system = {
        .master         = &omap2420_l4_core_hwmod,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dma_system slave ports */
-static struct omap_hwmod_ocp_if *omap2420_dma_system_slaves[] = {
-       &omap2420_l4_core__dma_system,
-};
-
 static struct omap_hwmod omap2420_dma_system_hwmod = {
        .name           = "dma",
        .class          = &omap2xxx_dma_hwmod_class,
        .mpu_irqs       = omap2_dma_system_irqs,
        .main_clk       = "core_l3_ck",
-       .slaves         = omap2420_dma_system_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_dma_system_slaves),
-       .masters        = omap2420_dma_system_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2420_dma_system_masters),
        .dev_attr       = &dma_dev_attr,
        .flags          = HWMOD_NO_IDLEST,
 };
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mailbox slave ports */
-static struct omap_hwmod_ocp_if *omap2420_mailbox_slaves[] = {
-       &omap2420_l4_core__mailbox,
-};
-
 static struct omap_hwmod omap2420_mailbox_hwmod = {
        .name           = "mailbox",
        .class          = &omap2xxx_mailbox_hwmod_class,
                        .idlest_idle_bit = OMAP24XX_ST_MAILBOXES_SHIFT,
                },
        },
-       .slaves         = omap2420_mailbox_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_mailbox_slaves),
 };
 
 /* mcspi1 */
-static struct omap_hwmod_ocp_if *omap2420_mcspi1_slaves[] = {
-       &omap2420_l4_core__mcspi1,
-};
-
 static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {
        .num_chipselect = 4,
 };
                        .idlest_idle_bit = OMAP24XX_ST_MCSPI1_SHIFT,
                },
        },
-       .slaves         = omap2420_mcspi1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_mcspi1_slaves),
        .class          = &omap2xxx_mcspi_class,
        .dev_attr       = &omap_mcspi1_dev_attr,
 };
 
 /* mcspi2 */
-static struct omap_hwmod_ocp_if *omap2420_mcspi2_slaves[] = {
-       &omap2420_l4_core__mcspi2,
-};
-
 static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {
        .num_chipselect = 2,
 };
                        .idlest_idle_bit = OMAP24XX_ST_MCSPI2_SHIFT,
                },
        },
-       .slaves         = omap2420_mcspi2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_mcspi2_slaves),
        .class          = &omap2xxx_mcspi_class,
        .dev_attr       = &omap_mcspi2_dev_attr,
 };
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcbsp1 slave ports */
-static struct omap_hwmod_ocp_if *omap2420_mcbsp1_slaves[] = {
-       &omap2420_l4_core__mcbsp1,
-};
-
 static struct omap_hwmod omap2420_mcbsp1_hwmod = {
        .name           = "mcbsp1",
        .class          = &omap2420_mcbsp_hwmod_class,
                        .idlest_idle_bit = OMAP24XX_ST_MCBSP1_SHIFT,
                },
        },
-       .slaves         = omap2420_mcbsp1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_mcbsp1_slaves),
 };
 
 /* mcbsp2 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcbsp2 slave ports */
-static struct omap_hwmod_ocp_if *omap2420_mcbsp2_slaves[] = {
-       &omap2420_l4_core__mcbsp2,
-};
-
 static struct omap_hwmod omap2420_mcbsp2_hwmod = {
        .name           = "mcbsp2",
        .class          = &omap2420_mcbsp_hwmod_class,
                        .idlest_idle_bit = OMAP24XX_ST_MCBSP2_SHIFT,
                },
        },
-       .slaves         = omap2420_mcbsp2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2420_mcbsp2_slaves),
-};
-
-static __initdata struct omap_hwmod *omap2420_hwmods[] = {
-       &omap2420_l3_main_hwmod,
-       &omap2420_l4_core_hwmod,
-       &omap2420_l4_wkup_hwmod,
-       &omap2420_mpu_hwmod,
-       &omap2420_iva_hwmod,
-
-       &omap2420_timer1_hwmod,
-       &omap2420_timer2_hwmod,
-       &omap2420_timer3_hwmod,
-       &omap2420_timer4_hwmod,
-       &omap2420_timer5_hwmod,
-       &omap2420_timer6_hwmod,
-       &omap2420_timer7_hwmod,
-       &omap2420_timer8_hwmod,
-       &omap2420_timer9_hwmod,
-       &omap2420_timer10_hwmod,
-       &omap2420_timer11_hwmod,
-       &omap2420_timer12_hwmod,
-
-       &omap2420_wd_timer2_hwmod,
-       &omap2420_uart1_hwmod,
-       &omap2420_uart2_hwmod,
-       &omap2420_uart3_hwmod,
-       /* dss class */
-       &omap2420_dss_core_hwmod,
-       &omap2420_dss_dispc_hwmod,
-       &omap2420_dss_rfbi_hwmod,
-       &omap2420_dss_venc_hwmod,
-       /* i2c class */
-       &omap2420_i2c1_hwmod,
-       &omap2420_i2c2_hwmod,
-
-       /* gpio class */
-       &omap2420_gpio1_hwmod,
-       &omap2420_gpio2_hwmod,
-       &omap2420_gpio3_hwmod,
-       &omap2420_gpio4_hwmod,
-
-       /* dma_system class*/
-       &omap2420_dma_system_hwmod,
-
-       /* mailbox class */
-       &omap2420_mailbox_hwmod,
-
-       /* mcbsp class */
-       &omap2420_mcbsp1_hwmod,
-       &omap2420_mcbsp2_hwmod,
-
-       /* mcspi class */
-       &omap2420_mcspi1_hwmod,
-       &omap2420_mcspi2_hwmod,
+};
+
+static struct omap_hwmod_ocp_if *omap2420_hwmod_ocp_ifs[] __initdata = {
+       &omap2420_l3_main__l4_core,
+       &omap2420_mpu__l3_main,
+       &omap2420_dss__l3,
+       &omap2420_l4_core__mcspi1,
+       &omap2420_l4_core__mcspi2,
+       &omap2420_l4_core__l4_wkup,
+       &omap2_l4_core__uart1,
+       &omap2_l4_core__uart2,
+       &omap2_l4_core__uart3,
+       &omap2420_l4_core__i2c1,
+       &omap2420_l4_core__i2c2,
+       &omap2420_l3__iva,
+       &omap2420_l4_wkup__timer1,
+       &omap2420_l4_core__timer2,
+       &omap2420_l4_core__timer3,
+       &omap2420_l4_core__timer4,
+       &omap2420_l4_core__timer5,
+       &omap2420_l4_core__timer6,
+       &omap2420_l4_core__timer7,
+       &omap2420_l4_core__timer8,
+       &omap2420_l4_core__timer9,
+       &omap2420_l4_core__timer10,
+       &omap2420_l4_core__timer11,
+       &omap2420_l4_core__timer12,
+       &omap2420_l4_wkup__wd_timer2,
+       &omap2420_l4_core__dss,
+       &omap2420_l4_core__dss_dispc,
+       &omap2420_l4_core__dss_rfbi,
+       &omap2420_l4_core__dss_venc,
+       &omap2420_l4_wkup__gpio1,
+       &omap2420_l4_wkup__gpio2,
+       &omap2420_l4_wkup__gpio3,
+       &omap2420_l4_wkup__gpio4,
+       &omap2420_dma_system__l3,
+       &omap2420_l4_core__dma_system,
+       &omap2420_l4_core__mailbox,
+       &omap2420_l4_core__mcbsp1,
+       &omap2420_l4_core__mcbsp2,
        NULL,
 };
 
 int __init omap2420_hwmod_init(void)
 {
-       return omap_hwmod_register(omap2420_hwmods);
+       return omap_hwmod_register_links(omap2420_hwmod_ocp_ifs);
 }
 
  * omap_hwmod_2430_data.c - hardware modules present on the OMAP2430 chips
  *
  * Copyright (C) 2009-2011 Nokia Corporation
+ * Copyright (C) 2012 Texas Instruments, Inc.
  * Paul Walmsley
  *
  * This program is free software; you can redistribute it and/or modify
        .user   = OCP_USER_MPU,
 };
 
-/* Slave interfaces on the L3 interconnect */
-static struct omap_hwmod_ocp_if *omap2430_l3_main_slaves[] = {
-       &omap2430_mpu__l3_main,
-};
-
 /* DSS -> l3 */
 static struct omap_hwmod_ocp_if omap2430_dss__l3 = {
        .master         = &omap2430_dss_core_hwmod,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* Master interfaces on the L3 interconnect */
-static struct omap_hwmod_ocp_if *omap2430_l3_main_masters[] = {
-       &omap2430_l3_main__l4_core,
-};
-
 /* L3 */
 static struct omap_hwmod omap2430_l3_main_hwmod = {
        .name           = "l3_main",
        .class          = &l3_hwmod_class,
-       .masters        = omap2430_l3_main_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2430_l3_main_masters),
-       .slaves         = omap2430_l3_main_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_l3_main_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
        .user           = OCP_USER_MPU,
 };
 
-static struct omap_hwmod_ocp_if *omap2430_usbhsotg_masters[] = {
-       &omap2430_usbhsotg__l3,
-};
-
-static struct omap_hwmod_ocp_if *omap2430_usbhsotg_slaves[] = {
-       &omap2430_l4_core__usbhsotg,
-};
-
 /* L4 CORE -> MMC1 interface */
 static struct omap_hwmod_ocp_if omap2430_l4_core__mmc1 = {
        .master         = &omap2430_l4_core_hwmod,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* Slave interfaces on the L4_CORE interconnect */
-static struct omap_hwmod_ocp_if *omap2430_l4_core_slaves[] = {
-       &omap2430_l3_main__l4_core,
-};
-
-/* Master interfaces on the L4_CORE interconnect */
-static struct omap_hwmod_ocp_if *omap2430_l4_core_masters[] = {
-       &omap2430_l4_core__l4_wkup,
-       &omap2430_l4_core__mmc1,
-       &omap2430_l4_core__mmc2,
-};
-
 /* L4 CORE */
 static struct omap_hwmod omap2430_l4_core_hwmod = {
        .name           = "l4_core",
        .class          = &l4_hwmod_class,
-       .masters        = omap2430_l4_core_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2430_l4_core_masters),
-       .slaves         = omap2430_l4_core_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_l4_core_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
-/* Slave interfaces on the L4_WKUP interconnect */
-static struct omap_hwmod_ocp_if *omap2430_l4_wkup_slaves[] = {
-       &omap2430_l4_core__l4_wkup,
-       &omap2_l4_core__uart1,
-       &omap2_l4_core__uart2,
-       &omap2_l4_core__uart3,
-};
-
-/* Master interfaces on the L4_WKUP interconnect */
-static struct omap_hwmod_ocp_if *omap2430_l4_wkup_masters[] = {
-};
-
 /* l4 core -> mcspi1 interface */
 static struct omap_hwmod_ocp_if omap2430_l4_core__mcspi1 = {
        .master         = &omap2430_l4_core_hwmod,
 static struct omap_hwmod omap2430_l4_wkup_hwmod = {
        .name           = "l4_wkup",
        .class          = &l4_hwmod_class,
-       .masters        = omap2430_l4_wkup_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2430_l4_wkup_masters),
-       .slaves         = omap2430_l4_wkup_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_l4_wkup_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
-/* Master interfaces on the MPU device */
-static struct omap_hwmod_ocp_if *omap2430_mpu_masters[] = {
-       &omap2430_mpu__l3_main,
-};
-
 /* MPU */
 static struct omap_hwmod omap2430_mpu_hwmod = {
        .name           = "mpu",
        .class          = &mpu_hwmod_class,
        .main_clk       = "mpu_ck",
-       .masters        = omap2430_mpu_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2430_mpu_masters),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-static struct omap_hwmod_ocp_if *omap2430_iva_masters[] = {
-       &omap2430_l3__iva,
-};
-
 /*
  * IVA2 (IVA2)
  */
 static struct omap_hwmod omap2430_iva_hwmod = {
        .name           = "iva",
        .class          = &iva_hwmod_class,
-       .masters        = omap2430_iva_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2430_iva_masters),
 };
 
 /* always-on timers dev attribute */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer1 slave port */
-static struct omap_hwmod_ocp_if *omap2430_timer1_slaves[] = {
-       &omap2430_l4_wkup__timer1,
-};
-
 /* timer1 hwmod */
 static struct omap_hwmod omap2430_timer1_hwmod = {
        .name           = "timer1",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2430_timer1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_timer1_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer2 slave port */
-static struct omap_hwmod_ocp_if *omap2430_timer2_slaves[] = {
-       &omap2430_l4_core__timer2,
-};
-
 /* timer2 hwmod */
 static struct omap_hwmod omap2430_timer2_hwmod = {
        .name           = "timer2",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2430_timer2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_timer2_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer3 slave port */
-static struct omap_hwmod_ocp_if *omap2430_timer3_slaves[] = {
-       &omap2430_l4_core__timer3,
-};
-
 /* timer3 hwmod */
 static struct omap_hwmod omap2430_timer3_hwmod = {
        .name           = "timer3",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2430_timer3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_timer3_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer4 slave port */
-static struct omap_hwmod_ocp_if *omap2430_timer4_slaves[] = {
-       &omap2430_l4_core__timer4,
-};
-
 /* timer4 hwmod */
 static struct omap_hwmod omap2430_timer4_hwmod = {
        .name           = "timer4",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2430_timer4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_timer4_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer5 slave port */
-static struct omap_hwmod_ocp_if *omap2430_timer5_slaves[] = {
-       &omap2430_l4_core__timer5,
-};
-
 /* timer5 hwmod */
 static struct omap_hwmod omap2430_timer5_hwmod = {
        .name           = "timer5",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2430_timer5_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_timer5_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer6 slave port */
-static struct omap_hwmod_ocp_if *omap2430_timer6_slaves[] = {
-       &omap2430_l4_core__timer6,
-};
-
 /* timer6 hwmod */
 static struct omap_hwmod omap2430_timer6_hwmod = {
        .name           = "timer6",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2430_timer6_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_timer6_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer7 slave port */
-static struct omap_hwmod_ocp_if *omap2430_timer7_slaves[] = {
-       &omap2430_l4_core__timer7,
-};
-
 /* timer7 hwmod */
 static struct omap_hwmod omap2430_timer7_hwmod = {
        .name           = "timer7",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2430_timer7_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_timer7_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer8 slave port */
-static struct omap_hwmod_ocp_if *omap2430_timer8_slaves[] = {
-       &omap2430_l4_core__timer8,
-};
-
 /* timer8 hwmod */
 static struct omap_hwmod omap2430_timer8_hwmod = {
        .name           = "timer8",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap2430_timer8_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_timer8_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer9 slave port */
-static struct omap_hwmod_ocp_if *omap2430_timer9_slaves[] = {
-       &omap2430_l4_core__timer9,
-};
-
 /* timer9 hwmod */
 static struct omap_hwmod omap2430_timer9_hwmod = {
        .name           = "timer9",
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap2430_timer9_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_timer9_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer10 slave port */
-static struct omap_hwmod_ocp_if *omap2430_timer10_slaves[] = {
-       &omap2430_l4_core__timer10,
-};
-
 /* timer10 hwmod */
 static struct omap_hwmod omap2430_timer10_hwmod = {
        .name           = "timer10",
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap2430_timer10_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_timer10_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer11 slave port */
-static struct omap_hwmod_ocp_if *omap2430_timer11_slaves[] = {
-       &omap2430_l4_core__timer11,
-};
-
 /* timer11 hwmod */
 static struct omap_hwmod omap2430_timer11_hwmod = {
        .name           = "timer11",
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap2430_timer11_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_timer11_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer12 slave port */
-static struct omap_hwmod_ocp_if *omap2430_timer12_slaves[] = {
-       &omap2430_l4_core__timer12,
-};
-
 /* timer12 hwmod */
 static struct omap_hwmod omap2430_timer12_hwmod = {
        .name           = "timer12",
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap2430_timer12_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_timer12_slaves),
        .class          = &omap2xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* wd_timer2 */
-static struct omap_hwmod_ocp_if *omap2430_wd_timer2_slaves[] = {
-       &omap2430_l4_wkup__wd_timer2,
-};
-
 static struct omap_hwmod omap2430_wd_timer2_hwmod = {
        .name           = "wd_timer2",
        .class          = &omap2xxx_wd_timer_hwmod_class,
                        .idlest_idle_bit = OMAP24XX_ST_MPU_WDT_SHIFT,
                },
        },
-       .slaves         = omap2430_wd_timer2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_wd_timer2_slaves),
 };
 
 /* UART1 */
-
-static struct omap_hwmod_ocp_if *omap2430_uart1_slaves[] = {
-       &omap2_l4_core__uart1,
-};
-
 static struct omap_hwmod omap2430_uart1_hwmod = {
        .name           = "uart1",
        .mpu_irqs       = omap2_uart1_mpu_irqs,
                        .idlest_idle_bit = OMAP24XX_EN_UART1_SHIFT,
                },
        },
-       .slaves         = omap2430_uart1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_uart1_slaves),
        .class          = &omap2_uart_class,
 };
 
 /* UART2 */
-
-static struct omap_hwmod_ocp_if *omap2430_uart2_slaves[] = {
-       &omap2_l4_core__uart2,
-};
-
 static struct omap_hwmod omap2430_uart2_hwmod = {
        .name           = "uart2",
        .mpu_irqs       = omap2_uart2_mpu_irqs,
                        .idlest_idle_bit = OMAP24XX_EN_UART2_SHIFT,
                },
        },
-       .slaves         = omap2430_uart2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_uart2_slaves),
        .class          = &omap2_uart_class,
 };
 
 /* UART3 */
 
-static struct omap_hwmod_ocp_if *omap2430_uart3_slaves[] = {
-       &omap2_l4_core__uart3,
-};
-
 static struct omap_hwmod omap2430_uart3_hwmod = {
        .name           = "uart3",
        .mpu_irqs       = omap2_uart3_mpu_irqs,
                        .idlest_idle_bit = OMAP24XX_EN_UART3_SHIFT,
                },
        },
-       .slaves         = omap2430_uart3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_uart3_slaves),
        .class          = &omap2_uart_class,
 };
 
 /* dss */
-/* dss master ports */
-static struct omap_hwmod_ocp_if *omap2430_dss_masters[] = {
-       &omap2430_dss__l3,
-};
 
 /* l4_core -> dss */
 static struct omap_hwmod_ocp_if omap2430_l4_core__dss = {
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dss slave ports */
-static struct omap_hwmod_ocp_if *omap2430_dss_slaves[] = {
-       &omap2430_l4_core__dss,
-};
-
 static struct omap_hwmod_opt_clk dss_opt_clks[] = {
        /*
         * The DSS HW needs all DSS clocks enabled during reset. The dss_core
        },
        .opt_clks       = dss_opt_clks,
        .opt_clks_cnt = ARRAY_SIZE(dss_opt_clks),
-       .slaves         = omap2430_dss_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_dss_slaves),
-       .masters        = omap2430_dss_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2430_dss_masters),
        .flags          = HWMOD_NO_IDLEST | HWMOD_CONTROL_OPT_CLKS_IN_RESET,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dss_dispc slave ports */
-static struct omap_hwmod_ocp_if *omap2430_dss_dispc_slaves[] = {
-       &omap2430_l4_core__dss_dispc,
-};
-
 static struct omap_hwmod omap2430_dss_dispc_hwmod = {
        .name           = "dss_dispc",
        .class          = &omap2_dispc_hwmod_class,
                        .idlest_stdby_bit = OMAP24XX_ST_DSS_SHIFT,
                },
        },
-       .slaves         = omap2430_dss_dispc_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_dss_dispc_slaves),
        .flags          = HWMOD_NO_IDLEST,
        .dev_attr       = &omap2_3_dss_dispc_dev_attr
 };
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dss_rfbi slave ports */
-static struct omap_hwmod_ocp_if *omap2430_dss_rfbi_slaves[] = {
-       &omap2430_l4_core__dss_rfbi,
-};
-
 static struct omap_hwmod_opt_clk dss_rfbi_opt_clks[] = {
        { .role = "ick", .clk = "dss_ick" },
 };
        },
        .opt_clks       = dss_rfbi_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(dss_rfbi_opt_clks),
-       .slaves         = omap2430_dss_rfbi_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_dss_rfbi_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dss_venc slave ports */
-static struct omap_hwmod_ocp_if *omap2430_dss_venc_slaves[] = {
-       &omap2430_l4_core__dss_venc,
-};
-
 static struct omap_hwmod omap2430_dss_venc_hwmod = {
        .name           = "dss_venc",
        .class          = &omap2_venc_hwmod_class,
                        .module_offs = CORE_MOD,
                },
        },
-       .slaves         = omap2430_dss_venc_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_dss_venc_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
 };
 
 /* I2C1 */
-
-static struct omap_hwmod_ocp_if *omap2430_i2c1_slaves[] = {
-       &omap2430_l4_core__i2c1,
-};
-
 static struct omap_hwmod omap2430_i2c1_hwmod = {
        .name           = "i2c1",
        .flags          = HWMOD_16BIT_REG,
                        .idlest_idle_bit = OMAP2430_ST_I2CHS1_SHIFT,
                },
        },
-       .slaves         = omap2430_i2c1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_i2c1_slaves),
        .class          = &i2c_class,
        .dev_attr       = &i2c_dev_attr,
 };
 
 /* I2C2 */
-
-static struct omap_hwmod_ocp_if *omap2430_i2c2_slaves[] = {
-       &omap2430_l4_core__i2c2,
-};
-
 static struct omap_hwmod omap2430_i2c2_hwmod = {
        .name           = "i2c2",
        .flags          = HWMOD_16BIT_REG,
                        .idlest_idle_bit = OMAP2430_ST_I2CHS2_SHIFT,
                },
        },
-       .slaves         = omap2430_i2c2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_i2c2_slaves),
        .class          = &i2c_class,
        .dev_attr       = &i2c_dev_attr,
 };
 };
 
 /* gpio1 */
-static struct omap_hwmod_ocp_if *omap2430_gpio1_slaves[] = {
-       &omap2430_l4_wkup__gpio1,
-};
-
 static struct omap_hwmod omap2430_gpio1_hwmod = {
        .name           = "gpio1",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP24XX_EN_GPIOS_SHIFT,
                },
        },
-       .slaves         = omap2430_gpio1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_gpio1_slaves),
        .class          = &omap2xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
 
 /* gpio2 */
-static struct omap_hwmod_ocp_if *omap2430_gpio2_slaves[] = {
-       &omap2430_l4_wkup__gpio2,
-};
-
 static struct omap_hwmod omap2430_gpio2_hwmod = {
        .name           = "gpio2",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP24XX_ST_GPIOS_SHIFT,
                },
        },
-       .slaves         = omap2430_gpio2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_gpio2_slaves),
        .class          = &omap2xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
 
 /* gpio3 */
-static struct omap_hwmod_ocp_if *omap2430_gpio3_slaves[] = {
-       &omap2430_l4_wkup__gpio3,
-};
-
 static struct omap_hwmod omap2430_gpio3_hwmod = {
        .name           = "gpio3",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP24XX_ST_GPIOS_SHIFT,
                },
        },
-       .slaves         = omap2430_gpio3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_gpio3_slaves),
        .class          = &omap2xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
 
 /* gpio4 */
-static struct omap_hwmod_ocp_if *omap2430_gpio4_slaves[] = {
-       &omap2430_l4_wkup__gpio4,
-};
-
 static struct omap_hwmod omap2430_gpio4_hwmod = {
        .name           = "gpio4",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP24XX_ST_GPIOS_SHIFT,
                },
        },
-       .slaves         = omap2430_gpio4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_gpio4_slaves),
        .class          = &omap2xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
        { .irq = -1 }
 };
 
-static struct omap_hwmod_ocp_if *omap2430_gpio5_slaves[] = {
-       &omap2430_l4_core__gpio5,
-};
-
 static struct omap_hwmod omap2430_gpio5_hwmod = {
        .name           = "gpio5",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP2430_ST_GPIO5_SHIFT,
                },
        },
-       .slaves         = omap2430_gpio5_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_gpio5_slaves),
        .class          = &omap2xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dma_system master ports */
-static struct omap_hwmod_ocp_if *omap2430_dma_system_masters[] = {
-       &omap2430_dma_system__l3,
-};
-
 /* l4_core -> dma_system */
 static struct omap_hwmod_ocp_if omap2430_l4_core__dma_system = {
        .master         = &omap2430_l4_core_hwmod,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dma_system slave ports */
-static struct omap_hwmod_ocp_if *omap2430_dma_system_slaves[] = {
-       &omap2430_l4_core__dma_system,
-};
-
 static struct omap_hwmod omap2430_dma_system_hwmod = {
        .name           = "dma",
        .class          = &omap2xxx_dma_hwmod_class,
        .mpu_irqs       = omap2_dma_system_irqs,
        .main_clk       = "core_l3_ck",
-       .slaves         = omap2430_dma_system_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_dma_system_slaves),
-       .masters        = omap2430_dma_system_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2430_dma_system_masters),
        .dev_attr       = &dma_dev_attr,
        .flags          = HWMOD_NO_IDLEST,
 };
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mailbox slave ports */
-static struct omap_hwmod_ocp_if *omap2430_mailbox_slaves[] = {
-       &omap2430_l4_core__mailbox,
-};
-
 static struct omap_hwmod omap2430_mailbox_hwmod = {
        .name           = "mailbox",
        .class          = &omap2xxx_mailbox_hwmod_class,
                        .idlest_idle_bit = OMAP24XX_ST_MAILBOXES_SHIFT,
                },
        },
-       .slaves         = omap2430_mailbox_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_mailbox_slaves),
 };
 
 /* mcspi1 */
-static struct omap_hwmod_ocp_if *omap2430_mcspi1_slaves[] = {
-       &omap2430_l4_core__mcspi1,
-};
-
 static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {
        .num_chipselect = 4,
 };
                        .idlest_idle_bit = OMAP24XX_ST_MCSPI1_SHIFT,
                },
        },
-       .slaves         = omap2430_mcspi1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_mcspi1_slaves),
        .class          = &omap2xxx_mcspi_class,
        .dev_attr       = &omap_mcspi1_dev_attr,
 };
 
 /* mcspi2 */
-static struct omap_hwmod_ocp_if *omap2430_mcspi2_slaves[] = {
-       &omap2430_l4_core__mcspi2,
-};
-
 static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {
        .num_chipselect = 2,
 };
                        .idlest_idle_bit = OMAP24XX_ST_MCSPI2_SHIFT,
                },
        },
-       .slaves         = omap2430_mcspi2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_mcspi2_slaves),
        .class          = &omap2xxx_mcspi_class,
        .dev_attr       = &omap_mcspi2_dev_attr,
 };
        { .dma_req = -1 }
 };
 
-static struct omap_hwmod_ocp_if *omap2430_mcspi3_slaves[] = {
-       &omap2430_l4_core__mcspi3,
-};
-
 static struct omap2_mcspi_dev_attr omap_mcspi3_dev_attr = {
        .num_chipselect = 2,
 };
                        .idlest_idle_bit = OMAP2430_ST_MCSPI3_SHIFT,
                },
        },
-       .slaves         = omap2430_mcspi3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_mcspi3_slaves),
        .class          = &omap2xxx_mcspi_class,
        .dev_attr       = &omap_mcspi3_dev_attr,
 };
                        .idlest_idle_bit = OMAP2430_ST_USBHS_SHIFT,
                },
        },
-       .masters        = omap2430_usbhsotg_masters,
-       .masters_cnt    = ARRAY_SIZE(omap2430_usbhsotg_masters),
-       .slaves         = omap2430_usbhsotg_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_usbhsotg_slaves),
        .class          = &usbotg_class,
        /*
         * Erratum ID: i479  idle_req / idle_ack mechanism potentially
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcbsp1 slave ports */
-static struct omap_hwmod_ocp_if *omap2430_mcbsp1_slaves[] = {
-       &omap2430_l4_core__mcbsp1,
-};
-
 static struct omap_hwmod omap2430_mcbsp1_hwmod = {
        .name           = "mcbsp1",
        .class          = &omap2430_mcbsp_hwmod_class,
                        .idlest_idle_bit = OMAP24XX_ST_MCBSP1_SHIFT,
                },
        },
-       .slaves         = omap2430_mcbsp1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_mcbsp1_slaves),
 };
 
 /* mcbsp2 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcbsp2 slave ports */
-static struct omap_hwmod_ocp_if *omap2430_mcbsp2_slaves[] = {
-       &omap2430_l4_core__mcbsp2,
-};
-
 static struct omap_hwmod omap2430_mcbsp2_hwmod = {
        .name           = "mcbsp2",
        .class          = &omap2430_mcbsp_hwmod_class,
                        .idlest_idle_bit = OMAP24XX_ST_MCBSP2_SHIFT,
                },
        },
-       .slaves         = omap2430_mcbsp2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_mcbsp2_slaves),
 };
 
 /* mcbsp3 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcbsp3 slave ports */
-static struct omap_hwmod_ocp_if *omap2430_mcbsp3_slaves[] = {
-       &omap2430_l4_core__mcbsp3,
-};
-
 static struct omap_hwmod omap2430_mcbsp3_hwmod = {
        .name           = "mcbsp3",
        .class          = &omap2430_mcbsp_hwmod_class,
                        .idlest_idle_bit = OMAP2430_ST_MCBSP3_SHIFT,
                },
        },
-       .slaves         = omap2430_mcbsp3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_mcbsp3_slaves),
 };
 
 /* mcbsp4 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcbsp4 slave ports */
-static struct omap_hwmod_ocp_if *omap2430_mcbsp4_slaves[] = {
-       &omap2430_l4_core__mcbsp4,
-};
-
 static struct omap_hwmod omap2430_mcbsp4_hwmod = {
        .name           = "mcbsp4",
        .class          = &omap2430_mcbsp_hwmod_class,
                        .idlest_idle_bit = OMAP2430_ST_MCBSP4_SHIFT,
                },
        },
-       .slaves         = omap2430_mcbsp4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_mcbsp4_slaves),
 };
 
 /* mcbsp5 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcbsp5 slave ports */
-static struct omap_hwmod_ocp_if *omap2430_mcbsp5_slaves[] = {
-       &omap2430_l4_core__mcbsp5,
-};
-
 static struct omap_hwmod omap2430_mcbsp5_hwmod = {
        .name           = "mcbsp5",
        .class          = &omap2430_mcbsp_hwmod_class,
                        .idlest_idle_bit = OMAP2430_ST_MCBSP5_SHIFT,
                },
        },
-       .slaves         = omap2430_mcbsp5_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_mcbsp5_slaves),
 };
 
 /* MMC/SD/SDIO common */
        { .role = "dbck", .clk = "mmchsdb1_fck" },
 };
 
-static struct omap_hwmod_ocp_if *omap2430_mmc1_slaves[] = {
-       &omap2430_l4_core__mmc1,
-};
-
 static struct omap_mmc_dev_attr mmc1_dev_attr = {
        .flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT,
 };
                },
        },
        .dev_attr       = &mmc1_dev_attr,
-       .slaves         = omap2430_mmc1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_mmc1_slaves),
        .class          = &omap2430_mmc_class,
 };
 
        { .role = "dbck", .clk = "mmchsdb2_fck" },
 };
 
-static struct omap_hwmod_ocp_if *omap2430_mmc2_slaves[] = {
-       &omap2430_l4_core__mmc2,
-};
-
 static struct omap_hwmod omap2430_mmc2_hwmod = {
        .name           = "mmc2",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP2430_ST_MMCHS2_SHIFT,
                },
        },
-       .slaves         = omap2430_mmc2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap2430_mmc2_slaves),
        .class          = &omap2430_mmc_class,
 };
 
-static __initdata struct omap_hwmod *omap2430_hwmods[] = {
-       &omap2430_l3_main_hwmod,
-       &omap2430_l4_core_hwmod,
-       &omap2430_l4_wkup_hwmod,
-       &omap2430_mpu_hwmod,
-       &omap2430_iva_hwmod,
-
-       &omap2430_timer1_hwmod,
-       &omap2430_timer2_hwmod,
-       &omap2430_timer3_hwmod,
-       &omap2430_timer4_hwmod,
-       &omap2430_timer5_hwmod,
-       &omap2430_timer6_hwmod,
-       &omap2430_timer7_hwmod,
-       &omap2430_timer8_hwmod,
-       &omap2430_timer9_hwmod,
-       &omap2430_timer10_hwmod,
-       &omap2430_timer11_hwmod,
-       &omap2430_timer12_hwmod,
-
-       &omap2430_wd_timer2_hwmod,
-       &omap2430_uart1_hwmod,
-       &omap2430_uart2_hwmod,
-       &omap2430_uart3_hwmod,
-       /* dss class */
-       &omap2430_dss_core_hwmod,
-       &omap2430_dss_dispc_hwmod,
-       &omap2430_dss_rfbi_hwmod,
-       &omap2430_dss_venc_hwmod,
-       /* i2c class */
-       &omap2430_i2c1_hwmod,
-       &omap2430_i2c2_hwmod,
-       &omap2430_mmc1_hwmod,
-       &omap2430_mmc2_hwmod,
-
-       /* gpio class */
-       &omap2430_gpio1_hwmod,
-       &omap2430_gpio2_hwmod,
-       &omap2430_gpio3_hwmod,
-       &omap2430_gpio4_hwmod,
-       &omap2430_gpio5_hwmod,
-
-       /* dma_system class*/
-       &omap2430_dma_system_hwmod,
-
-       /* mcbsp class */
-       &omap2430_mcbsp1_hwmod,
-       &omap2430_mcbsp2_hwmod,
-       &omap2430_mcbsp3_hwmod,
-       &omap2430_mcbsp4_hwmod,
-       &omap2430_mcbsp5_hwmod,
-
-       /* mailbox class */
-       &omap2430_mailbox_hwmod,
-
-       /* mcspi class */
-       &omap2430_mcspi1_hwmod,
-       &omap2430_mcspi2_hwmod,
-       &omap2430_mcspi3_hwmod,
-
-       /* usbotg class*/
-       &omap2430_usbhsotg_hwmod,
-
+static struct omap_hwmod_ocp_if *omap2430_hwmod_ocp_ifs[] __initdata = {
+       &omap2430_l3_main__l4_core,
+       &omap2430_mpu__l3_main,
+       &omap2430_dss__l3,
+       &omap2430_usbhsotg__l3,
+       &omap2430_l4_core__i2c1,
+       &omap2430_l4_core__i2c2,
+       &omap2430_l4_core__l4_wkup,
+       &omap2_l4_core__uart1,
+       &omap2_l4_core__uart2,
+       &omap2_l4_core__uart3,
+       &omap2430_l4_core__usbhsotg,
+       &omap2430_l4_core__mmc1,
+       &omap2430_l4_core__mmc2,
+       &omap2430_l4_core__mcspi1,
+       &omap2430_l4_core__mcspi2,
+       &omap2430_l4_core__mcspi3,
+       &omap2430_l3__iva,
+       &omap2430_l4_wkup__timer1,
+       &omap2430_l4_core__timer2,
+       &omap2430_l4_core__timer3,
+       &omap2430_l4_core__timer4,
+       &omap2430_l4_core__timer5,
+       &omap2430_l4_core__timer6,
+       &omap2430_l4_core__timer7,
+       &omap2430_l4_core__timer8,
+       &omap2430_l4_core__timer9,
+       &omap2430_l4_core__timer10,
+       &omap2430_l4_core__timer11,
+       &omap2430_l4_core__timer12,
+       &omap2430_l4_wkup__wd_timer2,
+       &omap2430_l4_core__dss,
+       &omap2430_l4_core__dss_dispc,
+       &omap2430_l4_core__dss_rfbi,
+       &omap2430_l4_core__dss_venc,
+       &omap2430_l4_wkup__gpio1,
+       &omap2430_l4_wkup__gpio2,
+       &omap2430_l4_wkup__gpio3,
+       &omap2430_l4_wkup__gpio4,
+       &omap2430_l4_core__gpio5,
+       &omap2430_dma_system__l3,
+       &omap2430_l4_core__dma_system,
+       &omap2430_l4_core__mailbox,
+       &omap2430_l4_core__mcbsp1,
+       &omap2430_l4_core__mcbsp2,
+       &omap2430_l4_core__mcbsp3,
+       &omap2430_l4_core__mcbsp4,
+       &omap2430_l4_core__mcbsp5,
        NULL,
 };
 
 int __init omap2430_hwmod_init(void)
 {
-       return omap_hwmod_register(omap2430_hwmods);
+       return omap_hwmod_register_links(omap2430_hwmod_ocp_ifs);
 }
 
  * omap_hwmod_3xxx_data.c - hardware modules present on the OMAP3xxx chips
  *
  * Copyright (C) 2009-2011 Nokia Corporation
+ * Copyright (C) 2012 Texas Instruments, Inc.
  * Paul Walmsley
  *
  * This program is free software; you can redistribute it and/or modify
        .user   = OCP_USER_MPU,
 };
 
-/* Slave interfaces on the L3 interconnect */
-static struct omap_hwmod_ocp_if *omap3xxx_l3_main_slaves[] = {
-       &omap3xxx_mpu__l3_main,
-};
-
 /* DSS -> l3 */
 static struct omap_hwmod_ocp_if omap3430es1_dss__l3 = {
        .master         = &omap3430es1_dss_core_hwmod,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* Master interfaces on the L3 interconnect */
-static struct omap_hwmod_ocp_if *omap3xxx_l3_main_masters[] = {
-       &omap3xxx_l3_main__l4_core,
-       &omap3xxx_l3_main__l4_per,
-};
-
 /* L3 */
 static struct omap_hwmod omap3xxx_l3_main_hwmod = {
        .name           = "l3_main",
        .class          = &l3_hwmod_class,
        .mpu_irqs       = omap3xxx_l3_main_irqs,
-       .masters        = omap3xxx_l3_main_masters,
-       .masters_cnt    = ARRAY_SIZE(omap3xxx_l3_main_masters),
-       .slaves         = omap3xxx_l3_main_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_l3_main_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
 static struct omap_hwmod omap3xxx_uart1_hwmod;
 static struct omap_hwmod omap3xxx_uart2_hwmod;
 static struct omap_hwmod omap3xxx_uart3_hwmod;
-static struct omap_hwmod omap3xxx_uart4_hwmod;
+static struct omap_hwmod omap36xx_uart4_hwmod;
 static struct omap_hwmod am35xx_uart4_hwmod;
 static struct omap_hwmod omap3xxx_usbhsotg_hwmod;
 
 };
 
 /* L4 PER -> UART4 interface */
-static struct omap_hwmod_addr_space omap3xxx_uart4_addr_space[] = {
+static struct omap_hwmod_addr_space omap36xx_uart4_addr_space[] = {
        {
                .pa_start       = OMAP3_UART4_BASE,
                .pa_end         = OMAP3_UART4_BASE + SZ_1K - 1,
        { }
 };
 
-static struct omap_hwmod_ocp_if omap3_l4_per__uart4 = {
+static struct omap_hwmod_ocp_if omap36xx_l4_per__uart4 = {
        .master         = &omap3xxx_l4_per_hwmod,
-       .slave          = &omap3xxx_uart4_hwmod,
+       .slave          = &omap36xx_uart4_hwmod,
        .clk            = "uart4_ick",
-       .addr           = omap3xxx_uart4_addr_space,
+       .addr           = omap36xx_uart4_addr_space,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
 /* AM35xx: L4 CORE -> UART4 interface */
 static struct omap_hwmod_addr_space am35xx_uart4_addr_space[] = {
        {
-               .pa_start       = OMAP3_UART4_AM35XX_BASE,
-               .pa_end         = OMAP3_UART4_AM35XX_BASE + SZ_1K - 1,
-               .flags          = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
+               .pa_start       = OMAP3_UART4_AM35XX_BASE,
+               .pa_end         = OMAP3_UART4_AM35XX_BASE + SZ_1K - 1,
+               .flags          = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
        },
 };
 
 static struct omap_hwmod_ocp_if am35xx_l4_core__uart4 = {
-       .master         = &omap3xxx_l4_core_hwmod,
-       .slave          = &am35xx_uart4_hwmod,
-       .clk            = "uart4_ick",
-       .addr           = am35xx_uart4_addr_space,
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+       .master         = &omap3xxx_l4_core_hwmod,
+       .slave          = &am35xx_uart4_hwmod,
+       .clk            = "uart4_ick",
+       .addr           = am35xx_uart4_addr_space,
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
 /* L4 CORE -> I2C1 interface */
        .user           = OCP_USER_MPU,
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_usbhsotg_masters[] = {
-       &omap3xxx_usbhsotg__l3,
-};
-
-static struct omap_hwmod_ocp_if *omap3xxx_usbhsotg_slaves[] = {
-       &omap3xxx_l4_core__usbhsotg,
-};
-
 static struct omap_hwmod_addr_space am35xx_usbhsotg_addrs[] = {
        {
                .pa_start       = AM35XX_IPSS_USBOTGSS_BASE,
        .user           = OCP_USER_MPU,
 };
 
-static struct omap_hwmod_ocp_if *am35xx_usbhsotg_masters[] = {
-       &am35xx_usbhsotg__l3,
-};
-
-static struct omap_hwmod_ocp_if *am35xx_usbhsotg_slaves[] = {
-       &am35xx_l4_core__usbhsotg,
-};
-/* Slave interfaces on the L4_CORE interconnect */
-static struct omap_hwmod_ocp_if *omap3xxx_l4_core_slaves[] = {
-       &omap3xxx_l3_main__l4_core,
-};
-
 /* L4 CORE */
 static struct omap_hwmod omap3xxx_l4_core_hwmod = {
        .name           = "l4_core",
        .class          = &l4_hwmod_class,
-       .slaves         = omap3xxx_l4_core_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_l4_core_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
-/* Slave interfaces on the L4_PER interconnect */
-static struct omap_hwmod_ocp_if *omap3xxx_l4_per_slaves[] = {
-       &omap3xxx_l3_main__l4_per,
-};
-
 /* L4 PER */
 static struct omap_hwmod omap3xxx_l4_per_hwmod = {
        .name           = "l4_per",
        .class          = &l4_hwmod_class,
-       .slaves         = omap3xxx_l4_per_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_l4_per_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
        .user   = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* Slave interfaces on the L4_WKUP interconnect */
-static struct omap_hwmod_ocp_if *omap3xxx_l4_wkup_slaves[] = {
-       &omap3xxx_l4_core__l4_wkup,
-};
-
 /* L4 WKUP */
 static struct omap_hwmod omap3xxx_l4_wkup_hwmod = {
        .name           = "l4_wkup",
        .class          = &l4_hwmod_class,
-       .slaves         = omap3xxx_l4_wkup_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_l4_wkup_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
-/* Slave interfaces on the L4_SEC interconnect */
-static struct omap_hwmod_ocp_if *omap3xxx_l4_sec_slaves[] = {
-       &omap3xxx_l4_wkup__l4_sec,
-};
-
 /* L4 SEC */
 static struct omap_hwmod omap3xxx_l4_sec_hwmod = {
        .name           = "l4_sec",
        .class          = &l4_hwmod_class,
-       .slaves         = omap3xxx_l4_sec_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_l4_sec_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
-/* Master interfaces on the MPU device */
-static struct omap_hwmod_ocp_if *omap3xxx_mpu_masters[] = {
-       &omap3xxx_mpu__l3_main,
-};
-
 /* MPU */
 static struct omap_hwmod omap3xxx_mpu_hwmod = {
        .name           = "mpu",
        .class          = &mpu_hwmod_class,
        .main_clk       = "arm_fck",
-       .masters        = omap3xxx_mpu_masters,
-       .masters_cnt    = ARRAY_SIZE(omap3xxx_mpu_masters),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_iva_masters[] = {
-       &omap3xxx_l3__iva,
-};
-
 /*
  * IVA2 (IVA2)
  */
 static struct omap_hwmod omap3xxx_iva_hwmod = {
        .name           = "iva",
        .class          = &iva_hwmod_class,
-       .masters        = omap3xxx_iva_masters,
-       .masters_cnt    = ARRAY_SIZE(omap3xxx_iva_masters),
 };
 
 /* timer class */
 
 /* secure timers dev attribute */
 static struct omap_timer_capability_dev_attr capability_secure_dev_attr = {
-       .timer_capability       = OMAP_TIMER_SECURE,
+       .timer_capability       = OMAP_TIMER_SECURE,
 };
 
 /* always-on timers dev attribute */
 static struct omap_timer_capability_dev_attr capability_alwon_dev_attr = {
-       .timer_capability       = OMAP_TIMER_ALWON,
+       .timer_capability       = OMAP_TIMER_ALWON,
 };
 
 /* pwm timers dev attribute */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer1 slave port */
-static struct omap_hwmod_ocp_if *omap3xxx_timer1_slaves[] = {
-       &omap3xxx_l4_wkup__timer1,
-};
-
 /* timer1 hwmod */
 static struct omap_hwmod omap3xxx_timer1_hwmod = {
        .name           = "timer1",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap3xxx_timer1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_timer1_slaves),
        .class          = &omap3xxx_timer_1ms_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer2 slave port */
-static struct omap_hwmod_ocp_if *omap3xxx_timer2_slaves[] = {
-       &omap3xxx_l4_per__timer2,
-};
-
 /* timer2 hwmod */
 static struct omap_hwmod omap3xxx_timer2_hwmod = {
        .name           = "timer2",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap3xxx_timer2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_timer2_slaves),
        .class          = &omap3xxx_timer_1ms_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer3 slave port */
-static struct omap_hwmod_ocp_if *omap3xxx_timer3_slaves[] = {
-       &omap3xxx_l4_per__timer3,
-};
-
 /* timer3 hwmod */
 static struct omap_hwmod omap3xxx_timer3_hwmod = {
        .name           = "timer3",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap3xxx_timer3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_timer3_slaves),
        .class          = &omap3xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer4 slave port */
-static struct omap_hwmod_ocp_if *omap3xxx_timer4_slaves[] = {
-       &omap3xxx_l4_per__timer4,
-};
-
 /* timer4 hwmod */
 static struct omap_hwmod omap3xxx_timer4_hwmod = {
        .name           = "timer4",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap3xxx_timer4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_timer4_slaves),
        .class          = &omap3xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer5 slave port */
-static struct omap_hwmod_ocp_if *omap3xxx_timer5_slaves[] = {
-       &omap3xxx_l4_per__timer5,
-};
-
 /* timer5 hwmod */
 static struct omap_hwmod omap3xxx_timer5_hwmod = {
        .name           = "timer5",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap3xxx_timer5_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_timer5_slaves),
        .class          = &omap3xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer6 slave port */
-static struct omap_hwmod_ocp_if *omap3xxx_timer6_slaves[] = {
-       &omap3xxx_l4_per__timer6,
-};
-
 /* timer6 hwmod */
 static struct omap_hwmod omap3xxx_timer6_hwmod = {
        .name           = "timer6",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap3xxx_timer6_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_timer6_slaves),
        .class          = &omap3xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer7 slave port */
-static struct omap_hwmod_ocp_if *omap3xxx_timer7_slaves[] = {
-       &omap3xxx_l4_per__timer7,
-};
-
 /* timer7 hwmod */
 static struct omap_hwmod omap3xxx_timer7_hwmod = {
        .name           = "timer7",
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap3xxx_timer7_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_timer7_slaves),
        .class          = &omap3xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer8 slave port */
-static struct omap_hwmod_ocp_if *omap3xxx_timer8_slaves[] = {
-       &omap3xxx_l4_per__timer8,
-};
-
 /* timer8 hwmod */
 static struct omap_hwmod omap3xxx_timer8_hwmod = {
        .name           = "timer8",
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap3xxx_timer8_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_timer8_slaves),
        .class          = &omap3xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer9 slave port */
-static struct omap_hwmod_ocp_if *omap3xxx_timer9_slaves[] = {
-       &omap3xxx_l4_per__timer9,
-};
-
 /* timer9 hwmod */
 static struct omap_hwmod omap3xxx_timer9_hwmod = {
        .name           = "timer9",
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap3xxx_timer9_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_timer9_slaves),
        .class          = &omap3xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer10 slave port */
-static struct omap_hwmod_ocp_if *omap3xxx_timer10_slaves[] = {
-       &omap3xxx_l4_core__timer10,
-};
-
 /* timer10 hwmod */
 static struct omap_hwmod omap3xxx_timer10_hwmod = {
        .name           = "timer10",
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap3xxx_timer10_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_timer10_slaves),
        .class          = &omap3xxx_timer_1ms_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer11 slave port */
-static struct omap_hwmod_ocp_if *omap3xxx_timer11_slaves[] = {
-       &omap3xxx_l4_core__timer11,
-};
-
 /* timer11 hwmod */
 static struct omap_hwmod omap3xxx_timer11_hwmod = {
        .name           = "timer11",
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap3xxx_timer11_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_timer11_slaves),
        .class          = &omap3xxx_timer_hwmod_class,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer12 slave port */
-static struct omap_hwmod_ocp_if *omap3xxx_timer12_slaves[] = {
-       &omap3xxx_l4_sec__timer12,
-};
-
 /* timer12 hwmod */
 static struct omap_hwmod omap3xxx_timer12_hwmod = {
        .name           = "timer12",
                },
        },
        .dev_attr       = &capability_secure_dev_attr,
-       .slaves         = omap3xxx_timer12_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_timer12_slaves),
        .class          = &omap3xxx_timer_hwmod_class,
 };
 
        .pre_shutdown   = &omap2_wd_timer_disable
 };
 
-/* wd_timer2 */
-static struct omap_hwmod_ocp_if *omap3xxx_wd_timer2_slaves[] = {
-       &omap3xxx_l4_wkup__wd_timer2,
-};
-
 static struct omap_hwmod omap3xxx_wd_timer2_hwmod = {
        .name           = "wd_timer2",
        .class          = &omap3xxx_wd_timer_hwmod_class,
                        .idlest_idle_bit = OMAP3430_ST_WDT2_SHIFT,
                },
        },
-       .slaves         = omap3xxx_wd_timer2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_wd_timer2_slaves),
        /*
         * XXX: Use software supervised mode, HW supervised smartidle seems to
         * block CORE power domain idle transitions. Maybe a HW bug in wdt2?
 };
 
 /* UART1 */
-
-static struct omap_hwmod_ocp_if *omap3xxx_uart1_slaves[] = {
-       &omap3_l4_core__uart1,
-};
-
 static struct omap_hwmod omap3xxx_uart1_hwmod = {
        .name           = "uart1",
        .mpu_irqs       = omap2_uart1_mpu_irqs,
                        .idlest_idle_bit = OMAP3430_EN_UART1_SHIFT,
                },
        },
-       .slaves         = omap3xxx_uart1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_uart1_slaves),
        .class          = &omap2_uart_class,
 };
 
 /* UART2 */
-
-static struct omap_hwmod_ocp_if *omap3xxx_uart2_slaves[] = {
-       &omap3_l4_core__uart2,
-};
-
 static struct omap_hwmod omap3xxx_uart2_hwmod = {
        .name           = "uart2",
        .mpu_irqs       = omap2_uart2_mpu_irqs,
                        .idlest_idle_bit = OMAP3430_EN_UART2_SHIFT,
                },
        },
-       .slaves         = omap3xxx_uart2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_uart2_slaves),
        .class          = &omap2_uart_class,
 };
 
 /* UART3 */
-
-static struct omap_hwmod_ocp_if *omap3xxx_uart3_slaves[] = {
-       &omap3_l4_per__uart3,
-};
-
 static struct omap_hwmod omap3xxx_uart3_hwmod = {
        .name           = "uart3",
        .mpu_irqs       = omap2_uart3_mpu_irqs,
                        .idlest_idle_bit = OMAP3430_EN_UART3_SHIFT,
                },
        },
-       .slaves         = omap3xxx_uart3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_uart3_slaves),
        .class          = &omap2_uart_class,
 };
 
        { .dma_req = -1 }
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_uart4_slaves[] = {
-       &omap3_l4_per__uart4,
-};
-
-static struct omap_hwmod omap3xxx_uart4_hwmod = {
+static struct omap_hwmod omap36xx_uart4_hwmod = {
        .name           = "uart4",
        .mpu_irqs       = uart4_mpu_irqs,
        .sdma_reqs      = uart4_sdma_reqs,
                        .idlest_idle_bit = OMAP3630_EN_UART4_SHIFT,
                },
        },
-       .slaves         = omap3xxx_uart4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_uart4_slaves),
        .class          = &omap2_uart_class,
 };
 
        { .name = "tx", .dma_req = AM35XX_DMA_UART4_TX, },
 };
 
-static struct omap_hwmod_ocp_if *am35xx_uart4_slaves[] = {
-       &am35xx_l4_core__uart4,
-};
-
 static struct omap_hwmod am35xx_uart4_hwmod = {
-       .name           = "uart4",
-       .mpu_irqs       = am35xx_uart4_mpu_irqs,
-       .sdma_reqs      = am35xx_uart4_sdma_reqs,
-       .main_clk       = "uart4_fck",
-       .prcm           = {
+       .name           = "uart4",
+       .mpu_irqs       = am35xx_uart4_mpu_irqs,
+       .sdma_reqs      = am35xx_uart4_sdma_reqs,
+       .main_clk       = "uart4_fck",
+       .prcm           = {
                .omap2 = {
                        .module_offs = CORE_MOD,
                        .prcm_reg_id = 1,
                        .idlest_idle_bit = OMAP3430_EN_UART4_SHIFT,
                },
        },
-       .slaves         = am35xx_uart4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(am35xx_uart4_slaves),
-       .class          = &omap2_uart_class,
+       .class          = &omap2_uart_class,
 };
 
 
 };
 
 /* dss */
-/* dss master ports */
-static struct omap_hwmod_ocp_if *omap3xxx_dss_masters[] = {
-       &omap3xxx_dss__l3,
-       &omap3430es1_dss__l3,
-};
 
 /* l4_core -> dss */
 static struct omap_hwmod_ocp_if omap3430es1_l4_core__dss = {
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dss slave ports */
-static struct omap_hwmod_ocp_if *omap3430es1_dss_slaves[] = {
-       &omap3430es1_l4_core__dss,
-};
-
-static struct omap_hwmod_ocp_if *omap3xxx_dss_slaves[] = {
-       &omap3xxx_l4_core__dss,
-};
-
 static struct omap_hwmod_opt_clk dss_opt_clks[] = {
        /*
         * The DSS HW needs all DSS clocks enabled during reset. The dss_core
        },
        .opt_clks       = dss_opt_clks,
        .opt_clks_cnt = ARRAY_SIZE(dss_opt_clks),
-       .slaves         = omap3430es1_dss_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3430es1_dss_slaves),
-       .masters        = omap3xxx_dss_masters,
-       .masters_cnt    = ARRAY_SIZE(omap3xxx_dss_masters),
        .flags          = HWMOD_NO_IDLEST | HWMOD_CONTROL_OPT_CLKS_IN_RESET,
 };
 
        },
        .opt_clks       = dss_opt_clks,
        .opt_clks_cnt = ARRAY_SIZE(dss_opt_clks),
-       .slaves         = omap3xxx_dss_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_dss_slaves),
-       .masters        = omap3xxx_dss_masters,
-       .masters_cnt    = ARRAY_SIZE(omap3xxx_dss_masters),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dss_dispc slave ports */
-static struct omap_hwmod_ocp_if *omap3xxx_dss_dispc_slaves[] = {
-       &omap3xxx_l4_core__dss_dispc,
-};
-
 static struct omap_hwmod omap3xxx_dss_dispc_hwmod = {
        .name           = "dss_dispc",
        .class          = &omap3_dispc_hwmod_class,
                        .module_offs = OMAP3430_DSS_MOD,
                },
        },
-       .slaves         = omap3xxx_dss_dispc_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_dss_dispc_slaves),
        .flags          = HWMOD_NO_IDLEST,
        .dev_attr       = &omap2_3_dss_dispc_dev_attr
 };
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dss_dsi1 slave ports */
-static struct omap_hwmod_ocp_if *omap3xxx_dss_dsi1_slaves[] = {
-       &omap3xxx_l4_core__dss_dsi1,
-};
-
 static struct omap_hwmod_opt_clk dss_dsi1_opt_clks[] = {
        { .role = "sys_clk", .clk = "dss2_alwon_fck" },
 };
        },
        .opt_clks       = dss_dsi1_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(dss_dsi1_opt_clks),
-       .slaves         = omap3xxx_dss_dsi1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_dss_dsi1_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dss_rfbi slave ports */
-static struct omap_hwmod_ocp_if *omap3xxx_dss_rfbi_slaves[] = {
-       &omap3xxx_l4_core__dss_rfbi,
-};
-
 static struct omap_hwmod_opt_clk dss_rfbi_opt_clks[] = {
        { .role = "ick", .clk = "dss_ick" },
 };
        },
        .opt_clks       = dss_rfbi_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(dss_rfbi_opt_clks),
-       .slaves         = omap3xxx_dss_rfbi_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_dss_rfbi_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dss_venc slave ports */
-static struct omap_hwmod_ocp_if *omap3xxx_dss_venc_slaves[] = {
-       &omap3xxx_l4_core__dss_venc,
-};
-
 static struct omap_hwmod_opt_clk dss_venc_opt_clks[] = {
        /* required only on OMAP3430 */
        { .role = "tv_dac_clk", .clk = "dss_96m_fck" },
        },
        .opt_clks       = dss_venc_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(dss_venc_opt_clks),
-       .slaves         = omap3xxx_dss_venc_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_dss_venc_slaves),
        .flags          = HWMOD_NO_IDLEST,
 };
 
                          OMAP_I2C_FLAG_BUS_SHIFT_2,
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_i2c1_slaves[] = {
-       &omap3_l4_core__i2c1,
-};
-
 static struct omap_hwmod omap3xxx_i2c1_hwmod = {
        .name           = "i2c1",
        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
                        .idlest_idle_bit = OMAP3430_ST_I2C1_SHIFT,
                },
        },
-       .slaves         = omap3xxx_i2c1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_i2c1_slaves),
        .class          = &i2c_class,
        .dev_attr       = &i2c1_dev_attr,
 };
                 OMAP_I2C_FLAG_BUS_SHIFT_2,
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_i2c2_slaves[] = {
-       &omap3_l4_core__i2c2,
-};
-
 static struct omap_hwmod omap3xxx_i2c2_hwmod = {
        .name           = "i2c2",
        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
                        .idlest_idle_bit = OMAP3430_ST_I2C2_SHIFT,
                },
        },
-       .slaves         = omap3xxx_i2c2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_i2c2_slaves),
        .class          = &i2c_class,
        .dev_attr       = &i2c2_dev_attr,
 };
        { .dma_req = -1 }
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_i2c3_slaves[] = {
-       &omap3_l4_core__i2c3,
-};
-
 static struct omap_hwmod omap3xxx_i2c3_hwmod = {
        .name           = "i2c3",
        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
                        .idlest_idle_bit = OMAP3430_ST_I2C3_SHIFT,
                },
        },
-       .slaves         = omap3xxx_i2c3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_i2c3_slaves),
        .class          = &i2c_class,
        .dev_attr       = &i2c3_dev_attr,
 };
        { .role = "dbclk", .clk = "gpio1_dbck", },
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_gpio1_slaves[] = {
-       &omap3xxx_l4_wkup__gpio1,
-};
-
 static struct omap_hwmod omap3xxx_gpio1_hwmod = {
        .name           = "gpio1",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP3430_ST_GPIO1_SHIFT,
                },
        },
-       .slaves         = omap3xxx_gpio1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_gpio1_slaves),
        .class          = &omap3xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
        { .role = "dbclk", .clk = "gpio2_dbck", },
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_gpio2_slaves[] = {
-       &omap3xxx_l4_per__gpio2,
-};
-
 static struct omap_hwmod omap3xxx_gpio2_hwmod = {
        .name           = "gpio2",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP3430_ST_GPIO2_SHIFT,
                },
        },
-       .slaves         = omap3xxx_gpio2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_gpio2_slaves),
        .class          = &omap3xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
        { .role = "dbclk", .clk = "gpio3_dbck", },
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_gpio3_slaves[] = {
-       &omap3xxx_l4_per__gpio3,
-};
-
 static struct omap_hwmod omap3xxx_gpio3_hwmod = {
        .name           = "gpio3",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP3430_ST_GPIO3_SHIFT,
                },
        },
-       .slaves         = omap3xxx_gpio3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_gpio3_slaves),
        .class          = &omap3xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
        { .role = "dbclk", .clk = "gpio4_dbck", },
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_gpio4_slaves[] = {
-       &omap3xxx_l4_per__gpio4,
-};
-
 static struct omap_hwmod omap3xxx_gpio4_hwmod = {
        .name           = "gpio4",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP3430_ST_GPIO4_SHIFT,
                },
        },
-       .slaves         = omap3xxx_gpio4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_gpio4_slaves),
        .class          = &omap3xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
        { .role = "dbclk", .clk = "gpio5_dbck", },
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_gpio5_slaves[] = {
-       &omap3xxx_l4_per__gpio5,
-};
-
 static struct omap_hwmod omap3xxx_gpio5_hwmod = {
        .name           = "gpio5",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP3430_ST_GPIO5_SHIFT,
                },
        },
-       .slaves         = omap3xxx_gpio5_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_gpio5_slaves),
        .class          = &omap3xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
        { .role = "dbclk", .clk = "gpio6_dbck", },
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_gpio6_slaves[] = {
-       &omap3xxx_l4_per__gpio6,
-};
-
 static struct omap_hwmod omap3xxx_gpio6_hwmod = {
        .name           = "gpio6",
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
                        .idlest_idle_bit = OMAP3430_ST_GPIO6_SHIFT,
                },
        },
-       .slaves         = omap3xxx_gpio6_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_gpio6_slaves),
        .class          = &omap3xxx_gpio_hwmod_class,
        .dev_attr       = &gpio_dev_attr,
 };
        { }
 };
 
-/* dma_system master ports */
-static struct omap_hwmod_ocp_if *omap3xxx_dma_system_masters[] = {
-       &omap3xxx_dma_system__l3,
-};
-
 /* l4_cfg -> dma_system */
 static struct omap_hwmod_ocp_if omap3xxx_l4_core__dma_system = {
        .master         = &omap3xxx_l4_core_hwmod,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dma_system slave ports */
-static struct omap_hwmod_ocp_if *omap3xxx_dma_system_slaves[] = {
-       &omap3xxx_l4_core__dma_system,
-};
-
 static struct omap_hwmod omap3xxx_dma_system_hwmod = {
        .name           = "dma",
        .class          = &omap3xxx_dma_hwmod_class,
                        .idlest_idle_bit        = OMAP3430_ST_SDMA_SHIFT,
                },
        },
-       .slaves         = omap3xxx_dma_system_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_dma_system_slaves),
-       .masters        = omap3xxx_dma_system_masters,
-       .masters_cnt    = ARRAY_SIZE(omap3xxx_dma_system_masters),
        .dev_attr       = &dma_dev_attr,
        .flags          = HWMOD_NO_IDLEST,
 };
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcbsp1 slave ports */
-static struct omap_hwmod_ocp_if *omap3xxx_mcbsp1_slaves[] = {
-       &omap3xxx_l4_core__mcbsp1,
-};
-
 static struct omap_hwmod omap3xxx_mcbsp1_hwmod = {
        .name           = "mcbsp1",
        .class          = &omap3xxx_mcbsp_hwmod_class,
                        .idlest_idle_bit = OMAP3430_ST_MCBSP1_SHIFT,
                },
        },
-       .slaves         = omap3xxx_mcbsp1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_mcbsp1_slaves),
 };
 
 /* mcbsp2 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcbsp2 slave ports */
-static struct omap_hwmod_ocp_if *omap3xxx_mcbsp2_slaves[] = {
-       &omap3xxx_l4_per__mcbsp2,
-};
-
 static struct omap_mcbsp_dev_attr omap34xx_mcbsp2_dev_attr = {
        .sidetone       = "mcbsp2_sidetone",
 };
                        .idlest_idle_bit = OMAP3430_ST_MCBSP2_SHIFT,
                },
        },
-       .slaves         = omap3xxx_mcbsp2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_mcbsp2_slaves),
        .dev_attr       = &omap34xx_mcbsp2_dev_attr,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcbsp3 slave ports */
-static struct omap_hwmod_ocp_if *omap3xxx_mcbsp3_slaves[] = {
-       &omap3xxx_l4_per__mcbsp3,
-};
-
 static struct omap_mcbsp_dev_attr omap34xx_mcbsp3_dev_attr = {
-       .sidetone       = "mcbsp3_sidetone",
+       .sidetone       = "mcbsp3_sidetone",
 };
 
 static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {
                        .idlest_idle_bit = OMAP3430_ST_MCBSP3_SHIFT,
                },
        },
-       .slaves         = omap3xxx_mcbsp3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_mcbsp3_slaves),
        .dev_attr       = &omap34xx_mcbsp3_dev_attr,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcbsp4 slave ports */
-static struct omap_hwmod_ocp_if *omap3xxx_mcbsp4_slaves[] = {
-       &omap3xxx_l4_per__mcbsp4,
-};
-
 static struct omap_hwmod omap3xxx_mcbsp4_hwmod = {
        .name           = "mcbsp4",
        .class          = &omap3xxx_mcbsp_hwmod_class,
                        .idlest_idle_bit = OMAP3430_ST_MCBSP4_SHIFT,
                },
        },
-       .slaves         = omap3xxx_mcbsp4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_mcbsp4_slaves),
 };
 
 /* mcbsp5 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcbsp5 slave ports */
-static struct omap_hwmod_ocp_if *omap3xxx_mcbsp5_slaves[] = {
-       &omap3xxx_l4_core__mcbsp5,
-};
-
 static struct omap_hwmod omap3xxx_mcbsp5_hwmod = {
        .name           = "mcbsp5",
        .class          = &omap3xxx_mcbsp_hwmod_class,
                        .idlest_idle_bit = OMAP3430_ST_MCBSP5_SHIFT,
                },
        },
-       .slaves         = omap3xxx_mcbsp5_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_mcbsp5_slaves),
 };
 /* 'mcbsp sidetone' class */
 
        .user           = OCP_USER_MPU,
 };
 
-/* mcbsp2_sidetone slave ports */
-static struct omap_hwmod_ocp_if *omap3xxx_mcbsp2_sidetone_slaves[] = {
-       &omap3xxx_l4_per__mcbsp2_sidetone,
-};
-
 static struct omap_hwmod omap3xxx_mcbsp2_sidetone_hwmod = {
        .name           = "mcbsp2_sidetone",
        .class          = &omap3xxx_mcbsp_sidetone_hwmod_class,
                        .idlest_idle_bit = OMAP3430_ST_MCBSP2_SHIFT,
                },
        },
-       .slaves         = omap3xxx_mcbsp2_sidetone_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_mcbsp2_sidetone_slaves),
 };
 
 /* mcbsp3_sidetone */
        .user           = OCP_USER_MPU,
 };
 
-/* mcbsp3_sidetone slave ports */
-static struct omap_hwmod_ocp_if *omap3xxx_mcbsp3_sidetone_slaves[] = {
-       &omap3xxx_l4_per__mcbsp3_sidetone,
-};
-
 static struct omap_hwmod omap3xxx_mcbsp3_sidetone_hwmod = {
        .name           = "mcbsp3_sidetone",
        .class          = &omap3xxx_mcbsp_sidetone_hwmod_class,
                        .idlest_idle_bit = OMAP3430_ST_MCBSP3_SHIFT,
                },
        },
-       .slaves         = omap3xxx_mcbsp3_sidetone_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_mcbsp3_sidetone_slaves),
 };
 
 
        .sensor_voltdm_name   = "mpu_iva",
 };
 
-static struct omap_hwmod_ocp_if *omap3_sr1_slaves[] = {
-       &omap3_l4_core__sr1,
-};
-
 static struct omap_hwmod omap34xx_sr1_hwmod = {
        .name           = "sr1",
        .class          = &omap34xx_smartreflex_hwmod_class,
                        .idlest_idle_bit = OMAP3430_EN_SR1_SHIFT,
                },
        },
-       .slaves         = omap3_sr1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3_sr1_slaves),
        .dev_attr       = &sr1_dev_attr,
        .mpu_irqs       = omap3_smartreflex_mpu_irqs,
        .flags          = HWMOD_SET_DEFAULT_CLOCKACT,
                        .idlest_idle_bit = OMAP3430_EN_SR1_SHIFT,
                },
        },
-       .slaves         = omap3_sr1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3_sr1_slaves),
        .dev_attr       = &sr1_dev_attr,
        .mpu_irqs       = omap3_smartreflex_mpu_irqs,
 };
        .sensor_voltdm_name     = "core",
 };
 
-static struct omap_hwmod_ocp_if *omap3_sr2_slaves[] = {
-       &omap3_l4_core__sr2,
-};
-
 static struct omap_hwmod omap34xx_sr2_hwmod = {
        .name           = "sr2",
        .class          = &omap34xx_smartreflex_hwmod_class,
                        .idlest_idle_bit = OMAP3430_EN_SR2_SHIFT,
                },
        },
-       .slaves         = omap3_sr2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3_sr2_slaves),
        .dev_attr       = &sr2_dev_attr,
        .mpu_irqs       = omap3_smartreflex_core_irqs,
        .flags          = HWMOD_SET_DEFAULT_CLOCKACT,
                        .idlest_idle_bit = OMAP3430_EN_SR2_SHIFT,
                },
        },
-       .slaves         = omap3_sr2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3_sr2_slaves),
        .dev_attr       = &sr2_dev_attr,
        .mpu_irqs       = omap3_smartreflex_core_irqs,
 };
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mailbox slave ports */
-static struct omap_hwmod_ocp_if *omap3xxx_mailbox_slaves[] = {
-       &omap3xxx_l4_core__mailbox,
-};
-
 static struct omap_hwmod omap3xxx_mailbox_hwmod = {
        .name           = "mailbox",
        .class          = &omap3xxx_mailbox_hwmod_class,
                        .idlest_idle_bit = OMAP3430_ST_MAILBOXES_SHIFT,
                },
        },
-       .slaves         = omap3xxx_mailbox_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_mailbox_slaves),
 };
 
 /* l4 core -> mcspi1 interface */
 };
 
 /* mcspi1 */
-static struct omap_hwmod_ocp_if *omap34xx_mcspi1_slaves[] = {
-       &omap34xx_l4_core__mcspi1,
-};
-
 static struct omap2_mcspi_dev_attr omap_mcspi1_dev_attr = {
        .num_chipselect = 4,
 };
                        .idlest_idle_bit = OMAP3430_ST_MCSPI1_SHIFT,
                },
        },
-       .slaves         = omap34xx_mcspi1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap34xx_mcspi1_slaves),
        .class          = &omap34xx_mcspi_class,
        .dev_attr       = &omap_mcspi1_dev_attr,
 };
 
 /* mcspi2 */
-static struct omap_hwmod_ocp_if *omap34xx_mcspi2_slaves[] = {
-       &omap34xx_l4_core__mcspi2,
-};
-
 static struct omap2_mcspi_dev_attr omap_mcspi2_dev_attr = {
        .num_chipselect = 2,
 };
                        .idlest_idle_bit = OMAP3430_ST_MCSPI2_SHIFT,
                },
        },
-       .slaves         = omap34xx_mcspi2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap34xx_mcspi2_slaves),
        .class          = &omap34xx_mcspi_class,
        .dev_attr       = &omap_mcspi2_dev_attr,
 };
        { .dma_req = -1 }
 };
 
-static struct omap_hwmod_ocp_if *omap34xx_mcspi3_slaves[] = {
-       &omap34xx_l4_core__mcspi3,
-};
-
 static struct omap2_mcspi_dev_attr omap_mcspi3_dev_attr = {
        .num_chipselect = 2,
 };
                        .idlest_idle_bit = OMAP3430_ST_MCSPI3_SHIFT,
                },
        },
-       .slaves         = omap34xx_mcspi3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap34xx_mcspi3_slaves),
        .class          = &omap34xx_mcspi_class,
        .dev_attr       = &omap_mcspi3_dev_attr,
 };
        { .dma_req = -1 }
 };
 
-static struct omap_hwmod_ocp_if *omap34xx_mcspi4_slaves[] = {
-       &omap34xx_l4_core__mcspi4,
-};
-
 static struct omap2_mcspi_dev_attr omap_mcspi4_dev_attr = {
        .num_chipselect = 1,
 };
                        .idlest_idle_bit = OMAP3430_ST_MCSPI4_SHIFT,
                },
        },
-       .slaves         = omap34xx_mcspi4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap34xx_mcspi4_slaves),
        .class          = &omap34xx_mcspi_class,
        .dev_attr       = &omap_mcspi4_dev_attr,
 };
                        .idlest_stdby_bit = OMAP3430ES2_ST_HSOTGUSB_STDBY_SHIFT
                },
        },
-       .masters        = omap3xxx_usbhsotg_masters,
-       .masters_cnt    = ARRAY_SIZE(omap3xxx_usbhsotg_masters),
-       .slaves         = omap3xxx_usbhsotg_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_usbhsotg_slaves),
        .class          = &usbotg_class,
 
        /*
                .omap2 = {
                },
        },
-       .masters        = am35xx_usbhsotg_masters,
-       .masters_cnt    = ARRAY_SIZE(am35xx_usbhsotg_masters),
-       .slaves         = am35xx_usbhsotg_slaves,
-       .slaves_cnt     = ARRAY_SIZE(am35xx_usbhsotg_slaves),
        .class          = &am35xx_usbotg_class,
 };
 
        { .role = "dbck", .clk = "omap_32k_fck", },
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_mmc1_slaves[] = {
-       &omap3xxx_l4_core__pre_es3_mmc1,
-       &omap3xxx_l4_core__es3plus_mmc1,
-};
-
 static struct omap_mmc_dev_attr mmc1_dev_attr = {
        .flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT,
 };
                },
        },
        .dev_attr       = &mmc1_pre_es3_dev_attr,
-       .slaves         = omap3xxx_mmc1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_mmc1_slaves),
        .class          = &omap34xx_mmc_class,
 };
 
                },
        },
        .dev_attr       = &mmc1_dev_attr,
-       .slaves         = omap3xxx_mmc1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_mmc1_slaves),
        .class          = &omap34xx_mmc_class,
 };
 
        { .role = "dbck", .clk = "omap_32k_fck", },
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_mmc2_slaves[] = {
-       &omap3xxx_l4_core__pre_es3_mmc2,
-       &omap3xxx_l4_core__es3plus_mmc2,
-};
-
 /* See 35xx errata 2.1.1.128 in SPRZ278F */
 static struct omap_mmc_dev_attr mmc2_pre_es3_dev_attr = {
        .flags = OMAP_HSMMC_BROKEN_MULTIBLOCK_READ,
                },
        },
        .dev_attr       = &mmc2_pre_es3_dev_attr,
-       .slaves         = omap3xxx_mmc2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_mmc2_slaves),
        .class          = &omap34xx_mmc_class,
 };
 
                        .idlest_idle_bit = OMAP3430_ST_MMC2_SHIFT,
                },
        },
-       .slaves         = omap3xxx_mmc2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_mmc2_slaves),
        .class          = &omap34xx_mmc_class,
 };
 
        { .role = "dbck", .clk = "omap_32k_fck", },
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_mmc3_slaves[] = {
-       &omap3xxx_l4_core__mmc3,
-};
-
 static struct omap_hwmod omap3xxx_mmc3_hwmod = {
        .name           = "mmc3",
        .mpu_irqs       = omap34xx_mmc3_mpu_irqs,
                        .idlest_idle_bit = OMAP3430_ST_MMC3_SHIFT,
                },
        },
-       .slaves         = omap3xxx_mmc3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_mmc3_slaves),
        .class          = &omap34xx_mmc_class,
 };
 
        .sysc = &omap3xxx_usb_host_hs_sysc,
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_usb_host_hs_masters[] = {
-       &omap3xxx_usb_host_hs__l3_main_2,
-};
-
 static struct omap_hwmod_addr_space omap3xxx_usb_host_hs_addrs[] = {
        {
                .name           = "uhh",
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_usb_host_hs_slaves[] = {
-       &omap3xxx_l4_core__usb_host_hs,
-};
-
 static struct omap_hwmod_opt_clk omap3xxx_usb_host_hs_opt_clks[] = {
          { .role = "ehci_logic_fck", .clk = "usbhost_120m_fck", },
 };
        },
        .opt_clks       = omap3xxx_usb_host_hs_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(omap3xxx_usb_host_hs_opt_clks),
-       .slaves         = omap3xxx_usb_host_hs_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_usb_host_hs_slaves),
-       .masters        = omap3xxx_usb_host_hs_masters,
-       .masters_cnt    = ARRAY_SIZE(omap3xxx_usb_host_hs_masters),
 
        /*
         * Errata: USBHOST Configured In Smart-Idle Can Lead To a Deadlock
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-static struct omap_hwmod_ocp_if *omap3xxx_usb_tll_hs_slaves[] = {
-       &omap3xxx_l4_core__usb_tll_hs,
-};
-
 static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod = {
        .name           = "usb_tll_hs",
        .class          = &omap3xxx_usb_tll_hs_hwmod_class,
                        .idlest_idle_bit = OMAP3430ES2_ST_USBTLL_SHIFT,
                },
        },
-       .slaves         = omap3xxx_usb_tll_hs_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap3xxx_usb_tll_hs_slaves),
-};
-
-static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
-       &omap3xxx_l3_main_hwmod,
-       &omap3xxx_l4_core_hwmod,
-       &omap3xxx_l4_per_hwmod,
-       &omap3xxx_l4_wkup_hwmod,
-       &omap3xxx_mmc3_hwmod,
-       &omap3xxx_mpu_hwmod,
-
-       &omap3xxx_timer1_hwmod,
-       &omap3xxx_timer2_hwmod,
-       &omap3xxx_timer3_hwmod,
-       &omap3xxx_timer4_hwmod,
-       &omap3xxx_timer5_hwmod,
-       &omap3xxx_timer6_hwmod,
-       &omap3xxx_timer7_hwmod,
-       &omap3xxx_timer8_hwmod,
-       &omap3xxx_timer9_hwmod,
-       &omap3xxx_timer10_hwmod,
-       &omap3xxx_timer11_hwmod,
-
-       &omap3xxx_wd_timer2_hwmod,
-       &omap3xxx_uart1_hwmod,
-       &omap3xxx_uart2_hwmod,
-       &omap3xxx_uart3_hwmod,
-
-       /* i2c class */
-       &omap3xxx_i2c1_hwmod,
-       &omap3xxx_i2c2_hwmod,
-       &omap3xxx_i2c3_hwmod,
-
-       /* gpio class */
-       &omap3xxx_gpio1_hwmod,
-       &omap3xxx_gpio2_hwmod,
-       &omap3xxx_gpio3_hwmod,
-       &omap3xxx_gpio4_hwmod,
-       &omap3xxx_gpio5_hwmod,
-       &omap3xxx_gpio6_hwmod,
-
-       /* dma_system class*/
-       &omap3xxx_dma_system_hwmod,
-
-       /* mcbsp class */
-       &omap3xxx_mcbsp1_hwmod,
-       &omap3xxx_mcbsp2_hwmod,
-       &omap3xxx_mcbsp3_hwmod,
-       &omap3xxx_mcbsp4_hwmod,
-       &omap3xxx_mcbsp5_hwmod,
-       &omap3xxx_mcbsp2_sidetone_hwmod,
-       &omap3xxx_mcbsp3_sidetone_hwmod,
-
-
-       /* mcspi class */
-       &omap34xx_mcspi1,
-       &omap34xx_mcspi2,
-       &omap34xx_mcspi3,
-       &omap34xx_mcspi4,
+};
 
+static struct omap_hwmod_ocp_if *omap3xxx_hwmod_ocp_ifs[] __initdata = {
+       &omap3xxx_l3_main__l4_core,
+       &omap3xxx_l3_main__l4_per,
+       &omap3xxx_mpu__l3_main,
+       &omap3xxx_l4_core__l4_wkup,
+       &omap3xxx_l4_core__mmc3,
+       &omap3_l4_core__uart1,
+       &omap3_l4_core__uart2,
+       &omap3_l4_per__uart3,
+       &omap3_l4_core__i2c1,
+       &omap3_l4_core__i2c2,
+       &omap3_l4_core__i2c3,
+       &omap3xxx_l4_wkup__l4_sec,
+       &omap3xxx_l4_wkup__timer1,
+       &omap3xxx_l4_per__timer2,
+       &omap3xxx_l4_per__timer3,
+       &omap3xxx_l4_per__timer4,
+       &omap3xxx_l4_per__timer5,
+       &omap3xxx_l4_per__timer6,
+       &omap3xxx_l4_per__timer7,
+       &omap3xxx_l4_per__timer8,
+       &omap3xxx_l4_per__timer9,
+       &omap3xxx_l4_core__timer10,
+       &omap3xxx_l4_core__timer11,
+       &omap3xxx_l4_wkup__wd_timer2,
+       &omap3xxx_l4_wkup__gpio1,
+       &omap3xxx_l4_per__gpio2,
+       &omap3xxx_l4_per__gpio3,
+       &omap3xxx_l4_per__gpio4,
+       &omap3xxx_l4_per__gpio5,
+       &omap3xxx_l4_per__gpio6,
+       &omap3xxx_dma_system__l3,
+       &omap3xxx_l4_core__dma_system,
+       &omap3xxx_l4_core__mcbsp1,
+       &omap3xxx_l4_per__mcbsp2,
+       &omap3xxx_l4_per__mcbsp3,
+       &omap3xxx_l4_per__mcbsp4,
+       &omap3xxx_l4_core__mcbsp5,
+       &omap3xxx_l4_per__mcbsp2_sidetone,
+       &omap3xxx_l4_per__mcbsp3_sidetone,
+       &omap34xx_l4_core__mcspi1,
+       &omap34xx_l4_core__mcspi2,
+       &omap34xx_l4_core__mcspi3,
+       &omap34xx_l4_core__mcspi4,
        NULL,
 };
 
-/* GP-only hwmods */
-static __initdata struct omap_hwmod *omap3xxx_gp_hwmods[] = {
-       &omap3xxx_timer12_hwmod,
+/* GP-only hwmod links */
+static struct omap_hwmod_ocp_if *omap3xxx_gp_hwmod_ocp_ifs[] __initdata = {
+       &omap3xxx_l4_sec__timer12,
        NULL
 };
 
-/* 3430ES1-only hwmods */
-static __initdata struct omap_hwmod *omap3430es1_hwmods[] = {
-       &omap3430es1_dss_core_hwmod,
+/* 3430ES1-only hwmod links */
+static struct omap_hwmod_ocp_if *omap3430es1_hwmod_ocp_ifs[] __initdata = {
+       &omap3430es1_dss__l3,
+       &omap3430es1_l4_core__dss,
        NULL
 };
 
-/* 3430ES2+-only hwmods */
-static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = {
-       &omap3xxx_dss_core_hwmod,
-       &omap3xxx_usbhsotg_hwmod,
-       &omap3xxx_usb_host_hs_hwmod,
-       &omap3xxx_usb_tll_hs_hwmod,
+/* 3430ES2+-only hwmod links */
+static struct omap_hwmod_ocp_if *omap3430es2plus_hwmod_ocp_ifs[] __initdata = {
+       &omap3xxx_dss__l3,
+       &omap3xxx_l4_core__dss,
+       &omap3xxx_usbhsotg__l3,
+       &omap3xxx_l4_core__usbhsotg,
+       &omap3xxx_usb_host_hs__l3_main_2,
+       &omap3xxx_l4_core__usb_host_hs,
+       &omap3xxx_l4_core__usb_tll_hs,
        NULL
 };
 
-/* <= 3430ES3-only hwmods */
-static struct omap_hwmod *omap3430_pre_es3_hwmods[] __initdata = {
-       &omap3xxx_pre_es3_mmc1_hwmod,
-       &omap3xxx_pre_es3_mmc2_hwmod,
+/* <= 3430ES3-only hwmod links */
+static struct omap_hwmod_ocp_if *omap3430_pre_es3_hwmod_ocp_ifs[] __initdata = {
+       &omap3xxx_l4_core__pre_es3_mmc1,
+       &omap3xxx_l4_core__pre_es3_mmc2,
        NULL
 };
 
-/* 3430ES3+-only hwmods */
-static struct omap_hwmod *omap3430_es3plus_hwmods[] __initdata = {
-       &omap3xxx_es3plus_mmc1_hwmod,
-       &omap3xxx_es3plus_mmc2_hwmod,
+/* 3430ES3+-only hwmod links */
+static struct omap_hwmod_ocp_if *omap3430_es3plus_hwmod_ocp_ifs[] __initdata = {
+       &omap3xxx_l4_core__es3plus_mmc1,
+       &omap3xxx_l4_core__es3plus_mmc2,
        NULL
 };
 
-/* 34xx-only hwmods (all ES revisions) */
-static __initdata struct omap_hwmod *omap34xx_hwmods[] = {
-       &omap3xxx_iva_hwmod,
-       &omap34xx_sr1_hwmod,
-       &omap34xx_sr2_hwmod,
-       &omap3xxx_mailbox_hwmod,
+/* 34xx-only hwmod links (all ES revisions) */
+static struct omap_hwmod_ocp_if *omap34xx_hwmod_ocp_ifs[] __initdata = {
+       &omap3xxx_l3__iva,
+       &omap34xx_l4_core__sr1,
+       &omap34xx_l4_core__sr2,
+       &omap3xxx_l4_core__mailbox,
        NULL
 };
 
-/* 36xx-only hwmods (all ES revisions) */
-static __initdata struct omap_hwmod *omap36xx_hwmods[] = {
-       &omap3xxx_iva_hwmod,
-       &omap3xxx_uart4_hwmod,
-       &omap3xxx_dss_core_hwmod,
-       &omap36xx_sr1_hwmod,
-       &omap36xx_sr2_hwmod,
-       &omap3xxx_usbhsotg_hwmod,
-       &omap3xxx_mailbox_hwmod,
-       &omap3xxx_usb_host_hs_hwmod,
-       &omap3xxx_usb_tll_hs_hwmod,
-       &omap3xxx_es3plus_mmc1_hwmod,
-       &omap3xxx_es3plus_mmc2_hwmod,
+/* 36xx-only hwmod links (all ES revisions) */
+static struct omap_hwmod_ocp_if *omap36xx_hwmod_ocp_ifs[] __initdata = {
+       &omap3xxx_l3__iva,
+       &omap36xx_l4_per__uart4,
+       &omap3xxx_dss__l3,
+       &omap3xxx_l4_core__dss,
+       &omap36xx_l4_core__sr1,
+       &omap36xx_l4_core__sr2,
+       &omap3xxx_usbhsotg__l3,
+       &omap3xxx_l4_core__usbhsotg,
+       &omap3xxx_l4_core__mailbox,
+       &omap3xxx_usb_host_hs__l3_main_2,
+       &omap3xxx_l4_core__usb_host_hs,
+       &omap3xxx_l4_core__usb_tll_hs,
+       &omap3xxx_l4_core__es3plus_mmc1,
+       &omap3xxx_l4_core__es3plus_mmc2,
        NULL
 };
 
-static __initdata struct omap_hwmod *am35xx_hwmods[] = {
-       &omap3xxx_dss_core_hwmod, /* XXX ??? */
-       &am35xx_usbhsotg_hwmod,
-       &am35xx_uart4_hwmod,
-       &omap3xxx_usb_host_hs_hwmod,
-       &omap3xxx_usb_tll_hs_hwmod,
-       &omap3xxx_es3plus_mmc1_hwmod,
-       &omap3xxx_es3plus_mmc2_hwmod,
+static struct omap_hwmod_ocp_if *am35xx_hwmod_ocp_ifs[] __initdata = {
+       &omap3xxx_dss__l3,
+       &omap3xxx_l4_core__dss,
+       &am35xx_usbhsotg__l3,
+       &am35xx_l4_core__usbhsotg,
+       &am35xx_l4_core__uart4,
+       &omap3xxx_usb_host_hs__l3_main_2,
+       &omap3xxx_l4_core__usb_host_hs,
+       &omap3xxx_l4_core__usb_tll_hs,
+       &omap3xxx_l4_core__es3plus_mmc1,
+       &omap3xxx_l4_core__es3plus_mmc2,
        NULL
 };
 
-static __initdata struct omap_hwmod *omap3xxx_dss_hwmods[] = {
-       /* dss class */
-       &omap3xxx_dss_dispc_hwmod,
-       &omap3xxx_dss_dsi1_hwmod,
-       &omap3xxx_dss_rfbi_hwmod,
-       &omap3xxx_dss_venc_hwmod,
+static struct omap_hwmod_ocp_if *omap3xxx_dss_hwmod_ocp_ifs[] __initdata = {
+       &omap3xxx_l4_core__dss_dispc,
+       &omap3xxx_l4_core__dss_dsi1,
+       &omap3xxx_l4_core__dss_rfbi,
+       &omap3xxx_l4_core__dss_venc,
        NULL
 };
 
 int __init omap3xxx_hwmod_init(void)
 {
        int r;
-       struct omap_hwmod **h = NULL;
+       struct omap_hwmod_ocp_if **h = NULL;
        unsigned int rev;
 
-       /* Register hwmods common to all OMAP3 */
-       r = omap_hwmod_register(omap3xxx_hwmods);
+       /* Register hwmod links common to all OMAP3 */
+       r = omap_hwmod_register_links(omap3xxx_hwmod_ocp_ifs);
        if (r < 0)
                return r;
 
-       /* Register GP-only hwmods. */
+       /* Register GP-only hwmod links. */
        if (omap_type() == OMAP2_DEVICE_TYPE_GP) {
-               r = omap_hwmod_register(omap3xxx_gp_hwmods);
+               r = omap_hwmod_register_links(omap3xxx_gp_hwmod_ocp_ifs);
                if (r < 0)
                        return r;
        }
        rev = omap_rev();
 
        /*
-        * Register hwmods common to individual OMAP3 families, all
+        * Register hwmod links common to individual OMAP3 families, all
         * silicon revisions (e.g., 34xx, or AM3505/3517, or 36xx)
         * All possible revisions should be included in this conditional.
         */
        if (rev == OMAP3430_REV_ES1_0 || rev == OMAP3430_REV_ES2_0 ||
            rev == OMAP3430_REV_ES2_1 || rev == OMAP3430_REV_ES3_0 ||
            rev == OMAP3430_REV_ES3_1 || rev == OMAP3430_REV_ES3_1_2) {
-               h = omap34xx_hwmods;
+               h = omap34xx_hwmod_ocp_ifs;
        } else if (rev == OMAP3517_REV_ES1_0 || rev == OMAP3517_REV_ES1_1) {
-               h = am35xx_hwmods;
+               h = am35xx_hwmod_ocp_ifs;
        } else if (rev == OMAP3630_REV_ES1_0 || rev == OMAP3630_REV_ES1_1 ||
                   rev == OMAP3630_REV_ES1_2) {
-               h = omap36xx_hwmods;
+               h = omap36xx_hwmod_ocp_ifs;
        } else {
                WARN(1, "OMAP3 hwmod family init: unknown chip type\n");
                return -EINVAL;
        };
 
-       r = omap_hwmod_register(h);
+       r = omap_hwmod_register_links(h);
        if (r < 0)
                return r;
 
        /*
-        * Register hwmods specific to certain ES levels of a
+        * Register hwmod links specific to certain ES levels of a
         * particular family of silicon (e.g., 34xx ES1.0)
         */
        h = NULL;
        if (rev == OMAP3430_REV_ES1_0) {
-               h = omap3430es1_hwmods;
+               h = omap3430es1_hwmod_ocp_ifs;
        } else if (rev == OMAP3430_REV_ES2_0 || rev == OMAP3430_REV_ES2_1 ||
                   rev == OMAP3430_REV_ES3_0 || rev == OMAP3430_REV_ES3_1 ||
                   rev == OMAP3430_REV_ES3_1_2) {
-               h = omap3430es2plus_hwmods;
+               h = omap3430es2plus_hwmod_ocp_ifs;
        };
 
        if (h) {
-               r = omap_hwmod_register(h);
+               r = omap_hwmod_register_links(h);
                if (r < 0)
                        return r;
        }
        h = NULL;
        if (rev == OMAP3430_REV_ES1_0 || rev == OMAP3430_REV_ES2_0 ||
            rev == OMAP3430_REV_ES2_1) {
-               h = omap3430_pre_es3_hwmods;
+               h = omap3430_pre_es3_hwmod_ocp_ifs;
        } else if (rev == OMAP3430_REV_ES3_0 || rev == OMAP3430_REV_ES3_1 ||
                   rev == OMAP3430_REV_ES3_1_2) {
-               h = omap3430_es3plus_hwmods;
+               h = omap3430_es3plus_hwmod_ocp_ifs;
        };
 
        if (h)
-               r = omap_hwmod_register(h);
+               r = omap_hwmod_register_links(h);
        if (r < 0)
                return r;
 
        /*
         * DSS code presumes that dss_core hwmod is handled first,
         * _before_ any other DSS related hwmods so register common
-        * DSS hwmods last to ensure that dss_core is already registered.
-        * Otherwise some change things may happen, for ex. if dispc
-        * is handled before dss_core and DSS is enabled in bootloader
-        * DIPSC will be reset with outputs enabled which sometimes leads
-        * to unrecoverable L3 error.
-        * XXX The long-term fix to this is to ensure modules are set up
-        * in dependency order in the hwmod core code.
+        * DSS hwmod links last to ensure that dss_core is already
+        * registered.  Otherwise some change things may happen, for
+        * ex. if dispc is handled before dss_core and DSS is enabled
+        * in bootloader DISPC will be reset with outputs enabled
+        * which sometimes leads to unrecoverable L3 error.  XXX The
+        * long-term fix to this is to ensure hwmods are set up in
+        * dependency order in the hwmod core code.
         */
-       r = omap_hwmod_register(omap3xxx_dss_hwmods);
+       r = omap_hwmod_register_links(omap3xxx_dss_hwmod_ocp_ifs);
 
        return r;
 }
 
 /*
  * Hardware modules present on the OMAP44xx chips
  *
- * Copyright (C) 2009-2011 Texas Instruments, Inc.
+ * Copyright (C) 2009-2012 Texas Instruments, Inc.
  * Copyright (C) 2009-2010 Nokia Corporation
  *
  * Paul Walmsley
        .user           = OCP_USER_MPU,
 };
 
-/* dmm slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_dmm_slaves[] = {
-       &omap44xx_l3_main_1__dmm,
-       &omap44xx_mpu__dmm,
-};
-
 static struct omap_hwmod omap44xx_dmm_hwmod = {
        .name           = "dmm",
        .class          = &omap44xx_dmm_hwmod_class,
                        .context_offs = OMAP4_RM_MEMIF_DMM_CONTEXT_OFFSET,
                },
        },
-       .slaves         = omap44xx_dmm_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_dmm_slaves),
        .mpu_irqs       = omap44xx_dmm_irqs,
 };
 
        .user           = OCP_USER_MPU,
 };
 
-/* emif_fw slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_emif_fw_slaves[] = {
-       &omap44xx_dmm__emif_fw,
-       &omap44xx_l4_cfg__emif_fw,
-};
-
 static struct omap_hwmod omap44xx_emif_fw_hwmod = {
        .name           = "emif_fw",
        .class          = &omap44xx_emif_fw_hwmod_class,
                        .context_offs = OMAP4_RM_MEMIF_EMIF_FW_CONTEXT_OFFSET,
                },
        },
-       .slaves         = omap44xx_emif_fw_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_emif_fw_slaves),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* l3_instr slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_l3_instr_slaves[] = {
-       &omap44xx_iva__l3_instr,
-       &omap44xx_l3_main_3__l3_instr,
-};
-
 static struct omap_hwmod omap44xx_l3_instr_hwmod = {
        .name           = "l3_instr",
        .class          = &omap44xx_l3_hwmod_class,
                        .modulemode   = MODULEMODE_HWCTRL,
                },
        },
-       .slaves         = omap44xx_l3_instr_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_l3_instr_slaves),
 };
 
 /* l3_main_1 */
        .user           = OCP_USER_MPU,
 };
 
-/* l3_main_1 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_l3_main_1_slaves[] = {
-       &omap44xx_dsp__l3_main_1,
-       &omap44xx_dss__l3_main_1,
-       &omap44xx_l3_main_2__l3_main_1,
-       &omap44xx_l4_cfg__l3_main_1,
-       &omap44xx_mmc1__l3_main_1,
-       &omap44xx_mmc2__l3_main_1,
-       &omap44xx_mpu__l3_main_1,
-};
-
 static struct omap_hwmod omap44xx_l3_main_1_hwmod = {
        .name           = "l3_main_1",
        .class          = &omap44xx_l3_hwmod_class,
                        .context_offs = OMAP4_RM_L3_1_L3_1_CONTEXT_OFFSET,
                },
        },
-       .slaves         = omap44xx_l3_main_1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_l3_main_1_slaves),
 };
 
 /* l3_main_2 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* l3_main_2 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_l3_main_2_slaves[] = {
-       &omap44xx_dma_system__l3_main_2,
-       &omap44xx_hsi__l3_main_2,
-       &omap44xx_ipu__l3_main_2,
-       &omap44xx_iss__l3_main_2,
-       &omap44xx_iva__l3_main_2,
-       &omap44xx_l3_main_1__l3_main_2,
-       &omap44xx_l4_cfg__l3_main_2,
-       &omap44xx_usb_otg_hs__l3_main_2,
-};
-
 static struct omap_hwmod omap44xx_l3_main_2_hwmod = {
        .name           = "l3_main_2",
        .class          = &omap44xx_l3_hwmod_class,
                        .context_offs = OMAP4_RM_L3_2_L3_2_CONTEXT_OFFSET,
                },
        },
-       .slaves         = omap44xx_l3_main_2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_l3_main_2_slaves),
 };
 
 /* l3_main_3 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* l3_main_3 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_l3_main_3_slaves[] = {
-       &omap44xx_l3_main_1__l3_main_3,
-       &omap44xx_l3_main_2__l3_main_3,
-       &omap44xx_l4_cfg__l3_main_3,
-};
-
 static struct omap_hwmod omap44xx_l3_main_3_hwmod = {
        .name           = "l3_main_3",
        .class          = &omap44xx_l3_hwmod_class,
                        .modulemode   = MODULEMODE_HWCTRL,
                },
        },
-       .slaves         = omap44xx_l3_main_3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_l3_main_3_slaves),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* l4_abe slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_l4_abe_slaves[] = {
-       &omap44xx_aess__l4_abe,
-       &omap44xx_dsp__l4_abe,
-       &omap44xx_l3_main_1__l4_abe,
-       &omap44xx_mpu__l4_abe,
-};
-
 static struct omap_hwmod omap44xx_l4_abe_hwmod = {
        .name           = "l4_abe",
        .class          = &omap44xx_l4_hwmod_class,
                        .clkctrl_offs = OMAP4_CM1_ABE_L4ABE_CLKCTRL_OFFSET,
                },
        },
-       .slaves         = omap44xx_l4_abe_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_l4_abe_slaves),
 };
 
 /* l4_cfg */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* l4_cfg slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_l4_cfg_slaves[] = {
-       &omap44xx_l3_main_1__l4_cfg,
-};
-
 static struct omap_hwmod omap44xx_l4_cfg_hwmod = {
        .name           = "l4_cfg",
        .class          = &omap44xx_l4_hwmod_class,
                        .context_offs = OMAP4_RM_L4CFG_L4_CFG_CONTEXT_OFFSET,
                },
        },
-       .slaves         = omap44xx_l4_cfg_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_l4_cfg_slaves),
 };
 
 /* l4_per */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* l4_per slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_l4_per_slaves[] = {
-       &omap44xx_l3_main_2__l4_per,
-};
-
 static struct omap_hwmod omap44xx_l4_per_hwmod = {
        .name           = "l4_per",
        .class          = &omap44xx_l4_hwmod_class,
                        .context_offs = OMAP4_RM_L4PER_L4_PER_CONTEXT_OFFSET,
                },
        },
-       .slaves         = omap44xx_l4_per_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_l4_per_slaves),
 };
 
 /* l4_wkup */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* l4_wkup slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_l4_wkup_slaves[] = {
-       &omap44xx_l4_cfg__l4_wkup,
-};
-
 static struct omap_hwmod omap44xx_l4_wkup_hwmod = {
        .name           = "l4_wkup",
        .class          = &omap44xx_l4_hwmod_class,
                        .context_offs = OMAP4_RM_WKUP_L4WKUP_CONTEXT_OFFSET,
                },
        },
-       .slaves         = omap44xx_l4_wkup_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_l4_wkup_slaves),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mpu_private slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mpu_private_slaves[] = {
-       &omap44xx_mpu__mpu_private,
-};
-
 static struct omap_hwmod omap44xx_mpu_private_hwmod = {
        .name           = "mpu_private",
        .class          = &omap44xx_mpu_bus_hwmod_class,
        .clkdm_name     = "mpuss_clkdm",
-       .slaves         = omap44xx_mpu_private_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mpu_private_slaves),
 };
 
 /*
        { .dma_req = -1 }
 };
 
-/* aess master ports */
-static struct omap_hwmod_ocp_if *omap44xx_aess_masters[] = {
-       &omap44xx_aess__l4_abe,
-};
-
 static struct omap_hwmod_addr_space omap44xx_aess_addrs[] = {
        {
                .pa_start       = 0x401f1000,
        .user           = OCP_USER_SDMA,
 };
 
-/* aess slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_aess_slaves[] = {
-       &omap44xx_l4_abe__aess,
-       &omap44xx_l4_abe__aess_dma,
-};
-
 static struct omap_hwmod omap44xx_aess_hwmod = {
        .name           = "aess",
        .class          = &omap44xx_aess_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_aess_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_aess_slaves),
-       .masters        = omap44xx_aess_masters,
-       .masters_cnt    = ARRAY_SIZE(omap44xx_aess_masters),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* counter_32k slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_counter_32k_slaves[] = {
-       &omap44xx_l4_wkup__counter_32k,
-};
-
 static struct omap_hwmod omap44xx_counter_32k_hwmod = {
        .name           = "counter_32k",
        .class          = &omap44xx_counter_hwmod_class,
                        .context_offs = OMAP4_RM_WKUP_SYNCTIMER_CONTEXT_OFFSET,
                },
        },
-       .slaves         = omap44xx_counter_32k_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_counter_32k_slaves),
 };
 
 /*
        { .irq = -1 }
 };
 
-/* dma_system master ports */
-static struct omap_hwmod_ocp_if *omap44xx_dma_system_masters[] = {
-       &omap44xx_dma_system__l3_main_2,
-};
-
 static struct omap_hwmod_addr_space omap44xx_dma_system_addrs[] = {
        {
                .pa_start       = 0x4a056000,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dma_system slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_dma_system_slaves[] = {
-       &omap44xx_l4_cfg__dma_system,
-};
-
 static struct omap_hwmod omap44xx_dma_system_hwmod = {
        .name           = "dma_system",
        .class          = &omap44xx_dma_hwmod_class,
                },
        },
        .dev_attr       = &dma_dev_attr,
-       .slaves         = omap44xx_dma_system_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_dma_system_slaves),
-       .masters        = omap44xx_dma_system_masters,
-       .masters_cnt    = ARRAY_SIZE(omap44xx_dma_system_masters),
 };
 
 /*
        .user           = OCP_USER_SDMA,
 };
 
-/* dmic slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_dmic_slaves[] = {
-       &omap44xx_l4_abe__dmic,
-       &omap44xx_l4_abe__dmic_dma,
-};
-
 static struct omap_hwmod omap44xx_dmic_hwmod = {
        .name           = "dmic",
        .class          = &omap44xx_dmic_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_dmic_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_dmic_slaves),
 };
 
 /*
        .user           = OCP_USER_DSP,
 };
 
-/* dsp master ports */
-static struct omap_hwmod_ocp_if *omap44xx_dsp_masters[] = {
-       &omap44xx_dsp__l3_main_1,
-       &omap44xx_dsp__l4_abe,
-       &omap44xx_dsp__iva,
-};
-
 /* l4_cfg -> dsp */
 static struct omap_hwmod_ocp_if omap44xx_l4_cfg__dsp = {
        .master         = &omap44xx_l4_cfg_hwmod,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* dsp slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_dsp_slaves[] = {
-       &omap44xx_l4_cfg__dsp,
-};
-
 static struct omap_hwmod omap44xx_dsp_hwmod = {
        .name           = "dsp",
        .class          = &omap44xx_dsp_hwmod_class,
                        .modulemode   = MODULEMODE_HWCTRL,
                },
        },
-       .slaves         = omap44xx_dsp_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_dsp_slaves),
-       .masters        = omap44xx_dsp_masters,
-       .masters_cnt    = ARRAY_SIZE(omap44xx_dsp_masters),
 };
 
 /*
 };
 
 /* dss */
-/* dss master ports */
-static struct omap_hwmod_ocp_if *omap44xx_dss_masters[] = {
-       &omap44xx_dss__l3_main_1,
-};
-
 static struct omap_hwmod_addr_space omap44xx_dss_dma_addrs[] = {
        {
                .pa_start       = 0x58000000,
        .user           = OCP_USER_MPU,
 };
 
-/* dss slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_dss_slaves[] = {
-       &omap44xx_l3_main_2__dss,
-       &omap44xx_l4_per__dss,
-};
-
 static struct omap_hwmod_opt_clk dss_opt_clks[] = {
        { .role = "sys_clk", .clk = "dss_sys_clk" },
        { .role = "tv_clk", .clk = "dss_tv_clk" },
        },
        .opt_clks       = dss_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(dss_opt_clks),
-       .slaves         = omap44xx_dss_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_dss_slaves),
-       .masters        = omap44xx_dss_masters,
-       .masters_cnt    = ARRAY_SIZE(omap44xx_dss_masters),
 };
 
 /*
        .user           = OCP_USER_MPU,
 };
 
-/* dss_dispc slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_dss_dispc_slaves[] = {
-       &omap44xx_l3_main_2__dss_dispc,
-       &omap44xx_l4_per__dss_dispc,
-};
-
 static struct omap_hwmod omap44xx_dss_dispc_hwmod = {
        .name           = "dss_dispc",
        .class          = &omap44xx_dispc_hwmod_class,
                        .context_offs = OMAP4_RM_DSS_DSS_CONTEXT_OFFSET,
                },
        },
-       .slaves         = omap44xx_dss_dispc_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_dss_dispc_slaves),
        .dev_attr       = &omap44xx_dss_dispc_dev_attr
 };
 
        .user           = OCP_USER_MPU,
 };
 
-/* dss_dsi1 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_dss_dsi1_slaves[] = {
-       &omap44xx_l3_main_2__dss_dsi1,
-       &omap44xx_l4_per__dss_dsi1,
-};
-
 static struct omap_hwmod_opt_clk dss_dsi1_opt_clks[] = {
        { .role = "sys_clk", .clk = "dss_sys_clk" },
 };
        },
        .opt_clks       = dss_dsi1_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(dss_dsi1_opt_clks),
-       .slaves         = omap44xx_dss_dsi1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_dss_dsi1_slaves),
 };
 
 /* dss_dsi2 */
        .user           = OCP_USER_MPU,
 };
 
-/* dss_dsi2 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_dss_dsi2_slaves[] = {
-       &omap44xx_l3_main_2__dss_dsi2,
-       &omap44xx_l4_per__dss_dsi2,
-};
-
 static struct omap_hwmod_opt_clk dss_dsi2_opt_clks[] = {
        { .role = "sys_clk", .clk = "dss_sys_clk" },
 };
        },
        .opt_clks       = dss_dsi2_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(dss_dsi2_opt_clks),
-       .slaves         = omap44xx_dss_dsi2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_dss_dsi2_slaves),
 };
 
 /*
        .user           = OCP_USER_MPU,
 };
 
-/* dss_hdmi slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_dss_hdmi_slaves[] = {
-       &omap44xx_l3_main_2__dss_hdmi,
-       &omap44xx_l4_per__dss_hdmi,
-};
-
 static struct omap_hwmod_opt_clk dss_hdmi_opt_clks[] = {
        { .role = "sys_clk", .clk = "dss_sys_clk" },
 };
        },
        .opt_clks       = dss_hdmi_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(dss_hdmi_opt_clks),
-       .slaves         = omap44xx_dss_hdmi_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_dss_hdmi_slaves),
 };
 
 /*
        .user           = OCP_USER_MPU,
 };
 
-/* dss_rfbi slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_dss_rfbi_slaves[] = {
-       &omap44xx_l3_main_2__dss_rfbi,
-       &omap44xx_l4_per__dss_rfbi,
-};
-
 static struct omap_hwmod_opt_clk dss_rfbi_opt_clks[] = {
        { .role = "ick", .clk = "dss_fck" },
 };
        },
        .opt_clks       = dss_rfbi_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(dss_rfbi_opt_clks),
-       .slaves         = omap44xx_dss_rfbi_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_dss_rfbi_slaves),
 };
 
 /*
        .user           = OCP_USER_MPU,
 };
 
-/* dss_venc slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_dss_venc_slaves[] = {
-       &omap44xx_l3_main_2__dss_venc,
-       &omap44xx_l4_per__dss_venc,
-};
-
 static struct omap_hwmod omap44xx_dss_venc_hwmod = {
        .name           = "dss_venc",
        .class          = &omap44xx_venc_hwmod_class,
                        .context_offs = OMAP4_RM_DSS_DSS_CONTEXT_OFFSET,
                },
        },
-       .slaves         = omap44xx_dss_venc_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_dss_venc_slaves),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* gpio1 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_gpio1_slaves[] = {
-       &omap44xx_l4_wkup__gpio1,
-};
-
 static struct omap_hwmod_opt_clk gpio1_opt_clks[] = {
        { .role = "dbclk", .clk = "gpio1_dbclk" },
 };
        .opt_clks       = gpio1_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(gpio1_opt_clks),
        .dev_attr       = &gpio_dev_attr,
-       .slaves         = omap44xx_gpio1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_gpio1_slaves),
 };
 
 /* gpio2 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* gpio2 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_gpio2_slaves[] = {
-       &omap44xx_l4_per__gpio2,
-};
-
 static struct omap_hwmod_opt_clk gpio2_opt_clks[] = {
        { .role = "dbclk", .clk = "gpio2_dbclk" },
 };
        .opt_clks       = gpio2_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(gpio2_opt_clks),
        .dev_attr       = &gpio_dev_attr,
-       .slaves         = omap44xx_gpio2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_gpio2_slaves),
 };
 
 /* gpio3 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* gpio3 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_gpio3_slaves[] = {
-       &omap44xx_l4_per__gpio3,
-};
-
 static struct omap_hwmod_opt_clk gpio3_opt_clks[] = {
        { .role = "dbclk", .clk = "gpio3_dbclk" },
 };
        .opt_clks       = gpio3_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(gpio3_opt_clks),
        .dev_attr       = &gpio_dev_attr,
-       .slaves         = omap44xx_gpio3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_gpio3_slaves),
 };
 
 /* gpio4 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* gpio4 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_gpio4_slaves[] = {
-       &omap44xx_l4_per__gpio4,
-};
-
 static struct omap_hwmod_opt_clk gpio4_opt_clks[] = {
        { .role = "dbclk", .clk = "gpio4_dbclk" },
 };
        .opt_clks       = gpio4_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(gpio4_opt_clks),
        .dev_attr       = &gpio_dev_attr,
-       .slaves         = omap44xx_gpio4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_gpio4_slaves),
 };
 
 /* gpio5 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* gpio5 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_gpio5_slaves[] = {
-       &omap44xx_l4_per__gpio5,
-};
-
 static struct omap_hwmod_opt_clk gpio5_opt_clks[] = {
        { .role = "dbclk", .clk = "gpio5_dbclk" },
 };
        .opt_clks       = gpio5_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(gpio5_opt_clks),
        .dev_attr       = &gpio_dev_attr,
-       .slaves         = omap44xx_gpio5_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_gpio5_slaves),
 };
 
 /* gpio6 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* gpio6 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_gpio6_slaves[] = {
-       &omap44xx_l4_per__gpio6,
-};
-
 static struct omap_hwmod_opt_clk gpio6_opt_clks[] = {
        { .role = "dbclk", .clk = "gpio6_dbclk" },
 };
        .opt_clks       = gpio6_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(gpio6_opt_clks),
        .dev_attr       = &gpio_dev_attr,
-       .slaves         = omap44xx_gpio6_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_gpio6_slaves),
 };
 
 /*
        { .irq = -1 }
 };
 
-/* hsi master ports */
-static struct omap_hwmod_ocp_if *omap44xx_hsi_masters[] = {
-       &omap44xx_hsi__l3_main_2,
-};
-
 static struct omap_hwmod_addr_space omap44xx_hsi_addrs[] = {
        {
                .pa_start       = 0x4a058000,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* hsi slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_hsi_slaves[] = {
-       &omap44xx_l4_cfg__hsi,
-};
-
 static struct omap_hwmod omap44xx_hsi_hwmod = {
        .name           = "hsi",
        .class          = &omap44xx_hsi_hwmod_class,
                        .modulemode   = MODULEMODE_HWCTRL,
                },
        },
-       .slaves         = omap44xx_hsi_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_hsi_slaves),
-       .masters        = omap44xx_hsi_masters,
-       .masters_cnt    = ARRAY_SIZE(omap44xx_hsi_masters),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* i2c1 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_i2c1_slaves[] = {
-       &omap44xx_l4_per__i2c1,
-};
-
 static struct omap_hwmod omap44xx_i2c1_hwmod = {
        .name           = "i2c1",
        .class          = &omap44xx_i2c_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_i2c1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_i2c1_slaves),
        .dev_attr       = &i2c_dev_attr,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* i2c2 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_i2c2_slaves[] = {
-       &omap44xx_l4_per__i2c2,
-};
-
 static struct omap_hwmod omap44xx_i2c2_hwmod = {
        .name           = "i2c2",
        .class          = &omap44xx_i2c_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_i2c2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_i2c2_slaves),
        .dev_attr       = &i2c_dev_attr,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* i2c3 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_i2c3_slaves[] = {
-       &omap44xx_l4_per__i2c3,
-};
-
 static struct omap_hwmod omap44xx_i2c3_hwmod = {
        .name           = "i2c3",
        .class          = &omap44xx_i2c_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_i2c3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_i2c3_slaves),
        .dev_attr       = &i2c_dev_attr,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* i2c4 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_i2c4_slaves[] = {
-       &omap44xx_l4_per__i2c4,
-};
-
 static struct omap_hwmod omap44xx_i2c4_hwmod = {
        .name           = "i2c4",
        .class          = &omap44xx_i2c_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_i2c4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_i2c4_slaves),
        .dev_attr       = &i2c_dev_attr,
 };
 
        { .name = "mmu_cache", .rst_shift = 2 },
 };
 
-/* ipu master ports */
-static struct omap_hwmod_ocp_if *omap44xx_ipu_masters[] = {
-       &omap44xx_ipu__l3_main_2,
-};
-
 /* l3_main_2 -> ipu */
 static struct omap_hwmod_ocp_if omap44xx_l3_main_2__ipu = {
        .master         = &omap44xx_l3_main_2_hwmod,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* ipu slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_ipu_slaves[] = {
-       &omap44xx_l3_main_2__ipu,
-};
-
 static struct omap_hwmod omap44xx_ipu_hwmod = {
        .name           = "ipu",
        .class          = &omap44xx_ipu_hwmod_class,
                        .modulemode   = MODULEMODE_HWCTRL,
                },
        },
-       .slaves         = omap44xx_ipu_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_ipu_slaves),
-       .masters        = omap44xx_ipu_masters,
-       .masters_cnt    = ARRAY_SIZE(omap44xx_ipu_masters),
 };
 
 /*
        { .dma_req = -1 }
 };
 
-/* iss master ports */
-static struct omap_hwmod_ocp_if *omap44xx_iss_masters[] = {
-       &omap44xx_iss__l3_main_2,
-};
-
 static struct omap_hwmod_addr_space omap44xx_iss_addrs[] = {
        {
                .pa_start       = 0x52000000,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* iss slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_iss_slaves[] = {
-       &omap44xx_l3_main_2__iss,
-};
-
 static struct omap_hwmod_opt_clk iss_opt_clks[] = {
        { .role = "ctrlclk", .clk = "iss_ctrlclk" },
 };
        },
        .opt_clks       = iss_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(iss_opt_clks),
-       .slaves         = omap44xx_iss_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_iss_slaves),
-       .masters        = omap44xx_iss_masters,
-       .masters_cnt    = ARRAY_SIZE(omap44xx_iss_masters),
 };
 
 /*
        { .name = "logic", .rst_shift = 2 },
 };
 
-/* iva master ports */
-static struct omap_hwmod_ocp_if *omap44xx_iva_masters[] = {
-       &omap44xx_iva__l3_main_2,
-       &omap44xx_iva__l3_instr,
-};
-
 static struct omap_hwmod_addr_space omap44xx_iva_addrs[] = {
        {
                .pa_start       = 0x5a000000,
        .user           = OCP_USER_MPU,
 };
 
-/* iva slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_iva_slaves[] = {
-       &omap44xx_dsp__iva,
-       &omap44xx_l3_main_2__iva,
-};
-
 static struct omap_hwmod omap44xx_iva_hwmod = {
        .name           = "iva",
        .class          = &omap44xx_iva_hwmod_class,
                        .modulemode   = MODULEMODE_HWCTRL,
                },
        },
-       .slaves         = omap44xx_iva_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_iva_slaves),
-       .masters        = omap44xx_iva_masters,
-       .masters_cnt    = ARRAY_SIZE(omap44xx_iva_masters),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* kbd slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_kbd_slaves[] = {
-       &omap44xx_l4_wkup__kbd,
-};
-
 static struct omap_hwmod omap44xx_kbd_hwmod = {
        .name           = "kbd",
        .class          = &omap44xx_kbd_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_kbd_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_kbd_slaves),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mailbox slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mailbox_slaves[] = {
-       &omap44xx_l4_cfg__mailbox,
-};
-
 static struct omap_hwmod omap44xx_mailbox_hwmod = {
        .name           = "mailbox",
        .class          = &omap44xx_mailbox_hwmod_class,
                        .context_offs = OMAP4_RM_L4CFG_MAILBOX_CONTEXT_OFFSET,
                },
        },
-       .slaves         = omap44xx_mailbox_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mailbox_slaves),
 };
 
 /*
        .user           = OCP_USER_SDMA,
 };
 
-/* mcbsp1 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mcbsp1_slaves[] = {
-       &omap44xx_l4_abe__mcbsp1,
-       &omap44xx_l4_abe__mcbsp1_dma,
-};
 
 static struct omap_hwmod_opt_clk mcbsp1_opt_clks[] = {
        { .role = "pad_fck", .clk = "pad_clks_ck" },
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_mcbsp1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mcbsp1_slaves),
        .opt_clks       = mcbsp1_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(mcbsp1_opt_clks),
 };
        .user           = OCP_USER_SDMA,
 };
 
-/* mcbsp2 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mcbsp2_slaves[] = {
-       &omap44xx_l4_abe__mcbsp2,
-       &omap44xx_l4_abe__mcbsp2_dma,
-};
-
 static struct omap_hwmod_opt_clk mcbsp2_opt_clks[] = {
        { .role = "pad_fck", .clk = "pad_clks_ck" },
        { .role = "prcm_clk", .clk = "mcbsp2_sync_mux_ck" },
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_mcbsp2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mcbsp2_slaves),
        .opt_clks       = mcbsp2_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(mcbsp2_opt_clks),
 };
        .user           = OCP_USER_SDMA,
 };
 
-/* mcbsp3 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mcbsp3_slaves[] = {
-       &omap44xx_l4_abe__mcbsp3,
-       &omap44xx_l4_abe__mcbsp3_dma,
-};
-
 static struct omap_hwmod_opt_clk mcbsp3_opt_clks[] = {
        { .role = "pad_fck", .clk = "pad_clks_ck" },
        { .role = "prcm_clk", .clk = "mcbsp3_sync_mux_ck" },
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_mcbsp3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mcbsp3_slaves),
        .opt_clks       = mcbsp3_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(mcbsp3_opt_clks),
 };
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcbsp4 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mcbsp4_slaves[] = {
-       &omap44xx_l4_per__mcbsp4,
-};
-
 static struct omap_hwmod_opt_clk mcbsp4_opt_clks[] = {
        { .role = "pad_fck", .clk = "pad_clks_ck" },
        { .role = "prcm_clk", .clk = "mcbsp4_sync_mux_ck" },
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_mcbsp4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mcbsp4_slaves),
        .opt_clks       = mcbsp4_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(mcbsp4_opt_clks),
 };
        .user           = OCP_USER_SDMA,
 };
 
-/* mcpdm slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mcpdm_slaves[] = {
-       &omap44xx_l4_abe__mcpdm,
-       &omap44xx_l4_abe__mcpdm_dma,
-};
-
 static struct omap_hwmod omap44xx_mcpdm_hwmod = {
        .name           = "mcpdm",
        .class          = &omap44xx_mcpdm_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_mcpdm_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mcpdm_slaves),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcspi1 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mcspi1_slaves[] = {
-       &omap44xx_l4_per__mcspi1,
-};
-
 /* mcspi1 dev_attr */
 static struct omap2_mcspi_dev_attr mcspi1_dev_attr = {
        .num_chipselect = 4,
                },
        },
        .dev_attr       = &mcspi1_dev_attr,
-       .slaves         = omap44xx_mcspi1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mcspi1_slaves),
 };
 
 /* mcspi2 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcspi2 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mcspi2_slaves[] = {
-       &omap44xx_l4_per__mcspi2,
-};
-
 /* mcspi2 dev_attr */
 static struct omap2_mcspi_dev_attr mcspi2_dev_attr = {
        .num_chipselect = 2,
                },
        },
        .dev_attr       = &mcspi2_dev_attr,
-       .slaves         = omap44xx_mcspi2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mcspi2_slaves),
 };
 
 /* mcspi3 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcspi3 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mcspi3_slaves[] = {
-       &omap44xx_l4_per__mcspi3,
-};
-
 /* mcspi3 dev_attr */
 static struct omap2_mcspi_dev_attr mcspi3_dev_attr = {
        .num_chipselect = 2,
                },
        },
        .dev_attr       = &mcspi3_dev_attr,
-       .slaves         = omap44xx_mcspi3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mcspi3_slaves),
 };
 
 /* mcspi4 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mcspi4 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mcspi4_slaves[] = {
-       &omap44xx_l4_per__mcspi4,
-};
-
 /* mcspi4 dev_attr */
 static struct omap2_mcspi_dev_attr mcspi4_dev_attr = {
        .num_chipselect = 1,
                },
        },
        .dev_attr       = &mcspi4_dev_attr,
-       .slaves         = omap44xx_mcspi4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mcspi4_slaves),
 };
 
 /*
        { .dma_req = -1 }
 };
 
-/* mmc1 master ports */
-static struct omap_hwmod_ocp_if *omap44xx_mmc1_masters[] = {
-       &omap44xx_mmc1__l3_main_1,
-};
-
 static struct omap_hwmod_addr_space omap44xx_mmc1_addrs[] = {
        {
                .pa_start       = 0x4809c000,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mmc1 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mmc1_slaves[] = {
-       &omap44xx_l4_per__mmc1,
-};
-
 /* mmc1 dev_attr */
 static struct omap_mmc_dev_attr mmc1_dev_attr = {
        .flags  = OMAP_HSMMC_SUPPORTS_DUAL_VOLT,
                },
        },
        .dev_attr       = &mmc1_dev_attr,
-       .slaves         = omap44xx_mmc1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mmc1_slaves),
-       .masters        = omap44xx_mmc1_masters,
-       .masters_cnt    = ARRAY_SIZE(omap44xx_mmc1_masters),
 };
 
 /* mmc2 */
        { .dma_req = -1 }
 };
 
-/* mmc2 master ports */
-static struct omap_hwmod_ocp_if *omap44xx_mmc2_masters[] = {
-       &omap44xx_mmc2__l3_main_1,
-};
-
 static struct omap_hwmod_addr_space omap44xx_mmc2_addrs[] = {
        {
                .pa_start       = 0x480b4000,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mmc2 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mmc2_slaves[] = {
-       &omap44xx_l4_per__mmc2,
-};
-
 static struct omap_hwmod omap44xx_mmc2_hwmod = {
        .name           = "mmc2",
        .class          = &omap44xx_mmc_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_mmc2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mmc2_slaves),
-       .masters        = omap44xx_mmc2_masters,
-       .masters_cnt    = ARRAY_SIZE(omap44xx_mmc2_masters),
 };
 
 /* mmc3 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mmc3 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mmc3_slaves[] = {
-       &omap44xx_l4_per__mmc3,
-};
-
 static struct omap_hwmod omap44xx_mmc3_hwmod = {
        .name           = "mmc3",
        .class          = &omap44xx_mmc_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_mmc3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mmc3_slaves),
 };
 
 /* mmc4 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mmc4 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mmc4_slaves[] = {
-       &omap44xx_l4_per__mmc4,
-};
-
 static struct omap_hwmod omap44xx_mmc4_hwmod = {
        .name           = "mmc4",
        .class          = &omap44xx_mmc_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_mmc4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mmc4_slaves),
 };
 
 /* mmc5 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* mmc5 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_mmc5_slaves[] = {
-       &omap44xx_l4_per__mmc5,
-};
-
 static struct omap_hwmod omap44xx_mmc5_hwmod = {
        .name           = "mmc5",
        .class          = &omap44xx_mmc_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_mmc5_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_mmc5_slaves),
 };
 
 /*
        { .irq = -1 }
 };
 
-/* mpu master ports */
-static struct omap_hwmod_ocp_if *omap44xx_mpu_masters[] = {
-       &omap44xx_mpu__l3_main_1,
-       &omap44xx_mpu__l4_abe,
-       &omap44xx_mpu__dmm,
-};
-
 static struct omap_hwmod omap44xx_mpu_hwmod = {
        .name           = "mpu",
        .class          = &omap44xx_mpu_hwmod_class,
                        .context_offs = OMAP4_RM_MPU_MPU_CONTEXT_OFFSET,
                },
        },
-       .masters        = omap44xx_mpu_masters,
-       .masters_cnt    = ARRAY_SIZE(omap44xx_mpu_masters),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* smartreflex_core slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_smartreflex_core_slaves[] = {
-       &omap44xx_l4_cfg__smartreflex_core,
-};
-
 static struct omap_hwmod omap44xx_smartreflex_core_hwmod = {
        .name           = "smartreflex_core",
        .class          = &omap44xx_smartreflex_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_smartreflex_core_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_smartreflex_core_slaves),
        .dev_attr       = &smartreflex_core_dev_attr,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* smartreflex_iva slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_smartreflex_iva_slaves[] = {
-       &omap44xx_l4_cfg__smartreflex_iva,
-};
-
 static struct omap_hwmod omap44xx_smartreflex_iva_hwmod = {
        .name           = "smartreflex_iva",
        .class          = &omap44xx_smartreflex_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_smartreflex_iva_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_smartreflex_iva_slaves),
        .dev_attr       = &smartreflex_iva_dev_attr,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* smartreflex_mpu slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_smartreflex_mpu_slaves[] = {
-       &omap44xx_l4_cfg__smartreflex_mpu,
-};
-
 static struct omap_hwmod omap44xx_smartreflex_mpu_hwmod = {
        .name           = "smartreflex_mpu",
        .class          = &omap44xx_smartreflex_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_smartreflex_mpu_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_smartreflex_mpu_slaves),
        .dev_attr       = &smartreflex_mpu_dev_attr,
 };
 
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* spinlock slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_spinlock_slaves[] = {
-       &omap44xx_l4_cfg__spinlock,
-};
-
 static struct omap_hwmod omap44xx_spinlock_hwmod = {
        .name           = "spinlock",
        .class          = &omap44xx_spinlock_hwmod_class,
                        .context_offs = OMAP4_RM_L4CFG_HW_SEM_CONTEXT_OFFSET,
                },
        },
-       .slaves         = omap44xx_spinlock_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_spinlock_slaves),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer1 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_timer1_slaves[] = {
-       &omap44xx_l4_wkup__timer1,
-};
-
 static struct omap_hwmod omap44xx_timer1_hwmod = {
        .name           = "timer1",
        .class          = &omap44xx_timer_1ms_hwmod_class,
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap44xx_timer1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_timer1_slaves),
 };
 
 /* timer2 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer2 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_timer2_slaves[] = {
-       &omap44xx_l4_per__timer2,
-};
-
 static struct omap_hwmod omap44xx_timer2_hwmod = {
        .name           = "timer2",
        .class          = &omap44xx_timer_1ms_hwmod_class,
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap44xx_timer2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_timer2_slaves),
 };
 
 /* timer3 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer3 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_timer3_slaves[] = {
-       &omap44xx_l4_per__timer3,
-};
-
 static struct omap_hwmod omap44xx_timer3_hwmod = {
        .name           = "timer3",
        .class          = &omap44xx_timer_hwmod_class,
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap44xx_timer3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_timer3_slaves),
 };
 
 /* timer4 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer4 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_timer4_slaves[] = {
-       &omap44xx_l4_per__timer4,
-};
-
 static struct omap_hwmod omap44xx_timer4_hwmod = {
        .name           = "timer4",
        .class          = &omap44xx_timer_hwmod_class,
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap44xx_timer4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_timer4_slaves),
 };
 
 /* timer5 */
        .user           = OCP_USER_SDMA,
 };
 
-/* timer5 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_timer5_slaves[] = {
-       &omap44xx_l4_abe__timer5,
-       &omap44xx_l4_abe__timer5_dma,
-};
-
 static struct omap_hwmod omap44xx_timer5_hwmod = {
        .name           = "timer5",
        .class          = &omap44xx_timer_hwmod_class,
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap44xx_timer5_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_timer5_slaves),
 };
 
 /* timer6 */
        .user           = OCP_USER_SDMA,
 };
 
-/* timer6 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_timer6_slaves[] = {
-       &omap44xx_l4_abe__timer6,
-       &omap44xx_l4_abe__timer6_dma,
-};
-
 static struct omap_hwmod omap44xx_timer6_hwmod = {
        .name           = "timer6",
        .class          = &omap44xx_timer_hwmod_class,
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap44xx_timer6_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_timer6_slaves),
 };
 
 /* timer7 */
        .user           = OCP_USER_SDMA,
 };
 
-/* timer7 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_timer7_slaves[] = {
-       &omap44xx_l4_abe__timer7,
-       &omap44xx_l4_abe__timer7_dma,
-};
-
 static struct omap_hwmod omap44xx_timer7_hwmod = {
        .name           = "timer7",
        .class          = &omap44xx_timer_hwmod_class,
                },
        },
        .dev_attr       = &capability_alwon_dev_attr,
-       .slaves         = omap44xx_timer7_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_timer7_slaves),
 };
 
 /* timer8 */
        .user           = OCP_USER_SDMA,
 };
 
-/* timer8 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_timer8_slaves[] = {
-       &omap44xx_l4_abe__timer8,
-       &omap44xx_l4_abe__timer8_dma,
-};
-
 static struct omap_hwmod omap44xx_timer8_hwmod = {
        .name           = "timer8",
        .class          = &omap44xx_timer_hwmod_class,
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap44xx_timer8_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_timer8_slaves),
 };
 
 /* timer9 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer9 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_timer9_slaves[] = {
-       &omap44xx_l4_per__timer9,
-};
-
 static struct omap_hwmod omap44xx_timer9_hwmod = {
        .name           = "timer9",
        .class          = &omap44xx_timer_hwmod_class,
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap44xx_timer9_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_timer9_slaves),
 };
 
 /* timer10 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer10 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_timer10_slaves[] = {
-       &omap44xx_l4_per__timer10,
-};
-
 static struct omap_hwmod omap44xx_timer10_hwmod = {
        .name           = "timer10",
        .class          = &omap44xx_timer_1ms_hwmod_class,
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap44xx_timer10_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_timer10_slaves),
 };
 
 /* timer11 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* timer11 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_timer11_slaves[] = {
-       &omap44xx_l4_per__timer11,
-};
-
 static struct omap_hwmod omap44xx_timer11_hwmod = {
        .name           = "timer11",
        .class          = &omap44xx_timer_hwmod_class,
                },
        },
        .dev_attr       = &capability_pwm_dev_attr,
-       .slaves         = omap44xx_timer11_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_timer11_slaves),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* uart1 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_uart1_slaves[] = {
-       &omap44xx_l4_per__uart1,
-};
-
 static struct omap_hwmod omap44xx_uart1_hwmod = {
        .name           = "uart1",
        .class          = &omap44xx_uart_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_uart1_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_uart1_slaves),
 };
 
 /* uart2 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* uart2 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_uart2_slaves[] = {
-       &omap44xx_l4_per__uart2,
-};
-
 static struct omap_hwmod omap44xx_uart2_hwmod = {
        .name           = "uart2",
        .class          = &omap44xx_uart_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_uart2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_uart2_slaves),
 };
 
 /* uart3 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* uart3 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_uart3_slaves[] = {
-       &omap44xx_l4_per__uart3,
-};
-
 static struct omap_hwmod omap44xx_uart3_hwmod = {
        .name           = "uart3",
        .class          = &omap44xx_uart_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_uart3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_uart3_slaves),
 };
 
 /* uart4 */
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* uart4 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_uart4_slaves[] = {
-       &omap44xx_l4_per__uart4,
-};
-
 static struct omap_hwmod omap44xx_uart4_hwmod = {
        .name           = "uart4",
        .class          = &omap44xx_uart_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_uart4_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_uart4_slaves),
 };
 
 /*
        { .irq = -1 }
 };
 
-/* usb_otg_hs master ports */
-static struct omap_hwmod_ocp_if *omap44xx_usb_otg_hs_masters[] = {
-       &omap44xx_usb_otg_hs__l3_main_2,
-};
-
 static struct omap_hwmod_addr_space omap44xx_usb_otg_hs_addrs[] = {
        {
                .pa_start       = 0x4a0ab000,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* usb_otg_hs slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_usb_otg_hs_slaves[] = {
-       &omap44xx_l4_cfg__usb_otg_hs,
-};
-
 static struct omap_hwmod_opt_clk usb_otg_hs_opt_clks[] = {
        { .role = "xclk", .clk = "usb_otg_hs_xclk" },
 };
        },
        .opt_clks       = usb_otg_hs_opt_clks,
        .opt_clks_cnt   = ARRAY_SIZE(usb_otg_hs_opt_clks),
-       .slaves         = omap44xx_usb_otg_hs_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_usb_otg_hs_slaves),
-       .masters        = omap44xx_usb_otg_hs_masters,
-       .masters_cnt    = ARRAY_SIZE(omap44xx_usb_otg_hs_masters),
 };
 
 /*
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* wd_timer2 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_wd_timer2_slaves[] = {
-       &omap44xx_l4_wkup__wd_timer2,
-};
-
 static struct omap_hwmod omap44xx_wd_timer2_hwmod = {
        .name           = "wd_timer2",
        .class          = &omap44xx_wd_timer_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_wd_timer2_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_wd_timer2_slaves),
 };
 
 /* wd_timer3 */
        .user           = OCP_USER_SDMA,
 };
 
-/* wd_timer3 slave ports */
-static struct omap_hwmod_ocp_if *omap44xx_wd_timer3_slaves[] = {
-       &omap44xx_l4_abe__wd_timer3,
-       &omap44xx_l4_abe__wd_timer3_dma,
-};
-
 static struct omap_hwmod omap44xx_wd_timer3_hwmod = {
        .name           = "wd_timer3",
        .class          = &omap44xx_wd_timer_hwmod_class,
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
-       .slaves         = omap44xx_wd_timer3_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_wd_timer3_slaves),
 };
 
 /*
        .sysc = &omap44xx_usb_host_hs_sysc,
 };
 
-static struct omap_hwmod_ocp_if *omap44xx_usb_host_hs_masters[] = {
-       &omap44xx_usb_host_hs__l3_main_2,
-};
-
 static struct omap_hwmod_addr_space omap44xx_usb_host_hs_addrs[] = {
        {
                .name           = "uhh",
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-static struct omap_hwmod_ocp_if *omap44xx_usb_host_hs_slaves[] = {
-       &omap44xx_l4_cfg__usb_host_hs,
-};
-
 static struct omap_hwmod omap44xx_usb_host_hs_hwmod = {
        .name           = "usb_host_hs",
        .class          = &omap44xx_usb_host_hs_hwmod_class,
                },
        },
        .mpu_irqs       = omap44xx_usb_host_hs_irqs,
-       .slaves         = omap44xx_usb_host_hs_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_usb_host_hs_slaves),
-       .masters        = omap44xx_usb_host_hs_masters,
-       .masters_cnt    = ARRAY_SIZE(omap44xx_usb_host_hs_masters),
 
        /*
         * Errata: USBHOST Configured In Smart-Idle Can Lead To a Deadlock
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-static struct omap_hwmod_ocp_if *omap44xx_usb_tll_hs_slaves[] = {
-       &omap44xx_l4_cfg__usb_tll_hs,
-};
-
 static struct omap_hwmod omap44xx_usb_tll_hs_hwmod = {
        .name           = "usb_tll_hs",
        .class          = &omap44xx_usb_tll_hs_hwmod_class,
                },
        },
        .mpu_irqs       = omap44xx_usb_tll_hs_irqs,
-       .slaves         = omap44xx_usb_tll_hs_slaves,
-       .slaves_cnt     = ARRAY_SIZE(omap44xx_usb_tll_hs_slaves),
 };
 
-static __initdata struct omap_hwmod *omap44xx_hwmods[] = {
-
-       /* dmm class */
-       &omap44xx_dmm_hwmod,
-
-       /* emif_fw class */
-       &omap44xx_emif_fw_hwmod,
-
-       /* l3 class */
-       &omap44xx_l3_instr_hwmod,
-       &omap44xx_l3_main_1_hwmod,
-       &omap44xx_l3_main_2_hwmod,
-       &omap44xx_l3_main_3_hwmod,
-
-       /* l4 class */
-       &omap44xx_l4_abe_hwmod,
-       &omap44xx_l4_cfg_hwmod,
-       &omap44xx_l4_per_hwmod,
-       &omap44xx_l4_wkup_hwmod,
-
-       /* mpu_bus class */
-       &omap44xx_mpu_private_hwmod,
-
-       /* aess class */
-       &omap44xx_aess_hwmod,
-
-       /* counter class */
-       &omap44xx_counter_32k_hwmod,
-
-       /* dma class */
-       &omap44xx_dma_system_hwmod,
-
-       /* dmic class */
-       &omap44xx_dmic_hwmod,
-
-       /* dsp class */
-       &omap44xx_dsp_hwmod,
-
-       /* dss class */
-       &omap44xx_dss_hwmod,
-       &omap44xx_dss_dispc_hwmod,
-       &omap44xx_dss_dsi1_hwmod,
-       &omap44xx_dss_dsi2_hwmod,
-       &omap44xx_dss_hdmi_hwmod,
-       &omap44xx_dss_rfbi_hwmod,
-       &omap44xx_dss_venc_hwmod,
-
-       /* gpio class */
-       &omap44xx_gpio1_hwmod,
-       &omap44xx_gpio2_hwmod,
-       &omap44xx_gpio3_hwmod,
-       &omap44xx_gpio4_hwmod,
-       &omap44xx_gpio5_hwmod,
-       &omap44xx_gpio6_hwmod,
-
-       /* hsi class */
-       &omap44xx_hsi_hwmod,
-
-       /* i2c class */
-       &omap44xx_i2c1_hwmod,
-       &omap44xx_i2c2_hwmod,
-       &omap44xx_i2c3_hwmod,
-       &omap44xx_i2c4_hwmod,
-
-       /* ipu class */
-       &omap44xx_ipu_hwmod,
-
-       /* iss class */
-       &omap44xx_iss_hwmod,
-
-       /* iva class */
-       &omap44xx_iva_hwmod,
-
-       /* kbd class */
-       &omap44xx_kbd_hwmod,
-
-       /* mailbox class */
-       &omap44xx_mailbox_hwmod,
-
-       /* mcbsp class */
-       &omap44xx_mcbsp1_hwmod,
-       &omap44xx_mcbsp2_hwmod,
-       &omap44xx_mcbsp3_hwmod,
-       &omap44xx_mcbsp4_hwmod,
-
-       /* mcpdm class */
-       &omap44xx_mcpdm_hwmod,
-
-       /* mcspi class */
-       &omap44xx_mcspi1_hwmod,
-       &omap44xx_mcspi2_hwmod,
-       &omap44xx_mcspi3_hwmod,
-       &omap44xx_mcspi4_hwmod,
-
-       /* mmc class */
-       &omap44xx_mmc1_hwmod,
-       &omap44xx_mmc2_hwmod,
-       &omap44xx_mmc3_hwmod,
-       &omap44xx_mmc4_hwmod,
-       &omap44xx_mmc5_hwmod,
-
-       /* mpu class */
-       &omap44xx_mpu_hwmod,
-
-       /* smartreflex class */
-       &omap44xx_smartreflex_core_hwmod,
-       &omap44xx_smartreflex_iva_hwmod,
-       &omap44xx_smartreflex_mpu_hwmod,
-
-       /* spinlock class */
-       &omap44xx_spinlock_hwmod,
-
-       /* timer class */
-       &omap44xx_timer1_hwmod,
-       &omap44xx_timer2_hwmod,
-       &omap44xx_timer3_hwmod,
-       &omap44xx_timer4_hwmod,
-       &omap44xx_timer5_hwmod,
-       &omap44xx_timer6_hwmod,
-       &omap44xx_timer7_hwmod,
-       &omap44xx_timer8_hwmod,
-       &omap44xx_timer9_hwmod,
-       &omap44xx_timer10_hwmod,
-       &omap44xx_timer11_hwmod,
-
-       /* uart class */
-       &omap44xx_uart1_hwmod,
-       &omap44xx_uart2_hwmod,
-       &omap44xx_uart3_hwmod,
-       &omap44xx_uart4_hwmod,
-
-       /* usb host class */
-       &omap44xx_usb_host_hs_hwmod,
-       &omap44xx_usb_tll_hs_hwmod,
-
-       /* usb_otg_hs class */
-       &omap44xx_usb_otg_hs_hwmod,
-
-       /* wd_timer class */
-       &omap44xx_wd_timer2_hwmod,
-       &omap44xx_wd_timer3_hwmod,
+static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
+       &omap44xx_l3_main_1__dmm,
+       &omap44xx_mpu__dmm,
+       &omap44xx_dmm__emif_fw,
+       &omap44xx_l4_cfg__emif_fw,
+       &omap44xx_iva__l3_instr,
+       &omap44xx_l3_main_3__l3_instr,
+       &omap44xx_dsp__l3_main_1,
+       &omap44xx_dss__l3_main_1,
+       &omap44xx_l3_main_2__l3_main_1,
+       &omap44xx_l4_cfg__l3_main_1,
+       &omap44xx_mmc1__l3_main_1,
+       &omap44xx_mmc2__l3_main_1,
+       &omap44xx_mpu__l3_main_1,
+       &omap44xx_dma_system__l3_main_2,
+       &omap44xx_hsi__l3_main_2,
+       &omap44xx_ipu__l3_main_2,
+       &omap44xx_iss__l3_main_2,
+       &omap44xx_iva__l3_main_2,
+       &omap44xx_l3_main_1__l3_main_2,
+       &omap44xx_l4_cfg__l3_main_2,
+       &omap44xx_usb_host_hs__l3_main_2,
+       &omap44xx_usb_otg_hs__l3_main_2,
+       &omap44xx_l3_main_1__l3_main_3,
+       &omap44xx_l3_main_2__l3_main_3,
+       &omap44xx_l4_cfg__l3_main_3,
+       &omap44xx_aess__l4_abe,
+       &omap44xx_dsp__l4_abe,
+       &omap44xx_l3_main_1__l4_abe,
+       &omap44xx_mpu__l4_abe,
+       &omap44xx_l3_main_1__l4_cfg,
+       &omap44xx_l3_main_2__l4_per,
+       &omap44xx_l4_cfg__l4_wkup,
+       &omap44xx_mpu__mpu_private,
+       &omap44xx_l4_abe__aess,
+       &omap44xx_l4_abe__aess_dma,
+       &omap44xx_l4_wkup__counter_32k,
+       &omap44xx_l4_cfg__dma_system,
+       &omap44xx_l4_abe__dmic,
+       &omap44xx_l4_abe__dmic_dma,
+       &omap44xx_dsp__iva,
+       &omap44xx_l4_cfg__dsp,
+       &omap44xx_l3_main_2__dss,
+       &omap44xx_l4_per__dss,
+       &omap44xx_l3_main_2__dss_dispc,
+       &omap44xx_l4_per__dss_dispc,
+       &omap44xx_l3_main_2__dss_dsi1,
+       &omap44xx_l4_per__dss_dsi1,
+       &omap44xx_l3_main_2__dss_dsi2,
+       &omap44xx_l4_per__dss_dsi2,
+       &omap44xx_l3_main_2__dss_hdmi,
+       &omap44xx_l4_per__dss_hdmi,
+       &omap44xx_l3_main_2__dss_rfbi,
+       &omap44xx_l4_per__dss_rfbi,
+       &omap44xx_l3_main_2__dss_venc,
+       &omap44xx_l4_per__dss_venc,
+       &omap44xx_l4_wkup__gpio1,
+       &omap44xx_l4_per__gpio2,
+       &omap44xx_l4_per__gpio3,
+       &omap44xx_l4_per__gpio4,
+       &omap44xx_l4_per__gpio5,
+       &omap44xx_l4_per__gpio6,
+       &omap44xx_l4_cfg__hsi,
+       &omap44xx_l4_per__i2c1,
+       &omap44xx_l4_per__i2c2,
+       &omap44xx_l4_per__i2c3,
+       &omap44xx_l4_per__i2c4,
+       &omap44xx_l3_main_2__ipu,
+       &omap44xx_l3_main_2__iss,
+       &omap44xx_l3_main_2__iva,
+       &omap44xx_l4_wkup__kbd,
+       &omap44xx_l4_cfg__mailbox,
+       &omap44xx_l4_abe__mcbsp1,
+       &omap44xx_l4_abe__mcbsp1_dma,
+       &omap44xx_l4_abe__mcbsp2,
+       &omap44xx_l4_abe__mcbsp2_dma,
+       &omap44xx_l4_abe__mcbsp3,
+       &omap44xx_l4_abe__mcbsp3_dma,
+       &omap44xx_l4_per__mcbsp4,
+       &omap44xx_l4_abe__mcpdm,
+       &omap44xx_l4_abe__mcpdm_dma,
+       &omap44xx_l4_per__mcspi1,
+       &omap44xx_l4_per__mcspi2,
+       &omap44xx_l4_per__mcspi3,
+       &omap44xx_l4_per__mcspi4,
+       &omap44xx_l4_per__mmc1,
+       &omap44xx_l4_per__mmc2,
+       &omap44xx_l4_per__mmc3,
+       &omap44xx_l4_per__mmc4,
+       &omap44xx_l4_per__mmc5,
+       &omap44xx_l4_cfg__smartreflex_core,
+       &omap44xx_l4_cfg__smartreflex_iva,
+       &omap44xx_l4_cfg__smartreflex_mpu,
+       &omap44xx_l4_cfg__spinlock,
+       &omap44xx_l4_wkup__timer1,
+       &omap44xx_l4_per__timer2,
+       &omap44xx_l4_per__timer3,
+       &omap44xx_l4_per__timer4,
+       &omap44xx_l4_abe__timer5,
+       &omap44xx_l4_abe__timer5_dma,
+       &omap44xx_l4_abe__timer6,
+       &omap44xx_l4_abe__timer6_dma,
+       &omap44xx_l4_abe__timer7,
+       &omap44xx_l4_abe__timer7_dma,
+       &omap44xx_l4_abe__timer8,
+       &omap44xx_l4_abe__timer8_dma,
+       &omap44xx_l4_per__timer9,
+       &omap44xx_l4_per__timer10,
+       &omap44xx_l4_per__timer11,
+       &omap44xx_l4_per__uart1,
+       &omap44xx_l4_per__uart2,
+       &omap44xx_l4_per__uart3,
+       &omap44xx_l4_per__uart4,
+       &omap44xx_l4_cfg__usb_host_hs,
+       &omap44xx_l4_cfg__usb_otg_hs,
+       &omap44xx_l4_cfg__usb_tll_hs,
+       &omap44xx_l4_wkup__wd_timer2,
+       &omap44xx_l4_abe__wd_timer3,
+       &omap44xx_l4_abe__wd_timer3_dma,
        NULL,
 };
 
 int __init omap44xx_hwmod_init(void)
 {
-       return omap_hwmod_register(omap44xx_hwmods);
+       return omap_hwmod_register_links(omap44xx_hwmod_ocp_ifs);
 }