Skip to content

Commit ddf664d

Browse files
committed
ARM: OMAP2+: Drop legacy platform data for omap4 des
We can now probe devices with ti-sysc interconnect driver and dts data. Let's drop the related platform data and custom ti,hwmods dts property. As we're just dropping data, and the early platform data init is based on the custom ti,hwmods property, we want to drop both the platform data and ti,hwmods property in a single patch. Cc: Tero Kristo <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
1 parent bea5e90 commit ddf664d

File tree

2 files changed

+0
-39
lines changed

2 files changed

+0
-39
lines changed

arch/arm/boot/dts/omap4-l4.dtsi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2187,7 +2187,6 @@
21872187

21882188
des_target: target-module@a5000 { /* 0x480a5000 */
21892189
compatible = "ti,sysc-omap2", "ti,sysc";
2190-
ti,hwmods = "des";
21912190
reg = <0xa5030 0x4>,
21922191
<0xa5034 0x4>,
21932192
<0xa5038 0x4>;

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -858,43 +858,6 @@ static struct omap_hwmod omap44xx_emif2_hwmod = {
858858
},
859859
};
860860

861-
862-
/*
863-
* 'des' class for DES3DES module
864-
*/
865-
static struct omap_hwmod_class_sysconfig omap44xx_des_sysc = {
866-
.rev_offs = 0x30,
867-
.sysc_offs = 0x34,
868-
.syss_offs = 0x38,
869-
.sysc_flags = SYSS_HAS_RESET_STATUS,
870-
};
871-
872-
static struct omap_hwmod_class omap44xx_des_hwmod_class = {
873-
.name = "des",
874-
.sysc = &omap44xx_des_sysc,
875-
};
876-
877-
static struct omap_hwmod omap44xx_des_hwmod = {
878-
.name = "des",
879-
.class = &omap44xx_des_hwmod_class,
880-
.clkdm_name = "l4_secure_clkdm",
881-
.main_clk = "l3_div_ck",
882-
.prcm = {
883-
.omap4 = {
884-
.context_offs = OMAP4_RM_L4SEC_DES3DES_CONTEXT_OFFSET,
885-
.clkctrl_offs = OMAP4_CM_L4SEC_DES3DES_CLKCTRL_OFFSET,
886-
.modulemode = MODULEMODE_SWCTRL,
887-
},
888-
},
889-
};
890-
891-
static struct omap_hwmod_ocp_if omap44xx_l3_main_2__des = {
892-
.master = &omap44xx_l3_main_2_hwmod,
893-
.slave = &omap44xx_des_hwmod,
894-
.clk = "l3_div_ck",
895-
.user = OCP_USER_MPU | OCP_USER_SDMA,
896-
};
897-
898861
/*
899862
* 'fdif' class
900863
* face detection hw accelerator module
@@ -2951,7 +2914,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
29512914
&omap44xx_l4_cfg__usb_tll_hs,
29522915
&omap44xx_mpu__emif1,
29532916
&omap44xx_mpu__emif2,
2954-
&omap44xx_l3_main_2__des,
29552917
NULL,
29562918
};
29572919

0 commit comments

Comments
 (0)