fix typos against the gpio buttons driver (#5804)

[openwrt/openwrt.git] / target / linux / brcm63xx / files / arch / mips / bcm63xx / boards / board_bcm963xx.c

diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
index b9ff9759eb8a74d6d274c4b56f6e5692b0d53596..b0497767cdb76fa730af25f6579574baf4034137 100644 (file)
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4,6 +4,7 @@
  * for more details.
  *
  * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
  * for more details.
  *
  * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>

+ * Copyright (C) 2009 Florian Fainelli <florian@openwrt.org>

  */
 
 #include <linux/init.h>
  */
 
 #include <linux/init.h>


@@ -14,6 +15,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/ssb/ssb.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/ssb/ssb.h>

+#include <linux/gpio_buttons.h>

 #include <asm/addrspace.h>
 #include <bcm63xx_board.h>
 #include <bcm63xx_cpu.h>
 #include <asm/addrspace.h>
 #include <bcm63xx_board.h>
 #include <bcm63xx_cpu.h>


@@ -54,6 +56,35 @@ static struct board_info __initdata board_96338gw = {
        },
 
        .has_ohci0                      = 1,
        },
 
        .has_ohci0                      = 1,

+
+       .leds = {
+               {
+                       .name           = "adsl",
+                       .gpio           = 3,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ses",
+                       .gpio           = 5,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ppp-fail",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "power",
+                       .gpio           = 0,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+               },
+               {
+                       .name           = "stop",
+                       .gpio           = 1,
+                       .active_low     = 1,
+               }
+       },

 };
 
 static struct board_info __initdata board_96338w = {
 };
 
 static struct board_info __initdata board_96338w = {


@@ -64,7 +95,36 @@ static struct board_info __initdata board_96338w = {
        .enet0 = {
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        .enet0 = {
                .force_speed_100        = 1,
                .force_duplex_full      = 1,

-       }
+       },
+
+       .leds = {
+               {
+                       .name           = "adsl",
+                       .gpio           = 3,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ses",
+                       .gpio           = 5,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ppp-fail",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "power",
+                       .gpio           = 0,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+               },
+               {
+                       .name           = "stop",
+                       .gpio           = 1,
+                       .active_low     = 1,
+               },
+       },

 };
 #endif
 
 };
 #endif
 


@@ -93,6 +153,36 @@ static struct board_info __initdata board_96348r = {
                .has_phy                = 1,
                .use_internal_phy       = 1,
        },
                .has_phy                = 1,
                .use_internal_phy       = 1,
        },

+
+       .leds = {
+               {
+                       .name           = "adsl-fail",
+                       .gpio           = 2,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ppp",
+                       .gpio           = 3,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ppp-fail",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "power",
+                       .gpio           = 0,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+                       
+               },
+               {
+                       .name           = "stop",
+                       .gpio           = 1,
+                       .active_low     = 1,
+               },
+       },

 };
 
 static struct board_info __initdata board_96348gw_10 = { 
 };
 
 static struct board_info __initdata board_96348gw_10 = { 


@@ -123,6 +213,35 @@ static struct board_info __initdata board_96348gw_10 = {
                .cs                     = 2,
                .ext_irq                = 2,
        },
                .cs                     = 2,
                .ext_irq                = 2,
        },

