lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arm: mach-omap2: remove NULL board_mux from board files

Browse Source 
If CONFIG_OMAP_MUX is not enabled, we can define board_mux in the header
file instead of forcing every single board to define it.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
[tony@atomide.com: updated for combined board-zoom files]
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Aaro Koskinen
2010-12-02 13:25:40 +00:00
committed by Tony Lindgren
parent 52aa8c539d
commit 7203f8a48b
20 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/board-2430sdp.c
View File

@@ -218,8 +218,6 @@ static struct omap_usb_config sdp2430_usb_config __initdata = {
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static void __init omap_2430sdp_init(void) static void __init omap_2430sdp_init(void)

2
arch/arm/mach-omap2/board-3430sdp.c
View File

@@ -663,8 +663,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
/* /*

2
arch/arm/mach-omap2/board-3630sdp.c
View File

@@ -83,8 +83,6 @@ static void __init omap_sdp_init_irq(void)
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
/* /*

2
arch/arm/mach-omap2/board-am3517evm.c
View File

@@ -442,8 +442,6 @@ static struct omap_board_mux board_mux[] __initdata = {
OMAP3_MUX(SAD2D_MCAD23, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN), OMAP3_MUX(SAD2D_MCAD23, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif

2
arch/arm/mach-omap2/board-apollon.c
View File

@@ -314,8 +314,6 @@ static void __init apollon_usb_init(void)
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static void __init omap_apollon_init(void) static void __init omap_apollon_init(void)

2
arch/arm/mach-omap2/board-h4.c
View File

@@ -321,8 +321,6 @@ static struct i2c_board_info __initdata h4_i2c_board_info[] = {
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static void __init omap_h4_init(void) static void __init omap_h4_init(void)

2
arch/arm/mach-omap2/board-igep0020.c
View File

@@ -564,8 +564,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
#if defined(CONFIG_LIBERTAS_SDIO) || defined(CONFIG_LIBERTAS_SDIO_MODULE) #if defined(CONFIG_LIBERTAS_SDIO) || defined(CONFIG_LIBERTAS_SDIO_MODULE)

2
arch/arm/mach-omap2/board-igep0030.c
View File

@@ -366,8 +366,6 @@ void __init igep3_wifi_bt_init(void) {}
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static void __init igep3_init(void) static void __init igep3_init(void)

2
arch/arm/mach-omap2/board-ldp.c
View File

@@ -381,8 +381,6 @@ static struct platform_device *ldp_devices[] __initdata = {
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static struct omap_musb_board_data musb_board_data = { static struct omap_musb_board_data musb_board_data = {

2
arch/arm/mach-omap2/board-n8x0.c
View File

@@ -653,8 +653,6 @@ static struct omap_board_mux board_mux[] __initdata = {
OMAP2420_MUX(EAC_AC_DOUT, OMAP_MUX_MODE1 | OMAP_PIN_OUTPUT), OMAP2420_MUX(EAC_AC_DOUT, OMAP_MUX_MODE1 | OMAP_PIN_OUTPUT),
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static void __init n8x0_init_machine(void) static void __init n8x0_init_machine(void)

2
arch/arm/mach-omap2/board-omap3beagle.c
View File

@@ -548,8 +548,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static struct omap_musb_board_data musb_board_data = { static struct omap_musb_board_data musb_board_data = {

2
arch/arm/mach-omap2/board-omap3evm.c
View File

@@ -654,8 +654,6 @@ static struct omap_board_mux board_mux[] __initdata = {
OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW), OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static struct omap_musb_board_data musb_board_data = { static struct omap_musb_board_data musb_board_data = {

2
arch/arm/mach-omap2/board-omap3logic.c
View File

@@ -206,8 +206,6 @@ static void __init omap3logic_init_irq(void)
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static void __init omap3logic_init(void) static void __init omap3logic_init(void)

2
arch/arm/mach-omap2/board-omap3pandora.c
View File

@@ -711,8 +711,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static struct omap_musb_board_data musb_board_data = { static struct omap_musb_board_data musb_board_data = {

2
arch/arm/mach-omap2/board-omap3stalker.c
View File

@@ -616,8 +616,6 @@ static struct omap_board_mux board_mux[] __initdata = {
OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE), OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE),
{.reg_offset = OMAP_MUX_TERMINATOR}, {.reg_offset = OMAP_MUX_TERMINATOR},
}; };
#else
#define board_mux NULL
#endif #endif
static struct omap_musb_board_data musb_board_data = { static struct omap_musb_board_data musb_board_data = {

2
arch/arm/mach-omap2/board-omap3touchbook.c
View File

@@ -413,8 +413,6 @@ static struct omap_board_config_kernel omap3_touchbook_config[] __initdata = {
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static void __init omap3_touchbook_init_irq(void) static void __init omap3_touchbook_init_irq(void)

2
arch/arm/mach-omap2/board-overo.c
View File

@@ -438,8 +438,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static struct omap_musb_board_data musb_board_data = { static struct omap_musb_board_data musb_board_data = {

2
arch/arm/mach-omap2/board-rx51.c
View File

@@ -117,8 +117,6 @@ extern void __init rx51_peripherals_init(void);
static struct omap_board_mux board_mux[] __initdata = { static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static struct omap_musb_board_data musb_board_data = { static struct omap_musb_board_data musb_board_data = {

2
arch/arm/mach-omap2/board-zoom.c
View File

@@ -63,8 +63,6 @@ static struct omap_board_mux board_mux[] __initdata = {
OMAP3_MUX(ETK_D6, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP), OMAP3_MUX(ETK_D6, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
{ .reg_offset = OMAP_MUX_TERMINATOR }, { .reg_offset = OMAP_MUX_TERMINATOR },
}; };
#else
#define board_mux NULL
#endif #endif
static struct mtd_partition zoom_nand_partitions[] = { static struct mtd_partition zoom_nand_partitions[] = {

2
arch/arm/mach-omap2/mux.h
View File

@@ -172,6 +172,8 @@ static inline int omap_mux_init_signal(char *muxname, int val)
return 0; return 0;
} }
static struct omap_board_mux *board_mux __initdata __maybe_unused;
#endif #endif
/** /**