Skip to content

Commit 6e678a7

Browse files
Tero Kristotmlind
authored andcommitted
ARM: OMAP5: hwmod-data: remove OMAP5 IOMMU hwmod data
IOMMUs are now supported via ti-sysc, so the legacy hwmod data can be removed. Signed-off-by: Tero Kristo <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
1 parent e4ebfc2 commit 6e678a7

File tree

1 file changed

+0
-83
lines changed

1 file changed

+0
-83
lines changed

arch/arm/mach-omap2/omap_hwmod_54xx_data.c

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -562,71 +562,6 @@ static struct omap_hwmod omap54xx_emif2_hwmod = {
562562

563563

564564

565-
/*
566-
* 'mmu' class
567-
* The memory management unit performs virtual to physical address translation
568-
* for its requestors.
569-
*/
570-
571-
static struct omap_hwmod_class_sysconfig omap54xx_mmu_sysc = {
572-
.rev_offs = 0x0000,
573-
.sysc_offs = 0x0010,
574-
.syss_offs = 0x0014,
575-
.sysc_flags = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
576-
SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
577-
SYSS_HAS_RESET_STATUS),
578-
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
579-
.sysc_fields = &omap_hwmod_sysc_type1,
580-
};
581-
582-
static struct omap_hwmod_class omap54xx_mmu_hwmod_class = {
583-
.name = "mmu",
584-
.sysc = &omap54xx_mmu_sysc,
585-
};
586-
587-
static struct omap_hwmod_rst_info omap54xx_mmu_dsp_resets[] = {
588-
{ .name = "mmu_cache", .rst_shift = 1 },
589-
};
590-
591-
static struct omap_hwmod omap54xx_mmu_dsp_hwmod = {
592-
.name = "mmu_dsp",
593-
.class = &omap54xx_mmu_hwmod_class,
594-
.clkdm_name = "dsp_clkdm",
595-
.rst_lines = omap54xx_mmu_dsp_resets,
596-
.rst_lines_cnt = ARRAY_SIZE(omap54xx_mmu_dsp_resets),
597-
.main_clk = "dpll_iva_h11x2_ck",
598-
.prcm = {
599-
.omap4 = {
600-
.clkctrl_offs = OMAP54XX_CM_DSP_DSP_CLKCTRL_OFFSET,
601-
.rstctrl_offs = OMAP54XX_RM_DSP_RSTCTRL_OFFSET,
602-
.context_offs = OMAP54XX_RM_DSP_DSP_CONTEXT_OFFSET,
603-
.modulemode = MODULEMODE_HWCTRL,
604-
},
605-
},
606-
};
607-
608-
/* mmu ipu */
609-
static struct omap_hwmod_rst_info omap54xx_mmu_ipu_resets[] = {
610-
{ .name = "mmu_cache", .rst_shift = 2 },
611-
};
612-
613-
static struct omap_hwmod omap54xx_mmu_ipu_hwmod = {
614-
.name = "mmu_ipu",
615-
.class = &omap54xx_mmu_hwmod_class,
616-
.clkdm_name = "ipu_clkdm",
617-
.rst_lines = omap54xx_mmu_ipu_resets,
618-
.rst_lines_cnt = ARRAY_SIZE(omap54xx_mmu_ipu_resets),
619-
.main_clk = "dpll_core_h22x2_ck",
620-
.prcm = {
621-
.omap4 = {
622-
.clkctrl_offs = OMAP54XX_CM_IPU_IPU_CLKCTRL_OFFSET,
623-
.rstctrl_offs = OMAP54XX_RM_IPU_RSTCTRL_OFFSET,
624-
.context_offs = OMAP54XX_RM_IPU_IPU_CONTEXT_OFFSET,
625-
.modulemode = MODULEMODE_HWCTRL,
626-
},
627-
},
628-
};
629-
630565
/*
631566
* 'mpu' class
632567
* mpu sub-system
@@ -922,14 +857,6 @@ static struct omap_hwmod_ocp_if omap54xx_l4_cfg__l3_main_1 = {
922857
.user = OCP_USER_MPU | OCP_USER_SDMA,
923858
};
924859

925-
/* l4_cfg -> mmu_dsp */
926-
static struct omap_hwmod_ocp_if omap54xx_l4_cfg__mmu_dsp = {
927-
.master = &omap54xx_l4_cfg_hwmod,
928-
.slave = &omap54xx_mmu_dsp_hwmod,
929-
.clk = "l4_root_clk_div",
930-
.user = OCP_USER_MPU | OCP_USER_SDMA,
931-
};
932-
933860
/* mpu -> l3_main_1 */
934861
static struct omap_hwmod_ocp_if omap54xx_mpu__l3_main_1 = {
935862
.master = &omap54xx_mpu_hwmod,
@@ -954,14 +881,6 @@ static struct omap_hwmod_ocp_if omap54xx_l4_cfg__l3_main_2 = {
954881
.user = OCP_USER_MPU | OCP_USER_SDMA,
955882
};
956883

957-
/* l3_main_2 -> mmu_ipu */
958-
static struct omap_hwmod_ocp_if omap54xx_l3_main_2__mmu_ipu = {
959-
.master = &omap54xx_l3_main_2_hwmod,
960-
.slave = &omap54xx_mmu_ipu_hwmod,
961-
.clk = "l3_iclk_div",
962-
.user = OCP_USER_MPU | OCP_USER_SDMA,
963-
};
964-
965884
/* l3_main_1 -> l3_main_3 */
966885
static struct omap_hwmod_ocp_if omap54xx_l3_main_1__l3_main_3 = {
967886
.master = &omap54xx_l3_main_1_hwmod,
@@ -1173,7 +1092,6 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
11731092
&omap54xx_mpu__mpu_private,
11741093
&omap54xx_l4_wkup__counter_32k,
11751094
&omap54xx_l4_cfg__dma_system,
1176-
&omap54xx_l4_cfg__mmu_dsp,
11771095
&omap54xx_l3_main_2__dss,
11781096
&omap54xx_l3_main_2__dss_dispc,
11791097
&omap54xx_l3_main_2__dss_dsi1_a,
@@ -1182,7 +1100,6 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
11821100
&omap54xx_l3_main_2__dss_rfbi,
11831101
&omap54xx_mpu__emif1,
11841102
&omap54xx_mpu__emif2,
1185-
&omap54xx_l3_main_2__mmu_ipu,
11861103
&omap54xx_l4_cfg__mpu,
11871104
&omap54xx_l4_wkup__timer1,
11881105
&omap54xx_l4_cfg__usb_host_hs,

0 commit comments

Comments
 (0)