]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - sitara-epos/sitara-epos-kernel.git/commitdiff
arm:omap:am335x:remove duplicated code in mux file
authorPatil, Rachna <rachna@ti.com>
Wed, 25 Jan 2012 06:20:01 +0000 (11:50 +0530)
committerPatil, Rachna <rachna@ti.com>
Wed, 25 Jan 2012 06:20:01 +0000 (11:50 +0530)
GPMC_CLK was declared twice, corrected the same

Signed-off-by: Patil, Rachna <rachna@ti.com>
arch/arm/mach-omap2/mux33xx.c

index d473780a17f420995c269cb988d172fdc44c8d7c..7bd50038cc828c01e12899a3f522602df828cf7e 100644 (file)
@@ -135,7 +135,7 @@ static struct omap_mux __initdata am33xx_muxmodes[] = {
                "gpmc_csn3", NULL, NULL, "mmc2_cmd",
                NULL, NULL, NULL, "gpio2_0"),
        _AM33XX_MUXENTRY(GPMC_CLK, 0,
-               "gpmc_clk", NULL, NULL, "mmc2_clk",
+               "gpmc_clk", "lcd_memory_clk_mux", NULL, "mmc2_clk",
                NULL, NULL, "mcasp0_fsr", "gpio2_1"),
        _AM33XX_MUXENTRY(GPMC_ADVN_ALE, 0,
                "gpmc_advn_ale", NULL, NULL, NULL,
@@ -209,9 +209,6 @@ static struct omap_mux __initdata am33xx_muxmodes[] = {
        _AM33XX_MUXENTRY(LCD_AC_BIAS_EN, 0,
                "lcd_ac_bias_en", NULL, NULL, NULL,
                NULL, NULL, NULL, "gpio2_25"),
-       _AM33XX_MUXENTRY(GPMC_CLK, 0,
-               "gpmc_clk", "lcd_memory_clk_mux", NULL, NULL,
-               NULL, NULL, NULL, NULL),
        _AM33XX_MUXENTRY(MMC0_DAT3, 0,
                "mmc0_dat3", NULL, NULL, NULL,
                NULL, NULL, NULL, "gpio2_26"),