Skip to content

L
linux
Commit 260caade authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'omap-for-v4.9/soc-signed' of... 

Merge tag 'omap-for-v4.9/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

Merge "omap soc updates for v4.9 merge window" from Tony Lindgren:

Two patches from Javier Martinez Canillas <javier@osg.samsung.com>
to update mach-omap1 and mach-oamp2 to use IS_ENABLED macro.

* tag 'omap-for-v4.9/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: use IS_ENABLED() instead of checking for built-in or module
  ARM: OMAP1: use IS_ENABLED() instead of checking for built-in or module
parents 55d421b4 502ad2a6
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 52 deletions
arch/arm/mach-omap1/board-h2-mmc.c
View file @ 260caade
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "board-h2.h" #include "board-h2.h"
#include "mmc.h" #include "mmc.h"
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) #if IS_ENABLED(CONFIG_MMC_OMAP)
static int mmc_set_power(struct device *dev, int slot, int power_on, static int mmc_set_power(struct device *dev, int slot, int power_on,
int vdd) int vdd)
......
arch/arm/mach-omap1/board-h2.c
View file @ 260caade
...@@ -349,7 +349,7 @@ static struct omap_usb_config h2_usb_config __initdata = { ...@@ -349,7 +349,7 @@ static struct omap_usb_config h2_usb_config __initdata = {
#if IS_ENABLED(CONFIG_USB_OMAP) #if IS_ENABLED(CONFIG_USB_OMAP)
.hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */ .hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */
/* .hmc_mode = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */ /* .hmc_mode = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */
#elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) #elif IS_ENABLED(CONFIG_USB_OHCI_HCD)
/* needs OTG cable, or NONSTANDARD (B-to-MiniB) */ /* needs OTG cable, or NONSTANDARD (B-to-MiniB) */
.hmc_mode = 20, /* 1:dev|otg(off) 1:host 2:disabled */ .hmc_mode = 20, /* 1:dev|otg(off) 1:host 2:disabled */
#endif #endif
......
arch/arm/mach-omap1/board-h3-mmc.c
View file @ 260caade
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "board-h3.h" #include "board-h3.h"
#include "mmc.h" #include "mmc.h"
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) #if IS_ENABLED(CONFIG_MMC_OMAP)
static int mmc_set_power(struct device *dev, int slot, int power_on, static int mmc_set_power(struct device *dev, int slot, int power_on,
int vdd) int vdd)
......
arch/arm/mach-omap1/board-h3.c
View file @ 260caade
...@@ -368,7 +368,7 @@ static struct omap_usb_config h3_usb_config __initdata = { ...@@ -368,7 +368,7 @@ static struct omap_usb_config h3_usb_config __initdata = {
#if IS_ENABLED(CONFIG_USB_OMAP) #if IS_ENABLED(CONFIG_USB_OMAP)
.hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */ .hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */
#elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) #elif IS_ENABLED(CONFIG_USB_OHCI_HCD)
/* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */ /* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */
.hmc_mode = 20, /* 1:dev|otg(off) 1:host 2:disabled */ .hmc_mode = 20, /* 1:dev|otg(off) 1:host 2:disabled */
#endif #endif
......
arch/arm/mach-omap1/board-htcherald.c
View file @ 260caade
...@@ -401,7 +401,7 @@ static struct platform_device lcd_device = { ...@@ -401,7 +401,7 @@ static struct platform_device lcd_device = {
}; };
/* MMC Card */ /* MMC Card */
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) #if IS_ENABLED(CONFIG_MMC_OMAP)
static struct omap_mmc_platform_data htc_mmc1_data = { static struct omap_mmc_platform_data htc_mmc1_data = {
.nr_slots = 1, .nr_slots = 1,
.switch_slot = NULL, .switch_slot = NULL,
...@@ -586,7 +586,7 @@ static void __init htcherald_init(void) ...@@ -586,7 +586,7 @@ static void __init htcherald_init(void)
omap_register_i2c_bus(1, 100, NULL, 0); omap_register_i2c_bus(1, 100, NULL, 0);
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) #if IS_ENABLED(CONFIG_MMC_OMAP)
htc_mmc_data[0] = &htc_mmc1_data; htc_mmc_data[0] = &htc_mmc1_data;
omap1_init_mmc(htc_mmc_data, 1); omap1_init_mmc(htc_mmc_data, 1);
#endif #endif
......
arch/arm/mach-omap1/board-innovator.c
View file @ 260caade
...@@ -315,7 +315,7 @@ static struct omap_usb_config h2_usb_config __initdata = { ...@@ -315,7 +315,7 @@ static struct omap_usb_config h2_usb_config __initdata = {
#if IS_ENABLED(CONFIG_USB_OMAP) #if IS_ENABLED(CONFIG_USB_OMAP)
.hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */ .hmc_mode = 19, /* 0:host(off) 1:dev|otg 2:disabled */
/* .hmc_mode = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */ /* .hmc_mode = 21,*/ /* 0:host(off) 1:dev(loopback) 2:host(loopback) */
#elif defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) #elif IS_ENABLED(CONFIG_USB_OHCI_HCD)
/* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */ /* NONSTANDARD CABLE NEEDED (B-to-Mini-B) */
.hmc_mode = 20, /* 1:dev|otg(off) 1:host 2:disabled */ .hmc_mode = 20, /* 1:dev|otg(off) 1:host 2:disabled */
#endif #endif
...@@ -328,7 +328,7 @@ static struct omap_lcd_config innovator1610_lcd_config __initdata = { ...@@ -328,7 +328,7 @@ static struct omap_lcd_config innovator1610_lcd_config __initdata = {
}; };
#endif #endif
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) #if IS_ENABLED(CONFIG_MMC_OMAP)
static int mmc_set_power(struct device *dev, int slot, int power_on, static int mmc_set_power(struct device *dev, int slot, int power_on,
int vdd) int vdd)
......
arch/arm/mach-omap1/board-nokia770.c
View file @ 260caade
...@@ -159,7 +159,7 @@ static struct omap_usb_config nokia770_usb_config __initdata = { ...@@ -159,7 +159,7 @@ static struct omap_usb_config nokia770_usb_config __initdata = {
.extcon = "tahvo-usb", .extcon = "tahvo-usb",
}; };
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) #if IS_ENABLED(CONFIG_MMC_OMAP)
#define NOKIA770_GPIO_MMC_POWER 41 #define NOKIA770_GPIO_MMC_POWER 41
#define NOKIA770_GPIO_MMC_SWITCH 23 #define NOKIA770_GPIO_MMC_SWITCH 23
...@@ -216,7 +216,7 @@ static inline void nokia770_mmc_init(void) ...@@ -216,7 +216,7 @@ static inline void nokia770_mmc_init(void)
} }
#endif #endif
#if defined(CONFIG_I2C_CBUS_GPIO) || defined(CONFIG_I2C_CBUS_GPIO_MODULE) #if IS_ENABLED(CONFIG_I2C_CBUS_GPIO)
static struct i2c_cbus_platform_data nokia770_cbus_data = { static struct i2c_cbus_platform_data nokia770_cbus_data = {
.clk_gpio = OMAP_MPUIO(9), .clk_gpio = OMAP_MPUIO(9),
.dat_gpio = OMAP_MPUIO(10), .dat_gpio = OMAP_MPUIO(10),
......
arch/arm/mach-omap1/board-sx1-mmc.c
View file @ 260caade
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "mmc.h" #include "mmc.h"
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) #if IS_ENABLED(CONFIG_MMC_OMAP)
static int mmc_set_power(struct device *dev, int slot, int power_on, static int mmc_set_power(struct device *dev, int slot, int power_on,
int vdd) int vdd)
......
arch/arm/mach-omap1/devices.c
View file @ 260caade
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "mmc.h" #include "mmc.h"
#include "sram.h" #include "sram.h"
#if defined(CONFIG_RTC_DRV_OMAP) || defined(CONFIG_RTC_DRV_OMAP_MODULE) #if IS_ENABLED(CONFIG_RTC_DRV_OMAP)
#define OMAP_RTC_BASE 0xfffb4800 #define OMAP_RTC_BASE 0xfffb4800
...@@ -72,7 +72,7 @@ static inline void omap_init_mbox(void) { } ...@@ -72,7 +72,7 @@ static inline void omap_init_mbox(void) { }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) #if IS_ENABLED(CONFIG_MMC_OMAP)
static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller, static inline void omap1_mmc_mux(struct omap_mmc_platform_data *mmc_controller,
int controller_nr) int controller_nr)
...@@ -230,7 +230,7 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, ...@@ -230,7 +230,7 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* OMAP7xx SPI support */ /* OMAP7xx SPI support */
#if defined(CONFIG_SPI_OMAP_100K) || defined(CONFIG_SPI_OMAP_100K_MODULE) #if IS_ENABLED(CONFIG_SPI_OMAP_100K)
struct platform_device omap_spi1 = { struct platform_device omap_spi1 = {
.name = "omap1_spi100k", .name = "omap1_spi100k",
...@@ -312,7 +312,7 @@ static inline void omap_init_sti(void) {} ...@@ -312,7 +312,7 @@ static inline void omap_init_sti(void) {}
* mcbsp1..3 = 5..7 * mcbsp1..3 = 5..7
*/ */
#if defined(CONFIG_SPI_OMAP_UWIRE) || defined(CONFIG_SPI_OMAP_UWIRE_MODULE) #if IS_ENABLED(CONFIG_SPI_OMAP_UWIRE)
#define OMAP_UWIRE_BASE 0xfffb3000 #define OMAP_UWIRE_BASE 0xfffb3000
...@@ -418,7 +418,7 @@ static int __init omap1_init_devices(void) ...@@ -418,7 +418,7 @@ static int __init omap1_init_devices(void)
} }
arch_initcall(omap1_init_devices); arch_initcall(omap1_init_devices);
#if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE) #if IS_ENABLED(CONFIG_OMAP_WATCHDOG)
static struct resource wdt_resources[] = { static struct resource wdt_resources[] = {
{ {
......
arch/arm/mach-omap1/fb.c
View file @ 260caade
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE) #if IS_ENABLED(CONFIG_FB_OMAP)
static bool omapfb_lcd_configured; static bool omapfb_lcd_configured;
static struct omapfb_platform_data omapfb_config; static struct omapfb_platform_data omapfb_config;
......
arch/arm/mach-omap1/include/mach/usb.h
View file @ 260caade
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
void omap_otg_init(struct omap_usb_config *config); void omap_otg_init(struct omap_usb_config *config);
#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE) #if IS_ENABLED(CONFIG_USB)
void omap1_usb_init(struct omap_usb_config *pdata); void omap1_usb_init(struct omap_usb_config *pdata);
#else #else
static inline void omap1_usb_init(struct omap_usb_config *pdata) static inline void omap1_usb_init(struct omap_usb_config *pdata)
......
arch/arm/mach-omap1/mmc.h
View file @ 260caade
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#define OMAP1_MMC1_BASE 0xfffb7800 #define OMAP1_MMC1_BASE 0xfffb7800
#define OMAP1_MMC2_BASE 0xfffb7c00 /* omap16xx only */ #define OMAP1_MMC2_BASE 0xfffb7c00 /* omap16xx only */
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) #if IS_ENABLED(CONFIG_MMC_OMAP)
void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
int nr_controllers); int nr_controllers);
#else #else
......
arch/arm/mach-omap1/usb.c
View file @ 260caade
...@@ -136,7 +136,7 @@ omap_otg_init(struct omap_usb_config *config) ...@@ -136,7 +136,7 @@ omap_otg_init(struct omap_usb_config *config)
} }
#endif #endif
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_OHCI_HCD)
if (config->otg || config->register_host) { if (config->otg || config->register_host) {
struct platform_device *ohci_device = config->ohci_device; struct platform_device *ohci_device = config->ohci_device;
int status; int status;
...@@ -221,7 +221,7 @@ static inline void udc_device_init(struct omap_usb_config *pdata) ...@@ -221,7 +221,7 @@ static inline void udc_device_init(struct omap_usb_config *pdata)
#endif #endif
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_OHCI_HCD)
/* The dmamask must be set for OHCI to work */ /* The dmamask must be set for OHCI to work */
static u64 ohci_dmamask = ~(u32)0; static u64 ohci_dmamask = ~(u32)0;
...@@ -612,7 +612,7 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config) ...@@ -612,7 +612,7 @@ static void __init omap_1510_usb_init(struct omap_usb_config *config)
} }
#endif #endif
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) #if IS_ENABLED(CONFIG_USB_OHCI_HCD)
if (config->register_host) { if (config->register_host) {
int status; int status;
......
arch/arm/mach-omap2/board-flash.c
View file @ 260caade
...@@ -81,8 +81,7 @@ __init board_nor_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs) ...@@ -81,8 +81,7 @@ __init board_nor_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs)
pr_err("Unable to register NOR device\n"); pr_err("Unable to register NOR device\n");
} }
#if defined(CONFIG_MTD_ONENAND_OMAP2) || \ #if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)
defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)
static struct omap_onenand_platform_data board_onenand_data = { static struct omap_onenand_platform_data board_onenand_data = {
.dma_channel = -1, /* disable DMA in OMAP OneNAND driver */ .dma_channel = -1, /* disable DMA in OMAP OneNAND driver */
}; };
...@@ -97,10 +96,9 @@ __init board_onenand_init(struct mtd_partition *onenand_parts, ...@@ -97,10 +96,9 @@ __init board_onenand_init(struct mtd_partition *onenand_parts,
gpmc_onenand_init(&board_onenand_data); gpmc_onenand_init(&board_onenand_data);
} }
#endif /* CONFIG_MTD_ONENAND_OMAP2 || CONFIG_MTD_ONENAND_OMAP2_MODULE */ #endif /* IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2) */
#if defined(CONFIG_MTD_NAND_OMAP2) || \ #if IS_ENABLED(CONFIG_MTD_NAND_OMAP2)
defined(CONFIG_MTD_NAND_OMAP2_MODULE)
/* Note that all values in this struct are in nanoseconds */ /* Note that all values in this struct are in nanoseconds */
struct gpmc_timings nand_default_timings[1] = { struct gpmc_timings nand_default_timings[1] = {
...@@ -144,7 +142,7 @@ __init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs, ...@@ -144,7 +142,7 @@ __init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs,
board_nand_data.ecc_opt = OMAP_ECC_HAM1_CODE_SW; board_nand_data.ecc_opt = OMAP_ECC_HAM1_CODE_SW;
gpmc_nand_init(&board_nand_data, gpmc_t); gpmc_nand_init(&board_nand_data, gpmc_t);
} }
#endif /* CONFIG_MTD_NAND_OMAP2 || CONFIG_MTD_NAND_OMAP2_MODULE */ #endif /* IS_ENABLED(CONFIG_MTD_NAND_OMAP2) */
/** /**
* get_gpmc0_type - Reads the FPGA DIP_SWITCH_INPUT_REGISTER2 to get * get_gpmc0_type - Reads the FPGA DIP_SWITCH_INPUT_REGISTER2 to get
......
arch/arm/mach-omap2/board-flash.h
View file @ 260caade
...@@ -23,10 +23,7 @@ struct flash_partitions { ...@@ -23,10 +23,7 @@ struct flash_partitions {
int nr_parts; int nr_parts;
}; };
#if defined(CONFIG_MTD_NAND_OMAP2) || \ #if IS_ENABLED(CONFIG_MTD_NAND_OMAP2) || IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)
defined(CONFIG_MTD_NAND_OMAP2_MODULE) || \
defined(CONFIG_MTD_ONENAND_OMAP2) || \
defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)
extern void board_flash_init(struct flash_partitions [], extern void board_flash_init(struct flash_partitions [],
char chip_sel[][GPMC_CS_NUM], int nand_type); char chip_sel[][GPMC_CS_NUM], int nand_type);
#else #else
...@@ -36,8 +33,7 @@ static inline void board_flash_init(struct flash_partitions part[], ...@@ -36,8 +33,7 @@ static inline void board_flash_init(struct flash_partitions part[],
} }
#endif #endif
#if defined(CONFIG_MTD_NAND_OMAP2) || \ #if IS_ENABLED(CONFIG_MTD_NAND_OMAP2)
defined(CONFIG_MTD_NAND_OMAP2_MODULE)
extern void board_nand_init(struct mtd_partition *nand_parts, extern void board_nand_init(struct mtd_partition *nand_parts,
u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t); u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t);
extern struct gpmc_timings nand_default_timings[]; extern struct gpmc_timings nand_default_timings[];
...@@ -49,8 +45,7 @@ static inline void board_nand_init(struct mtd_partition *nand_parts, ...@@ -49,8 +45,7 @@ static inline void board_nand_init(struct mtd_partition *nand_parts,
#define nand_default_timings NULL #define nand_default_timings NULL
#endif #endif
#if defined(CONFIG_MTD_ONENAND_OMAP2) || \ #if IS_ENABLED(CONFIG_MTD_ONENAND_OMAP2)
defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)
extern void board_onenand_init(struct mtd_partition *nand_parts, extern void board_onenand_init(struct mtd_partition *nand_parts,
u8 nr_parts, u8 cs); u8 nr_parts, u8 cs);
#else #else
......
arch/arm/mach-omap2/board-n8x0.c
View file @ 260caade
...@@ -66,7 +66,7 @@ static void board_check_revision(void) ...@@ -66,7 +66,7 @@ static void board_check_revision(void)
pr_err("Unknown board\n"); pr_err("Unknown board\n");
} }
#if defined(CONFIG_USB_MUSB_TUSB6010) || defined(CONFIG_USB_MUSB_TUSB6010_MODULE) #if IS_ENABLED(CONFIG_USB_MUSB_TUSB6010)
/* /*
* Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and
* 1.5 V voltage regulators of PM companion chip. Companion chip will then * 1.5 V voltage regulators of PM companion chip. Companion chip will then
...@@ -163,8 +163,7 @@ static struct spi_board_info n800_spi_board_info[] __initdata = { ...@@ -163,8 +163,7 @@ static struct spi_board_info n800_spi_board_info[] __initdata = {
}, },
}; };
#if defined(CONFIG_MENELAUS) && \ #if defined(CONFIG_MENELAUS) && IS_ENABLED(CONFIG_MMC_OMAP)
(defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE))
/* /*
* On both N800 and N810, only the first of the two MMC controllers is in use. * On both N800 and N810, only the first of the two MMC controllers is in use.
......
arch/arm/mach-omap2/common-board-devices.c
View file @ 260caade
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
#include "common.h" #include "common.h"
#include "common-board-devices.h" #include "common-board-devices.h"
#if defined(CONFIG_TOUCHSCREEN_ADS7846) || \ #if IS_ENABLED(CONFIG_TOUCHSCREEN_ADS7846)
defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
static struct omap2_mcspi_device_config ads7846_mcspi_config = { static struct omap2_mcspi_device_config ads7846_mcspi_config = {
.turbo_mode = 0, .turbo_mode = 0,
}; };
......
arch/arm/mach-omap2/devices.c
View file @ 260caade
...@@ -67,7 +67,7 @@ omap_postcore_initcall(omap3_l3_init); ...@@ -67,7 +67,7 @@ omap_postcore_initcall(omap3_l3_init);
static inline void omap_init_sti(void) {} static inline void omap_init_sti(void) {}
#if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE) #if IS_ENABLED(CONFIG_SPI_OMAP24XX)
#include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/spi-omap2-mcspi.h>
...@@ -163,9 +163,8 @@ static void __init omap_init_aes(void) ...@@ -163,9 +163,8 @@ static void __init omap_init_aes(void)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#if defined(CONFIG_VIDEO_OMAP2_VOUT) || \ #if IS_ENABLED(CONFIG_VIDEO_OMAP2_VOUT)
defined(CONFIG_VIDEO_OMAP2_VOUT_MODULE) #if IS_ENABLED(CONFIG_FB_OMAP2)
#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
static struct resource omap_vout_resource[3 - CONFIG_FB_OMAP2_NUM_FBS] = { static struct resource omap_vout_resource[3 - CONFIG_FB_OMAP2_NUM_FBS] = {
}; };
#else #else
......
arch/arm/mach-omap2/drm.c
View file @ 260caade
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "soc.h" #include "soc.h"
#include "display.h" #include "display.h"
#if defined(CONFIG_DRM_OMAP) || defined(CONFIG_DRM_OMAP_MODULE) #if IS_ENABLED(CONFIG_DRM_OMAP)
static struct omap_drm_platform_data platform_data; static struct omap_drm_platform_data platform_data;
......
arch/arm/mach-omap2/fb.c
View file @ 260caade
...@@ -90,7 +90,7 @@ int __init omap_init_vrfb(void) ...@@ -90,7 +90,7 @@ int __init omap_init_vrfb(void)
int __init omap_init_vrfb(void) { return 0; } int __init omap_init_vrfb(void) { return 0; }
#endif #endif
#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE) #if IS_ENABLED(CONFIG_FB_OMAP2)
static u64 omap_fb_dma_mask = ~(u32)0; static u64 omap_fb_dma_mask = ~(u32)0;
static struct omapfb_platform_data omapfb_config; static struct omapfb_platform_data omapfb_config;
......
arch/arm/mach-omap2/gpmc-smsc911x.h
View file @ 260caade
...@@ -21,7 +21,7 @@ struct omap_smsc911x_platform_data { ...@@ -21,7 +21,7 @@ struct omap_smsc911x_platform_data {
u32 flags; u32 flags;
}; };
#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) #if IS_ENABLED(CONFIG_SMSC911X)
extern void gpmc_smsc911x_init(struct omap_smsc911x_platform_data *d); extern void gpmc_smsc911x_init(struct omap_smsc911x_platform_data *d);
......
arch/arm/mach-omap2/hsmmc.c
View file @ 260caade
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "hsmmc.h" #include "hsmmc.h"
#include "control.h" #include "control.h"
#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) #if IS_ENABLED(CONFIG_MMC_OMAP_HS)
static u16 control_pbias_offset; static u16 control_pbias_offset;
static u16 control_devconf1_offset; static u16 control_devconf1_offset;
......
arch/arm/mach-omap2/hsmmc.h
View file @ 260caade
...@@ -28,7 +28,7 @@ struct omap2_hsmmc_info { ...@@ -28,7 +28,7 @@ struct omap2_hsmmc_info {
void (*init_card)(struct mmc_card *card); void (*init_card)(struct mmc_card *card);
}; };
#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) #if IS_ENABLED(CONFIG_MMC_OMAP_HS)
void omap_hsmmc_init(struct omap2_hsmmc_info *); void omap_hsmmc_init(struct omap2_hsmmc_info *);
void omap_hsmmc_late_init(struct omap2_hsmmc_info *); void omap_hsmmc_late_init(struct omap2_hsmmc_info *);
......
arch/arm/mach-omap2/twl-common.c
View file @ 260caade
...@@ -532,8 +532,7 @@ void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data, ...@@ -532,8 +532,7 @@ void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,
} }
#endif /* CONFIG_ARCH_OMAP4 */ #endif /* CONFIG_ARCH_OMAP4 */
#if defined(CONFIG_SND_OMAP_SOC_OMAP_TWL4030) || \ #if IS_ENABLED(CONFIG_SND_OMAP_SOC_OMAP_TWL4030)
defined(CONFIG_SND_OMAP_SOC_OMAP_TWL4030_MODULE)
#include <linux/platform_data/omap-twl4030.h> #include <linux/platform_data/omap-twl4030.h>
/* Commonly used configuration */ /* Commonly used configuration */
......
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