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

Commit c4a2c58d authored Apr 12, 2014 by Steven Miao

blackfin: cleanup board files



using IS_ENABLED() macro instead of defined(CONFIG_XXX) || defined(CONFIG_XXX_MODULE)

Signed-off-by: Steven Miao <realmz6@gmail.com>

parent f8ef77d9

arch/blackfin/mach-bf518/boards/ezbrd.c

+42 −45

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,7 @@ const char bfin_board_name[] = "ADI BF518F-EZBRD";
	* Driver needs to know address, irq and flag pin.		* Driver needs to know address, irq and flag pin.
	*/		*/

	#if defined(CONFIG_MTD_PHYSMAP) \|\| defined(CONFIG_MTD_PHYSMAP_MODULE)		#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
	static struct mtd_partition ezbrd_partitions[] = {		static struct mtd_partition ezbrd_partitions[] = {
	{		{
	.name = "bootloader(nor)",		.name = "bootloader(nor)",
	@@ -61,7 +61,7 @@ static struct physmap_flash_data ezbrd_flash_data = {

	static struct resource ezbrd_flash_resource = {		static struct resource ezbrd_flash_resource = {
	.start = 0x20000000,		.start = 0x20000000,
	#if defined(CONFIG_SPI_BFIN5XX) \|\| defined(CONFIG_SPI_BFIN5XX_MODULE)		#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
	.end = 0x202fffff,		.end = 0x202fffff,
	#else		#else
	.end = 0x203fffff,		.end = 0x203fffff,
	@@ -80,14 +80,14 @@ static struct platform_device ezbrd_flash_device = {
	};		};
	#endif		#endif

	#if defined(CONFIG_RTC_DRV_BFIN) \|\| defined(CONFIG_RTC_DRV_BFIN_MODULE)		#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
	static struct platform_device rtc_device = {		static struct platform_device rtc_device = {
	.name = "rtc-bfin",		.name = "rtc-bfin",
	.id = -1,		.id = -1,
	};		};
	#endif		#endif

	#if defined(CONFIG_BFIN_MAC) \|\| defined(CONFIG_BFIN_MAC_MODULE)		#if IS_ENABLED(CONFIG_BFIN_MAC)
	#include <linux/bfin_mac.h>		#include <linux/bfin_mac.h>
	static const unsigned short bfin_mac_peripherals[] = {		static const unsigned short bfin_mac_peripherals[] = {
	P_MII0_ETxD0,		P_MII0_ETxD0,
	@@ -105,7 +105,7 @@ static const unsigned short bfin_mac_peripherals[] = {

	static struct bfin_phydev_platform_data bfin_phydev_data[] = {		static struct bfin_phydev_platform_data bfin_phydev_data[] = {
	{		{
	#if defined(CONFIG_NET_DSA_KSZ8893M) \|\| defined(CONFIG_NET_DSA_KSZ8893M_MODULE)		#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
	.addr = 3,		.addr = 3,
	#else		#else
	.addr = 1,		.addr = 1,
	@@ -119,7 +119,7 @@ static struct bfin_mii_bus_platform_data bfin_mii_bus_data = {
	.phydev_data = bfin_phydev_data,		.phydev_data = bfin_phydev_data,
	.phy_mode = PHY_INTERFACE_MODE_MII,		.phy_mode = PHY_INTERFACE_MODE_MII,
	.mac_peripherals = bfin_mac_peripherals,		.mac_peripherals = bfin_mac_peripherals,
	#if defined(CONFIG_NET_DSA_KSZ8893M) \|\| defined(CONFIG_NET_DSA_KSZ8893M_MODULE)		#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
	.phy_mask = 0xfff7, /* Only probe the port phy connect to the on chip MAC */		.phy_mask = 0xfff7, /* Only probe the port phy connect to the on chip MAC */
	#endif		#endif
	.vlan1_mask = 1,		.vlan1_mask = 1,
	@@ -140,7 +140,7 @@ static struct platform_device bfin_mac_device = {
	}		}
	};		};

	#if defined(CONFIG_NET_DSA_KSZ8893M) \|\| defined(CONFIG_NET_DSA_KSZ8893M_MODULE)		#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
	static struct dsa_chip_data ksz8893m_switch_chip_data = {		static struct dsa_chip_data ksz8893m_switch_chip_data = {
	.mii_bus = &bfin_mii_bus.dev,		.mii_bus = &bfin_mii_bus.dev,
	.port_names = {		.port_names = {
	@@ -165,8 +165,7 @@ static struct platform_device ksz8893m_switch_device = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_MTD_M25P80) \		#if IS_ENABLED(CONFIG_MTD_M25P80)
	\|\| defined(CONFIG_MTD_M25P80_MODULE)
	static struct mtd_partition bfin_spi_flash_partitions[] = {		static struct mtd_partition bfin_spi_flash_partitions[] = {
	{		{
	.name = "bootloader(spi)",		.name = "bootloader(spi)",
	@@ -193,13 +192,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
	};		};
	#endif		#endif

	#if defined(CONFIG_MMC_SPI) \|\| defined(CONFIG_MMC_SPI_MODULE)		#if IS_ENABLED(CONFIG_MMC_SPI)
	static struct bfin5xx_spi_chip mmc_spi_chip_info = {		static struct bfin5xx_spi_chip mmc_spi_chip_info = {
	.enable_dma = 0,		.enable_dma = 0,
	};		};
	#endif		#endif

	#if defined(CONFIG_TOUCHSCREEN_AD7877) \|\| defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)		#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
	static const struct ad7877_platform_data bfin_ad7877_ts_info = {		static const struct ad7877_platform_data bfin_ad7877_ts_info = {
	.model = 7877,		.model = 7877,
	.vref_delay_usecs = 50, /* internal, no capacitor */		.vref_delay_usecs = 50, /* internal, no capacitor */
	@@ -216,8 +215,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
	#endif		#endif

	static struct spi_board_info bfin_spi_board_info[] __initdata = {		static struct spi_board_info bfin_spi_board_info[] __initdata = {
	#if defined(CONFIG_MTD_M25P80) \		#if IS_ENABLED(CONFIG_MTD_M25P80)
	\|\| defined(CONFIG_MTD_M25P80_MODULE)
	{		{
	/* the modalias must be the same as spi device driver name */		/* the modalias must be the same as spi device driver name */
	.modalias = "m25p80", /* Name of spi_driver for this device */		.modalias = "m25p80", /* Name of spi_driver for this device */
	@@ -230,9 +228,8 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	},		},
	#endif		#endif

	#if defined(CONFIG_BFIN_MAC) \|\| defined(CONFIG_BFIN_MAC_MODULE)		#if IS_ENABLED(CONFIG_BFIN_MAC)
	#if defined(CONFIG_NET_DSA_KSZ8893M) \		#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
	\|\| defined(CONFIG_NET_DSA_KSZ8893M_MODULE)
	{		{
	.modalias = "ksz8893m",		.modalias = "ksz8893m",
	.max_speed_hz = 5000000,		.max_speed_hz = 5000000,
	@@ -244,7 +241,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_MMC_SPI) \|\| defined(CONFIG_MMC_SPI_MODULE)		#if IS_ENABLED(CONFIG_MMC_SPI)
	{		{
	.modalias = "mmc_spi",		.modalias = "mmc_spi",
	.max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */		.max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */
	@@ -254,7 +251,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	.mode = SPI_MODE_3,		.mode = SPI_MODE_3,
	},		},
	#endif		#endif
	#if defined(CONFIG_TOUCHSCREEN_AD7877) \|\| defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)		#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
	{		{
	.modalias = "ad7877",		.modalias = "ad7877",
	.platform_data = &bfin_ad7877_ts_info,		.platform_data = &bfin_ad7877_ts_info,
	@@ -264,7 +261,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	.chip_select = 2,		.chip_select = 2,
	},		},
	#endif		#endif
	#if defined(CONFIG_SND_SOC_WM8731) \|\| defined(CONFIG_SND_SOC_WM8731_MODULE) \		#if IS_ENABLED(CONFIG_SND_SOC_WM8731) \
	&& defined(CONFIG_SND_SOC_WM8731_SPI)		&& defined(CONFIG_SND_SOC_WM8731_SPI)
	{		{
	.modalias = "wm8731",		.modalias = "wm8731",
	@@ -274,7 +271,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	.mode = SPI_MODE_0,		.mode = SPI_MODE_0,
	},		},
	#endif		#endif
	#if defined(CONFIG_SPI_SPIDEV) \|\| defined(CONFIG_SPI_SPIDEV_MODULE)		#if IS_ENABLED(CONFIG_SPI_SPIDEV)
	{		{
	.modalias = "spidev",		.modalias = "spidev",
	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */		.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
	@@ -282,7 +279,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	.chip_select = 1,		.chip_select = 1,
	},		},
	#endif		#endif
	#if defined(CONFIG_FB_BFIN_LQ035Q1) \|\| defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)		#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
	{		{
	.modalias = "bfin-lq035q1-spi",		.modalias = "bfin-lq035q1-spi",
	.max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */		.max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */
	@@ -294,7 +291,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	};		};

	/* SPI controller data */		/* SPI controller data */
	#if defined(CONFIG_SPI_BFIN5XX) \|\| defined(CONFIG_SPI_BFIN5XX_MODULE)		#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
	/* SPI (0) */		/* SPI (0) */
	static struct bfin5xx_spi_master bfin_spi0_info = {		static struct bfin5xx_spi_master bfin_spi0_info = {
	.num_chipselect = 6,		.num_chipselect = 6,
	@@ -366,7 +363,7 @@ static struct platform_device bfin_spi1_device = {
	};		};
	#endif /* spi master and devices */		#endif /* spi master and devices */

	#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)		#if IS_ENABLED(CONFIG_SERIAL_BFIN)
	#ifdef CONFIG_SERIAL_BFIN_UART0		#ifdef CONFIG_SERIAL_BFIN_UART0
	static struct resource bfin_uart0_resources[] = {		static struct resource bfin_uart0_resources[] = {
	{		{
	@@ -465,7 +462,7 @@ static struct platform_device bfin_uart1_device = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_BFIN_SIR) \|\| defined(CONFIG_BFIN_SIR_MODULE)		#if IS_ENABLED(CONFIG_BFIN_SIR)
	#ifdef CONFIG_BFIN_SIR0		#ifdef CONFIG_BFIN_SIR0
	static struct resource bfin_sir0_resources[] = {		static struct resource bfin_sir0_resources[] = {
	{		{
	@@ -520,7 +517,7 @@ static struct platform_device bfin_sir1_device = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_SND_BF5XX_I2S) \|\| defined(CONFIG_SND_BF5XX_I2S_MODULE)		#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
	static struct platform_device bfin_i2s = {		static struct platform_device bfin_i2s = {
	.name = "bfin-i2s",		.name = "bfin-i2s",
	.id = CONFIG_SND_BF5XX_SPORT_NUM,		.id = CONFIG_SND_BF5XX_SPORT_NUM,
	@@ -528,7 +525,7 @@ static struct platform_device bfin_i2s = {
	};		};
	#endif		#endif

	#if defined(CONFIG_I2C_BLACKFIN_TWI) \|\| defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)		#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
	static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};		static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};

	static struct resource bfin_twi0_resource[] = {		static struct resource bfin_twi0_resource[] = {
	@@ -556,25 +553,25 @@ static struct platform_device i2c_bfin_twi_device = {
	#endif		#endif

	static struct i2c_board_info __initdata bfin_i2c_board_info[] = {		static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
	#if defined(CONFIG_BFIN_TWI_LCD) \|\| defined(CONFIG_BFIN_TWI_LCD_MODULE)		#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
	{		{
	I2C_BOARD_INFO("pcf8574_lcd", 0x22),		I2C_BOARD_INFO("pcf8574_lcd", 0x22),
	},		},
	#endif		#endif
	#if defined(CONFIG_INPUT_PCF8574) \|\| defined(CONFIG_INPUT_PCF8574_MODULE)		#if IS_ENABLED(CONFIG_INPUT_PCF8574)
	{		{
	I2C_BOARD_INFO("pcf8574_keypad", 0x27),		I2C_BOARD_INFO("pcf8574_keypad", 0x27),
	.irq = IRQ_PF8,		.irq = IRQ_PF8,
	},		},
	#endif		#endif
	#if defined(CONFIG_SND_SOC_SSM2602) \|\| defined(CONFIG_SND_SOC_SSM2602_MODULE)		#if IS_ENABLED(CONFIG_SND_SOC_SSM2602)
	{		{
	I2C_BOARD_INFO("ssm2602", 0x1b),		I2C_BOARD_INFO("ssm2602", 0x1b),
	},		},
	#endif		#endif
	};		};

	#if defined(CONFIG_SERIAL_BFIN_SPORT) \|\| defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)		#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
	#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART		#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
	static struct resource bfin_sport0_uart_resources[] = {		static struct resource bfin_sport0_uart_resources[] = {
	{		{
	@@ -645,7 +642,7 @@ static struct platform_device bfin_sport1_uart_device = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_KEYBOARD_GPIO) \|\| defined(CONFIG_KEYBOARD_GPIO_MODULE)		#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
	#include <linux/input.h>		#include <linux/input.h>
	#include <linux/gpio_keys.h>		#include <linux/gpio_keys.h>

	@@ -667,7 +664,7 @@ static struct platform_device bfin_device_gpiokeys = {
	};		};
	#endif		#endif

	#if defined(CONFIG_SDH_BFIN) \|\| defined(CONFIG_SDH_BFIN_MODULE)		#if IS_ENABLED(CONFIG_SDH_BFIN)

	static struct bfin_sd_host bfin_sdh_data = {		static struct bfin_sd_host bfin_sdh_data = {
	.dma_chan = CH_RSI,		.dma_chan = CH_RSI,
	@@ -710,24 +707,24 @@ static struct platform_device *stamp_devices[] __initdata = {

	&bfin_dpmc,		&bfin_dpmc,

	#if defined(CONFIG_RTC_DRV_BFIN) \|\| defined(CONFIG_RTC_DRV_BFIN_MODULE)		#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
	&rtc_device,		&rtc_device,
	#endif		#endif

	#if defined(CONFIG_BFIN_MAC) \|\| defined(CONFIG_BFIN_MAC_MODULE)		#if IS_ENABLED(CONFIG_BFIN_MAC)
	&bfin_mii_bus,		&bfin_mii_bus,
	&bfin_mac_device,		&bfin_mac_device,
	#if defined(CONFIG_NET_DSA_KSZ8893M) \|\| defined(CONFIG_NET_DSA_KSZ8893M_MODULE)		#if IS_ENABLED(CONFIG_NET_DSA_KSZ8893M)
	&ksz8893m_switch_device,		&ksz8893m_switch_device,
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_SPI_BFIN5XX) \|\| defined(CONFIG_SPI_BFIN5XX_MODULE)		#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
	&bfin_spi0_device,		&bfin_spi0_device,
	&bfin_spi1_device,		&bfin_spi1_device,
	#endif		#endif

	#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)		#if IS_ENABLED(CONFIG_SERIAL_BFIN)
	#ifdef CONFIG_SERIAL_BFIN_UART0		#ifdef CONFIG_SERIAL_BFIN_UART0
	&bfin_uart0_device,		&bfin_uart0_device,
	#endif		#endif
	@@ -736,7 +733,7 @@ static struct platform_device *stamp_devices[] __initdata = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_BFIN_SIR) \|\| defined(CONFIG_BFIN_SIR_MODULE)		#if IS_ENABLED(CONFIG_BFIN_SIR)
	#ifdef CONFIG_BFIN_SIR0		#ifdef CONFIG_BFIN_SIR0
	&bfin_sir0_device,		&bfin_sir0_device,
	#endif		#endif
	@@ -745,15 +742,15 @@ static struct platform_device *stamp_devices[] __initdata = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_I2C_BLACKFIN_TWI) \|\| defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)		#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
	&i2c_bfin_twi_device,		&i2c_bfin_twi_device,
	#endif		#endif

	#if defined(CONFIG_SND_BF5XX_I2S) \|\| defined(CONFIG_SND_BF5XX_I2S_MODULE)		#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
	&bfin_i2s,		&bfin_i2s,
	#endif		#endif

	#if defined(CONFIG_SERIAL_BFIN_SPORT) \|\| defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)		#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
	#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART		#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
	&bfin_sport0_uart_device,		&bfin_sport0_uart_device,
	#endif		#endif
	@@ -762,15 +759,15 @@ static struct platform_device *stamp_devices[] __initdata = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_KEYBOARD_GPIO) \|\| defined(CONFIG_KEYBOARD_GPIO_MODULE)		#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
	&bfin_device_gpiokeys,		&bfin_device_gpiokeys,
	#endif		#endif

	#if defined(CONFIG_SDH_BFIN) \|\| defined(CONFIG_SDH_BFIN_MODULE)		#if IS_ENABLED(CONFIG_SDH_BFIN)
	&bf51x_sdh_device,		&bf51x_sdh_device,
	#endif		#endif

	#if defined(CONFIG_MTD_PHYSMAP) \|\| defined(CONFIG_MTD_PHYSMAP_MODULE)		#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
	&ezbrd_flash_device,		&ezbrd_flash_device,
	#endif		#endif
	};		};
	@@ -784,7 +781,7 @@ static int __init ezbrd_init(void)
	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));
	/* setup BF518-EZBRD GPIO pin PG11 to AMS2, PG15 to AMS3. */		/* setup BF518-EZBRD GPIO pin PG11 to AMS2, PG15 to AMS3. */
	peripheral_request(P_AMS2, "ParaFlash");		peripheral_request(P_AMS2, "ParaFlash");
	#if !defined(CONFIG_SPI_BFIN5XX) && !defined(CONFIG_SPI_BFIN5XX_MODULE)		#if !IS_ENABLED(CONFIG_SPI_BFIN5XX)
	peripheral_request(P_AMS3, "ParaFlash");		peripheral_request(P_AMS3, "ParaFlash");
	#endif		#endif
	return 0;		return 0;

arch/blackfin/mach-bf518/boards/tcm-bf518.c

+31 −33

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,7 @@ const char bfin_board_name[] = "Bluetechnix TCM-BF518";
	* Driver needs to know address, irq and flag pin.		* Driver needs to know address, irq and flag pin.
	*/		*/

	#if defined(CONFIG_MTD_PHYSMAP) \|\| defined(CONFIG_MTD_PHYSMAP_MODULE)		#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
	static struct mtd_partition tcm_partitions[] = {		static struct mtd_partition tcm_partitions[] = {
	{		{
	.name = "bootloader(nor)",		.name = "bootloader(nor)",
	@@ -73,14 +73,14 @@ static struct platform_device tcm_flash_device = {
	};		};
	#endif		#endif

	#if defined(CONFIG_RTC_DRV_BFIN) \|\| defined(CONFIG_RTC_DRV_BFIN_MODULE)		#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
	static struct platform_device rtc_device = {		static struct platform_device rtc_device = {
	.name = "rtc-bfin",		.name = "rtc-bfin",
	.id = -1,		.id = -1,
	};		};
	#endif		#endif

	#if defined(CONFIG_BFIN_MAC) \|\| defined(CONFIG_BFIN_MAC_MODULE)		#if IS_ENABLED(CONFIG_BFIN_MAC)
	#include <linux/bfin_mac.h>		#include <linux/bfin_mac.h>
	static const unsigned short bfin_mac_peripherals[] = P_MII0;		static const unsigned short bfin_mac_peripherals[] = P_MII0;

	@@ -113,8 +113,7 @@ static struct platform_device bfin_mac_device = {
	};		};
	#endif		#endif

	#if defined(CONFIG_MTD_M25P80) \		#if IS_ENABLED(CONFIG_MTD_M25P80)
	\|\| defined(CONFIG_MTD_M25P80_MODULE)
	static struct mtd_partition bfin_spi_flash_partitions[] = {		static struct mtd_partition bfin_spi_flash_partitions[] = {
	{		{
	.name = "bootloader(spi)",		.name = "bootloader(spi)",
	@@ -141,13 +140,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
	};		};
	#endif		#endif

	#if defined(CONFIG_MMC_SPI) \|\| defined(CONFIG_MMC_SPI_MODULE)		#if IS_ENABLED(CONFIG_MMC_SPI)
	static struct bfin5xx_spi_chip mmc_spi_chip_info = {		static struct bfin5xx_spi_chip mmc_spi_chip_info = {
	.enable_dma = 0,		.enable_dma = 0,
	};		};
	#endif		#endif

	#if defined(CONFIG_TOUCHSCREEN_AD7877) \|\| defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)		#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
	static const struct ad7877_platform_data bfin_ad7877_ts_info = {		static const struct ad7877_platform_data bfin_ad7877_ts_info = {
	.model = 7877,		.model = 7877,
	.vref_delay_usecs = 50, /* internal, no capacitor */		.vref_delay_usecs = 50, /* internal, no capacitor */
	@@ -164,8 +163,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
	#endif		#endif

	static struct spi_board_info bfin_spi_board_info[] __initdata = {		static struct spi_board_info bfin_spi_board_info[] __initdata = {
	#if defined(CONFIG_MTD_M25P80) \		#if IS_ENABLED(CONFIG_MTD_M25P80)
	\|\| defined(CONFIG_MTD_M25P80_MODULE)
	{		{
	/* the modalias must be the same as spi device driver name */		/* the modalias must be the same as spi device driver name */
	.modalias = "m25p80", /* Name of spi_driver for this device */		.modalias = "m25p80", /* Name of spi_driver for this device */
	@@ -178,7 +176,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	},		},
	#endif		#endif

	#if defined(CONFIG_MMC_SPI) \|\| defined(CONFIG_MMC_SPI_MODULE)		#if IS_ENABLED(CONFIG_MMC_SPI)
	{		{
	.modalias = "mmc_spi",		.modalias = "mmc_spi",
	.max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */		.max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */
	@@ -188,7 +186,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	.mode = SPI_MODE_3,		.mode = SPI_MODE_3,
	},		},
	#endif		#endif
	#if defined(CONFIG_TOUCHSCREEN_AD7877) \|\| defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)		#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7877)
	{		{
	.modalias = "ad7877",		.modalias = "ad7877",
	.platform_data = &bfin_ad7877_ts_info,		.platform_data = &bfin_ad7877_ts_info,
	@@ -198,7 +196,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	.chip_select = 2,		.chip_select = 2,
	},		},
	#endif		#endif
	#if defined(CONFIG_SND_SOC_WM8731) \|\| defined(CONFIG_SND_SOC_WM8731_MODULE) \		#if IS_ENABLED(CONFIG_SND_SOC_WM8731) \
	&& defined(CONFIG_SND_SOC_WM8731_SPI)		&& defined(CONFIG_SND_SOC_WM8731_SPI)
	{		{
	.modalias = "wm8731",		.modalias = "wm8731",
	@@ -208,7 +206,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	.mode = SPI_MODE_0,		.mode = SPI_MODE_0,
	},		},
	#endif		#endif
	#if defined(CONFIG_SPI_SPIDEV) \|\| defined(CONFIG_SPI_SPIDEV_MODULE)		#if IS_ENABLED(CONFIG_SPI_SPIDEV)
	{		{
	.modalias = "spidev",		.modalias = "spidev",
	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */		.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
	@@ -216,7 +214,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	.chip_select = 1,		.chip_select = 1,
	},		},
	#endif		#endif
	#if defined(CONFIG_FB_BFIN_LQ035Q1) \|\| defined(CONFIG_FB_BFIN_LQ035Q1_MODULE)		#if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
	{		{
	.modalias = "bfin-lq035q1-spi",		.modalias = "bfin-lq035q1-spi",
	.max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */		.max_speed_hz = 20000000, /* max spi clock (SCK) speed in HZ */
	@@ -228,7 +226,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	};		};

	/* SPI controller data */		/* SPI controller data */
	#if defined(CONFIG_SPI_BFIN5XX) \|\| defined(CONFIG_SPI_BFIN5XX_MODULE)		#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
	/* SPI (0) */		/* SPI (0) */
	static struct bfin5xx_spi_master bfin_spi0_info = {		static struct bfin5xx_spi_master bfin_spi0_info = {
	.num_chipselect = 6,		.num_chipselect = 6,
	@@ -300,7 +298,7 @@ static struct platform_device bfin_spi1_device = {
	};		};
	#endif /* spi master and devices */		#endif /* spi master and devices */

	#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)		#if IS_ENABLED(CONFIG_SERIAL_BFIN)
	#ifdef CONFIG_SERIAL_BFIN_UART0		#ifdef CONFIG_SERIAL_BFIN_UART0
	static struct resource bfin_uart0_resources[] = {		static struct resource bfin_uart0_resources[] = {
	{		{
	@@ -399,7 +397,7 @@ static struct platform_device bfin_uart1_device = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_BFIN_SIR) \|\| defined(CONFIG_BFIN_SIR_MODULE)		#if IS_ENABLED(CONFIG_BFIN_SIR)
	#ifdef CONFIG_BFIN_SIR0		#ifdef CONFIG_BFIN_SIR0
	static struct resource bfin_sir0_resources[] = {		static struct resource bfin_sir0_resources[] = {
	{		{
	@@ -454,7 +452,7 @@ static struct platform_device bfin_sir1_device = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_I2C_BLACKFIN_TWI) \|\| defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)		#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
	static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};		static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};

	static struct resource bfin_twi0_resource[] = {		static struct resource bfin_twi0_resource[] = {
	@@ -482,12 +480,12 @@ static struct platform_device i2c_bfin_twi_device = {
	#endif		#endif

	static struct i2c_board_info __initdata bfin_i2c_board_info[] = {		static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
	#if defined(CONFIG_BFIN_TWI_LCD) \|\| defined(CONFIG_BFIN_TWI_LCD_MODULE)		#if IS_ENABLED(CONFIG_BFIN_TWI_LCD)
	{		{
	I2C_BOARD_INFO("pcf8574_lcd", 0x22),		I2C_BOARD_INFO("pcf8574_lcd", 0x22),
	},		},
	#endif		#endif
	#if defined(CONFIG_INPUT_PCF8574) \|\| defined(CONFIG_INPUT_PCF8574_MODULE)		#if IS_ENABLED(CONFIG_INPUT_PCF8574)
	{		{
	I2C_BOARD_INFO("pcf8574_keypad", 0x27),		I2C_BOARD_INFO("pcf8574_keypad", 0x27),
	.irq = IRQ_PF8,		.irq = IRQ_PF8,
	@@ -495,7 +493,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
	#endif		#endif
	};		};

	#if defined(CONFIG_SERIAL_BFIN_SPORT) \|\| defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)		#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
	#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART		#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
	static struct resource bfin_sport0_uart_resources[] = {		static struct resource bfin_sport0_uart_resources[] = {
	{		{
	@@ -566,7 +564,7 @@ static struct platform_device bfin_sport1_uart_device = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_KEYBOARD_GPIO) \|\| defined(CONFIG_KEYBOARD_GPIO_MODULE)		#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
	#include <linux/input.h>		#include <linux/input.h>
	#include <linux/gpio_keys.h>		#include <linux/gpio_keys.h>

	@@ -588,7 +586,7 @@ static struct platform_device bfin_device_gpiokeys = {
	};		};
	#endif		#endif

	#if defined(CONFIG_SDH_BFIN) \|\| defined(CONFIG_SDH_BFIN_MODULE)		#if IS_ENABLED(CONFIG_SDH_BFIN)

	static struct bfin_sd_host bfin_sdh_data = {		static struct bfin_sd_host bfin_sdh_data = {
	.dma_chan = CH_RSI,		.dma_chan = CH_RSI,
	@@ -631,21 +629,21 @@ static struct platform_device *tcm_devices[] __initdata = {

	&bfin_dpmc,		&bfin_dpmc,

	#if defined(CONFIG_RTC_DRV_BFIN) \|\| defined(CONFIG_RTC_DRV_BFIN_MODULE)		#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
	&rtc_device,		&rtc_device,
	#endif		#endif

	#if defined(CONFIG_BFIN_MAC) \|\| defined(CONFIG_BFIN_MAC_MODULE)		#if IS_ENABLED(CONFIG_BFIN_MAC)
	&bfin_mii_bus,		&bfin_mii_bus,
	&bfin_mac_device,		&bfin_mac_device,
	#endif		#endif

	#if defined(CONFIG_SPI_BFIN5XX) \|\| defined(CONFIG_SPI_BFIN5XX_MODULE)		#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
	&bfin_spi0_device,		&bfin_spi0_device,
	&bfin_spi1_device,		&bfin_spi1_device,
	#endif		#endif

	#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)		#if IS_ENABLED(CONFIG_SERIAL_BFIN)
	#ifdef CONFIG_SERIAL_BFIN_UART0		#ifdef CONFIG_SERIAL_BFIN_UART0
	&bfin_uart0_device,		&bfin_uart0_device,
	#endif		#endif
	@@ -654,7 +652,7 @@ static struct platform_device *tcm_devices[] __initdata = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_BFIN_SIR) \|\| defined(CONFIG_BFIN_SIR_MODULE)		#if IS_ENABLED(CONFIG_BFIN_SIR)
	#ifdef CONFIG_BFIN_SIR0		#ifdef CONFIG_BFIN_SIR0
	&bfin_sir0_device,		&bfin_sir0_device,
	#endif		#endif
	@@ -663,11 +661,11 @@ static struct platform_device *tcm_devices[] __initdata = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_I2C_BLACKFIN_TWI) \|\| defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)		#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
	&i2c_bfin_twi_device,		&i2c_bfin_twi_device,
	#endif		#endif

	#if defined(CONFIG_SERIAL_BFIN_SPORT) \|\| defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)		#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
	#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART		#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
	&bfin_sport0_uart_device,		&bfin_sport0_uart_device,
	#endif		#endif
	@@ -676,15 +674,15 @@ static struct platform_device *tcm_devices[] __initdata = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_KEYBOARD_GPIO) \|\| defined(CONFIG_KEYBOARD_GPIO_MODULE)		#if IS_ENABLED(CONFIG_KEYBOARD_GPIO)
	&bfin_device_gpiokeys,		&bfin_device_gpiokeys,
	#endif		#endif

	#if defined(CONFIG_SDH_BFIN) \|\| defined(CONFIG_SDH_BFIN_MODULE)		#if IS_ENABLED(CONFIG_SDH_BFIN)
	&bf51x_sdh_device,		&bf51x_sdh_device,
	#endif		#endif

	#if defined(CONFIG_MTD_PHYSMAP) \|\| defined(CONFIG_MTD_PHYSMAP_MODULE)		#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
	&tcm_flash_device,		&tcm_flash_device,
	#endif		#endif
	};		};

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

+34 −37

Original line number	Original line	Diff line number	Diff line
	@@ -37,7 +37,7 @@ const char bfin_board_name[] = "ADI BF527-AD7160EVAL";
	* Driver needs to know address, irq and flag pin.		* Driver needs to know address, irq and flag pin.
	*/		*/

	#if defined(CONFIG_USB_MUSB_HDRC) \|\| defined(CONFIG_USB_MUSB_HDRC_MODULE)		#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
	static struct resource musb_resources[] = {		static struct resource musb_resources[] = {
	[0] = {		[0] = {
	.start = 0xffc03800,		.start = 0xffc03800,
	@@ -97,7 +97,7 @@ static struct platform_device musb_device = {
	};		};
	#endif		#endif

	#if defined(CONFIG_FB_BFIN_RA158Z) \|\| defined(CONFIG_FB_BFIN_RA158Z_MODULE)		#if IS_ENABLED(CONFIG_FB_BFIN_RA158Z)
	static struct resource bf52x_ra158z_resources[] = {		static struct resource bf52x_ra158z_resources[] = {
	{		{
	.start = IRQ_PPI_ERROR,		.start = IRQ_PPI_ERROR,
	@@ -114,7 +114,7 @@ static struct platform_device bf52x_ra158z_device = {
	};		};
	#endif		#endif

	#if defined(CONFIG_MTD_PHYSMAP) \|\| defined(CONFIG_MTD_PHYSMAP_MODULE)		#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
	static struct mtd_partition ad7160eval_partitions[] = {		static struct mtd_partition ad7160eval_partitions[] = {
	{		{
	.name = "bootloader(nor)",		.name = "bootloader(nor)",
	@@ -154,7 +154,7 @@ static struct platform_device ad7160eval_flash_device = {
	};		};
	#endif		#endif

	#if defined(CONFIG_MTD_NAND_BF5XX) \|\| defined(CONFIG_MTD_NAND_BF5XX_MODULE)		#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
	static struct mtd_partition partition_info[] = {		static struct mtd_partition partition_info[] = {
	{		{
	.name = "linux kernel(nand)",		.name = "linux kernel(nand)",
	@@ -200,14 +200,14 @@ static struct platform_device bf5xx_nand_device = {
	};		};
	#endif		#endif

	#if defined(CONFIG_RTC_DRV_BFIN) \|\| defined(CONFIG_RTC_DRV_BFIN_MODULE)		#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
	static struct platform_device rtc_device = {		static struct platform_device rtc_device = {
	.name = "rtc-bfin",		.name = "rtc-bfin",
	.id = -1,		.id = -1,
	};		};
	#endif		#endif

	#if defined(CONFIG_BFIN_MAC) \|\| defined(CONFIG_BFIN_MAC_MODULE)		#if IS_ENABLED(CONFIG_BFIN_MAC)
	#include <linux/bfin_mac.h>		#include <linux/bfin_mac.h>
	static const unsigned short bfin_mac_peripherals[] = P_RMII0;		static const unsigned short bfin_mac_peripherals[] = P_RMII0;

	@@ -241,8 +241,7 @@ static struct platform_device bfin_mac_device = {
	#endif		#endif


	#if defined(CONFIG_MTD_M25P80) \		#if IS_ENABLED(CONFIG_MTD_M25P80)
	\|\| defined(CONFIG_MTD_M25P80_MODULE)
	static struct mtd_partition bfin_spi_flash_partitions[] = {		static struct mtd_partition bfin_spi_flash_partitions[] = {
	{		{
	.name = "bootloader(spi)",		.name = "bootloader(spi)",
	@@ -269,13 +268,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
	};		};
	#endif		#endif

	#if defined(CONFIG_MMC_SPI) \|\| defined(CONFIG_MMC_SPI_MODULE)		#if IS_ENABLED(CONFIG_MMC_SPI)
	static struct bfin5xx_spi_chip mmc_spi_chip_info = {		static struct bfin5xx_spi_chip mmc_spi_chip_info = {
	.enable_dma = 0,		.enable_dma = 0,
	};		};
	#endif		#endif

	#if defined(CONFIG_SND_BF5XX_I2S) \|\| defined(CONFIG_SND_BF5XX_I2S_MODULE)		#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
	static struct platform_device bfin_i2s = {		static struct platform_device bfin_i2s = {
	.name = "bfin-i2s",		.name = "bfin-i2s",
	.id = CONFIG_SND_BF5XX_SPORT_NUM,		.id = CONFIG_SND_BF5XX_SPORT_NUM,
	@@ -284,8 +283,7 @@ static struct platform_device bfin_i2s = {
	#endif		#endif

	static struct spi_board_info bfin_spi_board_info[] __initdata = {		static struct spi_board_info bfin_spi_board_info[] __initdata = {
	#if defined(CONFIG_MTD_M25P80) \		#if IS_ENABLED(CONFIG_MTD_M25P80)
	\|\| defined(CONFIG_MTD_M25P80_MODULE)
	{		{
	/* the modalias must be the same as spi device driver name */		/* the modalias must be the same as spi device driver name */
	.modalias = "m25p80", /* Name of spi_driver for this device */		.modalias = "m25p80", /* Name of spi_driver for this device */
	@@ -297,8 +295,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	.mode = SPI_MODE_3,		.mode = SPI_MODE_3,
	},		},
	#endif		#endif
	#if defined(CONFIG_SND_BF5XX_SOC_AD183X) \		#if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
	\|\| defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE)
	{		{
	.modalias = "ad183x",		.modalias = "ad183x",
	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */		.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
	@@ -306,7 +303,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	.chip_select = 4,		.chip_select = 4,
	},		},
	#endif		#endif
	#if defined(CONFIG_MMC_SPI) \|\| defined(CONFIG_MMC_SPI_MODULE)		#if IS_ENABLED(CONFIG_MMC_SPI)
	{		{
	.modalias = "mmc_spi",		.modalias = "mmc_spi",
	.max_speed_hz = 30000000, /* max spi clock (SCK) speed in HZ */		.max_speed_hz = 30000000, /* max spi clock (SCK) speed in HZ */
	@@ -316,7 +313,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	.mode = SPI_MODE_3,		.mode = SPI_MODE_3,
	},		},
	#endif		#endif
	#if defined(CONFIG_SPI_SPIDEV) \|\| defined(CONFIG_SPI_SPIDEV_MODULE)		#if IS_ENABLED(CONFIG_SPI_SPIDEV)
	{		{
	.modalias = "spidev",		.modalias = "spidev",
	.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */		.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
	@@ -326,7 +323,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
	#endif		#endif
	};		};

	#if defined(CONFIG_SPI_BFIN5XX) \|\| defined(CONFIG_SPI_BFIN5XX_MODULE)		#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
	/* SPI controller data */		/* SPI controller data */
	static struct bfin5xx_spi_master bfin_spi0_info = {		static struct bfin5xx_spi_master bfin_spi0_info = {
	.num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,		.num_chipselect = MAX_CTRL_CS + MAX_BLACKFIN_GPIOS,
	@@ -364,7 +361,7 @@ static struct platform_device bfin_spi0_device = {
	};		};
	#endif /* spi master and devices */		#endif /* spi master and devices */

	#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)		#if IS_ENABLED(CONFIG_SERIAL_BFIN)
	#ifdef CONFIG_SERIAL_BFIN_UART0		#ifdef CONFIG_SERIAL_BFIN_UART0
	static struct resource bfin_uart0_resources[] = {		static struct resource bfin_uart0_resources[] = {
	{		{
	@@ -475,7 +472,7 @@ static struct platform_device bfin_uart1_device = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_BFIN_SIR) \|\| defined(CONFIG_BFIN_SIR_MODULE)		#if IS_ENABLED(CONFIG_BFIN_SIR)
	#ifdef CONFIG_BFIN_SIR0		#ifdef CONFIG_BFIN_SIR0
	static struct resource bfin_sir0_resources[] = {		static struct resource bfin_sir0_resources[] = {
	{		{
	@@ -530,7 +527,7 @@ static struct platform_device bfin_sir1_device = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_TOUCHSCREEN_AD7160) \|\| defined(CONFIG_TOUCHSCREEN_AD7160_MODULE)		#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7160)
	#include <linux/input/ad7160.h>		#include <linux/input/ad7160.h>
	static const struct ad7160_platform_data bfin_ad7160_ts_info = {		static const struct ad7160_platform_data bfin_ad7160_ts_info = {
	.sensor_x_res = 854,		.sensor_x_res = 854,
	@@ -560,7 +557,7 @@ static const struct ad7160_platform_data bfin_ad7160_ts_info = {
	};		};
	#endif		#endif

	#if defined(CONFIG_I2C_BLACKFIN_TWI) \|\| defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)		#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
	static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};		static const u16 bfin_twi0_pins[] = {P_TWI0_SCL, P_TWI0_SDA, 0};

	static struct resource bfin_twi0_resource[] = {		static struct resource bfin_twi0_resource[] = {
	@@ -588,7 +585,7 @@ static struct platform_device i2c_bfin_twi_device = {
	#endif		#endif

	static struct i2c_board_info __initdata bfin_i2c_board_info[] = {		static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
	#if defined(CONFIG_TOUCHSCREEN_AD7160) \|\| defined(CONFIG_TOUCHSCREEN_AD7160_MODULE)		#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7160)
	{		{
	I2C_BOARD_INFO("ad7160", 0x33),		I2C_BOARD_INFO("ad7160", 0x33),
	.irq = IRQ_PH1,		.irq = IRQ_PH1,
	@@ -597,7 +594,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
	#endif		#endif
	};		};

	#if defined(CONFIG_SERIAL_BFIN_SPORT) \|\| defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)		#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
	#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART		#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
	static struct resource bfin_sport0_uart_resources[] = {		static struct resource bfin_sport0_uart_resources[] = {
	{		{
	@@ -668,7 +665,7 @@ static struct platform_device bfin_sport1_uart_device = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_INPUT_BFIN_ROTARY) \|\| defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)		#if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
	#include <asm/bfin_rotary.h>		#include <asm/bfin_rotary.h>

	static struct bfin_rotary_platform_data bfin_rotary_data = {		static struct bfin_rotary_platform_data bfin_rotary_data = {
	@@ -725,28 +722,28 @@ static struct platform_device *stamp_devices[] __initdata = {

	&bfin_dpmc,		&bfin_dpmc,

	#if defined(CONFIG_MTD_NAND_BF5XX) \|\| defined(CONFIG_MTD_NAND_BF5XX_MODULE)		#if IS_ENABLED(CONFIG_MTD_NAND_BF5XX)
	&bf5xx_nand_device,		&bf5xx_nand_device,
	#endif		#endif

	#if defined(CONFIG_RTC_DRV_BFIN) \|\| defined(CONFIG_RTC_DRV_BFIN_MODULE)		#if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
	&rtc_device,		&rtc_device,
	#endif		#endif

	#if defined(CONFIG_USB_MUSB_HDRC) \|\| defined(CONFIG_USB_MUSB_HDRC_MODULE)		#if IS_ENABLED(CONFIG_USB_MUSB_HDRC)
	&musb_device,		&musb_device,
	#endif		#endif

	#if defined(CONFIG_BFIN_MAC) \|\| defined(CONFIG_BFIN_MAC_MODULE)		#if IS_ENABLED(CONFIG_BFIN_MAC)
	&bfin_mii_bus,		&bfin_mii_bus,
	&bfin_mac_device,		&bfin_mac_device,
	#endif		#endif

	#if defined(CONFIG_SPI_BFIN5XX) \|\| defined(CONFIG_SPI_BFIN5XX_MODULE)		#if IS_ENABLED(CONFIG_SPI_BFIN5XX)
	&bfin_spi0_device,		&bfin_spi0_device,
	#endif		#endif

	#if defined(CONFIG_SERIAL_BFIN) \|\| defined(CONFIG_SERIAL_BFIN_MODULE)		#if IS_ENABLED(CONFIG_SERIAL_BFIN)
	#ifdef CONFIG_SERIAL_BFIN_UART0		#ifdef CONFIG_SERIAL_BFIN_UART0
	&bfin_uart0_device,		&bfin_uart0_device,
	#endif		#endif
	@@ -755,11 +752,11 @@ static struct platform_device *stamp_devices[] __initdata = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_FB_BFIN_RA158Z) \|\| defined(CONFIG_FB_BFIN_RA158Z_MODULE)		#if IS_ENABLED(CONFIG_FB_BFIN_RA158Z)
	&bf52x_ra158z_device,		&bf52x_ra158z_device,
	#endif		#endif

	#if defined(CONFIG_BFIN_SIR) \|\| defined(CONFIG_BFIN_SIR_MODULE)		#if IS_ENABLED(CONFIG_BFIN_SIR)
	#ifdef CONFIG_BFIN_SIR0		#ifdef CONFIG_BFIN_SIR0
	&bfin_sir0_device,		&bfin_sir0_device,
	#endif		#endif
	@@ -768,11 +765,11 @@ static struct platform_device *stamp_devices[] __initdata = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_I2C_BLACKFIN_TWI) \|\| defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)		#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
	&i2c_bfin_twi_device,		&i2c_bfin_twi_device,
	#endif		#endif

	#if defined(CONFIG_SERIAL_BFIN_SPORT) \|\| defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)		#if IS_ENABLED(CONFIG_SERIAL_BFIN_SPORT)
	#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART		#ifdef CONFIG_SERIAL_BFIN_SPORT0_UART
	&bfin_sport0_uart_device,		&bfin_sport0_uart_device,
	#endif		#endif
	@@ -781,15 +778,15 @@ static struct platform_device *stamp_devices[] __initdata = {
	#endif		#endif
	#endif		#endif

	#if defined(CONFIG_INPUT_BFIN_ROTARY) \|\| defined(CONFIG_INPUT_BFIN_ROTARY_MODULE)		#if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
	&bfin_rotary_device,		&bfin_rotary_device,
	#endif		#endif

	#if defined(CONFIG_MTD_PHYSMAP) \|\| defined(CONFIG_MTD_PHYSMAP_MODULE)		#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
	&ad7160eval_flash_device,		&ad7160eval_flash_device,
	#endif		#endif

	#if defined(CONFIG_SND_BF5XX_I2S) \|\| defined(CONFIG_SND_BF5XX_I2S_MODULE)		#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
	&bfin_i2s,		&bfin_i2s,
	#endif		#endif
	};		};

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

+44 −47

File changed.

Preview size limit exceeded, changes collapsed.

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

+37 −39

File changed.

Preview size limit exceeded, changes collapsed.