commit 7515148af90aaf5cb7c400aa1436f2a5ef5c78e9
author Santosh Shilimkar <santosh.shilimkar@ti.com> Mon Jan 07 17:23:22 2013 +0530
committer Santosh Shilimkar <santosh.shilimkar@ti.com> Tue Mar 19 12:57:00 2013 +0530
tree 4b6bdfe44055f34fb12fae6ac47e9a7685e84b59
parent 960cba672bcecc6357984101703e70a8c819ccaa

ARM: OMAP5: prm: Allow prm init to succeed

Allow prm init to succeed on OMAP5 SOCs.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

arch/arm/mach-omap2/prm44xx.c

diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index d35f98a..960483d 100644
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@ -650,7 +650,7 @@
 
 int __init omap44xx_prm_init(void)
 {
-	if (!cpu_is_omap44xx())
+	if (!cpu_is_omap44xx() && !soc_is_omap54xx())
 		return 0;
 
 	return prm_register(&omap44xx_prm_ll_data);