This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / arm / mach-ixp2000 / ixdp2x01.c

diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index 0e919bb..176114a 100644 (file)
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -23,6 +23,9 @@
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
 #include <linux/pci.h>
+#include <linux/interrupt.h>
+#include <linux/mm.h>
+#include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
@@ -51,14 +54,12 @@
  *************************************************************************/
 static void ixdp2x01_irq_mask(unsigned int irq)
 {
-       ixp2000_reg_write(IXDP2X01_INT_MASK_SET_REG,
-                               IXP2000_BOARD_IRQ_MASK(irq));
+       *IXDP2X01_INT_MASK_SET_REG = IXP2000_BOARD_IRQ_MASK(irq);
 }
 
 static void ixdp2x01_irq_unmask(unsigned int irq)
 {
-       ixp2000_reg_write(IXDP2X01_INT_MASK_CLR_REG,
-                               IXP2000_BOARD_IRQ_MASK(irq));
+       *IXDP2X01_INT_MASK_CLR_REG = IXP2000_BOARD_IRQ_MASK(irq);
 }
 
 static u32 valid_irq_mask;
@@ -113,8 +114,8 @@ void __init ixdp2x01_init_irq(void)
                valid_irq_mask = IXDP2801_VALID_IRQ_MASK;
 
        /* Mask all interrupts from CPLD, disable simulation */
-       ixp2000_reg_write(IXDP2X01_INT_MASK_SET_REG, 0xffffffff);
-       ixp2000_reg_write(IXDP2X01_INT_SIM_REG, 0);
+       *IXDP2X01_INT_MASK_SET_REG = 0xffffffff;
+       *IXDP2X01_INT_SIM_REG = 0;
 
        for (irq = NR_IXP2000_IRQS; irq < NR_IXDP2X01_IRQS; irq++) {
                if (irq & valid_irq_mask) {
@@ -192,7 +193,7 @@ static int __init ixdp2x01_clock_setup(char *str)
 
 __setup("ixdp2x01_clock=", ixdp2x01_clock_setup);
 
-static void __init ixdp2x01_timer_init(void)
+static void __init ixdp2x01_init_time(void)
 {
        if (!ixdp2x01_clock)
                ixdp2x01_clock = 50000000;
@@ -200,11 +201,6 @@ static void __init ixdp2x01_timer_init(void)
        ixp2000_init_time(ixdp2x01_clock);
 }
 
-static struct sys_timer ixdp2x01_timer = {
-       .init           = ixdp2x01_timer_init,
-       .offset         = ixp2000_gettimeoffset,
-};
-
 /*************************************************************************
  * IXDP2x01 PCI
  *************************************************************************/
@@ -316,8 +312,8 @@ static struct flash_platform_data ixdp2x01_flash_platform_data = {
 
 static unsigned long ixdp2x01_flash_bank_setup(unsigned long ofs)
 {
-       ixp2000_reg_write(IXDP2X01_CPLD_FLASH_REG,
-               ((ofs >> IXDP2X01_FLASH_WINDOW_BITS) | IXDP2X01_CPLD_FLASH_INTERN));
+       *IXDP2X01_CPLD_FLASH_REG = 
+               ((ofs >> IXDP2X01_FLASH_WINDOW_BITS) | IXDP2X01_CPLD_FLASH_INTERN);
        return (ofs & IXDP2X01_FLASH_WINDOW_MASK);
 }
 
@@ -342,29 +338,14 @@ static struct platform_device ixdp2x01_flash = {
        .resource       = &ixdp2x01_flash_resource,
 };
 
-static struct ixp2000_i2c_pins ixdp2x01_i2c_gpio_pins = {
-       .sda_pin        = IXDP2X01_GPIO_SDA,
-       .scl_pin        = IXDP2X01_GPIO_SCL,
-};
-
-static struct platform_device ixdp2x01_i2c_controller = {
-       .name           = "IXP2000-I2C",
-       .id             = 0,
-       .dev            = {
-               .platform_data = &ixdp2x01_i2c_gpio_pins,
-       },
-       .num_resources  = 0
-};
-
 static struct platform_device *ixdp2x01_devices[] __initdata = {
-       &ixdp2x01_flash,
-       &ixdp2x01_i2c_controller
+       &ixdp2x01_flash
 };
 
 static void __init ixdp2x01_init_machine(void)
 {
-       ixp2000_reg_write(IXDP2X01_CPLD_FLASH_REG,
-               (IXDP2X01_CPLD_FLASH_BANK_MASK | IXDP2X01_CPLD_FLASH_INTERN));
+       *IXDP2X01_CPLD_FLASH_REG = 
+               (IXDP2X01_CPLD_FLASH_BANK_MASK | IXDP2X01_CPLD_FLASH_INTERN);
        
        ixdp2x01_flash_data.nr_banks =
                ((*IXDP2X01_CPLD_FLASH_REG & IXDP2X01_CPLD_FLASH_BANK_MASK) + 1);
@@ -380,7 +361,7 @@ MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")
        BOOT_PARAMS(0x00000100)
        MAPIO(ixdp2x01_map_io)
        INITIRQ(ixdp2x01_init_irq)
-       .timer          = &ixdp2x01_timer,
+       INITTIME(ixdp2x01_init_time)
        INIT_MACHINE(ixdp2x01_init_machine)
 MACHINE_END
 #endif
@@ -392,7 +373,7 @@ MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")
        BOOT_PARAMS(0x00000100)
        MAPIO(ixdp2x01_map_io)
        INITIRQ(ixdp2x01_init_irq)
-       .timer          = &ixdp2x01_timer,
+       INITTIME(ixdp2x01_init_time)
        INIT_MACHINE(ixdp2x01_init_machine)
 MACHINE_END
 #endif