5 files changed, 65 insertions, 97 deletions

diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c
index 6a60618a78ec..a8f947b72754 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -35,7 +35,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <asm/bfin5xx_spi.h>
 
 /*
@@ -53,11 +53,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                 .size = 0x00020000,
                 .offset = 0,
                 .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                 .name = "kernel",
                 .size = 0xe0000,
                 .offset = 0x20000
-        },{
+        }, {
                 .name = "file system",
                 .size = 0x700000,
                 .offset = 0x00100000,
@@ -202,7 +202,7 @@ static struct resource smc91x_resources[] = {
                 .start = 0x20200300,
                 .end = 0x20200300 + 16,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PF14,
                 .end = IRQ_PF14,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -223,11 +223,11 @@ static struct resource isp1362_hcd_resources[] = {
                 .start = 0x20308000,
                 .end = 0x20308000,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0x20308004,
                 .end = 0x20308004,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PG15,
                 .end = IRQ_PG15,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -262,7 +262,7 @@ static struct resource net2272_bfin_resources[] = {
                 .start = 0x20200000,
                 .end = 0x20200000 + 0x100,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PF7,
                 .end = IRQ_PF7,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -283,7 +283,7 @@ static struct resource bfin_uart_resources[] = {
                 .start = 0xFFC00400,
                 .end = 0xFFC004FF,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0xFFC02000,
                 .end = 0xFFC020FF,
                 .flags = IORESOURCE_MEM,
diff --git a/arch/blackfin/mach-bf537/boards/eth_mac.c b/arch/blackfin/mach-bf537/boards/eth_mac.c
index e129a08d63de..a725cc8a9290 100644
--- a/arch/blackfin/mach-bf537/boards/eth_mac.c
+++ b/arch/blackfin/mach-bf537/boards/eth_mac.c
@@ -20,8 +20,7 @@
 #include <linux/module.h>
 #include <asm/blackfin.h>
 
-#if     defined(CONFIG_GENERIC_BOARD) \
-        || defined(CONFIG_BFIN537_STAMP)
+#if     defined(CONFIG_GENERIC_BOARD) || defined(CONFIG_BFIN537_STAMP)
 
 /*
  * Currently the MAC address is saved in Flash by U-Boot
@@ -43,7 +42,7 @@ void get_bf537_ether_addr(char *addr)
  */
 void get_bf537_ether_addr(char *addr)
 {
-        printk(KERN_WARNING "%s: No valid Ethernet MAC address found\n",__FILE__);
+        printk(KERN_WARNING "%s: No valid Ethernet MAC address found\n", __FILE__);
 }
 
 #endif
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c
index fd57e7439e0f..648d984e98d6 100644
--- a/arch/blackfin/mach-bf537/boards/generic_board.c
+++ b/arch/blackfin/mach-bf537/boards/generic_board.c
@@ -35,9 +35,9 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
-#include <asm/irq.h>
-#include <asm/bfin5xx_spi.h>
+#include <linux/irq.h>
 #include <linux/usb_sl811.h>
