1 files changed, 7 insertions, 53 deletions

diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
index 0b26ae2de5ee..d22bc7773717 100644
--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c
@@ -39,7 +39,6 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb/isp1362.h>
 #endif
-#include <linux/pata_platform.h>
 #include <linux/i2c.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
@@ -160,15 +159,15 @@ static struct platform_device musb_device = {
 #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
 static struct mtd_partition ezkit_partitions[] = {
         {
-                .name       = "Bootloader",
+                .name       = "bootloader(nor)",
                 .size       = 0x40000,
                 .offset     = 0,
         }, {
-                .name       = "Kernel",
+                .name       = "linux kernel(nor)",
                 .size       = 0x1C0000,
                 .offset     = MTDPART_OFS_APPEND,
         }, {
-                .name       = "RootFS",
+                .name       = "file system(nor)",
                 .size       = MTDPART_SIZ_FULL,
                 .offset     = MTDPART_OFS_APPEND,
         }
@@ -200,12 +199,12 @@ static struct platform_device ezkit_flash_device = {
 #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
 static struct mtd_partition partition_info[] = {
         {
-                .name = "Linux Kernel",
+                .name = "linux kernel(nand)",
                 .offset = 0,
                 .size = 4 * SIZE_1M,
         },
         {
-                .name = "File System",
+                .name = "file system(nand)",
                 .offset = MTDPART_OFS_APPEND,
                 .size = MTDPART_SIZ_FULL,
         },
@@ -438,12 +437,12 @@ static struct platform_device net2272_bfin_device = {
         || defined(CONFIG_MTD_M25P80_MODULE)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
-                .name = "bootloader",
+                .name = "bootloader(spi)",
                 .size = 0x00040000,
                 .offset = 0,
                 .mask_flags = MTD_CAP_ROM
         }, {
-                .name = "linux kernel",
+                .name = "linux kernel(spi)",
                 .size = MTDPART_SIZ_FULL,
                 .offset = MTDPART_OFS_APPEND,
         }
@@ -799,43 +798,6 @@ static struct platform_device bfin_sport1_uart_device = {
 };
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
-#define PATA_INT        55
-
-static struct pata_platform_info bfin_pata_platform_data = {
-        .ioport_shift = 1,
-        .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
-};
-
-static struct resource bfin_pata_resources[] = {
-        {
-                .start = 0x20314020,
-                .end = 0x2031403F,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .start = 0x2031401C,
-                .end = 0x2031401F,
-                .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
-
 #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
@@ -961,10 +923,6 @@ static struct platform_device *stamp_devices[] __initdata = {
         &bfin_sport1_uart_device,
 #endif
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
-        &bfin_pata_device,
-#endif
-
 #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
         &bfin_device_gpiokeys,
 #endif
@@ -987,10 +945,6 @@ static int __init stamp_init(void)
 
         platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
         spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
-
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
-        irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;
-#endif
         return 0;
 }