Commit 0088903287aa1a7e49a64e83b9e5d4f08aedec69
Committed by
Hebbar, Gururaja
1 parent
c51243440a
Exists in
master
arm:omap:am335x: Correct KeyPad GPIO numbers
This patch corrects keypwr1 pinmux to gpmc_a6.gpio1_22 Signed-off-by: Goutam Kumar <goutam.kumar@ti.com> Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff
arch/arm/mach-omap2/board-am335xevm.c
... | ... | @@ -609,7 +609,7 @@ |
609 | 609 | /* pinmux for keypad device */ |
610 | 610 | static struct pinmux_config matrix_keypad_pin_mux[] = { |
611 | 611 | {"gpmc_a5.gpio1_21", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT}, |
612 | - {"gpmc_a8.gpio1_24", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT}, | |
612 | + {"gpmc_a8.gpio1_22", OMAP_MUX_MODE7 | AM33XX_PIN_OUTPUT}, | |
613 | 613 | {"gpmc_a9.gpio1_25", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, |
614 | 614 | {"gpmc_a10.gpio1_26", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, |
615 | 615 | {"gpmc_a11.gpio1_27", OMAP_MUX_MODE7 | AM33XX_PIN_INPUT}, |
... | ... | @@ -637,7 +637,7 @@ |
637 | 637 | }; |
638 | 638 | |
639 | 639 | static const unsigned int am335x_evm_keypad_col_gpios[] = { |
640 | - GPIO_TO_PIN(1, 21), GPIO_TO_PIN(1, 24) | |
640 | + GPIO_TO_PIN(1, 21), GPIO_TO_PIN(1, 22) | |
641 | 641 | }; |
642 | 642 | |
643 | 643 | static struct matrix_keypad_platform_data am335x_evm_keypad_platform_data = { |
arch/arm/mach-omap2/mux33xx.c
... | ... | @@ -97,7 +97,7 @@ |
97 | 97 | "gpmc_a21", NULL, NULL, "gpio1_21"), |
98 | 98 | _AM33XX_MUXENTRY(GPMC_A6, 0, |
99 | 99 | "gpmc_a6", "mii2_txclk", "rgmii2_tclk", "mmc2_dat4", |
100 | - "gpmc_a22", NULL, NULL, NULL), | |
100 | + "gpmc_a22", NULL, NULL, "gpio1_22"), | |
101 | 101 | _AM33XX_MUXENTRY(GPMC_A7, 0, |
102 | 102 | "gpmc_a7", "mii2_rxclk", "rgmii2_rclk", "mmc2_dat5", |
103 | 103 | NULL, NULL, NULL, NULL), |