OMAP7XX: Update core omap1 files to use omap7xx.h
Alistair Buxton [Tue, 22 Sep 2009 06:34:13 +0000 (07:34 +0100)]
This patch is part of a series which removes references to omap730 in code
which is shared with omap850, replacing them with references to omap7xx.

Signed-off-by: Alistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: Zebediah C. McClure <zmc@lurian.net>

arch/arm/mach-omap1/board-fsample.c
arch/arm/mach-omap1/board-perseus2.c
arch/arm/mach-omap1/clock.c
arch/arm/mach-omap1/io.c
arch/arm/plat-omap/include/mach/hardware.h
arch/arm/plat-omap/include/mach/mux.h
arch/arm/plat-omap/io.c

index a7ead1b..e53f774 100644 (file)
@@ -309,7 +309,7 @@ static void __init omap_fsample_map_io(void)
        /*
         * Hold GSM Reset until needed
         */
-       omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL);
+       omap_writew(omap_readw(OMAP7XX_DSP_M_CTL) & ~1, OMAP7XX_DSP_M_CTL);
 
        /*
         * UARTs -> done automagically by 8250 driver
@@ -320,21 +320,21 @@ static void __init omap_fsample_map_io(void)
         */
 
        /* Flash: CS0 timings setup */
-       omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0);
-       omap_writel(0x00000088, OMAP730_FLASH_ACFG_0);
+       omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_0);
+       omap_writel(0x00000088, OMAP7XX_FLASH_ACFG_0);
 
        /*
         * Ethernet support through the debug board
         * CS1 timings setup
         */
-       omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1);
-       omap_writel(0x00000000, OMAP730_FLASH_ACFG_1);
+       omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_1);
+       omap_writel(0x00000000, OMAP7XX_FLASH_ACFG_1);
 
        /*
         * Configure MPU_EXT_NIRQ IO in IO_CONF9 register,
         * It is used as the Ethernet controller interrupt
         */
-       omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9);
+       omap_writel(omap_readl(OMAP7XX_IO_CONF_9) & 0x1FFFFFFF, OMAP7XX_IO_CONF_9);
 }
 
 MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")
index 8340669..ec22838 100644 (file)
@@ -270,7 +270,7 @@ static void __init omap_perseus2_map_io(void)
        /*
         * Hold GSM Reset until needed
         */
-       omap_writew(omap_readw(OMAP730_DSP_M_CTL) & ~1, OMAP730_DSP_M_CTL);
+       omap_writew(omap_readw(OMAP7XX_DSP_M_CTL) & ~1, OMAP7XX_DSP_M_CTL);
 
        /*
         * UARTs -> done automagically by 8250 driver
@@ -281,21 +281,21 @@ static void __init omap_perseus2_map_io(void)
         */
 
        /* Flash: CS0 timings setup */
-       omap_writel(0x0000fff3, OMAP730_FLASH_CFG_0);
-       omap_writel(0x00000088, OMAP730_FLASH_ACFG_0);
+       omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_0);
+       omap_writel(0x00000088, OMAP7XX_FLASH_ACFG_0);
 
        /*
         * Ethernet support through the debug board
         * CS1 timings setup
         */
-       omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1);
-       omap_writel(0x00000000, OMAP730_FLASH_ACFG_1);
+       omap_writel(0x0000fff3, OMAP7XX_FLASH_CFG_1);
+       omap_writel(0x00000000, OMAP7XX_FLASH_ACFG_1);
 
        /*
         * Configure MPU_EXT_NIRQ IO in IO_CONF9 register,
         * It is used as the Ethernet controller interrupt
         */
-       omap_writel(omap_readl(OMAP730_IO_CONF_9) & 0x1FFFFFFF, OMAP730_IO_CONF_9);
+       omap_writel(omap_readl(OMAP7XX_IO_CONF_9) & 0x1FFFFFFF, OMAP7XX_IO_CONF_9);
 }
 
 MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
index fcbea61..c24cc28 100644 (file)
@@ -862,7 +862,7 @@ int __init omap1_clk_init(void)
 
 #if defined(CONFIG_MACH_OMAP_PERSEUS2) || defined(CONFIG_MACH_OMAP_FSAMPLE)
        /* Select slicer output as OMAP input clock */
-       omap_writew(omap_readw(OMAP730_PCC_UPLD_CTRL) & ~0x1, OMAP730_PCC_UPLD_CTRL);
+       omap_writew(omap_readw(OMAP7XX_PCC_UPLD_CTRL) & ~0x1, OMAP7XX_PCC_UPLD_CTRL);
 #endif
 
        /* Amstrad Delta wants BCLK high when inactive */
