Skip to content

Commit bea5e90

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

File tree

2 files changed

+0
-36
lines changed

2 files changed

+0
-36
lines changed

arch/arm/boot/dts/omap4.dtsi

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

327327
sham_target: target-module@4b100000 {
328328
compatible = "ti,sysc-omap3-sham", "ti,sysc";
329-
ti,hwmods = "sham";
330329
reg = <0x4b100100 0x4>,
331330
<0x4b100110 0x4>,
332331
<0x4b100114 0x4>;

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -777,32 +777,6 @@ static struct omap_hwmod omap44xx_dss_venc_hwmod = {
777777
.opt_clks_cnt = ARRAY_SIZE(dss_venc_opt_clks),
778778
};
779779

780-
/* sha0 HIB2 (the 'P' (public) device) */
781-
static struct omap_hwmod_class_sysconfig omap44xx_sha0_sysc = {
782-
.rev_offs = 0x100,
783-
.sysc_offs = 0x110,
784-
.syss_offs = 0x114,
785-
.sysc_flags = SYSS_HAS_RESET_STATUS,
786-
};
787-
788-
static struct omap_hwmod_class omap44xx_sha0_hwmod_class = {
789-
.name = "sham",
790-
.sysc = &omap44xx_sha0_sysc,
791-
};
792-
793-
static struct omap_hwmod omap44xx_sha0_hwmod = {
794-
.name = "sham",
795-
.class = &omap44xx_sha0_hwmod_class,
796-
.clkdm_name = "l4_secure_clkdm",
797-
.main_clk = "l3_div_ck",
798-
.prcm = {
799-
.omap4 = {
800-
.clkctrl_offs = OMAP4_CM_L4SEC_SHA2MD51_CLKCTRL_OFFSET,
801-
.context_offs = OMAP4_RM_L4SEC_SHA2MD51_CONTEXT_OFFSET,
802-
.modulemode = MODULEMODE_SWCTRL,
803-
},
804-
},
805-
};
806780

807781
/*
808782
* 'elm' class
@@ -2545,14 +2519,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__dss_venc = {
25452519
.user = OCP_USER_MPU,
25462520
};
25472521

2548-
/* l3_main_2 -> sham */
2549-
static struct omap_hwmod_ocp_if omap44xx_l3_main_2__sha0 = {
2550-
.master = &omap44xx_l3_main_2_hwmod,
2551-
.slave = &omap44xx_sha0_hwmod,
2552-
.clk = "l3_div_ck",
2553-
.user = OCP_USER_MPU | OCP_USER_SDMA,
2554-
};
2555-
25562522
/* l4_per -> elm */
25572523
static struct omap_hwmod_ocp_if omap44xx_l4_per__elm = {
25582524
.master = &omap44xx_l4_per_hwmod,
@@ -2986,7 +2952,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
29862952
&omap44xx_mpu__emif1,
29872953
&omap44xx_mpu__emif2,
29882954
&omap44xx_l3_main_2__des,
2989-
&omap44xx_l3_main_2__sha0,
29902955
NULL,
29912956
};
29922957

0 commit comments

Comments
 (0)