* Code cleanup:

[people/ms/u-boot.git] / board / eltec / bab7xx / l2cache.c

diff --git a/board/eltec/bab7xx/l2cache.c b/board/eltec/bab7xx/l2cache.c
index 748d515f446172ff1b5f646967eabf8970a969ec..077f2c919d55c0e0b7485777b73def9f71090b60 100644 (file)
--- a/board/eltec/bab7xx/l2cache.c
+++ b/board/eltec/bab7xx/l2cache.c
@@ -51,104 +51,104 @@ int l2_cache_enable (int l2control)
 {
     if (l2control)              /* BAB750 */
     {
-        mtspr(SPRN_L2CR, l2control);
-        mtspr(SPRN_L2CR, (l2control | L2CR_I));
-        while (mfspr(SPRN_L2CR) & L2CR_IP)
-            ;
-        mtspr(SPRN_L2CR, (l2control | L2CR_E));
-        return (0);
+       mtspr(SPRN_L2CR, l2control);
+       mtspr(SPRN_L2CR, (l2control | L2CR_I));
+       while (mfspr(SPRN_L2CR) & L2CR_IP)
+           ;
+       mtspr(SPRN_L2CR, (l2control | L2CR_E));
+       return (0);
     }
     else /* BAB740 */
     {
-        int picr1, picr2, mask;
-        int picr2CacheSize, cacheSize;
-        int *d;
-        int devbusfn;
-        u32 reg32;
-
-        devbusfn = pci_find_device(PCI_VENDOR_ID_MOTOROLA,
-                                   PCI_DEVICE_ID_MOTOROLA_MPC106, 0);
-        if (devbusfn == -1)
-            return (-1);
-
-        pci_read_config_dword  (devbusfn, PCI_PICR2, &reg32);
-        reg32 &= ~PICR2_L2_EN;
-        pci_write_config_dword (devbusfn, PCI_PICR2, reg32);
-
-        /* cache size */
-        if (*(volatile unsigned char *) (CFG_ISA_IO + 0x220) & 0x04)
-        {
-            /* cache size is 512 KB */
-            picr2CacheSize = PICR2_L2_SIZE_512K;
-            cacheSize = 0x80000;
-        }
-        else
-        {
-            /* cache size is 256 KB */
-            picr2CacheSize = PICR2_L2_SIZE_256K;
-            cacheSize = 0x40000;
-        }
-
-        /* setup PICR1 */
-        mask =
-        ~(PICR1_CF_BREAD_WS(1) |
-          PICR1_CF_BREAD_WS(2) |
-          PICR1_CF_CBA(0xff) |
-          PICR1_CF_CACHE_1G |
-          PICR1_CF_DPARK |
-          PICR1_CF_APARK |
-          PICR1_CF_L2_CACHE_MASK);
-
-        picr1 =
-        (PICR1_CF_CBA(0x3f) |
-         PICR1_CF_CACHE_1G |
-         PICR1_CF_APARK |
-         PICR1_CF_DPARK |
-         PICR1_CF_L2_COPY_BACK); /* PICR1_CF_L2_WRITE_THROUGH */
-
-        pci_read_config_dword  (devbusfn, PCI_PICR1, &reg32);
-        reg32 &= mask;
-        reg32 |= picr1;
-        pci_write_config_dword (devbusfn, PCI_PICR1, reg32);
-
-        /*
-         * invalidate all L2 cache
-         */
-        picr2 =
-        (PICR2_CF_INV_MODE |
-         PICR2_CF_HIT_HIGH |
-         PICR2_CF_MOD_HIGH |
-         PICR2_CF_L2_HIT_DELAY(1) |
-         PICR2_CF_APHASE_WS(1) |
-         picr2CacheSize);
-
-        pci_write_config_dword (devbusfn, PCI_PICR2, picr2);
-
-        /*
-         * dummy transactions
-         */
-        for (d=0; d<(int *)(2*cacheSize); d++)
-            dummy(*d);
-
-        pci_write_config_dword (devbusfn, PCI_PICR2,
-                                (picr2 | PICR2_CF_FLUSH_L2));
-
-        /* setup PICR2 */
-        picr2 =
-        (PICR2_CF_FAST_CASTOUT |
-         PICR2_CF_WDATA |
-         PICR2_CF_ADDR_ONLY_DISABLE |
-         PICR2_CF_HIT_HIGH |
-         PICR2_CF_MOD_HIGH |
-         PICR2_L2_UPDATE_EN |
-         PICR2_L2_EN |
-         PICR2_CF_APHASE_WS(1) |
-         PICR2_CF_DATA_RAM_PBURST |
-         PICR2_CF_L2_HIT_DELAY(1) |
-         PICR2_CF_SNOOP_WS(2) |
-         picr2CacheSize);
-
-        pci_write_config_dword (devbusfn, PCI_PICR2, picr2);
+       int picr1, picr2, mask;
+       int picr2CacheSize, cacheSize;
+       int *d;
+       int devbusfn;
+       u32 reg32;
+
+       devbusfn = pci_find_device(PCI_VENDOR_ID_MOTOROLA,
+                                  PCI_DEVICE_ID_MOTOROLA_MPC106, 0);
+       if (devbusfn == -1)
+           return (-1);
+
+       pci_read_config_dword  (devbusfn, PCI_PICR2, &reg32);
+       reg32 &= ~PICR2_L2_EN;
+       pci_write_config_dword (devbusfn, PCI_PICR2, reg32);
+
+       /* cache size */
+       if (*(volatile unsigned char *) (CFG_ISA_IO + 0x220) & 0x04)
+       {
+           /* cache size is 512 KB */
+           picr2CacheSize = PICR2_L2_SIZE_512K;
+           cacheSize = 0x80000;
+       }
+       else
+       {
+           /* cache size is 256 KB */
+           picr2CacheSize = PICR2_L2_SIZE_256K;
+           cacheSize = 0x40000;
+       }
+
+       /* setup PICR1 */
+       mask =
+       ~(PICR1_CF_BREAD_WS(1) |
+         PICR1_CF_BREAD_WS(2) |
+         PICR1_CF_CBA(0xff) |
+         PICR1_CF_CACHE_1G |
+         PICR1_CF_DPARK |
+         PICR1_CF_APARK |
+         PICR1_CF_L2_CACHE_MASK);
+
+       picr1 =
+       (PICR1_CF_CBA(0x3f) |
+        PICR1_CF_CACHE_1G |
+        PICR1_CF_APARK |
+        PICR1_CF_DPARK |
+        PICR1_CF_L2_COPY_BACK); /* PICR1_CF_L2_WRITE_THROUGH */
+
+       pci_read_config_dword  (devbusfn, PCI_PICR1, &reg32);
+       reg32 &= mask;
+       reg32 |= picr1;
+       pci_write_config_dword (devbusfn, PCI_PICR1, reg32);
+
+       /*
+        * invalidate all L2 cache
+        */
+       picr2 =
+       (PICR2_CF_INV_MODE |
+        PICR2_CF_HIT_HIGH |
+        PICR2_CF_MOD_HIGH |
+        PICR2_CF_L2_HIT_DELAY(1) |
+        PICR2_CF_APHASE_WS(1) |
+        picr2CacheSize);
+
+       pci_write_config_dword (devbusfn, PCI_PICR2, picr2);
+
+       /*
+        * dummy transactions
+        */
+       for (d=0; d<(int *)(2*cacheSize); d++)
+           dummy(*d);
+
+       pci_write_config_dword (devbusfn, PCI_PICR2,
+                               (picr2 | PICR2_CF_FLUSH_L2));
+
+       /* setup PICR2 */
+       picr2 =
+       (PICR2_CF_FAST_CASTOUT |
+        PICR2_CF_WDATA |
+        PICR2_CF_ADDR_ONLY_DISABLE |
+        PICR2_CF_HIT_HIGH |
+        PICR2_CF_MOD_HIGH |
+        PICR2_L2_UPDATE_EN |
+        PICR2_L2_EN |
+        PICR2_CF_APHASE_WS(1) |
+        PICR2_CF_DATA_RAM_PBURST |
+        PICR2_CF_L2_HIT_DELAY(1) |
+        PICR2_CF_SNOOP_WS(2) |
+        picr2CacheSize);
+
+       pci_write_config_dword (devbusfn, PCI_PICR2, picr2);
     }
     return (0);
 }
@@ -156,4 +156,3 @@ int l2_cache_enable (int l2control)
 /*----------------------------------------------------------------------------*/
 
 #endif /* (CFG_L2_BAB7xx) */
-