Skip to content

Commit 90aa4ed

Browse files
committed
ARM: OMAP2+: Drop legacy platform data for dra7 rtcss
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: Keerthy <j-keerthy@ti.com> Acked-by: Santosh Shilimkar <ssantosh@kernel.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
1 parent 6b8a3de commit 90aa4ed

2 files changed

Lines changed: 0 additions & 45 deletions

File tree

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

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

35623562
rtctarget: target-module@38000 { /* 0x48838000, ap 29 12.0 */
35633563
compatible = "ti,sysc-omap4-simple", "ti,sysc";
3564-
ti,hwmods = "rtcss";
35653564
reg = <0x38074 0x4>,
35663565
<0x38078 0x4>;
35673566
reg-names = "rev", "sysc";

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -418,41 +418,6 @@ static struct omap_hwmod dra7xx_qspi_hwmod = {
418418
},
419419
};
420420

421-
/*
422-
* 'rtcss' class
423-
*
424-
*/
425-
static struct omap_hwmod_class_sysconfig dra7xx_rtcss_sysc = {
426-
.rev_offs = 0x0074,
427-
.sysc_offs = 0x0078,
428-
.sysc_flags = SYSC_HAS_SIDLEMODE,
429-
.idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
430-
SIDLE_SMART_WKUP),
431-
.sysc_fields = &omap_hwmod_sysc_type3,
432-
};
433-
434-
static struct omap_hwmod_class dra7xx_rtcss_hwmod_class = {
435-
.name = "rtcss",
436-
.sysc = &dra7xx_rtcss_sysc,
437-
.unlock = &omap_hwmod_rtc_unlock,
438-
.lock = &omap_hwmod_rtc_lock,
439-
};
440-
441-
/* rtcss */
442-
static struct omap_hwmod dra7xx_rtcss_hwmod = {
443-
.name = "rtcss",
444-
.class = &dra7xx_rtcss_hwmod_class,
445-
.clkdm_name = "rtc_clkdm",
446-
.main_clk = "sys_32k_ck",
447-
.prcm = {
448-
.omap4 = {
449-
.clkctrl_offs = DRA7XX_CM_RTC_RTCSS_CLKCTRL_OFFSET,
450-
.context_offs = DRA7XX_RM_RTC_RTCSS_CONTEXT_OFFSET,
451-
.modulemode = MODULEMODE_SWCTRL,
452-
},
453-
},
454-
};
455-
456421
/*
457422
* 'sata' class
458423
*
@@ -702,14 +667,6 @@ static struct omap_hwmod_ocp_if dra7xx_l3_main_1__qspi = {
702667
.user = OCP_USER_MPU | OCP_USER_SDMA,
703668
};
704669

705-
/* l4_per3 -> rtcss */
706-
static struct omap_hwmod_ocp_if dra7xx_l4_per3__rtcss = {
707-
.master = &dra7xx_l4_per3_hwmod,
708-
.slave = &dra7xx_rtcss_hwmod,
709-
.clk = "l4_root_clk_div",
710-
.user = OCP_USER_MPU | OCP_USER_SDMA,
711-
};
712-
713670
/* l4_cfg -> sata */
714671
static struct omap_hwmod_ocp_if dra7xx_l4_cfg__sata = {
715672
.master = &dra7xx_l4_cfg_hwmod,
@@ -786,7 +743,6 @@ static struct omap_hwmod_ocp_if *dra72x_hwmod_ocp_ifs[] __initdata = {
786743
};
787744

788745
static struct omap_hwmod_ocp_if *rtc_hwmod_ocp_ifs[] __initdata = {
789-
&dra7xx_l4_per3__rtcss,
790746
NULL,
791747
};
792748

0 commit comments

Comments
 (0)