m68k: Drop CONFIG_MCFPIT support

All platforms currently use the "MCFTMR" DMA timer rather than the PIT
timer, so drop the MCFPIT code.

Cc: Huan Wang <alison.wang@nxp.com>
Cc: Angelo Dureghello <angelo@sysam.it>
Cc: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
Cc: Wolfgang Wegner <w.wegner@astro-kom.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Angelo Dureghello <angelo@sysam.it>

diff --git a/arch/m68k/include/asm/immap.h b/arch/m68k/include/asm/immap.h
index 80fa257..9e84fb9 100644 (file)
--- a/arch/m68k/include/asm/immap.h
+++ b/arch/m68k/include/asm/immap.h
@@ -28,12 +28,6 @@
 #define CONFIG_SYS_TIMER_PRESCALER     (((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE         (MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE            (MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE        (6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE           (MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS            (128)
 #endif                         /* CONFIG_M520x */
@@ -62,12 +56,6 @@
 #define CONFIG_SYS_TIMER_PRESCALER     (((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE         (MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE            (MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE        (6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE           (MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS            (128)
 #endif                         /* CONFIG_M52277 */
@@ -91,12 +79,6 @@
 #define CONFIG_SYS_TIMER_PRESCALER     (((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE         (MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE            (MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE        (6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE           (MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS            (128)
 #endif                         /* CONFIG_M5235 */
@@ -285,12 +267,6 @@
 #define CONFIG_SYS_TIMER_PRESCALER     (((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE         (MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE            (MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE        (6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE           (MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS            (128)
 #endif                         /* CONFIG_M5301x */
@@ -315,12 +291,6 @@
 #define CONFIG_SYS_TIMER_PRESCALER     (((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE         (MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE            (MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE        (6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE           (MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS            (128)
 #endif                         /* CONFIG_M5329 && CONFIG_M5373 */
@@ -355,12 +325,6 @@
 #define CONFIG_SYS_TIMER_PRESCALER     (((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE         (MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE            (MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE        (6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE           (MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS            (192)
 
@@ -391,12 +355,6 @@
 #define CONFIG_SYS_TIMER_PRESCALER     (((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
-#ifdef CONFIG_MCFPIT
-#define CONFIG_SYS_UDELAY_BASE         (MMAP_PIT0)
-#define CONFIG_SYS_PIT_BASE            (MMAP_PIT1)
-#define CONFIG_SYS_PIT_PRESCALE        (6)
-#endif
-
 #define CONFIG_SYS_INTR_BASE           (MMAP_INTC0)
 #define CONFIG_SYS_NUM_IRQS            (128)
 

diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index 8957d19..bde1f4c 100644 (file)
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -110,69 +110,6 @@ ulong get_timer(ulong base)
 
 #endif                         /* CONFIG_MCFTMR */
 
