powerpc, 8xx: Use IO accessors to access IO memory

[people/ms/u-boot.git] / arch / powerpc / cpu / mpc8xx / reginfo.c

diff --git a/arch/powerpc/cpu/mpc8xx/reginfo.c b/arch/powerpc/cpu/mpc8xx/reginfo.c
index b5a962431e634641fd1913df8af4b5320478ba12..48615cad016575a6e3dccac19987451a2ee56327 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/reginfo.c
+++ b/arch/powerpc/cpu/mpc8xx/reginfo.c
@@ -7,56 +7,62 @@
 
 #include <common.h>
 #include <mpc8xx.h>
+#include <asm/io.h>
 
 void mpc8xx_reginfo(void)
 {
-       volatile immap_t     *immap  = (immap_t *)CONFIG_SYS_IMMR;
-       volatile memctl8xx_t *memctl = &immap->im_memctl;
-       volatile sysconf8xx_t *sysconf = &immap->im_siu_conf;
-       volatile sit8xx_t *timers = &immap->im_sit;
+       immap_t __iomem     *immap  = (immap_t __iomem *)CONFIG_SYS_IMMR;
+       memctl8xx_t __iomem *memctl = &immap->im_memctl;
+       sysconf8xx_t __iomem *sysconf = &immap->im_siu_conf;
+       sit8xx_t __iomem *timers = &immap->im_sit;
 
        /* Hopefully more PowerPC  knowledgable people will add code to display
         * other useful registers
         */
 
        printf ("\nSystem Configuration registers\n"
-
                "\tIMMR\t0x%08X\n", get_immr(0));
 
-       printf("\tSIUMCR\t0x%08X", sysconf->sc_siumcr);
-       printf("\tSYPCR\t0x%08X\n",sysconf->sc_sypcr);
+       printf("\tSIUMCR\t0x%08X", in_be32(&sysconf->sc_siumcr));
+       printf("\tSYPCR\t0x%08X\n", in_be32(&sysconf->sc_sypcr));
 
-       printf("\tSWT\t0x%08X",    sysconf->sc_swt);
-       printf("\tSWSR\t0x%04X\n", sysconf->sc_swsr);
+       printf("\tSWT\t0x%08X", in_be32(&sysconf->sc_swt));
+       printf("\tSWSR\t0x%04X\n", in_be16(&sysconf->sc_swsr));
 
        printf("\tSIPEND\t0x%08X\tSIMASK\t0x%08X\n",
-               sysconf->sc_sipend, sysconf->sc_simask);
+              in_be32(&sysconf->sc_sipend), in_be32(&sysconf->sc_simask));
        printf("\tSIEL\t0x%08X\tSIVEC\t0x%08X\n",
-               sysconf->sc_siel, sysconf->sc_sivec);
+              in_be32(&sysconf->sc_siel), in_be32(&sysconf->sc_sivec));
        printf("\tTESR\t0x%08X\tSDCR\t0x%08X\n",
-               sysconf->sc_tesr, sysconf->sc_sdcr);
-
-       printf ("Memory Controller Registers\n"
+              in_be32(&sysconf->sc_tesr), in_be32(&sysconf->sc_sdcr));
 
-               "\tBR0\t0x%08X\tOR0\t0x%08X \n", memctl->memc_br0, memctl->memc_or0);
-       printf("\tBR1\t0x%08X\tOR1\t0x%08X \n", memctl->memc_br1, memctl->memc_or1);
-       printf("\tBR2\t0x%08X\tOR2\t0x%08X \n", memctl->memc_br2, memctl->memc_or2);
-       printf("\tBR3\t0x%08X\tOR3\t0x%08X \n", memctl->memc_br3, memctl->memc_or3);
-       printf("\tBR4\t0x%08X\tOR4\t0x%08X \n", memctl->memc_br4, memctl->memc_or4);
-       printf("\tBR5\t0x%08X\tOR5\t0x%08X \n", memctl->memc_br5, memctl->memc_or5);
-       printf("\tBR6\t0x%08X\tOR6\t0x%08X \n", memctl->memc_br6, memctl->memc_or6);
-       printf("\tBR7\t0x%08X\tOR7\t0x%08X \n", memctl->memc_br7, memctl->memc_or7);
-       printf ("\n"
-               "\tmamr\t0x%08X\tmbmr\t0x%08X \n",
-               memctl->memc_mamr, memctl->memc_mbmr );
-       printf("\tmstat\t0x%08X\tmptpr\t0x%08X \n",
-               memctl->memc_mstat, memctl->memc_mptpr );
-       printf("\tmdr\t0x%08X \n", memctl->memc_mdr);
+       printf("Memory Controller Registers\n");
+       printf("\tBR0\t0x%08X\tOR0\t0x%08X\n", in_be32(&memctl->memc_br0),
+              in_be32(&memctl->memc_or0));
+       printf("\tBR1\t0x%08X\tOR1\t0x%08X\n", in_be32(&memctl->memc_br1),
+              in_be32(&memctl->memc_or1));
+       printf("\tBR2\t0x%08X\tOR2\t0x%08X\n", in_be32(&memctl->memc_br2),
+              in_be32(&memctl->memc_or2));
+       printf("\tBR3\t0x%08X\tOR3\t0x%08X\n", in_be32(&memctl->memc_br3),
+              in_be32(&memctl->memc_or3));
+       printf("\tBR4\t0x%08X\tOR4\t0x%08X\n", in_be32(&memctl->memc_br4),
+              in_be32(&memctl->memc_or4));
+       printf("\tBR5\t0x%08X\tOR5\t0x%08X\n", in_be32(&memctl->memc_br5),
+              in_be32(&memctl->memc_or5));
+       printf("\tBR6\t0x%08X\tOR6\t0x%08X\n", in_be32(&memctl->memc_br6),
+              in_be32(&memctl->memc_or6));
+       printf("\tBR7\t0x%08X\tOR7\t0x%08X\n", in_be32(&memctl->memc_br7),
+              in_be32(&memctl->memc_or7));
+       printf("\n\tmamr\t0x%08X\tmbmr\t0x%08X\n", in_be32(&memctl->memc_mamr),
+              in_be32(&memctl->memc_mbmr));
+       printf("\tmstat\t0x%04X\tmptpr\t0x%04X\n", in_be16(&memctl->memc_mstat),
+              in_be16(&memctl->memc_mptpr));
+       printf("\tmdr\t0x%08X\n", in_be32(&memctl->memc_mdr));
 
-       printf ("\nSystem Integration Timers\n"
-               "\tTBSCR\t0x%08X\tRTCSC\t0x%08X \n",
-               timers->sit_tbscr, timers->sit_rtcsc);
-       printf("\tPISCR\t0x%08X \n", timers->sit_piscr);
+       printf("\nSystem Integration Timers\n");
+       printf("\tTBSCR\t0x%04X\tRTCSC\t0x%04X\n",
+              in_be16(&timers->sit_tbscr), in_be16(&timers->sit_rtcsc));
+       printf("\tPISCR\t0x%04X\n", in_be16(&timers->sit_piscr));
 
        /*
         * May be some CPM info here?