Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c
index 04b38bc..52fac89 100644 (file)
--- a/arch/arm/mach-ixp2000/enp2611.c
+++ b/arch/arm/mach-ixp2000/enp2611.c
@@ -32,7 +32,7 @@
 #include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/serial_core.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -63,6 +63,35 @@ static struct sys_timer enp2611_timer = {
 };
 
 
+/*************************************************************************
+ * ENP-2611 I/O
+ *************************************************************************/
+static struct map_desc enp2611_io_desc[] __initdata = {
+       {
+               .virtual        = ENP2611_CALEB_VIRT_BASE,
+               .pfn            = __phys_to_pfn(ENP2611_CALEB_PHYS_BASE),
+               .length         = ENP2611_CALEB_SIZE,
+               .type           = MT_IXP2000_DEVICE,
+       }, {
+               .virtual        = ENP2611_PM3386_0_VIRT_BASE,
+               .pfn            = __phys_to_pfn(ENP2611_PM3386_0_PHYS_BASE),
+               .length         = ENP2611_PM3386_0_SIZE,
+               .type           = MT_IXP2000_DEVICE,
+       }, {
+               .virtual        = ENP2611_PM3386_1_VIRT_BASE,
+               .pfn            = __phys_to_pfn(ENP2611_PM3386_1_PHYS_BASE),
+               .length         = ENP2611_PM3386_1_SIZE,
+               .type           = MT_IXP2000_DEVICE,
+       }
+};
+
+void __init enp2611_map_io(void)
+{
+       ixp2000_map_io();
+       iotable_init(enp2611_io_desc, ARRAY_SIZE(enp2611_io_desc));
+}
+
+
 /*************************************************************************
  * ENP-2611 PCI
  *************************************************************************/
@@ -77,6 +106,7 @@ static void __init enp2611_pci_preinit(void)
 {
        ixp2000_reg_write(IXP2000_PCI_ADDR_EXT, 0x00100000);
        ixp2000_pci_preinit();
+       pcibios_setup("firmware");
 }
 
 static inline int enp2611_pci_valid_device(struct pci_bus *bus,
@@ -197,24 +227,41 @@ static struct platform_device enp2611_flash = {
        .resource       = &enp2611_flash_resource,
 };
 
+static struct ixp2000_i2c_pins enp2611_i2c_gpio_pins = {
+       .sda_pin        = ENP2611_GPIO_SDA,
+       .scl_pin        = ENP2611_GPIO_SCL,
+};
+
+static struct platform_device enp2611_i2c_controller = {
+       .name           = "IXP2000-I2C",
+       .id             = 0,
+       .dev            = {
+               .platform_data = &enp2611_i2c_gpio_pins
+       },
+       .num_resources  = 0
+};
+
 static struct platform_device *enp2611_devices[] __initdata = {
-       &enp2611_flash
+       &enp2611_flash,
+       &enp2611_i2c_controller
 };
 
 static void __init enp2611_init_machine(void)
 {
        platform_add_devices(enp2611_devices, ARRAY_SIZE(enp2611_devices));
+       ixp2000_uart_init();
 }
 
 
 MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board")
-       MAINTAINER("Lennert Buytenhek <buytenh@wantstofly.org>")
-       BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(ixp2000_map_io)
-       INITIRQ(ixp2000_init_irq)
+       /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
+       .phys_io        = IXP2000_UART_PHYS_BASE,
+       .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = enp2611_map_io,
+       .init_irq       = ixp2000_init_irq,
        .timer          = &enp2611_timer,
-       INIT_MACHINE(enp2611_init_machine)
+       .init_machine   = enp2611_init_machine,
 MACHINE_END