arm: mach-omap2: remove NULL board_mux from board files
authorAaro Koskinen <Aaro.Koskinen@nokia.com>
Thu, 2 Dec 2010 13:25:40 +0000 (13:25 +0000)
committerTony Lindgren <tony@atomide.com>
Fri, 3 Dec 2010 01:03:41 +0000 (17:03 -0800)
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>
20 files changed:
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-3630sdp.c
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-igep0030.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-n8x0.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-omap3stalker.c
arch/arm/mach-omap2/board-omap3touchbook.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/board-zoom.c
arch/arm/mach-omap2/mux.h

index b527f8d187ad571f3d3ee7e04514393f1891f2b7..ee7ac993a277db5199b9126df38bff8a554fea3b 100644 (file)
@@ -218,8 +218,6 @@ static struct omap_usb_config sdp2430_usb_config __initdata = {
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static void __init omap_2430sdp_init(void)
index 4e3742c512b81f3da619c7cb9895bad8fe61b39e..ad4cb262719ee69d224f4e4a9cf9bd92bfbab714 100644 (file)
@@ -663,8 +663,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 /*
index bbcf580fa097101056b1fc98545fd5cae9c1fdf8..4cd96d70b9c7e6915ff0e0e0cb244bd66db6b1e3 100644 (file)
@@ -83,8 +83,6 @@ static void __init omap_sdp_init_irq(void)
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 /*
index 07399505312b19fac8331d1d0b5367e85418a422..63035d8231ef3d560a2f49f44efbefb3a52bfc72 100644 (file)
@@ -442,8 +442,6 @@ static struct omap_board_mux board_mux[] __initdata = {
        OMAP3_MUX(SAD2D_MCAD23, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 
index 2c6db1aaeb2965406d82457bb8fe0fb81ebc0498..b01d6e422d7a1a5dc40ed1be2b6fb35b74070829 100644 (file)
@@ -314,8 +314,6 @@ static void __init apollon_usb_init(void)
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static void __init omap_apollon_init(void)
index 929993b4bf26bbb77cbcb385a570d15adc50f231..263da1da181cd511d966f9cc849685557688a29f 100644 (file)
@@ -321,8 +321,6 @@ static struct i2c_board_info __initdata h4_i2c_board_info[] = {
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static void __init omap_h4_init(void)
index fe76b59b13edb80a80e14f38c45a27e20107023d..6f8f9b4533f9425a3560f6d9297217168d657d52 100644 (file)
@@ -564,8 +564,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 #if defined(CONFIG_LIBERTAS_SDIO) || defined(CONFIG_LIBERTAS_SDIO_MODULE)
index 22b0b253e16b4cc0858fcc8608172692155f6f7c..8dc6ed3aa377984f95904721ee6916f83a4b9c1c 100644 (file)
@@ -366,8 +366,6 @@ void __init igep3_wifi_bt_init(void) {}
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static void __init igep3_init(void)
index 001fd9713f391df3517f333dc1c6d55d65b8a9ba..84b4ea67d1565d5a787356a8cc0ef99ac22b04a9 100644 (file)
@@ -381,8 +381,6 @@ static struct platform_device *ldp_devices[] __initdata = {
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static struct omap_musb_board_data musb_board_data = {
index e823c7042ab31271145959530454b05dfb7830eb..dd353ffe57d284d41e3816bdec6420e4e77f44a8 100644 (file)
@@ -653,8 +653,6 @@ static struct omap_board_mux board_mux[] __initdata = {
        OMAP2420_MUX(EAC_AC_DOUT, OMAP_MUX_MODE1 | OMAP_PIN_OUTPUT),
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static void __init n8x0_init_machine(void)
index 14f42240ae792bf01fcd289d60d441d9d55eb328..d42c8c936053baf9052c3983665140a26de294b1 100644 (file)
@@ -548,8 +548,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static struct omap_musb_board_data musb_board_data = {
index b04365c6bb10895e4ebdf45fd5fa8465c722e518..8f1e69a9205663a91fd3ccc592cf2fca28a7537e 100644 (file)
@@ -654,8 +654,6 @@ static struct omap_board_mux board_mux[] __initdata = {
                                OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_OUTPUT_LOW),
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static struct omap_musb_board_data musb_board_data = {
index 5f7d2c1e7ef5e90d211425eac739a609b70a0e28..e2e9562f4de96ea4a766d73dcb0592a0bc44adaf 100644 (file)
@@ -206,8 +206,6 @@ static void __init omap3logic_init_irq(void)
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux       NULL
 #endif
 
 static void __init omap3logic_init(void)
index 89ed1be2d62e0d7214ef968e44d73170ebe35a22..445b15843212d3824466bbd07496fe96ed86624a 100644 (file)
@@ -711,8 +711,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static struct omap_musb_board_data musb_board_data = {
index f2527212541347afc144cc1c2df375304c6ce6a1..ba65fe8a9e10de56f78f7197edc61fe7859b1918 100644 (file)
@@ -616,8 +616,6 @@ static struct omap_board_mux board_mux[] __initdata = {
                  OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE),
        {.reg_offset = OMAP_MUX_TERMINATOR},
 };
-#else
-#define board_mux      NULL
 #endif
 
 static struct omap_musb_board_data musb_board_data = {
index 41104bb8774cf3a42fa96996ae4376b4624449cf..8d530a607f850506cf5e3da46bea5092d28b4ac6 100644 (file)
@@ -413,8 +413,6 @@ static struct omap_board_config_kernel omap3_touchbook_config[] __initdata = {
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static void __init omap3_touchbook_init_irq(void)
index 7053bc0b46dbf4531387990a7d4019551533c693..133b5ead830d740951bf417581010ea2f275bb74 100644 (file)
@@ -438,8 +438,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static struct omap_musb_board_data musb_board_data = {
index 36f2cf4efd57630b593bf42ca28965891c14f906..f3b6e103b01c499389ed3053dde71d92300491f0 100644 (file)
@@ -117,8 +117,6 @@ extern void __init rx51_peripherals_init(void);
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static struct omap_musb_board_data musb_board_data = {
index 3da69e4102a4a23b21331872f3915543a1a43196..27979fd527d39695e97ce35b6eb5e5bcb9d08acc 100644 (file)
@@ -63,8 +63,6 @@ static struct omap_board_mux board_mux[] __initdata = {
        OMAP3_MUX(ETK_D6, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static struct mtd_partition zoom_nand_partitions[] = {
index 79076d61d3993d3cddc116d895001cc57a853214..f5f7f4938057fec15c642a24ac52e6dc345706f5 100644 (file)
@@ -172,6 +172,8 @@ static inline int omap_mux_init_signal(char *muxname, int val)
        return 0;
 }
 
+static struct omap_board_mux *board_mux __initdata __maybe_unused;
+
 #endif
 
 /**