From 122136b42459ab34853157fb5de1691e890f8f88 Mon Sep 17 00:00:00 2001 From: Bas Laarhoven Date: Mon, 14 May 2012 18:26:12 +0200 Subject: [PATCH 48/56] Fixed reversed part of LCD bus. Added even more missing entries (TBC). --- arch/arm/mach-omap2/mux33xx.c | 56 ++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/arch/arm/mach-omap2/mux33xx.c b/arch/arm/mach-omap2/mux33xx.c index 26ecd66..72ac899 100644 --- a/arch/arm/mach-omap2/mux33xx.c +++ b/arch/arm/mach-omap2/mux33xx.c @@ -34,54 +34,54 @@ * Marked lines with completed spec by leading empty comment. */ static struct omap_mux __initdata am33xx_muxmodes[] = { - _AM33XX_MUXENTRY(GPMC_AD0, 0, +/**/ _AM33XX_MUXENTRY(GPMC_AD0, 0, "gpmc_ad0", "mmc1_dat0", NULL, NULL, NULL, NULL, NULL, "gpio1_0"), - _AM33XX_MUXENTRY(GPMC_AD1, 0, +/**/ _AM33XX_MUXENTRY(GPMC_AD1, 0, "gpmc_ad1", "mmc1_dat1", NULL, NULL, NULL, NULL, NULL, "gpio1_1"), - _AM33XX_MUXENTRY(GPMC_AD2, 0, +/**/ _AM33XX_MUXENTRY(GPMC_AD2, 0, "gpmc_ad2", "mmc1_dat2", NULL, NULL, NULL, NULL, NULL, "gpio1_2"), - _AM33XX_MUXENTRY(GPMC_AD3, 0, +/**/ _AM33XX_MUXENTRY(GPMC_AD3, 0, "gpmc_ad3", "mmc1_dat3", NULL, NULL, NULL, NULL, NULL, "gpio1_3"), - _AM33XX_MUXENTRY(GPMC_AD4, 0, +/**/ _AM33XX_MUXENTRY(GPMC_AD4, 0, "gpmc_ad4", "mmc1_dat4", NULL, NULL, NULL, NULL, NULL, "gpio1_4"), - _AM33XX_MUXENTRY(GPMC_AD5, 0, +/**/ _AM33XX_MUXENTRY(GPMC_AD5, 0, "gpmc_ad5", "mmc1_dat5", NULL, NULL, NULL, NULL, NULL, "gpio1_5"), - _AM33XX_MUXENTRY(GPMC_AD6, 0, +/**/ _AM33XX_MUXENTRY(GPMC_AD6, 0, "gpmc_ad6", "mmc1_dat6", NULL, NULL, NULL, NULL, NULL, "gpio1_6"), - _AM33XX_MUXENTRY(GPMC_AD7, 0, +/**/ _AM33XX_MUXENTRY(GPMC_AD7, 0, "gpmc_ad7", "mmc1_dat7", NULL, NULL, NULL, NULL, NULL, "gpio1_7"), /**/ _AM33XX_MUXENTRY(GPMC_AD8, 0, - "gpmc_ad8", "lcd_data16", "mmc1_dat0", "mmc2_dat4", + "gpmc_ad8", "lcd_data23", "mmc1_dat0", "mmc2_dat4", "ehrpwm2A", "pr1_mii_mt0_clk", NULL, "gpio0_22"), /**/ _AM33XX_MUXENTRY(GPMC_AD9, 0, - "gpmc_ad9", "lcd_data17", "mmc1_dat1", "mmc2_dat5", + "gpmc_ad9", "lcd_data22", "mmc1_dat1", "mmc2_dat5", "ehrpwm2B", "pr1_mii0_col", NULL, "gpio0_23"), /**/ _AM33XX_MUXENTRY(GPMC_AD10, 0, - "gpmc_ad10", "lcd_data18", "mmc1_dat2", "mmc2_dat6", + "gpmc_ad10", "lcd_data21", "mmc1_dat2", "mmc2_dat6", "ehrpwm2_tripzone_input", "pr1_mii0_txen", NULL, "gpio0_26"), /**/ _AM33XX_MUXENTRY(GPMC_AD11, 0, - "gpmc_ad11", "lcd_data19", "mmc1_dat3", "mmc2_dat7", + "gpmc_ad11", "lcd_data20", "mmc1_dat3", "mmc2_dat7", "ehrpwm0_synco", "pr1_mii0_txd3", NULL, "gpio0_27"), /**/ _AM33XX_MUXENTRY(GPMC_AD12, 0, - "gpmc_ad12", "lcd_data20", "mmc1_dat4", "mmc2_dat0", + "gpmc_ad12", "lcd_data19", "mmc1_dat4", "mmc2_dat0", "eqep2a_in", "pr1_mii0_txd2", "pr1_pru0_pru_r30_14", "gpio1_12"), - _AM33XX_MUXENTRY(GPMC_AD13, 0, - "gpmc_ad13", "lcd_data21", "mmc1_dat5", "mmc2_dat1", - NULL, NULL, NULL, "gpio1_13"), - _AM33XX_MUXENTRY(GPMC_AD14, 0, - "gpmc_ad14", "lcd_data22", "mmc1_dat6", "mmc2_dat2", - NULL, NULL, NULL, "gpio1_14"), - _AM33XX_MUXENTRY(GPMC_AD15, 0, - "gpmc_ad15", "lcd_data23", "mmc1_dat7", "mmc2_dat3", - NULL, NULL, NULL, "gpio1_15"), +/**/ _AM33XX_MUXENTRY(GPMC_AD13, 0, + "gpmc_ad13", "lcd_data18", "mmc1_dat5", "mmc2_dat1", + "eqep2B_in", "pr1_mii0_txd", "pr1_pru0_pru_r30_15", "gpio1_13"), +/**/ _AM33XX_MUXENTRY(GPMC_AD14, 0, + "gpmc_ad14", "lcd_data17", "mmc1_dat6", "mmc2_dat2", + "eqep2_index", "pr1_mii0_txd0", "pr1_pru0_pru_r31_14", "gpio1_14"), +/**/ _AM33XX_MUXENTRY(GPMC_AD15, 0, + "gpmc_ad15", "lcd_data16", "mmc1_dat7", "mmc2_dat3", + "eqep2_strobe", "pr1_ecap0_ecap_capin_apwm_o", "pr1_pru0_pru_r31_15", "gpio1_15"), /**/ _AM33XX_MUXENTRY(GPMC_A0, 0, "gpmc_a0", "gmii2_txen", "rgmii2_tctl", "rmii2_txen", "gpmc_a16", "pr1_mii_mt1_clk", "ehrpwm1_tripzone_input", "gpio1_16"), @@ -154,12 +154,12 @@ static struct omap_mux __initdata am33xx_muxmodes[] = { _AM33XX_MUXENTRY(GPMC_BEN0_CLE, 0, "gpmc_ben0_cle", NULL, NULL, NULL, NULL, NULL, NULL, "gpio2_5"), - _AM33XX_MUXENTRY(LCD_DATA0, 0, - "lcd_data0", "gpmc_a0", NULL, NULL, - NULL, NULL, NULL, "gpio2_6"), - _AM33XX_MUXENTRY(LCD_DATA1, 0, - "lcd_data1", "gpmc_a1", NULL, NULL, - NULL, NULL, NULL, "gpio2_7"), +/**/ _AM33XX_MUXENTRY(LCD_DATA0, 0, + "lcd_data0", "gpmc_a0", "pr1_mii_mt0_clk", "ehrpwm2A", + NULL, "pr1_pru1_pru_r30_0", "pr1_pru1_pru_r31_0", "gpio2_6"), +/**/ _AM33XX_MUXENTRY(LCD_DATA1, 0, + "lcd_data1", "gpmc_a1", "pr1_mii0_txen", "ehrpwm2B", + NULL, "pr1_pru1_pru_r30_1", "pr1_pru1_pru_r31_1", "gpio2_7"), /**/ _AM33XX_MUXENTRY(LCD_DATA2, 0, "lcd_data2", "gpmc_a2", "pr1_mii0_txd3", "ehrpwm2_tripzone_input", NULL, "pr1_pru1_pru_r30_2", "pr1_pru1_pru_r31_2", "gpio2_8"), -- 1.7.7.6