-#if defined(CONFIG_MCFPIT)
-#if !defined(CONFIG_SYS_PIT_BASE)
-#      error   "CONFIG_SYS_PIT_BASE not defined!"
-#endif
-
-static unsigned short lastinc;
-
-void __udelay(unsigned long usec)
-{
-       volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_UDELAY_BASE);
-       uint tmp;
-
-       while (usec > 0) {
-               if (usec > 65000)
-                       tmp = 65000;
-               else
-                       tmp = usec;
-               usec = usec - tmp;
-
-               /* Set up TIMER 3 as timebase clock */
-               timerp->pcsr = PIT_PCSR_OVW;
-               timerp->pmr = 0;
-               /* set period to 1 us */
-               timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN;
-
-               timerp->pmr = tmp;
-               while (timerp->pcntr > 0) ;
-       }
-}
-
-void timer_init(void)
-{
-       volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_PIT_BASE);
-       timestamp = 0;
-
-       /* Set up TIMER 4 as poll clock */
-       timerp->pcsr = PIT_PCSR_OVW;
-       timerp->pmr = lastinc = 0;
-       timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN;
-
-       return 0;
-}
-
-ulong get_timer(ulong base)
-{
-       unsigned short now, diff;
-       volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_PIT_BASE);
-
-       now = timerp->pcntr;
-       diff = -(now - lastinc);
-
-       timestamp += diff;
-       lastinc = now;
-       return timestamp - base;
-}
-
-void wait_ticks(unsigned long ticks)
-{
-       u32 start = get_timer(0);
-       while (get_timer(start) < ticks) ;
-}
-#endif                         /* CONFIG_MCFPIT */
-
 /*
  * This function is derived from PowerPC code (read timebase as long long).
  * On M68K it just returns the timer value.

diff --git a/board/freescale/m52277evb/README b/board/freescale/m52277evb/README
index b7ceb59..76f4789 100644 (file)
--- a/board/freescale/m52277evb/README
+++ b/board/freescale/m52277evb/README
@@ -79,7 +79,6 @@ RTC_DEBUG             -- define to show RTC debug message
 CONFIG_CMD_DATE                -- enable to use date feature in U-Boot
 
 CONFIG_MCFTMR          -- define to use DMA timer
-CONFIG_MCFPIT          -- define to use PIT timer
 
 CONFIG_SYS_I2C_FSL     -- define to use FSL common I2C driver
 CONFIG_SYS_I2C_SOFT    -- define for I2C bit-banged

diff --git a/board/freescale/m53017evb/README b/board/freescale/m53017evb/README
index 2fca12c..a7074c9 100644 (file)
--- a/board/freescale/m53017evb/README
+++ b/board/freescale/m53017evb/README
@@ -88,7 +88,6 @@ CONFIG_SYS_FEC0_MIIBASE               -- Set FEC0 MII base register
 MCFFEC_TOUT_LOOP               -- set FEC timeout loop
 
 CONFIG_MCFTMR                  -- define to use DMA timer
-CONFIG_MCFPIT                  -- define to use PIT timer
 
 CONFIG_SYS_I2C_FSL             -- define to use FSL common I2C driver
 CONFIG_SYS_I2C_SOFT            -- define for I2C bit-banged

diff --git a/board/freescale/m5373evb/README b/board/freescale/m5373evb/README
index 757f0ab..f0a0631 100644 (file)
--- a/board/freescale/m5373evb/README
+++ b/board/freescale/m5373evb/README
@@ -87,7 +87,6 @@ CONFIG_SYS_FEC0_MIIBASE       -- Set FEC0 MII base register
 MCFFEC_TOUT_LOOP       -- set FEC timeout loop
 
 CONFIG_MCFTMR          -- define to use DMA timer
-CONFIG_MCFPIT          -- define to use PIT timer
 
 CONFIG_SYS_I2C_FSL     -- define to use FSL common I2C driver
 CONFIG_SYS_I2C_SOFT    -- define for I2C bit-banged

diff --git a/board/freescale/m54455evb/README b/board/freescale/m54455evb/README
index 4a87193..260aec9 100644 (file)
--- a/board/freescale/m54455evb/README
+++ b/board/freescale/m54455evb/README
@@ -110,7 +110,6 @@ CONFIG_SYS_ATA_STRIDE               -- define for Interval between registers
 _IO_BASE               -- define for IO base address
 
 CONFIG_MCFTMR          -- define to use DMA timer
-CONFIG_MCFPIT          -- define to use PIT timer
 
 CONFIG_SYS_FSL_I2C     -- define to use FSL common I2C driver
 CONFIG_SYS_I2C_SOFT    -- define for I2C bit-banged

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 27a3eb2..d1cb003 100644 (file)
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -38,7 +38,6 @@
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2C */
 #define CONFIG_SYS_I2C

diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index a5a1c38..884ed11 100644 (file)
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -90,7 +90,6 @@
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2c */
 #define CONFIG_SYS_I2C

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index d062bc1..2a90525 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -47,7 +47,6 @@
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2C */
 #define CONFIG_SYS_I2C

diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 1756c99..9ae38ff 100644 (file)
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -53,7 +53,6 @@
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2C */
 #define CONFIG_SYS_I2C

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 6869370..d0ddd08 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -47,7 +47,6 @@
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2C */
 #define CONFIG_SYS_I2C

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 5a28ea8..fe0f5b8 100644 (file)
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -47,7 +47,6 @@
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2C */
 #define CONFIG_SYS_I2C

diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index b3c1bd7..62e3453 100644 (file)
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -128,7 +128,6 @@
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2c */
 #undef CONFIG_SYS_FSL_I2C

diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 7f7a371..7b48c66 100644 (file)
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -97,7 +97,6 @@
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2c */
 #define CONFIG_SYS_I2C

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index a5462cf..34653f7 100644 (file)
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -122,7 +122,6 @@
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2c */
 #define CONFIG_SYS_I2C

diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 3d79311..e112804 100644 (file)
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -57,7 +57,6 @@
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* I2C */
 #define CONFIG_SYS_I2C

diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index d6ba1f6..4df2750 100644 (file)
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -60,7 +60,6 @@
 
 /* Timer */
 #define CONFIG_MCFTMR
-#undef CONFIG_MCFPIT
 
 /* DSPI and Serial Flash */
 #define CONFIG_CF_DSPI

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9f5d173..ce6c339 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1081,7 +1081,6 @@ CONFIG_MAX_RAM_BANK_SIZE
 CONFIG_MCF5249
 CONFIG_MCF5253
 CONFIG_MCFFEC
-CONFIG_MCFPIT
 CONFIG_MCFRTC
 CONFIG_MCFTMR
 CONFIG_MCLK_DIS