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 },
 };
 