+#include <asm/bfin5xx_spi.h>
 
 /*
  * Name the Board for the /proc/cpuinfo
@@ -54,19 +54,19 @@ static struct resource bfin_pcmcia_cf_resources[] = {
                 .start = 0x20310000, /* IO PORT */
                 .end = 0x20312000,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0x20311000, /* Attribute Memory */
                 .end = 0x20311FFF,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PROG_INTA,
                 .end = IRQ_PROG_INTA,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },{
+        }, {
                 .start = IRQ_PF4,
                 .end = IRQ_PF4,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },{
+        }, {
                 .start = 6, /* Card Detect PF6 */
                 .end = 6,
                 .flags = IORESOURCE_IRQ,
@@ -95,11 +95,11 @@ static struct resource smc91x_resources[] = {
                 .start = 0x20300300,
                 .end = 0x20300300 + 16,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PROG_INTB,
                 .end = IRQ_PROG_INTB,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-        },{
+        }, {
                 /*
                  *  denotes the flag pin and is used directly if
                  *  CONFIG_IRQCHIP_DEMUX_GPIO is defined.
@@ -123,15 +123,15 @@ static struct resource sl811_hcd_resources[] = {
                 .start = 0x20340000,
                 .end = 0x20340000,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0x20340004,
                 .end = 0x20340004,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PROG_INTA,
                 .end = IRQ_PROG_INTA,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-        },{
+        }, {
                 .start = IRQ_PF0 + CONFIG_USB_SL811_BFIN_GPIO,
                 .end = IRQ_PF0 + CONFIG_USB_SL811_BFIN_GPIO,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -179,15 +179,15 @@ static struct resource isp1362_hcd_resources[] = {
                 .start = 0x20360000,
                 .end = 0x20360000,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0x20360004,
                 .end = 0x20360004,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PROG_INTA,
                 .end = IRQ_PROG_INTA,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-        },{
+        }, {
                 .start = IRQ_PF0 + CONFIG_USB_ISP1362_BFIN_GPIO,
                 .end = IRQ_PF0 + CONFIG_USB_ISP1362_BFIN_GPIO,
                 .flags = IORESOURCE_IRQ,
@@ -228,7 +228,7 @@ static struct resource net2272_bfin_resources[] = {
                 .start = 0x20300000,
                 .end = 0x20300000 + 0x100,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PF7,
                 .end = IRQ_PF7,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -253,11 +253,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                 .size = 0x00020000,
                 .offset = 0,
                 .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                 .name = "kernel",
                 .size = 0xe0000,
                 .offset = 0x20000
-        },{
+        }, {
                 .name = "file system",
                 .size = 0x700000,
                 .offset = 0x00100000,
@@ -375,7 +375,7 @@ static struct resource bfin_uart_resources[] = {
                 .start = 0xFFC00400,
                 .end = 0xFFC004FF,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0xFFC02000,
                 .end = 0xFFC020FF,
                 .flags = IORESOURCE_MEM,
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 8aaf76dfce80..8806f1230f2d 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -37,7 +37,7 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb_isp1362.h>
 #endif
-#include <asm/irq.h>
+#include <linux/irq.h>
 #include <asm/bfin5xx_spi.h>
 #include <linux/usb_sl811.h>
 
@@ -58,15 +58,15 @@ static struct resource bfin_pcmcia_cf_resources[] = {
                 .start = 0x20310000, /* IO PORT */
                 .end = 0x20312000,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0x20311000, /* Attribute Memory */
                 .end = 0x20311FFF,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PF4,
                 .end = IRQ_PF4,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },{
+        }, {
                 .start = 6, /* Card Detect PF6 */
                 .end = 6,
                 .flags = IORESOURCE_IRQ,
@@ -95,7 +95,7 @@ static struct resource smc91x_resources[] = {
                 .start = 0x20300300,
                 .end = 0x20300300 + 16,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
 
                 .start = IRQ_PF7,
                 .end = IRQ_PF7,
@@ -116,11 +116,11 @@ static struct resource sl811_hcd_resources[] = {
                 .start = 0x20340000,
                 .end = 0x20340000,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0x20340004,
                 .end = 0x20340004,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = CONFIG_USB_SL811_BFIN_IRQ,
                 .end = CONFIG_USB_SL811_BFIN_IRQ,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -167,11 +167,11 @@ static struct resource isp1362_hcd_resources[] = {
                 .start = 0x20360000,
                 .end = 0x20360000,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0x20360004,
                 .end = 0x20360004,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,
                 .end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -212,7 +212,7 @@ static struct resource net2272_bfin_resources[] = {
                 .start = 0x20300000,
                 .end = 0x20300000 + 0x100,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PF7,
                 .end = IRQ_PF7,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -238,11 +238,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                 .size = 0x00020000,
                 .offset = 0,
                 .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                 .name = "kernel",
                 .size = 0xe0000,
                 .offset = 0x20000
-        },{
+        }, {
                 .name = "file system",
                 .size = 0x700000,
                 .offset = 0x00100000,
@@ -294,16 +294,6 @@ static struct bfin5xx_spi_chip spi_mmc_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_PBX)
-static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
-        .ctl_reg        = 0x4, /* send zero */
-        .enable_dma     = 0,
-        .bits_per_word  = 8,
-        .cs_change_per_word = 1,
-};
-#endif
-
-
 #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
 static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
         .cs_change_per_word = 1,
@@ -392,24 +382,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .mode = SPI_MODE_3,
         },
 #endif
-#if defined(CONFIG_PBX)
-        {
-                .modalias       = "fxs-spi",
-                .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
-                .chip_select    = 3,
-                .controller_data= &spi_si3xxx_chip_info,
-                .mode = SPI_MODE_3,
-        },
-        {
-                .modalias       = "fxo-spi",
-                .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
-                .chip_select    = 2,
-                .controller_data= &spi_si3xxx_chip_info,
-                .mode = SPI_MODE_3,
-        },
-#endif
 #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
 {
         .modalias               = "ad7877",
@@ -451,7 +423,7 @@ static struct resource bfin_uart_resources[] = {
                 .start = 0xFFC00400,
                 .end = 0xFFC004FF,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0xFFC02000,
                 .end = 0xFFC020FF,
                 .flags = IORESOURCE_MEM,
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 3a29b4d15f25..c6373530898f 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -37,12 +37,10 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb_isp1362.h>
 #endif
-#include <asm/irq.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
-#include <asm/bfin5xx_spi.h>
 #include <linux/usb_sl811.h>
-
+#include <asm/bfin5xx_spi.h>
 #include <linux/spi/ad7877.h>
 
 /*
@@ -85,7 +83,7 @@ static struct platform_device *bfin_isp1761_devices[] = {
 
 int __init bfin_isp1761_init(void)
 {
-        unsigned int num_devices=ARRAY_SIZE(bfin_isp1761_devices);
+        unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices);
 
         printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
         set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING);
@@ -107,15 +105,15 @@ static struct resource bfin_pcmcia_cf_resources[] = {
                 .start = 0x20310000, /* IO PORT */
                 .end = 0x20312000,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0x20311000, /* Attribute Memory */
                 .end = 0x20311FFF,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PF4,
                 .end = IRQ_PF4,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        },{
+        }, {
                 .start = 6, /* Card Detect PF6 */
                 .end = 6,
                 .flags = IORESOURCE_IRQ,
@@ -144,7 +142,7 @@ static struct resource smc91x_resources[] = {
                 .start = 0x20300300,
                 .end = 0x20300300 + 16,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
 
                 .start = IRQ_PF7,
                 .end = IRQ_PF7,
@@ -165,11 +163,11 @@ static struct resource sl811_hcd_resources[] = {
                 .start = 0x20340000,
                 .end = 0x20340000,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0x20340004,
                 .end = 0x20340004,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = CONFIG_USB_SL811_BFIN_IRQ,
                 .end = CONFIG_USB_SL811_BFIN_IRQ,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -216,11 +214,11 @@ static struct resource isp1362_hcd_resources[] = {
                 .start = 0x20360000,
                 .end = 0x20360000,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0x20360004,
                 .end = 0x20360004,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,
                 .end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -261,7 +259,7 @@ static struct resource net2272_bfin_resources[] = {
                 .start = 0x20300000,
                 .end = 0x20300000 + 0x100,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = IRQ_PF7,
                 .end = IRQ_PF7,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -287,11 +285,11 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                 .size = 0x00020000,
                 .offset = 0,
                 .mask_flags = MTD_CAP_ROM
-        },{
+        }, {
                 .name = "kernel",
                 .size = 0xe0000,
                 .offset = 0x20000
-        },{
+        }, {
                 .name = "file system",
                 .size = 0x700000,
                 .offset = 0x00100000,
@@ -361,7 +359,6 @@ static struct bfin5xx_spi_chip ad5304_chip_info = {
 
 #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
 static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
-//      .cs_change_per_word = 1,
         .enable_dma = 0,
         .bits_per_word = 16,
 };
@@ -449,19 +446,19 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 #if defined(CONFIG_PBX)
         {
-                .modalias       = "fxs-spi",
-                .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
-                .chip_select    = 3,
-                .controller_data= &spi_si3xxx_chip_info,
+                .modalias = "fxs-spi",
+                .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
+                .bus_num = 1,
+                .chip_select = 3,
+                .controller_data = &spi_si3xxx_chip_info,
                 .mode = SPI_MODE_3,
         },
         {
-                .modalias       = "fxo-spi",
-                .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num        = 1,
-                .chip_select    = 2,
-                .controller_data= &spi_si3xxx_chip_info,
+                .modalias = "fxo-spi",
+                .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
+                .bus_num = 1,
+                .chip_select = 2,
+                .controller_data = &spi_si3xxx_chip_info,
                 .mode = SPI_MODE_3,
         },
 #endif
@@ -516,7 +513,7 @@ static struct resource bfin_uart_resources[] = {
                 .start = 0xFFC00400,
                 .end = 0xFFC004FF,
                 .flags = IORESOURCE_MEM,
-        },{
+        }, {
                 .start = 0xFFC02000,
                 .end = 0xFFC020FF,
                 .flags = IORESOURCE_MEM,