Skip to content

L
linux
Commit fd18f00d authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'blackfin-for-linus' of... 

Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux

Pull blackfin updates from Steven Miao:
 "Code cleanup, some previously ignored patches, and bug fixes"

* tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
  blackfin: cleanup board files
  bf609: clock: drop unused clock bit set/clear functions
  Blackfin: bf537: rename "CONFIG_ADT75"
  Blackfin: bf537: rename "CONFIG_AD7314"
  Blackfin: bf537: rename ad2s120x ->ad2s1200
  blackfin: bf537: fix typo "CONFIG_SND_SOC_ADV80X_MODULE"
  blackfin: dma: current count mmr is read only
  bfin_crc: Move architecture independant crc header file out of the blackfin folder.
  bf54x: drop unuesd HOST status,control,timeout registers bit define macros
  blackfin: portmux: cleanup head file
  Blackfin: remove "config IP_CHECKSUM_L1"
  blackfin: Remove GENERIC_GPIO config option again
  blackfin:Use generic /proc/interrupts implementation
  blackfin: bf60x: fix typo "CONFIG_PM_BFIN_WAKE_PA15_POL"
parents de0c9cf9 c4a2c58d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1115 additions and 1473 deletions
arch/blackfin/Kconfig
View file @ fd18f00d
...@@ -34,6 +34,7 @@ config BLACKFIN ...@@ -34,6 +34,7 @@ config BLACKFIN
select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IPC_PARSE_VERSION
select GENERIC_ATOMIC64 select GENERIC_ATOMIC64
select GENERIC_IRQ_PROBE select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW
select HAVE_NMI_WATCHDOG if NMI_WATCHDOG select HAVE_NMI_WATCHDOG if NMI_WATCHDOG
select GENERIC_SMP_IDLE_THREAD select GENERIC_SMP_IDLE_THREAD
select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS
...@@ -51,9 +52,6 @@ config GENERIC_BUG ...@@ -51,9 +52,6 @@ config GENERIC_BUG
config ZONE_DMA config ZONE_DMA
def_bool y def_bool y
config GENERIC_GPIO
def_bool y
config FORCE_MAX_ZONEORDER config FORCE_MAX_ZONEORDER
int int
default "14" default "14"
...@@ -870,14 +868,6 @@ config SYS_BFIN_SPINLOCK_L1 ...@@ -870,14 +868,6 @@ config SYS_BFIN_SPINLOCK_L1
If enabled, sys_bfin_spinlock function is linked If enabled, sys_bfin_spinlock function is linked
into L1 instruction memory. (less latency) into L1 instruction memory. (less latency)
config IP_CHECKSUM_L1
bool "Locate IP Checksum function in L1 Memory"
default n
depends on !SMP
help
If enabled, the IP Checksum function is linked
into L1 instruction memory. (less latency)
config CACHELINE_ALIGNED_L1 config CACHELINE_ALIGNED_L1
bool "Locate cacheline_aligned data to L1 Data Memory" bool "Locate cacheline_aligned data to L1 Data Memory"
default y if !BF54x default y if !BF54x
......
arch/blackfin/include/asm/bfin_crc.h deleted 100644 → 0
View file @ de0c9cf9
/*
* bfin_crc.h - interface to Blackfin CRC controllers
*
* Copyright 2012 Analog Devices Inc.
*
* Licensed under the GPL-2 or later.
*/
#ifndef __BFIN_CRC_H__
#define __BFIN_CRC_H__
/* Function driver which use hardware crc must initialize the structure */
struct crc_info {
/* Input data address */
unsigned char *in_addr;
/* Output data address */
unsigned char *out_addr;
/* Input or output bytes */
unsigned long datasize;
union {
/* CRC to compare with that of input buffer */
unsigned long crc_compare;
/* Value to compare with input data */
unsigned long val_verify;
/* Value to fill */
unsigned long val_fill;
};
/* Value to program the 32b CRC Polynomial */
unsigned long crc_poly;
union {
/* CRC calculated from the input data */
unsigned long crc_result;
/* First failed position to verify input data */
unsigned long pos_verify;
};
/* CRC mirror flags */
unsigned int bitmirr:1;
unsigned int bytmirr:1;
unsigned int w16swp:1;
unsigned int fdsel:1;
unsigned int rsltmirr:1;
unsigned int polymirr:1;
unsigned int cmpmirr:1;
};
/* Userspace interface */
#define CRC_IOC_MAGIC 'C'
#define CRC_IOC_CALC_CRC _IOWR('C', 0x01, unsigned int)
#define CRC_IOC_MEMCPY_CRC _IOWR('C', 0x02, unsigned int)
#define CRC_IOC_VERIFY_VAL _IOWR('C', 0x03, unsigned int)
#define CRC_IOC_FILL_VAL _IOWR('C', 0x04, unsigned int)
#ifdef __KERNEL__
#include <linux/types.h>
#include <linux/spinlock.h>
#include <linux/miscdevice.h>
struct crc_register {
u32 control;
u32 datacnt;
u32 datacntrld;
u32 __pad_1[2];
u32 compare;
u32 fillval;
u32 datafifo;
u32 intren;
u32 intrenset;
u32 intrenclr;
u32 poly;
u32 __pad_2[4];
u32 status;
u32 datacntcap;
u32 __pad_3;
u32 result;
u32 curresult;
u32 __pad_4[3];
u32 revid;
};
/* CRC_STATUS Masks */
#define CMPERR 0x00000002 /* Compare error */
#define DCNTEXP 0x00000010 /* datacnt register expired */
#define IBR 0x00010000 /* Input buffer ready */
#define OBR 0x00020000 /* Output buffer ready */
#define IRR 0x00040000 /* Immediate result readt */
#define LUTDONE 0x00080000 /* Look-up table generation done */
#define FSTAT 0x00700000 /* FIFO status */
#define MAX_FIFO 4 /* Max fifo size */
/* CRC_CONTROL Masks */
#define BLKEN 0x00000001 /* Block enable */
#define OPMODE 0x000000F0 /* Operation mode */
#define OPMODE_OFFSET 4 /* Operation mode mask offset*/
#define MODE_DMACPY_CRC 1 /* MTM CRC compute and compare */
#define MODE_DATA_FILL 2 /* MTM data fill */
#define MODE_CALC_CRC 3 /* MSM CRC compute and compare */
#define MODE_DATA_VERIFY 4 /* MSM data verify */
#define AUTOCLRZ 0x00000100 /* Auto clear to zero */
#define AUTOCLRF 0x00000200 /* Auto clear to one */
#define OBRSTALL 0x00001000 /* Stall on output buffer ready */
#define IRRSTALL 0x00002000 /* Stall on immediate result ready */
#define BITMIRR 0x00010000 /* Mirror bits within each byte of 32-bit input data */
#define BITMIRR_OFFSET 16 /* Mirror bits offset */
#define BYTMIRR 0x00020000 /* Mirror bytes of 32-bit input data */
#define BYTMIRR_OFFSET 17 /* Mirror bytes offset */
#define W16SWP 0x00040000 /* Mirror uppper and lower 16-bit word of 32-bit input data */
#define W16SWP_OFFSET 18 /* Mirror 16-bit word offset */
#define FDSEL 0x00080000 /* FIFO is written after input data is mirrored */
#define FDSEL_OFFSET 19 /* Mirror FIFO offset */
#define RSLTMIRR 0x00100000 /* CRC result registers are mirrored. */
#define RSLTMIRR_OFFSET 20 /* Mirror CRC result offset. */
#define POLYMIRR 0x00200000 /* CRC poly register is mirrored. */
#define POLYMIRR_OFFSET 21 /* Mirror CRC poly offset. */
#define CMPMIRR 0x00400000 /* CRC compare register is mirrored. */
#define CMPMIRR_OFFSET 22 /* Mirror CRC compare offset. */
/* CRC_INTREN Masks */
#define CMPERRI 0x02 /* CRC_ERROR_INTR */
#define DCNTEXPI 0x10 /* CRC_STATUS_INTR */
#endif
#endif
arch/blackfin/include/asm/dma.h
View file @ fd18f00d
...@@ -316,8 +316,6 @@ static inline void disable_dma(unsigned int channel) ...@@ -316,8 +316,6 @@ static inline void disable_dma(unsigned int channel)
} }
static inline void enable_dma(unsigned int channel) static inline void enable_dma(unsigned int channel)
{ {
dma_ch[channel].regs->curr_x_count = 0;
dma_ch[channel].regs->curr_y_count = 0;
dma_ch[channel].regs->cfg |= DMAEN; dma_ch[channel].regs->cfg |= DMAEN;
} }
int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data); int set_dma_callback(unsigned int channel, irq_handler_t callback, void *data);
......
arch/blackfin/include/asm/portmux.h
View file @ fd18f00d
...@@ -18,16 +18,14 @@ ...@@ -18,16 +18,14 @@
#define P_DONTCARE 0x1000 #define P_DONTCARE 0x1000
#ifdef CONFIG_PINCTRL #ifdef CONFIG_PINCTRL
#include <asm/irq_handler.h> int bfin_internal_set_wake(unsigned int irq, unsigned int state);
#define gpio_pint_regs bfin_pint_regs #define gpio_pint_regs bfin_pint_regs
#define adi_internal_set_wake bfin_internal_set_wake #define adi_internal_set_wake bfin_internal_set_wake
#define peripheral_request(per, label) 0 #define peripheral_request(per, label) (0)
#define peripheral_free(per) #define peripheral_free(per)
#define peripheral_request_list(per, label) \ #define peripheral_request_list(per, label) (0)
(pdev ? (IS_ERR(devm_pinctrl_get_select_default(&pdev->dev)) \
? -EINVAL : 0) : 0)
#define peripheral_free_list(per) #define peripheral_free_list(per)
#else #else
int peripheral_request(unsigned short per, const char *label); int peripheral_request(unsigned short per, const char *label);
...@@ -39,7 +37,7 @@ void peripheral_free_list(const unsigned short per[]); ...@@ -39,7 +37,7 @@ void peripheral_free_list(const unsigned short per[]);
#include <linux/err.h> #include <linux/err.h>
#include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinctrl.h>
#include <mach/portmux.h> #include <mach/portmux.h>
#include <linux/gpio.h> #include <mach/gpio.h>
#ifndef P_SPORT2_TFS #ifndef P_SPORT2_TFS
#define P_SPORT2_TFS P_UNDEF #define P_SPORT2_TFS P_UNDEF
......
arch/blackfin/kernel/irqchip.c
View file @ fd18f00d
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/seq_file.h>
#include <asm/irq_handler.h> #include <asm/irq_handler.h>
#include <asm/trace.h> #include <asm/trace.h>
#include <asm/pda.h> #include <asm/pda.h>
...@@ -33,37 +34,15 @@ static struct irq_desc bad_irq_desc = { ...@@ -33,37 +34,15 @@ static struct irq_desc bad_irq_desc = {
#endif #endif
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
int show_interrupts(struct seq_file *p, void *v) int arch_show_interrupts(struct seq_file *p, int prec)
{ {
int i = *(loff_t *) v, j; int j;
struct irqaction *action;
unsigned long flags; seq_printf(p, "%*s: ", prec, "NMI");
for_each_online_cpu(j)
if (i < NR_IRQS) { seq_printf(p, "%10u ", cpu_pda[j].__nmi_count);
struct irq_desc *desc = irq_to_desc(i); seq_printf(p, " CORE Non Maskable Interrupt\n");
seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
raw_spin_lock_irqsave(&desc->lock, flags);
action = desc->action;
if (!action)
goto skip;
seq_printf(p, "%3d: ", i);
for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
seq_printf(p, " %8s", irq_desc_get_chip(desc)->name);
seq_printf(p, " %s", action->name);
for (action = action->next; action; action = action->next)
seq_printf(p, " %s", action->name);
seq_putc(p, '\n');
skip:
raw_spin_unlock_irqrestore(&desc->lock, flags);
} else if (i == NR_IRQS) {
seq_printf(p, "NMI: ");
for_each_online_cpu(j)
seq_printf(p, "%10u ", cpu_pda[j].__nmi_count);
seq_printf(p, " CORE Non Maskable Interrupt\n");
seq_printf(p, "Err: %10u\n", atomic_read(&irq_err_count));
}
return 0; return 0;
} }
#endif #endif
......
arch/blackfin/mach-bf518/boards/ezbrd.c
View file @ fd18f00d
This diff is collapsed.
arch/blackfin/mach-bf518/boards/tcm-bf518.c
View file @ fd18f00d
...@@ -36,7 +36,7 @@ const char bfin_board_name[] = "Bluetechnix TCM-BF518"; ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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[] = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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
View file @ fd18f00d
...@@ -37,7 +37,7 @@ const char bfin_board_name[] = "ADI BF527-AD7160EVAL"; ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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[] = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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 = { ...@@ -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
View file @ fd18f00d
This diff is collapsed.
arch/blackfin/mach-bf527/boards/ezbrd.c
View file @ fd18f00d
...@@ -36,7 +36,7 @@ const char bfin_board_name[] = "ADI BF526-EZBRD"; ...@@ -36,7 +36,7 @@ const char bfin_board_name[] = "ADI BF526-EZBRD";
* 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,
...@@ -98,7 +98,7 @@ static struct platform_device musb_device = { ...@@ -98,7 +98,7 @@ static struct platform_device musb_device = {
}; };
#endif #endif
#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)",
...@@ -138,7 +138,7 @@ static struct platform_device ezbrd_flash_device = { ...@@ -138,7 +138,7 @@ static struct platform_device ezbrd_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 = "bootloader(nand)", .name = "bootloader(nand)",
...@@ -188,7 +188,7 @@ static struct platform_device bf5xx_nand_device = { ...@@ -188,7 +188,7 @@ 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,
...@@ -196,7 +196,7 @@ static struct platform_device rtc_device = { ...@@ -196,7 +196,7 @@ static struct platform_device rtc_device = {
#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;
...@@ -229,8 +229,7 @@ static struct platform_device bfin_mac_device = { ...@@ -229,8 +229,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)",
...@@ -257,13 +256,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { ...@@ -257,13 +256,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 */
...@@ -279,7 +278,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = { ...@@ -279,7 +278,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
}; };
#endif #endif
#if defined(CONFIG_TOUCHSCREEN_AD7879) || defined(CONFIG_TOUCHSCREEN_AD7879_MODULE) #if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879)
#include <linux/spi/ad7879.h> #include <linux/spi/ad7879.h>
static const struct ad7879_platform_data bfin_ad7879_ts_info = { static const struct ad7879_platform_data bfin_ad7879_ts_info = {
.model = 7879, /* Model = AD7879 */ .model = 7879, /* Model = AD7879 */
...@@ -297,8 +296,7 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = { ...@@ -297,8 +296,7 @@ static const struct ad7879_platform_data bfin_ad7879_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 */
...@@ -311,7 +309,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -311,7 +309,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 = 25000000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */
...@@ -321,7 +319,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -321,7 +319,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,
...@@ -331,7 +329,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -331,7 +329,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
.chip_select = 2, .chip_select = 2,
}, },
#endif #endif
#if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE) #if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879_SPI)
{ {
.modalias = "ad7879", .modalias = "ad7879",
.platform_data = &bfin_ad7879_ts_info, .platform_data = &bfin_ad7879_ts_info,
...@@ -342,7 +340,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -342,7 +340,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
.mode = SPI_CPHA | SPI_CPOL, .mode = SPI_CPHA | SPI_CPOL,
}, },
#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",
...@@ -352,7 +350,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -352,7 +350,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 */
...@@ -360,7 +358,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -360,7 +358,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 */
...@@ -371,7 +369,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -371,7 +369,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 = 8, .num_chipselect = 8,
...@@ -409,7 +407,7 @@ static struct platform_device bfin_spi0_device = { ...@@ -409,7 +407,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[] = {
{ {
...@@ -520,7 +518,7 @@ static struct platform_device bfin_uart1_device = { ...@@ -520,7 +518,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[] = {
{ {
...@@ -575,7 +573,7 @@ static struct platform_device bfin_sir1_device = { ...@@ -575,7 +573,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[] = {
...@@ -603,12 +601,12 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -603,12 +601,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,
...@@ -616,7 +614,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { ...@@ -616,7 +614,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[] = {
{ {
...@@ -687,7 +685,7 @@ static struct platform_device bfin_sport1_uart_device = { ...@@ -687,7 +685,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>
...@@ -731,7 +729,7 @@ static struct platform_device bfin_dpmc = { ...@@ -731,7 +729,7 @@ static struct platform_device bfin_dpmc = {
}, },
}; };
#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE) #if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
#include <asm/bfin-lq035q1.h> #include <asm/bfin-lq035q1.h>
static struct bfin_lq035q1fb_disp_info bfin_lq035q1_data = { static struct bfin_lq035q1fb_disp_info bfin_lq035q1_data = {
...@@ -764,28 +762,28 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -764,28 +762,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
...@@ -794,11 +792,11 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -794,11 +792,11 @@ static struct platform_device *stamp_devices[] __initdata = {
#endif #endif
#endif #endif
#if defined(CONFIG_FB_BFIN_LQ035Q1) || defined(CONFIG_FB_BFIN_LQ035Q1_MODULE) #if IS_ENABLED(CONFIG_FB_BFIN_LQ035Q1)
&bfin_lq035q1_device, &bfin_lq035q1_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
...@@ -807,11 +805,11 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -807,11 +805,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
...@@ -820,11 +818,11 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -820,11 +818,11 @@ 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_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) #if IS_ENABLED(CONFIG_MTD_PHYSMAP)
&ezbrd_flash_device, &ezbrd_flash_device,
#endif #endif
}; };
......
arch/blackfin/mach-bf527/boards/ezkit.c
View file @ fd18f00d
This diff is collapsed.
arch/blackfin/mach-bf527/boards/tll6527m.c
View file @ fd18f00d
This diff is collapsed.
arch/blackfin/mach-bf533/boards/H8606.c
View file @ fd18f00d
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
#include <linux/usb/isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/irq.h> #include <linux/irq.h>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
*/ */
const char bfin_board_name[] = "HV Sistemas H8606"; const char bfin_board_name[] = "HV Sistemas H8606";
#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,
...@@ -39,7 +39,7 @@ static struct platform_device rtc_device = { ...@@ -39,7 +39,7 @@ static struct platform_device rtc_device = {
/* /*
* Driver needs to know address, irq and flag pin. * Driver needs to know address, irq and flag pin.
*/ */
#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE) #if IS_ENABLED(CONFIG_DM9000)
static struct resource dm9000_resources[] = { static struct resource dm9000_resources[] = {
[0] = { [0] = {
.start = 0x20300000, .start = 0x20300000,
...@@ -67,7 +67,7 @@ static struct platform_device dm9000_device = { ...@@ -67,7 +67,7 @@ static struct platform_device dm9000_device = {
}; };
#endif #endif
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
#include <linux/smc91x.h> #include <linux/smc91x.h>
static struct smc91x_platdata smc91x_info = { static struct smc91x_platdata smc91x_info = {
...@@ -104,7 +104,7 @@ static struct platform_device smc91x_device = { ...@@ -104,7 +104,7 @@ static struct platform_device smc91x_device = {
}; };
#endif #endif
#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
static struct resource net2272_bfin_resources[] = { static struct resource net2272_bfin_resources[] = {
{ {
.start = 0x20300000, .start = 0x20300000,
...@@ -125,10 +125,10 @@ static struct platform_device net2272_bfin_device = { ...@@ -125,10 +125,10 @@ static struct platform_device net2272_bfin_device = {
}; };
#endif #endif
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
/* all SPI peripherals info goes here */ /* all SPI peripherals info goes here */
#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
static struct mtd_partition bfin_spi_flash_partitions[] = { static struct mtd_partition bfin_spi_flash_partitions[] = {
{ {
.name = "bootloader (spi)", .name = "bootloader (spi)",
...@@ -166,7 +166,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { ...@@ -166,7 +166,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
/* Notice: for blackfin, the speed_hz is the value of register /* Notice: for blackfin, the speed_hz is the value of register
* SPI_BAUD, not the real baudrate */ * SPI_BAUD, not the real baudrate */
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) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
{ {
/* 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 */
...@@ -180,7 +180,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -180,7 +180,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
}, },
#endif #endif
#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) #if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
{ {
.modalias = "ad183x", .modalias = "ad183x",
.max_speed_hz = 16, .max_speed_hz = 16,
...@@ -229,7 +229,7 @@ static struct platform_device bfin_spi0_device = { ...@@ -229,7 +229,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[] = {
{ {
...@@ -280,7 +280,7 @@ static struct platform_device bfin_uart0_device = { ...@@ -280,7 +280,7 @@ static struct platform_device bfin_uart0_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[] = {
{ {
...@@ -309,7 +309,7 @@ static struct platform_device bfin_sir0_device = { ...@@ -309,7 +309,7 @@ static struct platform_device bfin_sir0_device = {
#endif #endif
#endif #endif
#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE) #if IS_ENABLED(CONFIG_SERIAL_8250)
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/serial.h> #include <linux/serial.h>
...@@ -353,7 +353,7 @@ static struct platform_device serial8250_device = { ...@@ -353,7 +353,7 @@ static struct platform_device serial8250_device = {
#endif #endif
#if defined(CONFIG_KEYBOARD_OPENCORES) || defined(CONFIG_KEYBOARD_OPENCORES_MODULE) #if IS_ENABLED(CONFIG_KEYBOARD_OPENCORES)
/* /*
* Configuration for one OpenCores keyboard controller in FPGA at address 0x20200030, * Configuration for one OpenCores keyboard controller in FPGA at address 0x20200030,
...@@ -382,43 +382,43 @@ static struct platform_device opencores_kbd_device = { ...@@ -382,43 +382,43 @@ static struct platform_device opencores_kbd_device = {
#endif #endif
static struct platform_device *h8606_devices[] __initdata = { static struct platform_device *h8606_devices[] __initdata = {
#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_DM9000) || defined(CONFIG_DM9000_MODULE) #if IS_ENABLED(CONFIG_DM9000)
&dm9000_device, &dm9000_device,
#endif #endif
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
&smc91x_device, &smc91x_device,
#endif #endif
#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
&net2272_bfin_device, &net2272_bfin_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
#endif #endif
#if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE) #if IS_ENABLED(CONFIG_SERIAL_8250)
&serial8250_device, &serial8250_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
#endif #endif
#if defined(CONFIG_KEYBOARD_OPENCORES) || defined(CONFIG_KEYBOARD_OPENCORES_MODULE) #if IS_ENABLED(CONFIG_KEYBOARD_OPENCORES)
&opencores_kbd_device, &opencores_kbd_device,
#endif #endif
}; };
...@@ -428,7 +428,7 @@ static int __init H8606_init(void) ...@@ -428,7 +428,7 @@ static int __init H8606_init(void)
printk(KERN_INFO "HV Sistemas H8606 board support by http://www.hvsistemas.com\n"); printk(KERN_INFO "HV Sistemas H8606 board support by http://www.hvsistemas.com\n");
printk(KERN_INFO "%s(): registering device resources\n", __func__); printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(h8606_devices, ARRAY_SIZE(h8606_devices)); platform_add_devices(h8606_devices, ARRAY_SIZE(h8606_devices));
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
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 #endif
return 0; return 0;
......
arch/blackfin/mach-bf533/boards/blackstamp.c
View file @ fd18f00d
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
*/ */
const char bfin_board_name[] = "BlackStamp"; const char bfin_board_name[] = "BlackStamp";
#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,
...@@ -41,7 +41,7 @@ static struct platform_device rtc_device = { ...@@ -41,7 +41,7 @@ static struct platform_device rtc_device = {
/* /*
* Driver needs to know address, irq and flag pin. * Driver needs to know address, irq and flag pin.
*/ */
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
#include <linux/smc91x.h> #include <linux/smc91x.h>
static struct smc91x_platdata smc91x_info = { static struct smc91x_platdata smc91x_info = {
...@@ -74,7 +74,7 @@ static struct platform_device smc91x_device = { ...@@ -74,7 +74,7 @@ static struct platform_device smc91x_device = {
}; };
#endif #endif
#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
static struct mtd_partition bfin_spi_flash_partitions[] = { static struct mtd_partition bfin_spi_flash_partitions[] = {
{ {
.name = "bootloader(spi)", .name = "bootloader(spi)",
...@@ -105,14 +105,14 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { ...@@ -105,14 +105,14 @@ 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
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) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
{ {
/* 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 */
...@@ -125,7 +125,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -125,7 +125,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 */
...@@ -136,7 +136,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -136,7 +136,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
}, },
#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 */
...@@ -146,7 +146,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -146,7 +146,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 (0) */ /* SPI (0) */
static struct resource bfin_spi0_resource[] = { static struct resource bfin_spi0_resource[] = {
[0] = { [0] = {
...@@ -184,7 +184,7 @@ static struct platform_device bfin_spi0_device = { ...@@ -184,7 +184,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[] = {
{ {
...@@ -235,7 +235,7 @@ static struct platform_device bfin_uart0_device = { ...@@ -235,7 +235,7 @@ static struct platform_device bfin_uart0_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[] = {
{ {
...@@ -264,7 +264,7 @@ static struct platform_device bfin_sir0_device = { ...@@ -264,7 +264,7 @@ static struct platform_device bfin_sir0_device = {
#endif #endif
#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[] = {
{ {
...@@ -335,7 +335,7 @@ static struct platform_device bfin_sport1_uart_device = { ...@@ -335,7 +335,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>
...@@ -358,7 +358,7 @@ static struct platform_device bfin_device_gpiokeys = { ...@@ -358,7 +358,7 @@ static struct platform_device bfin_device_gpiokeys = {
}; };
#endif #endif
#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE) #if IS_ENABLED(CONFIG_I2C_GPIO)
#include <linux/i2c-gpio.h> #include <linux/i2c-gpio.h>
static struct i2c_gpio_platform_data i2c_gpio_data = { static struct i2c_gpio_platform_data i2c_gpio_data = {
...@@ -413,32 +413,32 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -413,32 +413,32 @@ 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_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
&smc91x_device, &smc91x_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
#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
#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
...@@ -447,11 +447,11 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -447,11 +447,11 @@ 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_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE) #if IS_ENABLED(CONFIG_I2C_GPIO)
&i2c_gpio_device, &i2c_gpio_device,
#endif #endif
}; };
...@@ -469,7 +469,7 @@ static int __init blackstamp_init(void) ...@@ -469,7 +469,7 @@ static int __init blackstamp_init(void)
if (ret < 0) if (ret < 0)
return ret; return ret;
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
/* /*
* setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC. * setup BF533_STAMP CPLD to route AMS3 to Ethernet MAC.
* the bfin-async-map driver takes care of flipping between * the bfin-async-map driver takes care of flipping between
......
arch/blackfin/mach-bf533/boards/cm_bf533.c
View file @ fd18f00d
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#include <linux/spi/mmc_spi.h> #include <linux/spi/mmc_spi.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
#include <linux/usb/isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/irq.h> #include <linux/irq.h>
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
*/ */
const char bfin_board_name[] = "Bluetechnix CM BF533"; const char bfin_board_name[] = "Bluetechnix CM BF533";
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
/* all SPI peripherals info goes here */ /* all SPI peripherals info goes here */
#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
static struct mtd_partition bfin_spi_flash_partitions[] = { static struct mtd_partition bfin_spi_flash_partitions[] = {
{ {
.name = "bootloader(spi)", .name = "bootloader(spi)",
...@@ -62,14 +62,14 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { ...@@ -62,14 +62,14 @@ 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
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) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
{ {
/* 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 */
...@@ -82,7 +82,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -82,7 +82,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
}, },
#endif #endif
#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) #if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
{ {
.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 */
...@@ -91,7 +91,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -91,7 +91,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 */
...@@ -140,14 +140,14 @@ static struct platform_device bfin_spi0_device = { ...@@ -140,14 +140,14 @@ static struct platform_device bfin_spi0_device = {
}; };
#endif /* spi master and devices */ #endif /* spi master and devices */
#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_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
#include <linux/smc91x.h> #include <linux/smc91x.h>
static struct smc91x_platdata smc91x_info = { static struct smc91x_platdata smc91x_info = {
...@@ -178,7 +178,7 @@ static struct platform_device smc91x_device = { ...@@ -178,7 +178,7 @@ static struct platform_device smc91x_device = {
}; };
#endif #endif
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) #if IS_ENABLED(CONFIG_SMSC911X)
#include <linux/smsc911x.h> #include <linux/smsc911x.h>
static struct resource smsc911x_resources[] = { static struct resource smsc911x_resources[] = {
...@@ -212,7 +212,7 @@ static struct platform_device smsc911x_device = { ...@@ -212,7 +212,7 @@ static struct platform_device smsc911x_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
static struct resource bfin_uart0_resources[] = { static struct resource bfin_uart0_resources[] = {
{ {
...@@ -263,7 +263,7 @@ static struct platform_device bfin_uart0_device = { ...@@ -263,7 +263,7 @@ static struct platform_device bfin_uart0_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[] = {
{ {
...@@ -292,7 +292,7 @@ static struct platform_device bfin_sir0_device = { ...@@ -292,7 +292,7 @@ static struct platform_device bfin_sir0_device = {
#endif #endif
#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[] = {
{ {
...@@ -363,7 +363,7 @@ static struct platform_device bfin_sport1_uart_device = { ...@@ -363,7 +363,7 @@ static struct platform_device bfin_sport1_uart_device = {
#endif #endif
#endif #endif
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
static struct resource isp1362_hcd_resources[] = { static struct resource isp1362_hcd_resources[] = {
{ {
.start = 0x20308000, .start = 0x20308000,
...@@ -403,7 +403,7 @@ static struct platform_device isp1362_hcd_device = { ...@@ -403,7 +403,7 @@ static struct platform_device isp1362_hcd_device = {
#endif #endif
#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
static struct resource net2272_bfin_resources[] = { static struct resource net2272_bfin_resources[] = {
{ {
.start = 0x20300000, .start = 0x20300000,
...@@ -426,7 +426,7 @@ static struct platform_device net2272_bfin_device = { ...@@ -426,7 +426,7 @@ static struct platform_device net2272_bfin_device = {
#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) #if IS_ENABLED(CONFIG_MTD_PHYSMAP)
static struct mtd_partition para_partitions[] = { static struct mtd_partition para_partitions[] = {
{ {
.name = "bootloader(nor)", .name = "bootloader(nor)",
...@@ -495,19 +495,19 @@ static struct platform_device *cm_bf533_devices[] __initdata = { ...@@ -495,19 +495,19 @@ static struct platform_device *cm_bf533_devices[] __initdata = {
&bfin_dpmc, &bfin_dpmc,
#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
#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
#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
...@@ -516,31 +516,31 @@ static struct platform_device *cm_bf533_devices[] __initdata = { ...@@ -516,31 +516,31 @@ static struct platform_device *cm_bf533_devices[] __initdata = {
#endif #endif
#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_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
&isp1362_hcd_device, &isp1362_hcd_device,
#endif #endif
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
&smc91x_device, &smc91x_device,
#endif #endif
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) #if IS_ENABLED(CONFIG_SMSC911X)
&smsc911x_device, &smsc911x_device,
#endif #endif
#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
&net2272_bfin_device, &net2272_bfin_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_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) #if IS_ENABLED(CONFIG_MTD_PHYSMAP)
&para_flash_device, &para_flash_device,
#endif #endif
}; };
...@@ -549,7 +549,7 @@ static int __init cm_bf533_init(void) ...@@ -549,7 +549,7 @@ static int __init cm_bf533_init(void)
{ {
printk(KERN_INFO "%s(): registering device resources\n", __func__); printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(cm_bf533_devices, ARRAY_SIZE(cm_bf533_devices)); platform_add_devices(cm_bf533_devices, ARRAY_SIZE(cm_bf533_devices));
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
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 #endif
return 0; return 0;
......
arch/blackfin/mach-bf533/boards/ezkit.c
View file @ fd18f00d
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
#include <linux/usb/isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/irq.h> #include <linux/irq.h>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
*/ */
const char bfin_board_name[] = "ADI BF533-EZKIT"; const char bfin_board_name[] = "ADI BF533-EZKIT";
#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,
...@@ -40,7 +40,7 @@ static struct platform_device rtc_device = { ...@@ -40,7 +40,7 @@ static struct platform_device rtc_device = {
* USB-LAN EzExtender board * USB-LAN EzExtender board
* Driver needs to know address, irq and flag pin. * Driver needs to know address, irq and flag pin.
*/ */
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
#include <linux/smc91x.h> #include <linux/smc91x.h>
static struct smc91x_platdata smc91x_info = { static struct smc91x_platdata smc91x_info = {
...@@ -72,7 +72,7 @@ static struct platform_device smc91x_device = { ...@@ -72,7 +72,7 @@ static struct platform_device smc91x_device = {
}; };
#endif #endif
#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) #if IS_ENABLED(CONFIG_MTD_PHYSMAP)
static struct mtd_partition ezkit_partitions_a[] = { static struct mtd_partition ezkit_partitions_a[] = {
{ {
.name = "bootloader(nor a)", .name = "bootloader(nor a)",
...@@ -138,7 +138,7 @@ static struct platform_device ezkit_flash_device_b = { ...@@ -138,7 +138,7 @@ static struct platform_device ezkit_flash_device_b = {
}; };
#endif #endif
#if defined(CONFIG_MTD_PLATRAM) || defined(CONFIG_MTD_PLATRAM_MODULE) #if IS_ENABLED(CONFIG_MTD_PLATRAM)
static struct platdata_mtd_ram sram_data_a = { static struct platdata_mtd_ram sram_data_a = {
.mapname = "Flash A SRAM", .mapname = "Flash A SRAM",
.bankwidth = 2, .bankwidth = 2,
...@@ -182,7 +182,7 @@ static struct platform_device sram_device_b = { ...@@ -182,7 +182,7 @@ static struct platform_device sram_device_b = {
}; };
#endif #endif
#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
static struct mtd_partition bfin_spi_flash_partitions[] = { static struct mtd_partition bfin_spi_flash_partitions[] = {
{ {
.name = "bootloader(spi)", .name = "bootloader(spi)",
...@@ -214,7 +214,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { ...@@ -214,7 +214,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_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) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
{ {
/* 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 */
...@@ -227,7 +227,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -227,7 +227,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
}, },
#endif #endif
#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) #if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
{ {
.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 */
...@@ -235,7 +235,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -235,7 +235,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
.chip_select = 4, .chip_select = 4,
}, },
#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 */
...@@ -245,7 +245,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -245,7 +245,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 (0) */ /* SPI (0) */
static struct resource bfin_spi0_resource[] = { static struct resource bfin_spi0_resource[] = {
[0] = { [0] = {
...@@ -283,7 +283,7 @@ static struct platform_device bfin_spi0_device = { ...@@ -283,7 +283,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[] = {
{ {
...@@ -334,7 +334,7 @@ static struct platform_device bfin_uart0_device = { ...@@ -334,7 +334,7 @@ static struct platform_device bfin_uart0_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[] = {
{ {
...@@ -363,7 +363,7 @@ static struct platform_device bfin_sir0_device = { ...@@ -363,7 +363,7 @@ static struct platform_device bfin_sir0_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>
...@@ -387,7 +387,7 @@ static struct platform_device bfin_device_gpiokeys = { ...@@ -387,7 +387,7 @@ static struct platform_device bfin_device_gpiokeys = {
}; };
#endif #endif
#if defined(CONFIG_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE) #if IS_ENABLED(CONFIG_I2C_GPIO)
#include <linux/i2c-gpio.h> #include <linux/i2c-gpio.h>
static struct i2c_gpio_platform_data i2c_gpio_data = { static struct i2c_gpio_platform_data i2c_gpio_data = {
...@@ -435,14 +435,14 @@ static struct platform_device bfin_dpmc = { ...@@ -435,14 +435,14 @@ static struct platform_device bfin_dpmc = {
}; };
static struct i2c_board_info __initdata bfin_i2c_board_info[] = { static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE) #if IS_ENABLED(CONFIG_FB_BFIN_7393)
{ {
I2C_BOARD_INFO("bfin-adv7393", 0x2B), I2C_BOARD_INFO("bfin-adv7393", 0x2B),
}, },
#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,
...@@ -450,7 +450,7 @@ static struct platform_device bfin_i2s = { ...@@ -450,7 +450,7 @@ static struct platform_device bfin_i2s = {
}; };
#endif #endif
#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) #if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
static struct platform_device bfin_ac97 = { static struct platform_device bfin_ac97 = {
.name = "bfin-ac97", .name = "bfin-ac97",
.id = CONFIG_SND_BF5XX_SPORT_NUM, .id = CONFIG_SND_BF5XX_SPORT_NUM,
...@@ -462,53 +462,53 @@ static struct platform_device *ezkit_devices[] __initdata = { ...@@ -462,53 +462,53 @@ static struct platform_device *ezkit_devices[] __initdata = {
&bfin_dpmc, &bfin_dpmc,
#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) #if IS_ENABLED(CONFIG_MTD_PHYSMAP)
&ezkit_flash_device_a, &ezkit_flash_device_a,
&ezkit_flash_device_b, &ezkit_flash_device_b,
#endif #endif
#if defined(CONFIG_MTD_PLATRAM) || defined(CONFIG_MTD_PLATRAM_MODULE) #if IS_ENABLED(CONFIG_MTD_PLATRAM)
&sram_device_a, &sram_device_a,
&sram_device_b, &sram_device_b,
#endif #endif
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
&smc91x_device, &smc91x_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_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_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
#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
#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_I2C_GPIO) || defined(CONFIG_I2C_GPIO_MODULE) #if IS_ENABLED(CONFIG_I2C_GPIO)
&i2c_gpio_device, &i2c_gpio_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_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE) #if IS_ENABLED(CONFIG_SND_BF5XX_AC97)
&bfin_ac97, &bfin_ac97,
#endif #endif
}; };
......
arch/blackfin/mach-bf533/boards/ip0x.c
View file @ fd18f00d
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
#include <linux/usb/isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <asm/irq.h> #include <asm/irq.h>
...@@ -32,7 +32,7 @@ const char bfin_board_name[] = "IP04/IP08"; ...@@ -32,7 +32,7 @@ const char bfin_board_name[] = "IP04/IP08";
* Driver needs to know address, irq and flag pin. * Driver needs to know address, irq and flag pin.
*/ */
#if defined(CONFIG_BFIN532_IP0X) #if defined(CONFIG_BFIN532_IP0X)
#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE) #if IS_ENABLED(CONFIG_DM9000)
#include <linux/dm9000.h> #include <linux/dm9000.h>
...@@ -104,10 +104,10 @@ static struct platform_device dm9000_device2 = { ...@@ -104,10 +104,10 @@ static struct platform_device dm9000_device2 = {
#endif #endif
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
/* all SPI peripherals info goes here */ /* all SPI peripherals info goes here */
#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, /* if 1 - block!!! */ .enable_dma = 0, /* if 1 - block!!! */
}; };
...@@ -116,7 +116,7 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = { ...@@ -116,7 +116,7 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = {
/* Notice: for blackfin, the speed_hz is the value of register /* Notice: for blackfin, the speed_hz is the value of register
* SPI_BAUD, not the real baudrate */ * SPI_BAUD, not the real baudrate */
static struct spi_board_info bfin_spi_board_info[] __initdata = { static struct spi_board_info bfin_spi_board_info[] __initdata = {
#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 = 2, .max_speed_hz = 2,
...@@ -142,7 +142,7 @@ static struct platform_device spi_bfin_master_device = { ...@@ -142,7 +142,7 @@ static struct platform_device spi_bfin_master_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[] = {
{ {
...@@ -193,7 +193,7 @@ static struct platform_device bfin_uart0_device = { ...@@ -193,7 +193,7 @@ static struct platform_device bfin_uart0_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[] = {
{ {
...@@ -222,7 +222,7 @@ static struct platform_device bfin_sir0_device = { ...@@ -222,7 +222,7 @@ static struct platform_device bfin_sir0_device = {
#endif #endif
#endif #endif
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
static struct resource isp1362_hcd_resources[] = { static struct resource isp1362_hcd_resources[] = {
{ {
.start = 0x20300000, .start = 0x20300000,
...@@ -264,29 +264,29 @@ static struct platform_device isp1362_hcd_device = { ...@@ -264,29 +264,29 @@ static struct platform_device isp1362_hcd_device = {
static struct platform_device *ip0x_devices[] __initdata = { static struct platform_device *ip0x_devices[] __initdata = {
#if defined(CONFIG_BFIN532_IP0X) #if defined(CONFIG_BFIN532_IP0X)
#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE) #if IS_ENABLED(CONFIG_DM9000)
&dm9000_device1, &dm9000_device1,
&dm9000_device2, &dm9000_device2,
#endif #endif
#endif #endif
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
&spi_bfin_master_device, &spi_bfin_master_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
#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
#endif #endif
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
&isp1362_hcd_device, &isp1362_hcd_device,
#endif #endif
}; };
......
arch/blackfin/mach-bf533/boards/stamp.c
View file @ fd18f00d
This diff is collapsed.
arch/blackfin/mach-bf537/boards/cm_bf537e.c
View file @ fd18f00d
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
#include <linux/usb/isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
*/ */
const char bfin_board_name[] = "Bluetechnix CM BF537E"; const char bfin_board_name[] = "Bluetechnix CM BF537E";
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
/* all SPI peripherals info goes here */ /* all SPI peripherals info goes here */
#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
static struct mtd_partition bfin_spi_flash_partitions[] = { static struct mtd_partition bfin_spi_flash_partitions[] = {
{ {
.name = "bootloader(spi)", .name = "bootloader(spi)",
...@@ -66,14 +66,14 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { ...@@ -66,14 +66,14 @@ 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
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) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
{ {
/* 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 */
...@@ -86,7 +86,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -86,7 +86,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
}, },
#endif #endif
#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) #if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
{ {
.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 */
...@@ -95,7 +95,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -95,7 +95,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 */
...@@ -144,7 +144,7 @@ static struct platform_device bfin_spi0_device = { ...@@ -144,7 +144,7 @@ static struct platform_device bfin_spi0_device = {
}; };
#endif /* spi master and devices */ #endif /* spi master and devices */
#if defined(CONFIG_SPI_BFIN_SPORT) || defined(CONFIG_SPI_BFIN_SPORT_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN_SPORT)
/* SPORT SPI controller data */ /* SPORT SPI controller data */
static struct bfin5xx_spi_master bfin_sport_spi0_info = { static struct bfin5xx_spi_master bfin_sport_spi0_info = {
...@@ -209,20 +209,20 @@ static struct platform_device bfin_sport_spi1_device = { ...@@ -209,20 +209,20 @@ static struct platform_device bfin_sport_spi1_device = {
#endif /* sport spi master and devices */ #endif /* sport spi master and devices */
#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_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE) #if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
static struct platform_device hitachi_fb_device = { static struct platform_device hitachi_fb_device = {
.name = "hitachi-tx09", .name = "hitachi-tx09",
}; };
#endif #endif
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
#include <linux/smc91x.h> #include <linux/smc91x.h>
static struct smc91x_platdata smc91x_info = { static struct smc91x_platdata smc91x_info = {
...@@ -254,7 +254,7 @@ static struct platform_device smc91x_device = { ...@@ -254,7 +254,7 @@ static struct platform_device smc91x_device = {
}; };
#endif #endif
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
static struct resource isp1362_hcd_resources[] = { static struct resource isp1362_hcd_resources[] = {
{ {
.start = 0x20308000, .start = 0x20308000,
...@@ -293,7 +293,7 @@ static struct platform_device isp1362_hcd_device = { ...@@ -293,7 +293,7 @@ static struct platform_device isp1362_hcd_device = {
}; };
#endif #endif
#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
static struct resource net2272_bfin_resources[] = { static struct resource net2272_bfin_resources[] = {
{ {
.start = 0x20300000, .start = 0x20300000,
...@@ -314,7 +314,7 @@ static struct platform_device net2272_bfin_device = { ...@@ -314,7 +314,7 @@ static struct platform_device net2272_bfin_device = {
}; };
#endif #endif
#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE) #if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
static struct mtd_partition cm_partitions[] = { static struct mtd_partition cm_partitions[] = {
{ {
.name = "bootloader(nor)", .name = "bootloader(nor)",
...@@ -363,7 +363,7 @@ static struct platform_device cm_flash_device = { ...@@ -363,7 +363,7 @@ static struct platform_device cm_flash_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
static struct resource bfin_uart0_resources[] = { static struct resource bfin_uart0_resources[] = {
{ {
...@@ -498,7 +498,7 @@ static struct platform_device bfin_uart1_device = { ...@@ -498,7 +498,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[] = {
{ {
...@@ -551,7 +551,7 @@ static struct platform_device bfin_sir1_device = { ...@@ -551,7 +551,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[] = {
...@@ -578,14 +578,14 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -578,14 +578,14 @@ static struct platform_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) \
|| defined(CONFIG_BFIN_SPORT) || defined(CONFIG_BFIN_SPORT_MODULE) || IS_ENABLED(CONFIG_BFIN_SPORT)
unsigned short bfin_sport0_peripherals[] = { unsigned short bfin_sport0_peripherals[] = {
P_SPORT0_TFS, P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS, P_SPORT0_TFS, P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,
P_SPORT0_DRPRI, P_SPORT0_RSCLK, P_SPORT0_DRSEC, P_SPORT0_DTSEC, 0 P_SPORT0_DRPRI, P_SPORT0_RSCLK, P_SPORT0_DRSEC, P_SPORT0_DTSEC, 0
}; };
#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[] = {
{ {
...@@ -650,7 +650,7 @@ static struct platform_device bfin_sport1_uart_device = { ...@@ -650,7 +650,7 @@ static struct platform_device bfin_sport1_uart_device = {
}; };
#endif #endif
#endif #endif
#if defined(CONFIG_BFIN_SPORT) || defined(CONFIG_BFIN_SPORT_MODULE) #if IS_ENABLED(CONFIG_BFIN_SPORT)
static struct resource bfin_sport0_resources[] = { static struct resource bfin_sport0_resources[] = {
{ {
.start = SPORT0_TCR1, .start = SPORT0_TCR1,
...@@ -694,7 +694,7 @@ static struct platform_device bfin_sport0_device = { ...@@ -694,7 +694,7 @@ static struct platform_device bfin_sport0_device = {
}; };
#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;
...@@ -727,7 +727,7 @@ static struct platform_device bfin_mac_device = { ...@@ -727,7 +727,7 @@ static struct platform_device bfin_mac_device = {
}; };
#endif #endif
#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) #if IS_ENABLED(CONFIG_PATA_PLATFORM)
#define PATA_INT IRQ_PF14 #define PATA_INT IRQ_PF14
static struct pata_platform_info bfin_pata_platform_data = { static struct pata_platform_info bfin_pata_platform_data = {
...@@ -795,19 +795,19 @@ static struct platform_device *cm_bf537e_devices[] __initdata = { ...@@ -795,19 +795,19 @@ static struct platform_device *cm_bf537e_devices[] __initdata = {
&bfin_dpmc, &bfin_dpmc,
#if defined(CONFIG_BFIN_SPORT) || defined(CONFIG_BFIN_SPORT_MODULE) #if IS_ENABLED(CONFIG_BFIN_SPORT)
&bfin_sport0_device, &bfin_sport0_device,
#endif #endif
#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE) #if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
&hitachi_fb_device, &hitachi_fb_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_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
...@@ -816,7 +816,7 @@ static struct platform_device *cm_bf537e_devices[] __initdata = { ...@@ -816,7 +816,7 @@ static struct platform_device *cm_bf537e_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
...@@ -825,11 +825,11 @@ static struct platform_device *cm_bf537e_devices[] __initdata = { ...@@ -825,11 +825,11 @@ static struct platform_device *cm_bf537e_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
...@@ -838,44 +838,44 @@ static struct platform_device *cm_bf537e_devices[] __initdata = { ...@@ -838,44 +838,44 @@ static struct platform_device *cm_bf537e_devices[] __initdata = {
#endif #endif
#endif #endif
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
&isp1362_hcd_device, &isp1362_hcd_device,
#endif #endif
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
&smc91x_device, &smc91x_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_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
&net2272_bfin_device, &net2272_bfin_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_SPI_BFIN_SPORT) || defined(CONFIG_SPI_BFIN_SPORT_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN_SPORT)
&bfin_sport_spi0_device, &bfin_sport_spi0_device,
&bfin_sport_spi1_device, &bfin_sport_spi1_device,
#endif #endif
#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) #if IS_ENABLED(CONFIG_PATA_PLATFORM)
&bfin_pata_device, &bfin_pata_device,
#endif #endif
#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE) #if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
&cm_flash_device, &cm_flash_device,
#endif #endif
}; };
static int __init net2272_init(void) static int __init net2272_init(void)
{ {
#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
int ret; int ret;
ret = gpio_request(GPIO_PG14, "net2272"); ret = gpio_request(GPIO_PG14, "net2272");
...@@ -895,11 +895,11 @@ static int __init cm_bf537e_init(void) ...@@ -895,11 +895,11 @@ static int __init cm_bf537e_init(void)
{ {
printk(KERN_INFO "%s(): registering device resources\n", __func__); printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(cm_bf537e_devices, ARRAY_SIZE(cm_bf537e_devices)); platform_add_devices(cm_bf537e_devices, ARRAY_SIZE(cm_bf537e_devices));
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
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 #endif
#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) #if IS_ENABLED(CONFIG_PATA_PLATFORM)
irq_set_status_flags(PATA_INT, IRQ_NOAUTOEN); irq_set_status_flags(PATA_INT, IRQ_NOAUTOEN);
#endif #endif
......
arch/blackfin/mach-bf537/boards/cm_bf537u.c
View file @ fd18f00d
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
#include <linux/usb/isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
*/ */
const char bfin_board_name[] = "Bluetechnix CM BF537U"; const char bfin_board_name[] = "Bluetechnix CM BF537U";
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
/* all SPI peripherals info goes here */ /* all SPI peripherals info goes here */
#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
static struct mtd_partition bfin_spi_flash_partitions[] = { static struct mtd_partition bfin_spi_flash_partitions[] = {
{ {
.name = "bootloader(spi)", .name = "bootloader(spi)",
...@@ -66,14 +66,14 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { ...@@ -66,14 +66,14 @@ 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
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) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
{ {
/* 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 */
...@@ -86,7 +86,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -86,7 +86,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
}, },
#endif #endif
#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) #if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
{ {
.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 */
...@@ -95,7 +95,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -95,7 +95,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 */
...@@ -144,20 +144,20 @@ static struct platform_device bfin_spi0_device = { ...@@ -144,20 +144,20 @@ static struct platform_device bfin_spi0_device = {
}; };
#endif /* spi master and devices */ #endif /* spi master and devices */
#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_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE) #if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
static struct platform_device hitachi_fb_device = { static struct platform_device hitachi_fb_device = {
.name = "hitachi-tx09", .name = "hitachi-tx09",
}; };
#endif #endif
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
#include <linux/smc91x.h> #include <linux/smc91x.h>
static struct smc91x_platdata smc91x_info = { static struct smc91x_platdata smc91x_info = {
...@@ -189,7 +189,7 @@ static struct platform_device smc91x_device = { ...@@ -189,7 +189,7 @@ static struct platform_device smc91x_device = {
}; };
#endif #endif
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
static struct resource isp1362_hcd_resources[] = { static struct resource isp1362_hcd_resources[] = {
{ {
.start = 0x20308000, .start = 0x20308000,
...@@ -228,7 +228,7 @@ static struct platform_device isp1362_hcd_device = { ...@@ -228,7 +228,7 @@ static struct platform_device isp1362_hcd_device = {
}; };
#endif #endif
#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
static struct resource net2272_bfin_resources[] = { static struct resource net2272_bfin_resources[] = {
{ {
.start = 0x20200000, .start = 0x20200000,
...@@ -249,7 +249,7 @@ static struct platform_device net2272_bfin_device = { ...@@ -249,7 +249,7 @@ static struct platform_device net2272_bfin_device = {
}; };
#endif #endif
#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE) #if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
static struct mtd_partition cm_partitions[] = { static struct mtd_partition cm_partitions[] = {
{ {
.name = "bootloader(nor)", .name = "bootloader(nor)",
...@@ -298,7 +298,7 @@ static struct platform_device cm_flash_device = { ...@@ -298,7 +298,7 @@ static struct platform_device cm_flash_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
static struct resource bfin_uart0_resources[] = { static struct resource bfin_uart0_resources[] = {
{ {
...@@ -397,7 +397,7 @@ static struct platform_device bfin_uart1_device = { ...@@ -397,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[] = {
{ {
...@@ -450,7 +450,7 @@ static struct platform_device bfin_sir1_device = { ...@@ -450,7 +450,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[] = {
...@@ -477,7 +477,7 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -477,7 +477,7 @@ static struct platform_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
static struct resource bfin_sport0_uart_resources[] = { static struct resource bfin_sport0_uart_resources[] = {
{ {
...@@ -548,7 +548,7 @@ static struct platform_device bfin_sport1_uart_device = { ...@@ -548,7 +548,7 @@ static struct platform_device bfin_sport1_uart_device = {
#endif #endif
#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;
...@@ -581,7 +581,7 @@ static struct platform_device bfin_mac_device = { ...@@ -581,7 +581,7 @@ static struct platform_device bfin_mac_device = {
}; };
#endif #endif
#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) #if IS_ENABLED(CONFIG_PATA_PLATFORM)
#define PATA_INT IRQ_PF14 #define PATA_INT IRQ_PF14
static struct pata_platform_info bfin_pata_platform_data = { static struct pata_platform_info bfin_pata_platform_data = {
...@@ -649,15 +649,15 @@ static struct platform_device *cm_bf537u_devices[] __initdata = { ...@@ -649,15 +649,15 @@ static struct platform_device *cm_bf537u_devices[] __initdata = {
&bfin_dpmc, &bfin_dpmc,
#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE) #if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
&hitachi_fb_device, &hitachi_fb_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_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
...@@ -666,7 +666,7 @@ static struct platform_device *cm_bf537u_devices[] __initdata = { ...@@ -666,7 +666,7 @@ static struct platform_device *cm_bf537u_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
...@@ -675,11 +675,11 @@ static struct platform_device *cm_bf537u_devices[] __initdata = { ...@@ -675,11 +675,11 @@ static struct platform_device *cm_bf537u_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
...@@ -688,39 +688,39 @@ static struct platform_device *cm_bf537u_devices[] __initdata = { ...@@ -688,39 +688,39 @@ static struct platform_device *cm_bf537u_devices[] __initdata = {
#endif #endif
#endif #endif
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
&isp1362_hcd_device, &isp1362_hcd_device,
#endif #endif
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
&smc91x_device, &smc91x_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_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
&net2272_bfin_device, &net2272_bfin_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_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) #if IS_ENABLED(CONFIG_PATA_PLATFORM)
&bfin_pata_device, &bfin_pata_device,
#endif #endif
#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE) #if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
&cm_flash_device, &cm_flash_device,
#endif #endif
}; };
static int __init net2272_init(void) static int __init net2272_init(void)
{ {
#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
int ret; int ret;
ret = gpio_request(GPIO_PH15, driver_name); ret = gpio_request(GPIO_PH15, driver_name);
...@@ -752,11 +752,11 @@ static int __init cm_bf537u_init(void) ...@@ -752,11 +752,11 @@ static int __init cm_bf537u_init(void)
{ {
printk(KERN_INFO "%s(): registering device resources\n", __func__); printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(cm_bf537u_devices, ARRAY_SIZE(cm_bf537u_devices)); platform_add_devices(cm_bf537u_devices, ARRAY_SIZE(cm_bf537u_devices));
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
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 #endif
#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) #if IS_ENABLED(CONFIG_PATA_PLATFORM)
irq_set_status_flags(PATA_INT, IRQ_NOAUTOEN); irq_set_status_flags(PATA_INT, IRQ_NOAUTOEN);
#endif #endif
......
arch/blackfin/mach-bf537/boards/dnp5370.c
View file @ fd18f00d
...@@ -41,14 +41,14 @@ const char bfin_board_name[] = "DNP/5370"; ...@@ -41,14 +41,14 @@ const char bfin_board_name[] = "DNP/5370";
#define FLASH_MAC 0x202f0000 #define FLASH_MAC 0x202f0000
#define CONFIG_MTD_PHYSMAP_LEN 0x300000 #define CONFIG_MTD_PHYSMAP_LEN 0x300000
#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;
...@@ -81,7 +81,7 @@ static struct platform_device bfin_mac_device = { ...@@ -81,7 +81,7 @@ static struct platform_device bfin_mac_device = {
}; };
#endif #endif
#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) #if IS_ENABLED(CONFIG_MTD_PHYSMAP)
static struct mtd_partition asmb_flash_partitions[] = { static struct mtd_partition asmb_flash_partitions[] = {
{ {
.name = "bootloader(nor)", .name = "bootloader(nor)",
...@@ -125,9 +125,9 @@ static struct platform_device asmb_flash_device = { ...@@ -125,9 +125,9 @@ static struct platform_device asmb_flash_device = {
}; };
#endif #endif
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
#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, /* use no dma transfer with this chip*/ .enable_dma = 0, /* use no dma transfer with this chip*/
...@@ -135,7 +135,7 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = { ...@@ -135,7 +135,7 @@ static struct bfin5xx_spi_chip mmc_spi_chip_info = {
#endif #endif
#if defined(CONFIG_MTD_DATAFLASH) || defined(CONFIG_MTD_DATAFLASH_MODULE) #if IS_ENABLED(CONFIG_MTD_DATAFLASH)
/* This mapping is for at45db642 it has 1056 page size, /* This mapping is for at45db642 it has 1056 page size,
* partition size and offset should be page aligned * partition size and offset should be page aligned
*/ */
...@@ -166,7 +166,7 @@ static struct bfin5xx_spi_chip spi_dataflash_chip_info = { ...@@ -166,7 +166,7 @@ static struct bfin5xx_spi_chip spi_dataflash_chip_info = {
static struct spi_board_info bfin_spi_board_info[] __initdata = { static struct spi_board_info bfin_spi_board_info[] __initdata = {
/* SD/MMC card reader at SPI bus */ /* SD/MMC card reader at SPI bus */
#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_speed_hz = 20000000,
...@@ -178,7 +178,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -178,7 +178,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
#endif #endif
/* 8 Megabyte Atmel NOR flash chip at SPI bus */ /* 8 Megabyte Atmel NOR flash chip at SPI bus */
#if defined(CONFIG_MTD_DATAFLASH) || defined(CONFIG_MTD_DATAFLASH_MODULE) #if IS_ENABLED(CONFIG_MTD_DATAFLASH)
{ {
.modalias = "mtd_dataflash", .modalias = "mtd_dataflash",
.max_speed_hz = 16700000, .max_speed_hz = 16700000,
...@@ -228,7 +228,7 @@ static struct platform_device spi_bfin_master_device = { ...@@ -228,7 +228,7 @@ static struct platform_device spi_bfin_master_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
static struct resource bfin_uart0_resources[] = { static struct resource bfin_uart0_resources[] = {
{ {
...@@ -328,7 +328,7 @@ static struct platform_device bfin_uart1_device = { ...@@ -328,7 +328,7 @@ static struct platform_device bfin_uart1_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[] = {
...@@ -357,7 +357,7 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -357,7 +357,7 @@ static struct platform_device i2c_bfin_twi_device = {
static struct platform_device *dnp5370_devices[] __initdata = { static struct platform_device *dnp5370_devices[] __initdata = {
#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
...@@ -366,24 +366,24 @@ static struct platform_device *dnp5370_devices[] __initdata = { ...@@ -366,24 +366,24 @@ static struct platform_device *dnp5370_devices[] __initdata = {
#endif #endif
#endif #endif
#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) #if IS_ENABLED(CONFIG_MTD_PHYSMAP)
&asmb_flash_device, &asmb_flash_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)
&spi_bfin_master_device, &spi_bfin_master_device,
#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_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE) #if IS_ENABLED(CONFIG_RTC_DRV_BFIN)
&rtc_device, &rtc_device,
#endif #endif
......
arch/blackfin/mach-bf537/boards/minotaur.c
View file @ fd18f00d
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
#include <linux/usb/isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
*/ */
const char bfin_board_name[] = "CamSig Minotaur BF537"; const char bfin_board_name[] = "CamSig Minotaur BF537";
#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) #if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
static struct resource bfin_pcmcia_cf_resources[] = { static struct resource bfin_pcmcia_cf_resources[] = {
{ {
.start = 0x20310000, /* IO PORT */ .start = 0x20310000, /* IO PORT */
...@@ -60,14 +60,14 @@ static struct platform_device bfin_pcmcia_cf_device = { ...@@ -60,14 +60,14 @@ static struct platform_device bfin_pcmcia_cf_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;
...@@ -100,7 +100,7 @@ static struct platform_device bfin_mac_device = { ...@@ -100,7 +100,7 @@ static struct platform_device bfin_mac_device = {
}; };
#endif #endif
#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
static struct resource net2272_bfin_resources[] = { static struct resource net2272_bfin_resources[] = {
{ {
.start = 0x20300000, .start = 0x20300000,
...@@ -121,11 +121,10 @@ static struct platform_device net2272_bfin_device = { ...@@ -121,11 +121,10 @@ static struct platform_device net2272_bfin_device = {
}; };
#endif #endif
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
/* all SPI peripherals info goes here */ /* all SPI peripherals info goes here */
#if defined(CONFIG_MTD_M25P80) \ #if IS_ENABLED(CONFIG_MTD_M25P80)
|| defined(CONFIG_MTD_M25P80_MODULE)
/* Partition sizes */ /* Partition sizes */
#define FLASH_SIZE 0x00400000 #define FLASH_SIZE 0x00400000
...@@ -162,15 +161,14 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { ...@@ -162,15 +161,14 @@ 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
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 */
...@@ -183,7 +181,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -183,7 +181,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 = 5000000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 5000000, /* max spi clock (SCK) speed in HZ */
...@@ -231,7 +229,7 @@ static struct platform_device bfin_spi0_device = { ...@@ -231,7 +229,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[] = {
{ {
...@@ -330,7 +328,7 @@ static struct platform_device bfin_uart1_device = { ...@@ -330,7 +328,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[] = {
{ {
...@@ -385,7 +383,7 @@ static struct platform_device bfin_sir1_device = { ...@@ -385,7 +383,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[] = {
...@@ -412,7 +410,7 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -412,7 +410,7 @@ static struct platform_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
static struct resource bfin_sport0_uart_resources[] = { static struct resource bfin_sport0_uart_resources[] = {
{ {
...@@ -484,28 +482,28 @@ static struct platform_device bfin_sport1_uart_device = { ...@@ -484,28 +482,28 @@ static struct platform_device bfin_sport1_uart_device = {
#endif #endif
static struct platform_device *minotaur_devices[] __initdata = { static struct platform_device *minotaur_devices[] __initdata = {
#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) #if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
&bfin_pcmcia_cf_device, &bfin_pcmcia_cf_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_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_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
&net2272_bfin_device, &net2272_bfin_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
...@@ -514,7 +512,7 @@ static struct platform_device *minotaur_devices[] __initdata = { ...@@ -514,7 +512,7 @@ static struct platform_device *minotaur_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
...@@ -523,11 +521,11 @@ static struct platform_device *minotaur_devices[] __initdata = { ...@@ -523,11 +521,11 @@ static struct platform_device *minotaur_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
...@@ -542,7 +540,7 @@ static int __init minotaur_init(void) ...@@ -542,7 +540,7 @@ static int __init minotaur_init(void)
{ {
printk(KERN_INFO "%s(): registering device resources\n", __func__); printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(minotaur_devices, ARRAY_SIZE(minotaur_devices)); platform_add_devices(minotaur_devices, ARRAY_SIZE(minotaur_devices));
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
spi_register_board_info(bfin_spi_board_info, spi_register_board_info(bfin_spi_board_info,
ARRAY_SIZE(bfin_spi_board_info)); ARRAY_SIZE(bfin_spi_board_info));
#endif #endif
......
arch/blackfin/mach-bf537/boards/pnav10.c
View file @ fd18f00d
...@@ -30,7 +30,7 @@ const char bfin_board_name[] = "ADI PNAV-1.0"; ...@@ -30,7 +30,7 @@ const char bfin_board_name[] = "ADI PNAV-1.0";
* Driver needs to know address, irq and flag pin. * Driver needs to know address, irq and flag pin.
*/ */
#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) #if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
static struct resource bfin_pcmcia_cf_resources[] = { static struct resource bfin_pcmcia_cf_resources[] = {
{ {
.start = 0x20310000, /* IO PORT */ .start = 0x20310000, /* IO PORT */
...@@ -59,14 +59,14 @@ static struct platform_device bfin_pcmcia_cf_device = { ...@@ -59,14 +59,14 @@ static struct platform_device bfin_pcmcia_cf_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_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
#include <linux/smc91x.h> #include <linux/smc91x.h>
static struct smc91x_platdata smc91x_info = { static struct smc91x_platdata smc91x_info = {
...@@ -99,7 +99,7 @@ static struct platform_device smc91x_device = { ...@@ -99,7 +99,7 @@ static struct platform_device smc91x_device = {
}; };
#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;
...@@ -132,7 +132,7 @@ static struct platform_device bfin_mac_device = { ...@@ -132,7 +132,7 @@ static struct platform_device bfin_mac_device = {
}; };
#endif #endif
#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
static struct resource net2272_bfin_resources[] = { static struct resource net2272_bfin_resources[] = {
{ {
.start = 0x20300000, .start = 0x20300000,
...@@ -153,11 +153,10 @@ static struct platform_device net2272_bfin_device = { ...@@ -153,11 +153,10 @@ static struct platform_device net2272_bfin_device = {
}; };
#endif #endif
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
/* all SPI peripherals info goes here */ /* all SPI peripherals info goes here */
#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)",
...@@ -188,13 +187,13 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { ...@@ -188,13 +187,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 */
...@@ -211,8 +210,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = { ...@@ -211,8 +210,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 */
...@@ -225,8 +223,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -225,8 +223,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
}, },
#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 */
...@@ -234,7 +231,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -234,7 +231,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 = 25000000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */
...@@ -244,7 +241,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -244,7 +241,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,
...@@ -294,13 +291,13 @@ static struct platform_device bfin_spi0_device = { ...@@ -294,13 +291,13 @@ static struct platform_device bfin_spi0_device = {
}; };
#endif /* spi master and devices */ #endif /* spi master and devices */
#if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) #if IS_ENABLED(CONFIG_FB_BF537_LQ035)
static struct platform_device bfin_fb_device = { static struct platform_device bfin_fb_device = {
.name = "bf537-lq035", .name = "bf537-lq035",
}; };
#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
static struct resource bfin_uart0_resources[] = { static struct resource bfin_uart0_resources[] = {
{ {
...@@ -399,7 +396,7 @@ static struct platform_device bfin_uart1_device = { ...@@ -399,7 +396,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[] = {
{ {
...@@ -455,36 +452,36 @@ static struct platform_device bfin_sir1_device = { ...@@ -455,36 +452,36 @@ static struct platform_device bfin_sir1_device = {
#endif #endif
static struct platform_device *stamp_devices[] __initdata = { static struct platform_device *stamp_devices[] __initdata = {
#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) #if IS_ENABLED(CONFIG_BFIN_CFPCMCIA)
&bfin_pcmcia_cf_device, &bfin_pcmcia_cf_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_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
&smc91x_device, &smc91x_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_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
&net2272_bfin_device, &net2272_bfin_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_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE) #if IS_ENABLED(CONFIG_FB_BF537_LQ035)
&bfin_fb_device, &bfin_fb_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
...@@ -493,7 +490,7 @@ static struct platform_device *stamp_devices[] __initdata = { ...@@ -493,7 +490,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
...@@ -507,7 +504,7 @@ static int __init pnav_init(void) ...@@ -507,7 +504,7 @@ static int __init pnav_init(void)
{ {
printk(KERN_INFO "%s(): registering device resources\n", __func__); printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
spi_register_board_info(bfin_spi_board_info, spi_register_board_info(bfin_spi_board_info,
ARRAY_SIZE(bfin_spi_board_info)); ARRAY_SIZE(bfin_spi_board_info));
#endif #endif
......
arch/blackfin/mach-bf537/boards/stamp.c
View file @ fd18f00d
This diff is collapsed.
arch/blackfin/mach-bf537/boards/tcm_bf537.c
View file @ fd18f00d
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <linux/mtd/physmap.h> #include <linux/mtd/physmap.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/flash.h> #include <linux/spi/flash.h>
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
#include <linux/usb/isp1362.h> #include <linux/usb/isp1362.h>
#endif #endif
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
*/ */
const char bfin_board_name[] = "Bluetechnix TCM BF537"; const char bfin_board_name[] = "Bluetechnix TCM BF537";
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
/* all SPI peripherals info goes here */ /* all SPI peripherals info goes here */
#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
static struct mtd_partition bfin_spi_flash_partitions[] = { static struct mtd_partition bfin_spi_flash_partitions[] = {
{ {
.name = "bootloader(spi)", .name = "bootloader(spi)",
...@@ -66,14 +66,14 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = { ...@@ -66,14 +66,14 @@ 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
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) || defined(CONFIG_MTD_M25P80_MODULE) #if IS_ENABLED(CONFIG_MTD_M25P80)
{ {
/* 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 */
...@@ -86,7 +86,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -86,7 +86,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
}, },
#endif #endif
#if defined(CONFIG_SND_BF5XX_SOC_AD183X) || defined(CONFIG_SND_BF5XX_SOC_AD183X_MODULE) #if IS_ENABLED(CONFIG_SND_BF5XX_SOC_AD183X)
{ {
.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 */
...@@ -95,7 +95,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { ...@@ -95,7 +95,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 = 25000000, /* max spi clock (SCK) speed in HZ */ .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */
...@@ -144,20 +144,20 @@ static struct platform_device bfin_spi0_device = { ...@@ -144,20 +144,20 @@ static struct platform_device bfin_spi0_device = {
}; };
#endif /* spi master and devices */ #endif /* spi master and devices */
#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_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE) #if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
static struct platform_device hitachi_fb_device = { static struct platform_device hitachi_fb_device = {
.name = "hitachi-tx09", .name = "hitachi-tx09",
}; };
#endif #endif
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
#include <linux/smc91x.h> #include <linux/smc91x.h>
static struct smc91x_platdata smc91x_info = { static struct smc91x_platdata smc91x_info = {
...@@ -189,7 +189,7 @@ static struct platform_device smc91x_device = { ...@@ -189,7 +189,7 @@ static struct platform_device smc91x_device = {
}; };
#endif #endif
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
static struct resource isp1362_hcd_resources[] = { static struct resource isp1362_hcd_resources[] = {
{ {
.start = 0x20308000, .start = 0x20308000,
...@@ -228,7 +228,7 @@ static struct platform_device isp1362_hcd_device = { ...@@ -228,7 +228,7 @@ static struct platform_device isp1362_hcd_device = {
}; };
#endif #endif
#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
static struct resource net2272_bfin_resources[] = { static struct resource net2272_bfin_resources[] = {
{ {
.start = 0x20300000, .start = 0x20300000,
...@@ -249,7 +249,7 @@ static struct platform_device net2272_bfin_device = { ...@@ -249,7 +249,7 @@ static struct platform_device net2272_bfin_device = {
}; };
#endif #endif
#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE) #if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
static struct mtd_partition cm_partitions[] = { static struct mtd_partition cm_partitions[] = {
{ {
.name = "bootloader(nor)", .name = "bootloader(nor)",
...@@ -298,7 +298,7 @@ static struct platform_device cm_flash_device = { ...@@ -298,7 +298,7 @@ static struct platform_device cm_flash_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
static struct resource bfin_uart0_resources[] = { static struct resource bfin_uart0_resources[] = {
{ {
...@@ -397,7 +397,7 @@ static struct platform_device bfin_uart1_device = { ...@@ -397,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[] = {
{ {
...@@ -452,7 +452,7 @@ static struct platform_device bfin_sir1_device = { ...@@ -452,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[] = {
...@@ -479,7 +479,7 @@ static struct platform_device i2c_bfin_twi_device = { ...@@ -479,7 +479,7 @@ static struct platform_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
static struct resource bfin_sport0_uart_resources[] = { static struct resource bfin_sport0_uart_resources[] = {
{ {
...@@ -550,7 +550,7 @@ static struct platform_device bfin_sport1_uart_device = { ...@@ -550,7 +550,7 @@ static struct platform_device bfin_sport1_uart_device = {
#endif #endif
#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;
...@@ -583,7 +583,7 @@ static struct platform_device bfin_mac_device = { ...@@ -583,7 +583,7 @@ static struct platform_device bfin_mac_device = {
}; };
#endif #endif
#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) #if IS_ENABLED(CONFIG_PATA_PLATFORM)
#define PATA_INT IRQ_PF14 #define PATA_INT IRQ_PF14
static struct pata_platform_info bfin_pata_platform_data = { static struct pata_platform_info bfin_pata_platform_data = {
...@@ -651,15 +651,15 @@ static struct platform_device *cm_bf537_devices[] __initdata = { ...@@ -651,15 +651,15 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
&bfin_dpmc, &bfin_dpmc,
#if defined(CONFIG_FB_HITACHI_TX09) || defined(CONFIG_FB_HITACHI_TX09_MODULE) #if IS_ENABLED(CONFIG_FB_HITACHI_TX09)
&hitachi_fb_device, &hitachi_fb_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_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
...@@ -668,7 +668,7 @@ static struct platform_device *cm_bf537_devices[] __initdata = { ...@@ -668,7 +668,7 @@ static struct platform_device *cm_bf537_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
...@@ -677,11 +677,11 @@ static struct platform_device *cm_bf537_devices[] __initdata = { ...@@ -677,11 +677,11 @@ static struct platform_device *cm_bf537_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
...@@ -690,39 +690,39 @@ static struct platform_device *cm_bf537_devices[] __initdata = { ...@@ -690,39 +690,39 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
#endif #endif
#endif #endif
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_ISP1362_HCD)
&isp1362_hcd_device, &isp1362_hcd_device,
#endif #endif
#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) #if IS_ENABLED(CONFIG_SMC91X)
&smc91x_device, &smc91x_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_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
&net2272_bfin_device, &net2272_bfin_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_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) #if IS_ENABLED(CONFIG_PATA_PLATFORM)
&bfin_pata_device, &bfin_pata_device,
#endif #endif
#if defined(CONFIG_MTD_GPIO_ADDR) || defined(CONFIG_MTD_GPIO_ADDR_MODULE) #if IS_ENABLED(CONFIG_MTD_GPIO_ADDR)
&cm_flash_device, &cm_flash_device,
#endif #endif
}; };
static int __init net2272_init(void) static int __init net2272_init(void)
{ {
#if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) #if IS_ENABLED(CONFIG_USB_NET2272)
int ret; int ret;
ret = gpio_request(GPIO_PG14, "net2272"); ret = gpio_request(GPIO_PG14, "net2272");
...@@ -742,11 +742,11 @@ static int __init tcm_bf537_init(void) ...@@ -742,11 +742,11 @@ static int __init tcm_bf537_init(void)
{ {
printk(KERN_INFO "%s(): registering device resources\n", __func__); printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(cm_bf537_devices, ARRAY_SIZE(cm_bf537_devices)); platform_add_devices(cm_bf537_devices, ARRAY_SIZE(cm_bf537_devices));
#if defined(CONFIG_SPI_BFIN5XX) || defined(CONFIG_SPI_BFIN5XX_MODULE) #if IS_ENABLED(CONFIG_SPI_BFIN5XX)
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 #endif
#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) #if IS_ENABLED(CONFIG_PATA_PLATFORM)
irq_set_status_flags(PATA_INT, IRQ_NOAUTOEN); irq_set_status_flags(PATA_INT, IRQ_NOAUTOEN);
#endif #endif
......
arch/blackfin/mach-bf538/boards/ezkit.c
View file @ fd18f00d
This diff is collapsed.
arch/blackfin/mach-bf548/boards/cm_bf548.c
View file @ fd18f00d
This diff is collapsed.
arch/blackfin/mach-bf548/boards/ezkit.c
View file @ fd18f00d
This diff is collapsed.
arch/blackfin/mach-bf548/include/mach/defBF544.h
View file @ fd18f00d
...@@ -601,36 +601,6 @@ ...@@ -601,36 +601,6 @@
#define GU_TRANS 0xff00 /* Transparent Color - G/U Component */ #define GU_TRANS 0xff00 /* Transparent Color - G/U Component */
#define BV_TRANS 0xff0000 /* Transparent Color - B/V Component */ #define BV_TRANS 0xff0000 /* Transparent Color - B/V Component */
/* Bit masks for HOST_CONTROL */
#define HOST_EN 0x1 /* Host Enable */
#define HOST_END 0x2 /* Host Endianess */
#define DATA_SIZE 0x4 /* Data Size */
#define HOST_RST 0x8 /* Host Reset */
#define HRDY_OVR 0x20 /* Host Ready Override */
#define INT_MODE 0x40 /* Interrupt Mode */
#define BT_EN 0x80 /* Bus Timeout Enable */
#define EHW 0x100 /* Enable Host Write */
#define EHR 0x200 /* Enable Host Read */
#define BDR 0x400 /* Burst DMA Requests */
/* Bit masks for HOST_STATUS */
#define DMA_READY 0x1 /* DMA Ready */
#define FIFOFULL 0x2 /* FIFO Full */
#define FIFOEMPTY 0x4 /* FIFO Empty */
#define DMA_COMPLETE 0x8 /* DMA Complete */
#define HSHK 0x10 /* Host Handshake */
#define HSTIMEOUT 0x20 /* Host Timeout */
#define HIRQ 0x40 /* Host Interrupt Request */
#define ALLOW_CNFG 0x80 /* Allow New Configuration */
#define DMA_DIR 0x100 /* DMA Direction */
#define BTE 0x200 /* Bus Timeout Enabled */
/* Bit masks for HOST_TIMEOUT */
#define COUNT_TIMEOUT 0x7ff /* Host Timeout count */
/* Bit masks for TIMER_ENABLE1 */ /* Bit masks for TIMER_ENABLE1 */
#define TIMEN8 0x1 /* Timer 8 Enable */ #define TIMEN8 0x1 /* Timer 8 Enable */
......
arch/blackfin/mach-bf548/include/mach/defBF547.h
View file @ fd18f00d
...@@ -581,36 +581,6 @@ ...@@ -581,36 +581,6 @@
#define GU_TRANS 0xff00 /* Transparent Color - G/U Component */ #define GU_TRANS 0xff00 /* Transparent Color - G/U Component */
#define BV_TRANS 0xff0000 /* Transparent Color - B/V Component */ #define BV_TRANS 0xff0000 /* Transparent Color - B/V Component */
/* Bit masks for HOST_CONTROL */
#define HOST_EN 0x1 /* Host Enable */
#define HOST_END 0x2 /* Host Endianess */
#define DATA_SIZE 0x4 /* Data Size */
#define HOST_RST 0x8 /* Host Reset */
#define HRDY_OVR 0x20 /* Host Ready Override */
#define INT_MODE 0x40 /* Interrupt Mode */
#define BT_EN 0x80 /* Bus Timeout Enable */
#define EHW 0x100 /* Enable Host Write */
#define EHR 0x200 /* Enable Host Read */
#define BDR 0x400 /* Burst DMA Requests */
/* Bit masks for HOST_STATUS */
#define DMA_READY 0x1 /* DMA Ready */
#define FIFOFULL 0x2 /* FIFO Full */
#define FIFOEMPTY 0x4 /* FIFO Empty */
#define DMA_COMPLETE 0x8 /* DMA Complete */
#define HSHK 0x10 /* Host Handshake */
#define HSTIMEOUT 0x20 /* Host Timeout */
#define HIRQ 0x40 /* Host Interrupt Request */
#define ALLOW_CNFG 0x80 /* Allow New Configuration */
#define DMA_DIR 0x100 /* DMA Direction */
#define BTE 0x200 /* Bus Timeout Enabled */
/* Bit masks for HOST_TIMEOUT */
#define COUNT_TIMEOUT 0x7ff /* Host Timeout count */
/* Bit masks for KPAD_CTL */ /* Bit masks for KPAD_CTL */
#define KPAD_EN 0x1 /* Keypad Enable */ #define KPAD_EN 0x1 /* Keypad Enable */
......
arch/blackfin/mach-bf561/boards/acvilon.c
View file @ fd18f00d
This diff is collapsed.
arch/blackfin/mach-bf561/boards/cm_bf561.c
View file @ fd18f00d
This diff is collapsed.
arch/blackfin/mach-bf561/boards/ezkit.c
View file @ fd18f00d
This diff is collapsed.
arch/blackfin/mach-bf561/boards/tepla.c
View file @ fd18f00d
...@@ -42,7 +42,7 @@ static struct platform_device smc91x_device = { ...@@ -42,7 +42,7 @@ static struct platform_device smc91x_device = {
.resource = smc91x_resources, .resource = smc91x_resources,
}; };
#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[] = {
{ {
...@@ -93,7 +93,7 @@ static struct platform_device bfin_uart0_device = { ...@@ -93,7 +93,7 @@ static struct platform_device bfin_uart0_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[] = {
{ {
...@@ -125,13 +125,13 @@ static struct platform_device bfin_sir0_device = { ...@@ -125,13 +125,13 @@ static struct platform_device bfin_sir0_device = {
static struct platform_device *tepla_devices[] __initdata = { static struct platform_device *tepla_devices[] __initdata = {
&smc91x_device, &smc91x_device,
#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
#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
......
arch/blackfin/mach-bf609/boards/ezkit.c
View file @ fd18f00d
This diff is collapsed.
arch/blackfin/mach-bf609/clock.c
View file @ fd18f00d
...@@ -73,24 +73,6 @@ static void clk_reg_write_mask(u32 reg, uint32_t val, uint32_t mask) ...@@ -73,24 +73,6 @@ static void clk_reg_write_mask(u32 reg, uint32_t val, uint32_t mask)
bfin_write32(reg, val2); bfin_write32(reg, val2);
} }
static void clk_reg_set_bits(u32 reg, uint32_t mask)
{
u32 val;
val = bfin_read32(reg);
val |= mask;
bfin_write32(reg, val);
}
static void clk_reg_clear_bits(u32 reg, uint32_t mask)
{
u32 val;
val = bfin_read32(reg);
val &= ~mask;
bfin_write32(reg, val);
}
int wait_for_pll_align(void) int wait_for_pll_align(void)
{ {
int i = 10000; int i = 10000;
......
arch/blackfin/mach-bf609/pm.c
View file @ fd18f00d
...@@ -210,7 +210,7 @@ void bf609_cpu_pm_enter(suspend_state_t state) ...@@ -210,7 +210,7 @@ void bf609_cpu_pm_enter(suspend_state_t state)
#ifdef CONFIG_PM_BFIN_WAKE_PB15 #ifdef CONFIG_PM_BFIN_WAKE_PB15
wakeup |= PB15WE; wakeup |= PB15WE;
# if CONFIG_PM_BFIN_WAKE_PA15_POL # if CONFIG_PM_BFIN_WAKE_PB15_POL
wakeup_pol |= PB15WE; wakeup_pol |= PB15WE;
# endif # endif
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7