[POWERPC] 85xx: Fix 8548CDS reset bug
authorRoy Zang <tie-fei.zang@freescale.com>
Wed, 13 Jun 2007 09:13:42 +0000 (17:13 +0800)
committerKumar Gala <galak@kernel.crashing.org>
Tue, 3 Jul 2007 07:04:29 +0000 (02:04 -0500)
Begin with MPC8548 a new reset control register is added that asserts
HRESET_REQ to board logic.

This register is used for chip reset.

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/boot/dts/mpc8548cds.dts
arch/powerpc/platforms/85xx/misc.c

index ad96381033c09e7f35fbac9b4c3f83040ece2690..0550a3c391aa5cb320db13cc2288636623ec10e2 100644 (file)
                        interrupt-parent = <&mpic>;
                };
 
+               global-utilities@e0000 {        //global utilities reg
+                       compatible = "fsl,mpc8548-guts";
+                       reg = <e0000 1000>;
+                       fsl,has-rstcr;
+               };
+
                pci1: pci@8000 {
                        interrupt-map-mask = <1f800 0 0 7>;
                        interrupt-map = <
index 3e62fcb04c1c523766641db8bb89ec1821a3e378..4fe376e9c3b665d67a0fcda4438feab3ff1a56d3 100644 (file)
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <asm/irq.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <sysdev/fsl_soc.h>
+
+static __be32 __iomem *rstcr;
 
 extern void abort(void);
 
+static int __init mpc85xx_rstcr(void)
+{
+       struct device_node *np;
+       np = of_find_node_by_name(NULL, "global-utilities");
+       if ((np && of_get_property(np, "fsl,has-rstcr", NULL))) {
+               const u32 *prop = of_get_property(np, "reg", NULL);
+               if (prop) {
+                       /* map reset control register
+                        * 0xE00B0 is offset of reset control register
+                        */
+                       rstcr = ioremap(get_immrbase() + *prop + 0xB0, 0xff);
+                       if (!rstcr)
+                               printk (KERN_EMERG "Error: reset control "
+                                               "register not mapped!\n");
+               }
+       } else
+               printk (KERN_INFO "rstcr compatible register does not exist!\n");
+       if (np)
+               of_node_put(np);
+       return 0;
+}
+
+arch_initcall(mpc85xx_rstcr);
+
 void mpc85xx_restart(char *cmd)
 {
        local_irq_disable();
+       if (rstcr)
+               /* set reset control register */
+               out_be32(rstcr, 0x2);   /* HRESET_REQ */
        abort();
 }