index 19de57f..157d508 100644 (file)
@@ -39,14 +39,14 @@ static struct map_desc omap_io_desc[] __initdata = {
 #if defined (CONFIG_ARCH_OMAP730) || defined (CONFIG_ARCH_OMAP850)
 static struct map_desc omap730_io_desc[] __initdata = {
        {
-               .virtual        = OMAP730_DSP_BASE,
-               .pfn            = __phys_to_pfn(OMAP730_DSP_START),
-               .length         = OMAP730_DSP_SIZE,
+               .virtual        = OMAP7XX_DSP_BASE,
+               .pfn            = __phys_to_pfn(OMAP7XX_DSP_START),
+               .length         = OMAP7XX_DSP_SIZE,
                .type           = MT_DEVICE
        }, {
-               .virtual        = OMAP730_DSPREG_BASE,
-               .pfn            = __phys_to_pfn(OMAP730_DSPREG_START),
-               .length         = OMAP730_DSPREG_SIZE,
+               .virtual        = OMAP7XX_DSPREG_BASE,
+               .pfn            = __phys_to_pfn(OMAP7XX_DSPREG_START),
+               .length         = OMAP7XX_DSPREG_SIZE,
                .type           = MT_DEVICE
        }
 };
index 26c1fbf..99c4241 100644 (file)
  * ---------------------------------------------------------------------------
  */
 
-#include "omap730.h"
+#include "omap7xx.h"
 #include "omap1510.h"
 #include "omap16xx.h"
 #include "omap24xx.h"
index 587fb63..66ae302 100644 (file)
                                        .pu_pd_reg = PU_PD_SEL_##reg, \
                                        .pu_pd_val = status,
 
-#define MUX_REG_730(reg, mode_offset, mode) .mux_reg_name = "OMAP730_IO_CONF_"#reg, \
-                                       .mux_reg = OMAP730_IO_CONF_##reg, \
+#define MUX_REG_730(reg, mode_offset, mode) .mux_reg_name = "OMAP7XX_IO_CONF_"#reg, \
+                                       .mux_reg = OMAP7XX_IO_CONF_##reg, \
                                        .mask_offset = mode_offset, \
                                        .mask = mode,
 
-#define PULL_REG_730(reg, bit, status) .pull_name = "OMAP730_IO_CONF_"#reg, \
-                                       .pull_reg = OMAP730_IO_CONF_##reg, \
+#define PULL_REG_730(reg, bit, status) .pull_name = "OMAP7XX_IO_CONF_"#reg, \
+                                       .pull_reg = OMAP7XX_IO_CONF_##reg, \
                                        .pull_bit = bit, \
                                        .pull_val = status,
 
                                        .pu_pd_val = status,
 
 #define MUX_REG_730(reg, mode_offset, mode) \
-                                       .mux_reg = OMAP730_IO_CONF_##reg, \
+                                       .mux_reg = OMAP7XX_IO_CONF_##reg, \
                                        .mask_offset = mode_offset, \
                                        .mask = mode,
 
-#define PULL_REG_730(reg, bit, status) .pull_reg = OMAP730_IO_CONF_##reg, \
+#define PULL_REG_730(reg, bit, status) .pull_reg = OMAP7XX_IO_CONF_##reg, \
                                        .pull_bit = bit, \
                                        .pull_val = status,
 
@@ -99,7 +99,7 @@
 
 /*
  * OMAP730/850 has a slightly different config for the pin mux.
- * - config regs are the OMAP730_IO_CONF_x regs (see omap730.h) regs and
+ * - config regs are the OMAP7XX_IO_CONF_x regs (see omap730.h) regs and
  *   not the FUNC_MUX_CTRL_x regs from hardware.h
  * - for pull-up/down, only has one enable bit which is is in the same register
  *   as mux config
index 388fd94..23a205f 100644 (file)
@@ -13,7 +13,7 @@
 #include <linux/io.h>
 #include <linux/mm.h>
 
-#include <mach/omap730.h>
+#include <mach/omap7xx.h>
 #include <mach/omap1510.h>
 #include <mach/omap16xx.h>
 #include <mach/omap24xx.h>
@@ -34,12 +34,12 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)
                        return XLATE(p, OMAP1_IO_PHYS, OMAP1_IO_VIRT);
        }
        if (cpu_is_omap7xx()) {
-               if (BETWEEN(p, OMAP730_DSP_BASE, OMAP730_DSP_SIZE))
-                       return XLATE(p, OMAP730_DSP_BASE, OMAP730_DSP_START);
+               if (BETWEEN(p, OMAP7XX_DSP_BASE, OMAP7XX_DSP_SIZE))
+                       return XLATE(p, OMAP7XX_DSP_BASE, OMAP7XX_DSP_START);
 
-               if (BETWEEN(p, OMAP730_DSPREG_BASE, OMAP730_DSPREG_SIZE))
-                       return XLATE(p, OMAP730_DSPREG_BASE,
-                                       OMAP730_DSPREG_START);
+               if (BETWEEN(p, OMAP7XX_DSPREG_BASE, OMAP7XX_DSPREG_SIZE))
+                       return XLATE(p, OMAP7XX_DSPREG_BASE,
+                                       OMAP7XX_DSPREG_START);
        }
        if (cpu_is_omap15xx()) {
                if (BETWEEN(p, OMAP1510_DSP_BASE, OMAP1510_DSP_SIZE))