[PATCH] ppc32: Clean up NUM_TLBCAMS usage for Freescale Book-E PPC's

Made the number of TLB CAM entries private and converted the board
consumers to use num_tlbcam_entries which is setup at boot time from
configuration registers.  This way the only consumers of the #define
NUM_TLBCAMS are the arrays used to manage the TLB.

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 6 insertions, 6 deletions

diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.c b/arch/ppc/platforms/85xx/mpc8540_ads.c
index 583838ab02d8..d1c2c6cb3000 100644
--- a/arch/ppc/platforms/85xx/mpc8540_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8540_ads.c
@@ -88,7 +88,7 @@ mpc8540ads_setup_arch(void)
 #ifdef CONFIG_SERIAL_TEXT_DEBUG
         /* Invalidate the entry we stole earlier the serial ports
          * should be properly mapped */
-        invalidate_tlbcam_entry(NUM_TLBCAMS - 1);
+        invalidate_tlbcam_entry(num_tlbcam_entries - 1);
 #endif
 
         /* setup the board related information for the enet controllers */
@@ -150,7 +150,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                 struct uart_port p;
 
                 /* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */
-                settlbcam(NUM_TLBCAMS - 1, binfo->bi_immr_base,
+                settlbcam(num_tlbcam_entries - 1, binfo->bi_immr_base,
                           binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
 
                 memset(&p, 0, sizeof (p));
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index bee6633f4601..51964b3081eb 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -446,7 +446,7 @@ mpc85xx_cds_setup_arch(void)
 #ifdef CONFIG_SERIAL_TEXT_DEBUG
         /* Invalidate the entry we stole earlier the serial ports
          * should be properly mapped */
-        invalidate_tlbcam_entry(NUM_TLBCAMS - 1);
+        invalidate_tlbcam_entry(num_tlbcam_entries - 1);
 #endif
 
         /* setup the board related information for the enet controllers */
@@ -528,7 +528,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                 struct uart_port p;
 
                 /* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */
-                settlbcam(NUM_TLBCAMS - 1, binfo->bi_immr_base,
+                settlbcam(num_tlbcam_entries - 1, binfo->bi_immr_base,
                                 binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
 
                 memset(&p, 0, sizeof (p));
diff --git a/arch/ppc/platforms/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c
index 7b9e1543e175..42e960a0bf33 100644
--- a/arch/ppc/platforms/85xx/sbc8560.c
+++ b/arch/ppc/platforms/85xx/sbc8560.c
@@ -125,7 +125,7 @@ sbc8560_setup_arch(void)
 #ifdef CONFIG_SERIAL_TEXT_DEBUG
         /* Invalidate the entry we stole earlier the serial ports
          * should be properly mapped */ 
-        invalidate_tlbcam_entry(NUM_TLBCAMS - 1);
+        invalidate_tlbcam_entry(num_tlbcam_entries - 1);
 #endif
 
         /* setup the board related information for the enet controllers */
@@ -176,7 +176,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 
 #ifdef CONFIG_SERIAL_TEXT_DEBUG
         /* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */
-        settlbcam(NUM_TLBCAMS - 1, UARTA_ADDR,
+        settlbcam(num_tlbcam_entries - 1, UARTA_ADDR,
                   UARTA_ADDR, 0x1000, _PAGE_IO, 0);
 #endif