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

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

arch/arm/mach-omap1/board-h2-mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "board-h2.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,

				int vdd)

arch/arm/mach-omap1/board-h2.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static struct omap_usb_config h2_usb_config __initdata = { 
#if IS_ENABLED(CONFIG_USB_OMAP)

	.hmc_mode	= 19,	/* 0:host(off) 1:dev|otg 2:disabled */

	/* .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) */

	.hmc_mode	= 20,	/* 1:dev|otg(off) 1:host 2:disabled */

#endif

arch/arm/mach-omap1/board-h3-mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "board-h3.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,

				int vdd)

arch/arm/mach-omap1/board-h3.c

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static struct omap_usb_config h3_usb_config __initdata = { 


#if IS_ENABLED(CONFIG_USB_OMAP)

	.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) */

	.hmc_mode       = 20,   /* 1:dev|otg(off) 1:host 2:disabled */

#endif

arch/arm/mach-omap1/board-htcherald.c

+2 −2
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static struct platform_device lcd_device = { 
};



/* 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 = {

	.nr_slots                       = 1,

	.switch_slot                    = NULL,
@@ -586,7 +586,7 @@ static void __init htcherald_init(void) 


	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;

	omap1_init_mmc(htc_mmc_data, 1);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE