Skip to content

Commit 814b253

Browse files
committed
ARM: OMAP2+: Drop legacy platform data for omap4 aes
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 23673f1 commit 814b253

File tree

2 files changed

+0
-64
lines changed

2 files changed

+0
-64
lines changed

arch/arm/boot/dts/omap4.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@
268268

269269
aes1_target: target-module@4b501000 {
270270
compatible = "ti,sysc-omap2", "ti,sysc";
271-
ti,hwmods = "aes1";
272271
reg = <0x4b501080 0x4>,
273272
<0x4b501084 0x4>,
274273
<0x4b501088 0x4>;
@@ -298,7 +297,6 @@
298297

299298
aes2_target: target-module@4b701000 {
300299
compatible = "ti,sysc-omap2", "ti,sysc";
301-
ti,hwmods = "aes2";
302300
reg = <0x4b701080 0x4>,
303301
<0x4b701084 0x4>,
304302
<0x4b701088 0x4>;

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -884,66 +884,6 @@ static struct omap_hwmod omap44xx_emif2_hwmod = {
884884
},
885885
};
886886

887-
/*
888-
Crypto modules AES0/1 belong to:
889-
PD_L4_PER power domain
890-
CD_L4_SEC clock domain
891-
On the L3, the AES modules are mapped to
892-
L3_CLK2: Peripherals and multimedia sub clock domain
893-
*/
894-
static struct omap_hwmod_class_sysconfig omap44xx_aes_sysc = {
895-
.rev_offs = 0x80,
896-
.sysc_offs = 0x84,
897-
.syss_offs = 0x88,
898-
.sysc_flags = SYSS_HAS_RESET_STATUS,
899-
};
900-
901-
static struct omap_hwmod_class omap44xx_aes_hwmod_class = {
902-
.name = "aes",
903-
.sysc = &omap44xx_aes_sysc,
904-
};
905-
906-
static struct omap_hwmod omap44xx_aes1_hwmod = {
907-
.name = "aes1",
908-
.class = &omap44xx_aes_hwmod_class,
909-
.clkdm_name = "l4_secure_clkdm",
910-
.main_clk = "l3_div_ck",
911-
.prcm = {
912-
.omap4 = {
913-
.context_offs = OMAP4_RM_L4SEC_AES1_CONTEXT_OFFSET,
914-
.clkctrl_offs = OMAP4_CM_L4SEC_AES1_CLKCTRL_OFFSET,
915-
.modulemode = MODULEMODE_SWCTRL,
916-
},
917-
},
918-
};
919-
920-
static struct omap_hwmod_ocp_if omap44xx_l3_main_2__aes1 = {
921-
.master = &omap44xx_l4_per_hwmod,
922-
.slave = &omap44xx_aes1_hwmod,
923-
.clk = "l3_div_ck",
924-
.user = OCP_USER_MPU | OCP_USER_SDMA,
925-
};
926-
927-
static struct omap_hwmod omap44xx_aes2_hwmod = {
928-
.name = "aes2",
929-
.class = &omap44xx_aes_hwmod_class,
930-
.clkdm_name = "l4_secure_clkdm",
931-
.main_clk = "l3_div_ck",
932-
.prcm = {
933-
.omap4 = {
934-
.context_offs = OMAP4_RM_L4SEC_AES2_CONTEXT_OFFSET,
935-
.clkctrl_offs = OMAP4_CM_L4SEC_AES2_CLKCTRL_OFFSET,
936-
.modulemode = MODULEMODE_SWCTRL,
937-
},
938-
},
939-
};
940-
941-
static struct omap_hwmod_ocp_if omap44xx_l3_main_2__aes2 = {
942-
.master = &omap44xx_l4_per_hwmod,
943-
.slave = &omap44xx_aes2_hwmod,
944-
.clk = "l3_div_ck",
945-
.user = OCP_USER_MPU | OCP_USER_SDMA,
946-
};
947887

948888
/*
949889
* 'des' class for DES3DES module
@@ -3045,8 +2985,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
30452985
&omap44xx_l4_cfg__usb_tll_hs,
30462986
&omap44xx_mpu__emif1,
30472987
&omap44xx_mpu__emif2,
3048-
&omap44xx_l3_main_2__aes1,
3049-
&omap44xx_l3_main_2__aes2,
30502988
&omap44xx_l3_main_2__des,
30512989
&omap44xx_l3_main_2__sha0,
30522990
NULL,

0 commit comments

Comments
 (0)