+       
+       .leds = {
+               {
+                       .name           = "adsl-fail",
+                       .gpio           = 2,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ppp",
+                       .gpio           = 3,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ppp-fail",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "power",
+                       .gpio           = 0,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+               },
+               {
+                       .name           = "stop",
+                       .gpio           = 1,
+                       .active_low     = 1,
+               },
+       },

 }; 
 
 static struct board_info __initdata board_96348gw_11 = {
 }; 
 
 static struct board_info __initdata board_96348gw_11 = {


@@ -147,6 +266,35 @@ static struct board_info __initdata board_96348gw_11 = {
        .has_ohci0 = 1,
        .has_pccard = 1,
        .has_ehci0 = 1,
        .has_ohci0 = 1,
        .has_pccard = 1,
        .has_ehci0 = 1,

+       
+       .leds = {
+               {
+                       .name           = "adsl-fail",
+                       .gpio           = 2,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ppp",
+                       .gpio           = 3,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ppp-fail",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "power",
+                       .gpio           = 0,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+               },
+               {
+                       .name           = "stop",
+                       .gpio           = 1,
+                       .active_low     = 1,
+               },
+       },

 };
 
 static struct board_info __initdata board_96348gw = {
 };
 
 static struct board_info __initdata board_96348gw = {


@@ -175,6 +323,35 @@ static struct board_info __initdata board_96348gw = {
                .ext_irq                = 2,
                .cs                     = 2,
        },
                .ext_irq                = 2,
                .cs                     = 2,
        },

+       
+       .leds = {
+               {
+                       .name           = "adsl-fail",
+                       .gpio           = 2,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ppp",
+                       .gpio           = 3,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ppp-fail",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "power",
+                       .gpio           = 0,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+               },
+               {
+                       .name           = "stop",
+                       .gpio           = 1,
+                       .active_low     = 1,
+               },
+       },

 };
 
 static struct board_info __initdata board_FAST2404 = {
 };
 
 static struct board_info __initdata board_FAST2404 = {


@@ -270,6 +447,33 @@ static struct board_info __initdata board_96358vw = {
        .has_ohci0 = 1,
        .has_pccard = 1,
        .has_ehci0 = 1,
        .has_ohci0 = 1,
        .has_pccard = 1,
        .has_ehci0 = 1,

+       
+       .leds = {
+               {
+                       .name           = "adsl-fail",
+                       .gpio           = 15,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ppp",
+                       .gpio           = 22,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ppp-fail",
+                       .gpio           = 23,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "power",
+                       .gpio           = 4,
+                       .default_trigger = "default-on",
+               },
+               {
+                       .name           = "stop",
+                       .gpio           = 5,
+               },
+       },

 };
 
 static struct board_info __initdata board_96358vw2 = {
 };
 
 static struct board_info __initdata board_96358vw2 = {


@@ -294,6 +498,29 @@ static struct board_info __initdata board_96358vw2 = {
        .has_ohci0 = 1,
        .has_pccard = 1,
        .has_ehci0 = 1,
        .has_ohci0 = 1,
        .has_pccard = 1,
        .has_ehci0 = 1,

+
+       .leds = {
+               {
+                       .name           = "adsl",
+                       .gpio           = 22,
+                       .active_low     = 1,
+               },
+               {
+                       .name           = "ppp-fail",
+                       .gpio           = 23,
+               },
+               {
+                       .name           = "power",
+                       .gpio           = 5,
+                       .active_low     = 1,
+                       .default_trigger = "default-on",
+               },
+               {
+                       .name           = "stop",
+                       .gpio           = 4,
+                       .active_low     = 1,
+               },
+       },

 };
 
 static struct board_info __initdata board_AGPFS0 = {
 };
 
 static struct board_info __initdata board_AGPFS0 = {


@@ -317,6 +544,27 @@ static struct board_info __initdata board_AGPFS0 = {
        .has_ohci0 = 1,
        .has_ehci0 = 1,
 };
        .has_ohci0 = 1,
        .has_ehci0 = 1,
 };

+
+static struct board_info __initdata board_DWVS0 = {
+       .name                           = "DWV-S0",
+       .expected_cpu_id                = 0x6358,
+
+       .has_enet0                      = 1,
+       .has_enet1                      = 1,
+       .has_pci                        = 1,
+
+       .enet0 = {
+               .has_phy                = 1,
+               .use_internal_phy       = 1,
+       },
+
+       .enet1 = {
+               .force_speed_100        = 1,
+               .force_duplex_full      = 1,
+       },
+
+       .has_ohci0 = 1,
+};

 #endif
 
 /*
 #endif
 
 /*


@@ -344,6 +592,7 @@ static const struct board_info __initdata *bcm963xx_boards[] = {
        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,
        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,

+       &board_DWVS0,

 #endif
 };
 
 #endif
 };
 


@@ -358,7 +607,7 @@ void __init board_prom_init(void)
        u32 val;
 
        /* read base address of boot chip select (0) 
        u32 val;
 
        /* read base address of boot chip select (0) 

-        * 6338/6345 does not have MPI but boots from standard
+        * 6345 does not have MPI but boots from standard

         * MIPS Flash address */
        if (BCMCPU_IS_6345())
                val = 0x1fc00000;
         * MIPS Flash address */
        if (BCMCPU_IS_6345())
                val = 0x1fc00000;


@@ -546,6 +795,25 @@ static struct resource gpiodev_resource = {
        .start                  = 0xFFFFFFFF,
 };
 
        .start                  = 0xFFFFFFFF,
 };
 

+static struct gpio_led_platform_data bcm63xx_led_data;
+
+static struct platform_device bcm63xx_gpio_leds = {
+       .name                   = "leds-gpio",
+       .id                     = 0,
+       .dev.platform_data      = &bcm63xx_led_data,
+};
+
+struct gpio_buttons_platform_data bcm63xx_gpio_buttons_data = {
+       .poll_interval  = 20,
+};
+
+struct platform_device bcm63xx_gpio_buttons_device = {
+        .name           = "gpio-buttons",
+        .id             = 0,
+        .dev.platform_data = &bcm63xx_gpio_buttons_data,
+};
+
+

 /*
  * third stage init callback, register all board devices.
  */
 /*
  * third stage init callback, register all board devices.
  */


@@ -555,7 +823,9 @@ int __init board_register_devices(void)
 
        bcm63xx_uart_register();
        bcm63xx_wdt_register();
 
        bcm63xx_uart_register();
        bcm63xx_wdt_register();

-       bcm63xx_spi_register();
+
+       if (!BCMCPU_IS_6345())
+               bcm63xx_spi_register();

 
        if (board.has_pccard)
                bcm63xx_pcmcia_register();
 
        if (board.has_pccard)
                bcm63xx_pcmcia_register();


@@ -593,7 +863,7 @@ int __init board_register_devices(void)
 
        /* read base address of boot chip select (0) */
        if (BCMCPU_IS_6345())
 
        /* read base address of boot chip select (0) */
        if (BCMCPU_IS_6345())

-               val = 0x1fc0000;
+               val = 0x1fc00000;

        else {
                val = bcm_mpi_readl(MPI_CSBASE_REG(0));
                val &= MPI_CSBASE_BASE_MASK;
        else {
                val = bcm_mpi_readl(MPI_CSBASE_REG(0));
                val &= MPI_CSBASE_BASE_MASK;


@@ -606,6 +876,16 @@ int __init board_register_devices(void)
        /* Register GPIODEV */
        platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
 
        /* Register GPIODEV */
        platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
 

+       bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
+       bcm63xx_led_data.leds = board.leds;
+
+       platform_device_register(&bcm63xx_gpio_leds);
+
+       bcm63xx_gpio_buttons_data.nbuttons = 1,
+       bcm63xx_gpio_buttons_data.buttons = board.reset_btn;
+
+       platform_device_register(&bcm63xx_gpio_buttons_device);
+

        return 0;
 }
 
        return 0;
 }