OSDN Git Service

Merge branch 'omap-for-v5.7/accelerators' into omap-for-v5.7/ti-sysc-drop-pdata
authorTony Lindgren <tony@atomide.com>
Wed, 4 Mar 2020 16:13:46 +0000 (08:13 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 4 Mar 2020 16:13:46 +0000 (08:13 -0800)
1  2 
arch/arm/boot/dts/omap4.dtsi
arch/arm/mach-omap2/omap_hwmod_43xx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c

Simple merge
@@@ -241,9 -303,36 +234,8 @@@ static struct omap_hwmod_ocp_if am43xx_
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
 -static struct omap_hwmod_ocp_if am43xx_dss__l3_main = {
 -      .master         = &am43xx_dss_core_hwmod,
 -      .slave          = &am33xx_l3_main_hwmod,
 -      .clk            = "l3_gclk",
 -      .user           = OCP_USER_MPU | OCP_USER_SDMA,
 -};
 -
 -static struct omap_hwmod_ocp_if am43xx_l4_ls__dss = {
 -      .master         = &am33xx_l4_ls_hwmod,
 -      .slave          = &am43xx_dss_core_hwmod,
 -      .clk            = "l4ls_gclk",
 -      .user           = OCP_USER_MPU | OCP_USER_SDMA,
 -};
 -
 -static struct omap_hwmod_ocp_if am43xx_l4_ls__dss_dispc = {
 -      .master         = &am33xx_l4_ls_hwmod,
 -      .slave          = &am43xx_dss_dispc_hwmod,
 -      .clk            = "l4ls_gclk",
 -      .user           = OCP_USER_MPU | OCP_USER_SDMA,
 -};
 -
 -static struct omap_hwmod_ocp_if am43xx_l4_ls__dss_rfbi = {
 -      .master         = &am33xx_l4_ls_hwmod,
 -      .slave          = &am43xx_dss_rfbi_hwmod,
 -      .clk            = "l4ls_gclk",
 -      .user           = OCP_USER_MPU | OCP_USER_SDMA,
 -};
 -
  static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
        &am33xx_l4_wkup__synctimer,
-       &am43xx_l3_main__pruss,
        &am33xx_mpu__l3_main,
        &am33xx_mpu__prcm,
        &am33xx_l3_s__l4_ls,
@@@ -356,37 -356,275 +356,6 @@@ static struct omap_hwmod omap44xx_debug
  };
  
  /*
-  * 'dsp' class
-  * dsp sub-system
 - * 'dss' class
 - * display sub-system
-- */
--
- static struct omap_hwmod_class omap44xx_dsp_hwmod_class = {
-       .name   = "dsp",
 -static struct omap_hwmod_class_sysconfig omap44xx_dss_sysc = {
 -      .rev_offs       = 0x0000,
 -      .syss_offs      = 0x0014,
 -      .sysc_flags     = SYSS_HAS_RESET_STATUS,
--};
--
- /* dsp */
- static struct omap_hwmod_rst_info omap44xx_dsp_resets[] = {
-       { .name = "dsp", .rst_shift = 0 },
 -static struct omap_hwmod_class omap44xx_dss_hwmod_class = {
 -      .name   = "dss",
 -      .sysc   = &omap44xx_dss_sysc,
 -      .reset  = omap_dss_reset,
--};
--
- static struct omap_hwmod omap44xx_dsp_hwmod = {
-       .name           = "dsp",
-       .class          = &omap44xx_dsp_hwmod_class,
-       .clkdm_name     = "tesla_clkdm",
-       .rst_lines      = omap44xx_dsp_resets,
-       .rst_lines_cnt  = ARRAY_SIZE(omap44xx_dsp_resets),
-       .main_clk       = "dpll_iva_m4x2_ck",
 -/* dss */
 -static struct omap_hwmod_opt_clk dss_opt_clks[] = {
 -      { .role = "sys_clk", .clk = "dss_sys_clk" },
 -      { .role = "tv_clk", .clk = "dss_tv_clk" },
 -      { .role = "hdmi_clk", .clk = "dss_48mhz_clk" },
 -};
 -
 -static struct omap_hwmod omap44xx_dss_hwmod = {
 -      .name           = "dss_core",
 -      .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
 -      .class          = &omap44xx_dss_hwmod_class,
 -      .clkdm_name     = "l3_dss_clkdm",
 -      .main_clk       = "dss_dss_clk",
--      .prcm = {
--              .omap4 = {
-                       .clkctrl_offs = OMAP4_CM_TESLA_TESLA_CLKCTRL_OFFSET,
-                       .rstctrl_offs = OMAP4_RM_TESLA_RSTCTRL_OFFSET,
-                       .context_offs = OMAP4_RM_TESLA_TESLA_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_HWCTRL,
 -                      .clkctrl_offs = OMAP4_CM_DSS_DSS_CLKCTRL_OFFSET,
 -                      .context_offs = OMAP4_RM_DSS_DSS_CONTEXT_OFFSET,
 -                      .modulemode   = MODULEMODE_SWCTRL,
 -              },
 -      },
 -      .opt_clks       = dss_opt_clks,
 -      .opt_clks_cnt   = ARRAY_SIZE(dss_opt_clks),
 -};
 -
 -/*
 - * 'dispc' class
 - * display controller
 - */
 -
 -static struct omap_hwmod_class_sysconfig omap44xx_dispc_sysc = {
 -      .rev_offs       = 0x0000,
 -      .sysc_offs      = 0x0010,
 -      .syss_offs      = 0x0014,
 -      .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
 -                         SYSC_HAS_ENAWAKEUP | SYSC_HAS_MIDLEMODE |
 -                         SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
 -                         SYSS_HAS_RESET_STATUS),
 -      .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
 -                         MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
 -      .sysc_fields    = &omap_hwmod_sysc_type1,
 -};
 -
 -static struct omap_hwmod_class omap44xx_dispc_hwmod_class = {
 -      .name   = "dispc",
 -      .sysc   = &omap44xx_dispc_sysc,
 -};
 -
 -/* dss_dispc */
 -static struct omap_dss_dispc_dev_attr omap44xx_dss_dispc_dev_attr = {
 -      .manager_count          = 3,
 -      .has_framedonetv_irq    = 1
 -};
 -
 -static struct omap_hwmod omap44xx_dss_dispc_hwmod = {
 -      .name           = "dss_dispc",
 -      .class          = &omap44xx_dispc_hwmod_class,
 -      .clkdm_name     = "l3_dss_clkdm",
 -      .main_clk       = "dss_dss_clk",
 -      .prcm = {
 -              .omap4 = {
 -                      .clkctrl_offs = OMAP4_CM_DSS_DSS_CLKCTRL_OFFSET,
 -                      .context_offs = OMAP4_RM_DSS_DSS_CONTEXT_OFFSET,
 -              },
 -      },
 -      .dev_attr       = &omap44xx_dss_dispc_dev_attr,
 -      .parent_hwmod   = &omap44xx_dss_hwmod,
 -};
 -
 -/*
 - * 'dsi' class
 - * display serial interface controller
 - */
 -
 -static struct omap_hwmod_class_sysconfig omap44xx_dsi_sysc = {
 -      .rev_offs       = 0x0000,
 -      .sysc_offs      = 0x0010,
 -      .syss_offs      = 0x0014,
 -      .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
 -                         SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE |
 -                         SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
 -      .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
 -      .sysc_fields    = &omap_hwmod_sysc_type1,
 -};
 -
 -static struct omap_hwmod_class omap44xx_dsi_hwmod_class = {
 -      .name   = "dsi",
 -      .sysc   = &omap44xx_dsi_sysc,
 -};
 -
 -/* dss_dsi1 */
 -static struct omap_hwmod_opt_clk dss_dsi1_opt_clks[] = {
 -      { .role = "sys_clk", .clk = "dss_sys_clk" },
 -};
 -
 -static struct omap_hwmod omap44xx_dss_dsi1_hwmod = {
 -      .name           = "dss_dsi1",
 -      .class          = &omap44xx_dsi_hwmod_class,
 -      .clkdm_name     = "l3_dss_clkdm",
 -      .main_clk       = "dss_dss_clk",
 -      .prcm = {
 -              .omap4 = {
 -                      .clkctrl_offs = OMAP4_CM_DSS_DSS_CLKCTRL_OFFSET,
 -                      .context_offs = OMAP4_RM_DSS_DSS_CONTEXT_OFFSET,
 -              },
 -      },
 -      .opt_clks       = dss_dsi1_opt_clks,
 -      .opt_clks_cnt   = ARRAY_SIZE(dss_dsi1_opt_clks),
 -      .parent_hwmod   = &omap44xx_dss_hwmod,
 -};
 -
 -/* dss_dsi2 */
 -static struct omap_hwmod_opt_clk dss_dsi2_opt_clks[] = {
 -      { .role = "sys_clk", .clk = "dss_sys_clk" },
 -};
 -
 -static struct omap_hwmod omap44xx_dss_dsi2_hwmod = {
 -      .name           = "dss_dsi2",
 -      .class          = &omap44xx_dsi_hwmod_class,
 -      .clkdm_name     = "l3_dss_clkdm",
 -      .main_clk       = "dss_dss_clk",
 -      .prcm = {
 -              .omap4 = {
 -                      .clkctrl_offs = OMAP4_CM_DSS_DSS_CLKCTRL_OFFSET,
 -                      .context_offs = OMAP4_RM_DSS_DSS_CONTEXT_OFFSET,
 -              },
 -      },
 -      .opt_clks       = dss_dsi2_opt_clks,
 -      .opt_clks_cnt   = ARRAY_SIZE(dss_dsi2_opt_clks),
 -      .parent_hwmod   = &omap44xx_dss_hwmod,
 -};
 -
 -/*
 - * 'hdmi' class
 - * hdmi controller
 - */
 -
 -static struct omap_hwmod_class_sysconfig omap44xx_hdmi_sysc = {
 -      .rev_offs       = 0x0000,
 -      .sysc_offs      = 0x0010,
 -      .sysc_flags     = (SYSC_HAS_RESET_STATUS | SYSC_HAS_SIDLEMODE |
 -                         SYSC_HAS_SOFTRESET),
 -      .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
 -                         SIDLE_SMART_WKUP),
 -      .sysc_fields    = &omap_hwmod_sysc_type2,
 -};
 -
 -static struct omap_hwmod_class omap44xx_hdmi_hwmod_class = {
 -      .name   = "hdmi",
 -      .sysc   = &omap44xx_hdmi_sysc,
 -};
 -
 -/* dss_hdmi */
 -static struct omap_hwmod_opt_clk dss_hdmi_opt_clks[] = {
 -      { .role = "sys_clk", .clk = "dss_sys_clk" },
 -      { .role = "hdmi_clk", .clk = "dss_48mhz_clk" },
 -};
 -
 -static struct omap_hwmod omap44xx_dss_hdmi_hwmod = {
 -      .name           = "dss_hdmi",
 -      .class          = &omap44xx_hdmi_hwmod_class,
 -      .clkdm_name     = "l3_dss_clkdm",
 -      /*
 -       * HDMI audio requires to use no-idle mode. Hence,
 -       * set idle mode by software.
 -       */
 -      .flags          = HWMOD_SWSUP_SIDLE | HWMOD_OPT_CLKS_NEEDED,
 -      .main_clk       = "dss_48mhz_clk",
 -      .prcm = {
 -              .omap4 = {
 -                      .clkctrl_offs = OMAP4_CM_DSS_DSS_CLKCTRL_OFFSET,
 -                      .context_offs = OMAP4_RM_DSS_DSS_CONTEXT_OFFSET,
 -              },
 -      },
 -      .opt_clks       = dss_hdmi_opt_clks,
 -      .opt_clks_cnt   = ARRAY_SIZE(dss_hdmi_opt_clks),
 -      .parent_hwmod   = &omap44xx_dss_hwmod,
 -};
 -
 -/*
 - * 'rfbi' class
 - * remote frame buffer interface
 - */
 -
 -static struct omap_hwmod_class_sysconfig omap44xx_rfbi_sysc = {
 -      .rev_offs       = 0x0000,
 -      .sysc_offs      = 0x0010,
 -      .syss_offs      = 0x0014,
 -      .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE |
 -                         SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
 -      .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
 -      .sysc_fields    = &omap_hwmod_sysc_type1,
 -};
 -
 -static struct omap_hwmod_class omap44xx_rfbi_hwmod_class = {
 -      .name   = "rfbi",
 -      .sysc   = &omap44xx_rfbi_sysc,
 -};
 -
 -/* dss_rfbi */
 -static struct omap_hwmod_opt_clk dss_rfbi_opt_clks[] = {
 -      { .role = "ick", .clk = "l3_div_ck" },
 -};
 -
 -static struct omap_hwmod omap44xx_dss_rfbi_hwmod = {
 -      .name           = "dss_rfbi",
 -      .class          = &omap44xx_rfbi_hwmod_class,
 -      .clkdm_name     = "l3_dss_clkdm",
 -      .main_clk       = "dss_dss_clk",
 -      .prcm = {
 -              .omap4 = {
 -                      .clkctrl_offs = OMAP4_CM_DSS_DSS_CLKCTRL_OFFSET,
 -                      .context_offs = OMAP4_RM_DSS_DSS_CONTEXT_OFFSET,
 -              },
 -      },
 -      .opt_clks       = dss_rfbi_opt_clks,
 -      .opt_clks_cnt   = ARRAY_SIZE(dss_rfbi_opt_clks),
 -      .parent_hwmod   = &omap44xx_dss_hwmod,
 -};
 -
 -/*
 - * 'venc' class
 - * video encoder
 - */
 -
 -static struct omap_hwmod_class omap44xx_venc_hwmod_class = {
 -      .name   = "venc",
 -};
 -
 -/* dss_venc */
 -static struct omap_hwmod_opt_clk dss_venc_opt_clks[] = {
 -      { .role = "tv_clk", .clk = "dss_tv_clk" },
 -};
 -
 -static struct omap_hwmod omap44xx_dss_venc_hwmod = {
 -      .name           = "dss_venc",
 -      .class          = &omap44xx_venc_hwmod_class,
 -      .clkdm_name     = "l3_dss_clkdm",
 -      .main_clk       = "dss_tv_clk",
 -      .flags          = HWMOD_OPT_CLKS_NEEDED,
 -      .prcm = {
 -              .omap4 = {
 -                      .clkctrl_offs = OMAP4_CM_DSS_DSS_CLKCTRL_OFFSET,
 -                      .context_offs = OMAP4_RM_DSS_DSS_CONTEXT_OFFSET,
--              },
--      },
 -      .parent_hwmod   = &omap44xx_dss_hwmod,
 -      .opt_clks       = dss_venc_opt_clks,
 -      .opt_clks_cnt   = ARRAY_SIZE(dss_venc_opt_clks),
--};
 -
 -
--
--/*
   * 'emif' class
   * external memory interface no1
   */
@@@ -967,14 -1172,14 +903,6 @@@ static struct omap_hwmod_ocp_if omap44x
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* dsp -> l3_main_1 */
- static struct omap_hwmod_ocp_if omap44xx_dsp__l3_main_1 = {
-       .master         = &omap44xx_dsp_hwmod,
 -/* dss -> l3_main_1 */
 -static struct omap_hwmod_ocp_if omap44xx_dss__l3_main_1 = {
 -      .master         = &omap44xx_dss_hwmod,
--      .slave          = &omap44xx_l3_main_1_hwmod,
--      .clk            = "l3_div_ck",
--      .user           = OCP_USER_MPU | OCP_USER_SDMA,
--};
--
  /* l3_main_2 -> l3_main_1 */
  static struct omap_hwmod_ocp_if omap44xx_l3_main_2__l3_main_1 = {
        .master         = &omap44xx_l3_main_2_hwmod,
@@@ -1199,30 -1388,118 +1111,6 @@@ static struct omap_hwmod_ocp_if omap44x
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* dsp -> iva */
- static struct omap_hwmod_ocp_if omap44xx_dsp__iva = {
-       .master         = &omap44xx_dsp_hwmod,
-       .slave          = &omap44xx_iva_hwmod,
-       .clk            = "dpll_iva_m5x2_ck",
-       .user           = OCP_USER_DSP,
 -/* l3_main_2 -> dss */
 -static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss = {
 -      .master         = &omap44xx_l3_main_2_hwmod,
 -      .slave          = &omap44xx_dss_hwmod,
 -      .clk            = "l3_div_ck",
 -      .user           = OCP_USER_SDMA,
--};
--
- /* dsp -> sl2if */
- static struct omap_hwmod_ocp_if __maybe_unused omap44xx_dsp__sl2if = {
-       .master         = &omap44xx_dsp_hwmod,
-       .slave          = &omap44xx_sl2if_hwmod,
-       .clk            = "dpll_iva_m5x2_ck",
-       .user           = OCP_USER_DSP,
 -/* l4_per -> dss */
 -static struct omap_hwmod_ocp_if omap44xx_l4_per__dss = {
 -      .master         = &omap44xx_l4_per_hwmod,
 -      .slave          = &omap44xx_dss_hwmod,
 -      .clk            = "l4_div_ck",
 -      .user           = OCP_USER_MPU,
--};
--
- /* l4_cfg -> dsp */
- static struct omap_hwmod_ocp_if omap44xx_l4_cfg__dsp = {
-       .master         = &omap44xx_l4_cfg_hwmod,
-       .slave          = &omap44xx_dsp_hwmod,
 -/* l3_main_2 -> dss_dispc */
 -static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_dispc = {
 -      .master         = &omap44xx_l3_main_2_hwmod,
 -      .slave          = &omap44xx_dss_dispc_hwmod,
 -      .clk            = "l3_div_ck",
 -      .user           = OCP_USER_SDMA,
 -};
 -
 -/* l4_per -> dss_dispc */
 -static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_dispc = {
 -      .master         = &omap44xx_l4_per_hwmod,
 -      .slave          = &omap44xx_dss_dispc_hwmod,
--      .clk            = "l4_div_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
 -      .user           = OCP_USER_MPU,
 -};
 -
 -/* l3_main_2 -> dss_dsi1 */
 -static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_dsi1 = {
 -      .master         = &omap44xx_l3_main_2_hwmod,
 -      .slave          = &omap44xx_dss_dsi1_hwmod,
 -      .clk            = "l3_div_ck",
 -      .user           = OCP_USER_SDMA,
 -};
 -
 -/* l4_per -> dss_dsi1 */
 -static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_dsi1 = {
 -      .master         = &omap44xx_l4_per_hwmod,
 -      .slave          = &omap44xx_dss_dsi1_hwmod,
 -      .clk            = "l4_div_ck",
 -      .user           = OCP_USER_MPU,
 -};
 -
 -/* l3_main_2 -> dss_dsi2 */
 -static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_dsi2 = {
 -      .master         = &omap44xx_l3_main_2_hwmod,
 -      .slave          = &omap44xx_dss_dsi2_hwmod,
 -      .clk            = "l3_div_ck",
 -      .user           = OCP_USER_SDMA,
 -};
 -
 -/* l4_per -> dss_dsi2 */
 -static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_dsi2 = {
 -      .master         = &omap44xx_l4_per_hwmod,
 -      .slave          = &omap44xx_dss_dsi2_hwmod,
 -      .clk            = "l4_div_ck",
 -      .user           = OCP_USER_MPU,
 -};
 -
 -/* l3_main_2 -> dss_hdmi */
 -static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_hdmi = {
 -      .master         = &omap44xx_l3_main_2_hwmod,
 -      .slave          = &omap44xx_dss_hdmi_hwmod,
 -      .clk            = "l3_div_ck",
 -      .user           = OCP_USER_SDMA,
 -};
 -
 -/* l4_per -> dss_hdmi */
 -static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_hdmi = {
 -      .master         = &omap44xx_l4_per_hwmod,
 -      .slave          = &omap44xx_dss_hdmi_hwmod,
 -      .clk            = "l4_div_ck",
 -      .user           = OCP_USER_MPU,
 -};
 -
 -/* l3_main_2 -> dss_rfbi */
 -static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_rfbi = {
 -      .master         = &omap44xx_l3_main_2_hwmod,
 -      .slave          = &omap44xx_dss_rfbi_hwmod,
 -      .clk            = "l3_div_ck",
 -      .user           = OCP_USER_SDMA,
 -};
 -
 -/* l4_per -> dss_rfbi */
 -static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_rfbi = {
 -      .master         = &omap44xx_l4_per_hwmod,
 -      .slave          = &omap44xx_dss_rfbi_hwmod,
 -      .clk            = "l4_div_ck",
 -      .user           = OCP_USER_MPU,
 -};
 -
 -/* l3_main_2 -> dss_venc */
 -static struct omap_hwmod_ocp_if omap44xx_l3_main_2__dss_venc = {
 -      .master         = &omap44xx_l3_main_2_hwmod,
 -      .slave          = &omap44xx_dss_venc_hwmod,
 -      .clk            = "l3_div_ck",
 -      .user           = OCP_USER_SDMA,
 -};
 -
 -/* l4_per -> dss_venc */
 -static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_venc = {
 -      .master         = &omap44xx_l4_per_hwmod,
 -      .slave          = &omap44xx_dss_venc_hwmod,
 -      .clk            = "l4_div_ck",
 -      .user           = OCP_USER_MPU,
--};
--
  /* l3_main_2 -> gpmc */
  static struct omap_hwmod_ocp_if omap44xx_l3_main_2__gpmc = {
        .master         = &omap44xx_l3_main_2_hwmod,
@@@ -1373,7 -1642,7 +1253,6 @@@ static struct omap_hwmod_ocp_if *omap44
        &omap44xx_iva__l3_instr,
        &omap44xx_l3_main_3__l3_instr,
        &omap44xx_ocp_wp_noc__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_mpu__l3_main_1,
        &omap44xx_l4_wkup__ctrl_module_wkup,
        &omap44xx_l4_wkup__ctrl_module_pad_wkup,
        &omap44xx_l3_instr__debugss,
-       &omap44xx_dsp__iva,
-       /* &omap44xx_dsp__sl2if, */
-       &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_l3_main_2__gpmc,
-       &omap44xx_l3_main_2__ipu,
        &omap44xx_l3_main_2__iss,
        /* &omap44xx_iva__sl2if, */
        &omap44xx_l3_main_2__iva,