Commit c6c4d7bb authored by Bryan Wu's avatar Bryan Wu
Browse files

Blackfin arch: update platform driver resource information to all board files 



Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
parent bbf25010

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

+72 −9
Original line number Diff line number Diff line
@@ -34,7 +34,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>



/*
@@ -93,7 +95,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,
@@ -101,7 +103,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 = 2,           /* Framework chip select. */

		.platform_data = NULL,      /* No spi_driver specific config */

		.controller_data = &spi_adc_chip_info,
@@ -110,24 +112,40 @@ 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,

	},

#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 */
@@ -227,6 +245,43 @@ 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 struct platform_device *cm_bf533_devices[] __initdata = {

#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)

	&bfin_uart_device,
@@ -250,7 +305,11 @@ static struct platform_device *cm_bf533_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

};
@@ -261,6 +320,10 @@ 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

+82 −9
Original line number Diff line number Diff line
@@ -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>



/*
@@ -50,6 +52,12 @@ static struct platform_device rtc_device = { 
};

#endif



#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)

static struct platform_device bfin_fb_adv7393_device = {

	.name = "bfin-adv7393",

};

#endif



/*

 *  USB-LAN EzExtender board

 *  Driver needs to know address, irq and flag pin.
@@ -131,7 +139,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 = 2, /* Framework chip select. On STAMP537 it is SPISSEL2*/

		.platform_data = &bfin_spi_flash_data,

		.controller_data = &spi_flash_chip_info,
@@ -143,7 +151,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,
@@ -154,24 +162,40 @@ 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,

	},

#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 */
@@ -193,13 +217,54 @@ static struct platform_device bfin_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



static struct platform_device *ezkit_devices[] __initdata = {

#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)

	&smc91x_device,

#endif



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

	&spi_bfin_master_device,

	&bfin_spi0_device,

#endif



#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)

	&bfin_fb_adv7393_device,

#endif



#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
@@ -209,6 +274,10 @@ static struct platform_device *ezkit_devices[] __initdata = { 
#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)

	&bfin_uart_device,

#endif



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

	&bfin_pata_device,

#endif

};



static int __init ezkit_init(void)
@@ -218,6 +287,10 @@ static int __init ezkit_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/stamp.c

+102 −17
Original line number Diff line number Diff line
@@ -37,8 +37,11 @@ 
#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/irq.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>

#include <asm/reboot.h>



/*

 * Name the Board for the /proc/cpuinfo
@@ -77,6 +80,12 @@ static struct platform_device smc91x_device = { 
};

#endif



#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)

static struct platform_device bfin_fb_adv7393_device = {

	.name = "bfin-adv7393",

};

#endif



#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)

static struct resource net2272_bfin_resources[] = {

	{
@@ -177,7 +186,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 = 2, /* Framework chip select. On STAMP537 it is SPISSEL2*/

		.platform_data = &bfin_spi_flash_data,

		.controller_data = &spi_flash_chip_info,
@@ -189,7 +198,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,
@@ -200,7 +209,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
	{

		.modalias = "ad1836-spi",

		.max_speed_hz = 31250000,     /* 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,

	},
@@ -210,7 +219,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 = 0,

		.platform_data = NULL,

		.controller_data = &spi_mmc_chip_info,
@@ -219,7 +228,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,
@@ -231,16 +240,16 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
	{

		.modalias = "fxs-spi",

		.max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 1,

		.chip_select = 3,

		.bus_num = 0,

		.chip_select = 8 - CONFIG_J11_JUMPER,

		.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,

		.bus_num = 0,

		.chip_select = 8 - CONFIG_J19_JUMPER,

		.controller_data = &spi_si3xxx_chip_info,

		.mode = SPI_MODE_3,

	},
@@ -250,7 +259,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
	{

		.modalias = "ad5304_spi",

		.max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 1,

		.bus_num = 0,

		.chip_select = 2,

		.platform_data = NULL,

		.controller_data = &ad5304_chip_info,
@@ -259,17 +268,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 */
@@ -309,6 +334,43 @@ 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



static struct platform_device *stamp_devices[] __initdata = {

#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)

	&rtc_device,
@@ -318,12 +380,16 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&smc91x_device,

#endif



#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)

	&bfin_fb_adv7393_device,

#endif



#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)

	&net2272_bfin_device,

#endif



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

	&spi_bfin_master_device,

	&bfin_spi0_device,

#endif



#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
@@ -334,6 +400,10 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&bfin_sport0_uart_device,

	&bfin_sport1_uart_device,

#endif



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

	&bfin_pata_device,

#endif

};



static int __init stamp_init(void)
@@ -355,8 +425,23 @@ static int __init stamp_init(void) 
#endif



#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

	return spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));

	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_initcall(stamp_init);



void native_machine_restart(char *cmd)

{

#if defined(CONFIG_BFIN_SHARED_FLASH_ENET)

# define BIT_TO_SET (1 << CONFIG_ENET_FLASH_PIN)

	bfin_write_FIO_INEN(~BIT_TO_SET);

	bfin_write_FIO_DIR(BIT_TO_SET);

	bfin_write_FIO_FLAG_C(BIT_TO_SET);

#endif

}

arch/blackfin/mach-bf537/boards/cm_bf537.c

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

}

arch/blackfin/mach-bf537/boards/generic_board.c

+342 −55

File changed.

Preview size limit exceeded, changes collapsed.