Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90808911 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin arch: remove pata resources from generic board 



these are highly board specific, so putting into generic doesnt make much sense

Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent b9da3b92

arch/blackfin/mach-bf527/boards/cm_bf527.c

+0 −46
Original line number Diff line number Diff line
@@ -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>
@@ -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;

}

arch/blackfin/mach-bf527/boards/ezkit.c

+0 −46
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

#include <linux/usb/isp1362.h>

#endif

#include <linux/ata_platform.h>

#include <linux/i2c.h>

#include <linux/irq.h>

#include <linux/interrupt.h>
@@ -825,43 +824,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>
@@ -996,10 +958,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
@@ -1022,10 +980,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;

}

arch/blackfin/mach-bf533/boards/H8606.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

#include <linux/usb/isp1362.h>

#endif

#include <linux/ata_platform.h>

#include <linux/irq.h>



#include <asm/dma.h>

arch/blackfin/mach-bf533/boards/cm_bf533.c

+0 −46
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

#include <linux/usb/isp1362.h>

#endif

#include <linux/ata_platform.h>

#include <linux/irq.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>
@@ -307,43 +306,6 @@ static struct platform_device isp1362_hcd_device = { 
};

#endif



#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

#define PATA_INT	38



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 const unsigned int cclk_vlev_datasheet[] =

{

	VRPAIR(VLEV_085, 250000000),
@@ -403,10 +365,6 @@ static struct platform_device *cm_bf533_devices[] __initdata = { 
#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

	&bfin_spi0_device,

#endif



#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

	&bfin_pata_device,

#endif

};



static int __init cm_bf533_init(void)
@@ -416,10 +374,6 @@ static int __init cm_bf533_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;

}

arch/blackfin/mach-bf533/boards/ezkit.c

+0 −46
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

#include <linux/usb/isp1362.h>

#endif

#include <linux/ata_platform.h>

#include <linux/irq.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>
@@ -255,43 +254,6 @@ static struct platform_device bfin_sir_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>
@@ -404,10 +366,6 @@ static struct platform_device *ezkit_devices[] __initdata = { 
	&bfin_sir_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
@@ -424,10 +382,6 @@ static int __init ezkit_init(void) 
	printk(KERN_INFO "%s(): registering device resources\n", __func__);

	platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_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;

}