1 files changed, 75 insertions, 12 deletions

diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c
index a8f947b72754..44dea05e1d03 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -35,7 +35,9 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
+#include <linux/pata_platform.h>
 #include <linux/irq.h>
+#include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
 
 /*
@@ -113,7 +115,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/
                 .platform_data = &bfin_spi_flash_data,
                 .controller_data = &spi_flash_chip_info,
@@ -125,7 +127,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */
                 .max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 1, /* Framework chip select. */
                 .platform_data = NULL, /* No spi_driver specific config */
                 .controller_data = &spi_adc_chip_info,
@@ -136,7 +138,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad1836-spi",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
                 .controller_data = &ad1836_spi_chip_info,
         },
@@ -146,7 +148,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad9960-spi",
                 .max_speed_hz = 10000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = 1,
                 .controller_data = &ad9960_spi_chip_info,
         },
@@ -156,7 +158,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "spi_mmc_dummy",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = 7,
                 .platform_data = NULL,
                 .controller_data = &spi_mmc_chip_info,
@@ -165,7 +167,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "spi_mmc",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SPI_MMC_CS_CHAN,
                 .platform_data = NULL,
                 .controller_data = &spi_mmc_chip_info,
@@ -174,17 +176,33 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
+/* SPI (0) */
+static struct resource bfin_spi0_resource[] = {
+        [0] = {
+                .start = SPI0_REGBASE,
+                .end   = SPI0_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+                },
+        [1] = {
+                .start = CH_SPI,
+                .end   = CH_SPI,
+                .flags = IORESOURCE_IRQ,
+        }
+};
+
 /* SPI controller data */
-static struct bfin5xx_spi_master spi_bfin_master_info = {
+static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 8,
         .enable_dma = 1,  /* master has the ability to do dma transfer */
 };
 
-static struct platform_device spi_bfin_master_device = {
-        .name = "bfin-spi-master",
-        .id = 1, /* Bus number */
+static struct platform_device bfin_spi0_device = {
+        .name = "bfin-spi",
+        .id = 0, /* Bus number */
+        .num_resources = ARRAY_SIZE(bfin_spi0_resource),
+        .resource = bfin_spi0_resource,
         .dev = {
-                .platform_data = &spi_bfin_master_info, /* Passed to driver */
+                .platform_data = &bfin_spi0_info, /* Passed to driver */
         },
 };
 #endif  /* spi master and devices */
@@ -316,6 +334,43 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#define PATA_INT        64
+
+static struct pata_platform_info bfin_pata_platform_data = {
+        .ioport_shift = 2,
+        .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
+};
+
+static struct resource bfin_pata_resources[] = {
+        {
+                .start = 0x2030C000,
+                .end = 0x2030C01F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = 0x2030D018,
+                .end = 0x2030D01B,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = PATA_INT,
+                .end = PATA_INT,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bfin_pata_device = {
+        .name = "pata_platform",
+        .id = -1,
+        .num_resources = ARRAY_SIZE(bfin_pata_resources),
+        .resource = bfin_pata_resources,
+        .dev = {
+                .platform_data = &bfin_pata_platform_data,
+        }
+};
+#endif
+
 static struct platform_device *cm_bf537_devices[] __initdata = {
 #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
         &rtc_device,
@@ -347,7 +402,11 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
 #endif
 
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
-        &spi_bfin_master_device,
+        &bfin_spi0_device,
+#endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        &bfin_pata_device,
 #endif
 };
 
@@ -358,6 +417,10 @@ static int __init cm_bf537_init(void)
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
         spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 #endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;
+#endif
         return 0;
 }