From: "Raphaël Assénat" <raph@8d.com>
To: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
Subject: [PATCH] mux34xx: Compact declaration of placeholders in omap3_muxmodes
Date: Wed, 06 Jul 2011 12:58:10 -0400 [thread overview]
Message-ID: <4E149422.1060103@8d.com> (raw)
With the addition of support for the ZCN package, there
are even more placeholders in the superset, such as:
_OMAP3_MUXENTRY(GPMC_A11, 0,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL),
which takes a lot of space. This patch introduces and uses
_OMAP3_NULL_MUXENTRY to declare such entries.
Also, a duplicate GPMC_A11 entry is removed.
Signed-off-by: Raphael Assenat <raph@8d.com>
diff --git a/arch/arm/mach-omap2/mux34xx.c b/arch/arm/mach-omap2/mux34xx.c
index 26b703a..d775040 100644
--- a/arch/arm/mach-omap2/mux34xx.c
+++ b/arch/arm/mach-omap2/mux34xx.c
@@ -37,6 +37,9 @@
.balls = { bb, bt }, \
}
+#define _OMAP3_NULL_MUXENTRY(M0) _OMAP3_MUXENTRY(M0, 0, NULL, NULL, \
+ NULL, NULL, NULL, NULL, NULL, NULL)
+
/*
* Superset of all mux modes for omap3
*/
@@ -651,131 +654,48 @@ static struct omap_mux __initdata omap3_muxmodes[] = {
"gpio_166", NULL, NULL, "safe_mode"),
/* Only on 3630, see omap36xx_cbp_subset for the signals */
- _OMAP3_MUXENTRY(GPMC_A11, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(SAD2D_MBUSFLAG, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(SAD2D_MREAD, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(SAD2D_MWRITE, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(SAD2D_SBUSFLAG, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(SAD2D_SREAD, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(SAD2D_SWRITE, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(GPMC_A11, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(SAD2D_MCAD28, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(SAD2D_MCAD29, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(SAD2D_MCAD32, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(SAD2D_MCAD33, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(SAD2D_MCAD34, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(SAD2D_MCAD35, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(SAD2D_MCAD36, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
+ _OMAP3_NULL_MUXENTRY(GPMC_A11),
+ _OMAP3_NULL_MUXENTRY(SAD2D_MBUSFLAG),
+ _OMAP3_NULL_MUXENTRY(SAD2D_MREAD),
+ _OMAP3_NULL_MUXENTRY(SAD2D_MWRITE),
+ _OMAP3_NULL_MUXENTRY(SAD2D_SBUSFLAG),
+ _OMAP3_NULL_MUXENTRY(SAD2D_SREAD),
+ _OMAP3_NULL_MUXENTRY(SAD2D_SWRITE),
+ _OMAP3_NULL_MUXENTRY(SAD2D_MCAD28),
+ _OMAP3_NULL_MUXENTRY(SAD2D_MCAD29),
+ _OMAP3_NULL_MUXENTRY(SAD2D_MCAD32),
+ _OMAP3_NULL_MUXENTRY(SAD2D_MCAD33),
+ _OMAP3_NULL_MUXENTRY(SAD2D_MCAD34),
+ _OMAP3_NULL_MUXENTRY(SAD2D_MCAD35),
+ _OMAP3_NULL_MUXENTRY(SAD2D_MCAD36),
/* Only on AM35xx, see am35xx_zcn_subset for the signals */
- _OMAP3_MUXENTRY(CCDC_PCLK, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(CCDC_FIELD, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(CCDC_HD, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(CCDC_VD, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(CCDC_WEN, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(CCDC_DATA0, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(CCDC_DATA1, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(CCDC_DATA2, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(CCDC_DATA3, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(CCDC_DATA4, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(CCDC_DATA5, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(CCDC_DATA6, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(CCDC_DATA7, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(RMII_MDIO_DATA, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(RMII_MDIO_CLK, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(RMII_RXD0, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(RMII_RXD1, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(RMII_CRS_DV, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(RMII_RXER, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(RMII_TXD0, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(RMII_TXD1, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(RMII_TXEN, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(RMII_50MHZ_CLK, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(USB0_DRVVBUS, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(HECC1_TXD, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
- _OMAP3_MUXENTRY(HECC1_RXD, 0,
- NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL),
+ _OMAP3_NULL_MUXENTRY(CCDC_PCLK),
+ _OMAP3_NULL_MUXENTRY(CCDC_FIELD),
+ _OMAP3_NULL_MUXENTRY(CCDC_HD),
+ _OMAP3_NULL_MUXENTRY(CCDC_VD),
+ _OMAP3_NULL_MUXENTRY(CCDC_WEN),
+ _OMAP3_NULL_MUXENTRY(CCDC_DATA0),
+ _OMAP3_NULL_MUXENTRY(CCDC_DATA1),
+ _OMAP3_NULL_MUXENTRY(CCDC_DATA2),
+ _OMAP3_NULL_MUXENTRY(CCDC_DATA3),
+ _OMAP3_NULL_MUXENTRY(CCDC_DATA4),
+ _OMAP3_NULL_MUXENTRY(CCDC_DATA5),
+ _OMAP3_NULL_MUXENTRY(CCDC_DATA6),
+ _OMAP3_NULL_MUXENTRY(CCDC_DATA7),
+ _OMAP3_NULL_MUXENTRY(RMII_MDIO_DATA),
+ _OMAP3_NULL_MUXENTRY(RMII_MDIO_CLK),
+ _OMAP3_NULL_MUXENTRY(RMII_RXD0),
+ _OMAP3_NULL_MUXENTRY(RMII_RXD1),
+ _OMAP3_NULL_MUXENTRY(RMII_CRS_DV),
+ _OMAP3_NULL_MUXENTRY(RMII_RXER),
+ _OMAP3_NULL_MUXENTRY(RMII_TXD0),
+ _OMAP3_NULL_MUXENTRY(RMII_TXD1),
+ _OMAP3_NULL_MUXENTRY(RMII_TXEN),
+ _OMAP3_NULL_MUXENTRY(RMII_50MHZ_CLK),
+ _OMAP3_NULL_MUXENTRY(USB0_DRVVBUS),
+ _OMAP3_NULL_MUXENTRY(HECC1_TXD),
+ _OMAP3_NULL_MUXENTRY(HECC1_RXD),
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
reply other threads:[~2011-07-06 16:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E149422.1060103@8d.com \
--to=raph@8d.com \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.