ARM: DRA7: hwmod: Do not register RTC on DRA71

RTC is not available on DRA71x, so accessing any of the RTC
register or clkctrl register will lead to a crash. So, do not
register RTC hwmod for DRA71x.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 2804f06ed6b46de78570c8009b12abe63b54d115..d0585293a381bdb54edc89982e2fa94f7cfb70bc 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -4015,7 +4015,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
        &dra7xx_l3_main_1__pciess2,
        &dra7xx_l4_cfg__pciess2,
        &dra7xx_l3_main_1__qspi,
-       &dra7xx_l4_per3__rtcss,
        &dra7xx_l4_cfg__sata,
        &dra7xx_l4_cfg__smartreflex_core,
        &dra7xx_l4_cfg__smartreflex_mpu,
@@ -4077,6 +4076,11 @@ static struct omap_hwmod_ocp_if *dra72x_hwmod_ocp_ifs[] __initdata = {
        NULL,
 };
 
+static struct omap_hwmod_ocp_if *dra74x_dra72x_hwmod_ocp_ifs[] __initdata = {
+       &dra7xx_l4_per3__rtcss,
+       NULL,
+};
+
 int __init dra7xx_hwmod_init(void)
 {
        int ret;
@@ -4092,5 +4096,9 @@ int __init dra7xx_hwmod_init(void)
        if (!ret && omap_type() == OMAP2_DEVICE_TYPE_GP)
                ret = omap_hwmod_register_links(dra7xx_gp_hwmod_ocp_ifs);
 
+       /* now for the IPs *NOT* in dra71 */
+       if (!ret && !of_machine_is_compatible("ti,dra718"))
+               ret = omap_hwmod_register_links(dra74x_dra72x_hwmod_ocp_ifs);
+
        return ret;
 }