diff options
-rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 5c64ccd402e2..95dbc643c4fc 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c | |||
@@ -379,16 +379,10 @@ static int __init setup_rstcr(void) | |||
379 | struct device_node *np; | 379 | struct device_node *np; |
380 | np = of_find_node_by_name(NULL, "global-utilities"); | 380 | np = of_find_node_by_name(NULL, "global-utilities"); |
381 | if ((np && of_get_property(np, "fsl,has-rstcr", NULL))) { | 381 | if ((np && of_get_property(np, "fsl,has-rstcr", NULL))) { |
382 | const u32 *prop = of_get_property(np, "reg", NULL); | 382 | rstcr = of_iomap(np, 0) + 0xb0; |
383 | if (prop) { | 383 | if (!rstcr) |
384 | /* map reset control register | 384 | printk (KERN_EMERG "Error: reset control register " |
385 | * 0xE00B0 is offset of reset control register | 385 | "not mapped!\n"); |
386 | */ | ||
387 | rstcr = ioremap(get_immrbase() + *prop + 0xB0, 0xff); | ||
388 | if (!rstcr) | ||
389 | printk (KERN_EMERG "Error: reset control " | ||
390 | "register not mapped!\n"); | ||
391 | } | ||
392 | } else | 386 | } else |
393 | printk (KERN_INFO "rstcr compatible register does not exist!\n"); | 387 | printk (KERN_INFO "rstcr compatible register does not exist!\n"); |
394 | if (np) | 388 | if (np) |