Skip to content

Commit e4ebfc2

Browse files
Tero Kristotmlind
authored andcommitted
ARM: OMAP4: hwmod-data: remove OMAP4 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 54a751f commit e4ebfc2

File tree

1 file changed

+0
-89
lines changed

1 file changed

+0
-89
lines changed

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,93 +1028,6 @@ static struct omap_hwmod omap44xx_iva_hwmod = {
10281028
},
10291029
};
10301030

1031-
1032-
1033-
/*
1034-
* 'mmu' class
1035-
* The memory management unit performs virtual to physical address translation
1036-
* for its requestors.
1037-
*/
1038-
1039-
static struct omap_hwmod_class_sysconfig mmu_sysc = {
1040-
.rev_offs = 0x000,
1041-
.sysc_offs = 0x010,
1042-
.syss_offs = 0x014,
1043-
.sysc_flags = (SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_SIDLEMODE |
1044-
SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE),
1045-
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
1046-
.sysc_fields = &omap_hwmod_sysc_type1,
1047-
};
1048-
1049-
static struct omap_hwmod_class omap44xx_mmu_hwmod_class = {
1050-
.name = "mmu",
1051-
.sysc = &mmu_sysc,
1052-
};
1053-
1054-
/* mmu ipu */
1055-
1056-
static struct omap_hwmod omap44xx_mmu_ipu_hwmod;
1057-
static struct omap_hwmod_rst_info omap44xx_mmu_ipu_resets[] = {
1058-
{ .name = "mmu_cache", .rst_shift = 2 },
1059-
};
1060-
1061-
/* l3_main_2 -> mmu_ipu */
1062-
static struct omap_hwmod_ocp_if omap44xx_l3_main_2__mmu_ipu = {
1063-
.master = &omap44xx_l3_main_2_hwmod,
1064-
.slave = &omap44xx_mmu_ipu_hwmod,
1065-
.clk = "l3_div_ck",
1066-
.user = OCP_USER_MPU | OCP_USER_SDMA,
1067-
};
1068-
1069-
static struct omap_hwmod omap44xx_mmu_ipu_hwmod = {
1070-
.name = "mmu_ipu",
1071-
.class = &omap44xx_mmu_hwmod_class,
1072-
.clkdm_name = "ducati_clkdm",
1073-
.rst_lines = omap44xx_mmu_ipu_resets,
1074-
.rst_lines_cnt = ARRAY_SIZE(omap44xx_mmu_ipu_resets),
1075-
.main_clk = "ducati_clk_mux_ck",
1076-
.prcm = {
1077-
.omap4 = {
1078-
.clkctrl_offs = OMAP4_CM_DUCATI_DUCATI_CLKCTRL_OFFSET,
1079-
.rstctrl_offs = OMAP4_RM_DUCATI_RSTCTRL_OFFSET,
1080-
.context_offs = OMAP4_RM_DUCATI_DUCATI_CONTEXT_OFFSET,
1081-
.modulemode = MODULEMODE_HWCTRL,
1082-
},
1083-
},
1084-
};
1085-
1086-
/* mmu dsp */
1087-
1088-
static struct omap_hwmod omap44xx_mmu_dsp_hwmod;
1089-
static struct omap_hwmod_rst_info omap44xx_mmu_dsp_resets[] = {
1090-
{ .name = "mmu_cache", .rst_shift = 1 },
1091-
};
1092-
1093-
/* l4_cfg -> dsp */
1094-
static struct omap_hwmod_ocp_if omap44xx_l4_cfg__mmu_dsp = {
1095-
.master = &omap44xx_l4_cfg_hwmod,
1096-
.slave = &omap44xx_mmu_dsp_hwmod,
1097-
.clk = "l4_div_ck",
1098-
.user = OCP_USER_MPU | OCP_USER_SDMA,
1099-
};
1100-
1101-
static struct omap_hwmod omap44xx_mmu_dsp_hwmod = {
1102-
.name = "mmu_dsp",
1103-
.class = &omap44xx_mmu_hwmod_class,
1104-
.clkdm_name = "tesla_clkdm",
1105-
.rst_lines = omap44xx_mmu_dsp_resets,
1106-
.rst_lines_cnt = ARRAY_SIZE(omap44xx_mmu_dsp_resets),
1107-
.main_clk = "dpll_iva_m4x2_ck",
1108-
.prcm = {
1109-
.omap4 = {
1110-
.clkctrl_offs = OMAP4_CM_TESLA_TESLA_CLKCTRL_OFFSET,
1111-
.rstctrl_offs = OMAP4_RM_TESLA_RSTCTRL_OFFSET,
1112-
.context_offs = OMAP4_RM_TESLA_TESLA_CONTEXT_OFFSET,
1113-
.modulemode = MODULEMODE_HWCTRL,
1114-
},
1115-
},
1116-
};
1117-
11181031
/*
11191032
* 'mpu' class
11201033
* mpu sub-system
@@ -2101,8 +2014,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
21012014
&omap44xx_l3_main_2__iss,
21022015
/* &omap44xx_iva__sl2if, */
21032016
&omap44xx_l3_main_2__iva,
2104-
&omap44xx_l3_main_2__mmu_ipu,
2105-
&omap44xx_l4_cfg__mmu_dsp,
21062017
&omap44xx_l3_main_2__ocmc_ram,
21072018
&omap44xx_mpu_private__prcm_mpu,
21082019
&omap44xx_l4_wkup__cm_core_aon,

0 commit comments

Comments
 (0)