1 files changed, 35 insertions, 35 deletions

diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c
index 91ecddc9057a..bb4018b60642 100644
--- a/arch/arm/mach-omap2/board-zoom-debugboard.c
+++ b/arch/arm/mach-omap2/board-zoom-debugboard.c
@@ -16,18 +16,18 @@
 
 #include <plat/gpmc.h>
 
-#define ZOOM2_SMSC911X_CS       7
-#define ZOOM2_SMSC911X_GPIO     158
-#define ZOOM2_QUADUART_CS       3
-#define ZOOM2_QUADUART_GPIO     102
+#define ZOOM_SMSC911X_CS        7
+#define ZOOM_SMSC911X_GPIO      158
+#define ZOOM_QUADUART_CS        3
+#define ZOOM_QUADUART_GPIO      102
 #define QUART_CLK               1843200
 #define DEBUG_BASE              0x08000000
-#define ZOOM2_ETHR_START        DEBUG_BASE
+#define ZOOM_ETHR_START DEBUG_BASE
 
-static struct resource zoom2_smsc911x_resources[] = {
+static struct resource zoom_smsc911x_resources[] = {
         [0] = {
-                .start  = ZOOM2_ETHR_START,
-                .end    = ZOOM2_ETHR_START + SZ_4K,
+                .start  = ZOOM_ETHR_START,
+                .end    = ZOOM_ETHR_START + SZ_4K,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
@@ -35,42 +35,42 @@ static struct resource zoom2_smsc911x_resources[] = {
         },
 };
 
-static struct smsc911x_platform_config zoom2_smsc911x_config = {
+static struct smsc911x_platform_config zoom_smsc911x_config = {
         .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
         .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
         .flags          = SMSC911X_USE_32BIT,
         .phy_interface  = PHY_INTERFACE_MODE_MII,
 };
 
-static struct platform_device zoom2_smsc911x_device = {
+static struct platform_device zoom_smsc911x_device = {
         .name           = "smsc911x",
         .id             = -1,
-        .num_resources  = ARRAY_SIZE(zoom2_smsc911x_resources),
-        .resource       = zoom2_smsc911x_resources,
+        .num_resources  = ARRAY_SIZE(zoom_smsc911x_resources),
+        .resource       = zoom_smsc911x_resources,
         .dev            = {
-                .platform_data = &zoom2_smsc911x_config,
+                .platform_data = &zoom_smsc911x_config,
         },
 };
 
-static inline void __init zoom2_init_smsc911x(void)
+static inline void __init zoom_init_smsc911x(void)
 {
         int eth_cs;
         unsigned long cs_mem_base;
         int eth_gpio = 0;
 
-        eth_cs = ZOOM2_SMSC911X_CS;
+        eth_cs = ZOOM_SMSC911X_CS;
 
         if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) {
                 printk(KERN_ERR "Failed to request GPMC mem for smsc911x\n");
                 return;
         }
 
-        zoom2_smsc911x_resources[0].start = cs_mem_base + 0x0;
-        zoom2_smsc911x_resources[0].end   = cs_mem_base + 0xff;
+        zoom_smsc911x_resources[0].start = cs_mem_base + 0x0;
+        zoom_smsc911x_resources[0].end   = cs_mem_base + 0xff;
 
-        eth_gpio = ZOOM2_SMSC911X_GPIO;
+        eth_gpio = ZOOM_SMSC911X_GPIO;
 
-        zoom2_smsc911x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
+        zoom_smsc911x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
 
         if (gpio_request(eth_gpio, "smsc911x irq") < 0) {
                 printk(KERN_ERR "Failed to request GPIO%d for smsc911x IRQ\n",
@@ -94,7 +94,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
         }
 };
 
-static struct platform_device zoom2_debugboard_serial_device = {
+static struct platform_device zoom_debugboard_serial_device = {
         .name                   = "serial8250",
         .id                     = 3,
         .dev                    = {
@@ -102,13 +102,13 @@ static struct platform_device zoom2_debugboard_serial_device = {
         },
 };
 
-static inline void __init zoom2_init_quaduart(void)
+static inline void __init zoom_init_quaduart(void)
 {
         int quart_cs;
         unsigned long cs_mem_base;
         int quart_gpio = 0;
 
-        quart_cs = ZOOM2_QUADUART_CS;
+        quart_cs = ZOOM_QUADUART_CS;
 
         if (gpmc_cs_request(quart_cs, SZ_1M, &cs_mem_base) < 0) {
                 printk(KERN_ERR "Failed to request GPMC mem"
@@ -116,7 +116,7 @@ static inline void __init zoom2_init_quaduart(void)
                 return;
         }
 
-        quart_gpio = ZOOM2_QUADUART_GPIO;
+        quart_gpio = ZOOM_QUADUART_GPIO;
 
         if (gpio_request(quart_gpio, "TL16CP754C GPIO") < 0) {
                 printk(KERN_ERR "Failed to request GPIO%d for TL16CP754C\n",
@@ -126,15 +126,15 @@ static inline void __init zoom2_init_quaduart(void)
         gpio_direction_input(quart_gpio);
 }
 
-static inline int omap_zoom2_debugboard_detect(void)
+static inline int omap_zoom_debugboard_detect(void)
 {
         int debug_board_detect = 0;
         int ret = 1;
 
-        debug_board_detect = ZOOM2_SMSC911X_GPIO;
+        debug_board_detect = ZOOM_SMSC911X_GPIO;
 
-        if (gpio_request(debug_board_detect, "Zoom2 debug board detect") < 0) {
-                printk(KERN_ERR "Failed to request GPIO%d for Zoom2 debug"
+        if (gpio_request(debug_board_detect, "Zoom debug board detect") < 0) {
+                printk(KERN_ERR "Failed to request GPIO%d for Zoom debug"
                 "board detect\n", debug_board_detect);
                 return 0;
         }
@@ -147,17 +147,17 @@ static inline int omap_zoom2_debugboard_detect(void)
         return ret;
 }
 
-static struct platform_device *zoom2_devices[] __initdata = {
-        &zoom2_smsc911x_device,
-        &zoom2_debugboard_serial_device,
+static struct platform_device *zoom_devices[] __initdata = {
+        &zoom_smsc911x_device,
+        &zoom_debugboard_serial_device,
 };
 
-int __init omap_zoom2_debugboard_init(void)
+int __init zoom_debugboard_init(void)
 {
-        if (!omap_zoom2_debugboard_detect())
+        if (!omap_zoom_debugboard_detect())
                 return 0;
 
-        zoom2_init_smsc911x();
-        zoom2_init_quaduart();
-        return platform_add_devices(zoom2_devices, ARRAY_SIZE(zoom2_devices));
+        zoom_init_smsc911x();
+        zoom_init_quaduart();
+        return platform_add_devices(zoom_devices, ARRAY_SIZE(zoom_devices));
 }