diff options
author | Nishanth Menon <nm@ti.com> | 2016-10-21 06:38:38 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2016-11-09 17:59:18 -0500 |
commit | 6cd9699c6b21191fb141c66cd7250a7bbb46c1f0 (patch) | |
tree | 823e5625be71db144e2555c7885389e1b3c0a827 | |
parent | a2af765adb4aadfe6e75fb2d5e99f5a0f212791b (diff) |
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>
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c index 2804f06ed6b4..d0585293a381 100644 --- 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 = { | |||
4015 | &dra7xx_l3_main_1__pciess2, | 4015 | &dra7xx_l3_main_1__pciess2, |
4016 | &dra7xx_l4_cfg__pciess2, | 4016 | &dra7xx_l4_cfg__pciess2, |
4017 | &dra7xx_l3_main_1__qspi, | 4017 | &dra7xx_l3_main_1__qspi, |
4018 | &dra7xx_l4_per3__rtcss, | ||
4019 | &dra7xx_l4_cfg__sata, | 4018 | &dra7xx_l4_cfg__sata, |
4020 | &dra7xx_l4_cfg__smartreflex_core, | 4019 | &dra7xx_l4_cfg__smartreflex_core, |
4021 | &dra7xx_l4_cfg__smartreflex_mpu, | 4020 | &dra7xx_l4_cfg__smartreflex_mpu, |
@@ -4077,6 +4076,11 @@ static struct omap_hwmod_ocp_if *dra72x_hwmod_ocp_ifs[] __initdata = { | |||
4077 | NULL, | 4076 | NULL, |
4078 | }; | 4077 | }; |
4079 | 4078 | ||
4079 | static struct omap_hwmod_ocp_if *dra74x_dra72x_hwmod_ocp_ifs[] __initdata = { | ||
4080 | &dra7xx_l4_per3__rtcss, | ||
4081 | NULL, | ||
4082 | }; | ||
4083 | |||
4080 | int __init dra7xx_hwmod_init(void) | 4084 | int __init dra7xx_hwmod_init(void) |
4081 | { | 4085 | { |
4082 | int ret; | 4086 | int ret; |
@@ -4092,5 +4096,9 @@ int __init dra7xx_hwmod_init(void) | |||
4092 | if (!ret && omap_type() == OMAP2_DEVICE_TYPE_GP) | 4096 | if (!ret && omap_type() == OMAP2_DEVICE_TYPE_GP) |
4093 | ret = omap_hwmod_register_links(dra7xx_gp_hwmod_ocp_ifs); | 4097 | ret = omap_hwmod_register_links(dra7xx_gp_hwmod_ocp_ifs); |
4094 | 4098 | ||
4099 | /* now for the IPs *NOT* in dra71 */ | ||
4100 | if (!ret && !of_machine_is_compatible("ti,dra718")) | ||
4101 | ret = omap_hwmod_register_links(dra74x_dra72x_hwmod_ocp_ifs); | ||
4102 | |||
4095 | return ret; | 4103 | return ret; |
4096 | } | 4104 | } |