Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93c43f25 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: mux: Do keypad muxing in board-*.c files 



This way we get pin muxing out of plat-omap and can convert H4 to use the
new mux functions.

Note that it should be safe to assume we can mux all the keypad pins
except on H4 which may have Menelaus connected.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 0d600ff6

arch/arm/mach-omap1/board-fsample.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -292,6 +292,18 @@ static void __init omap_fsample_init(void) 
	omap_cfg_reg(L3_1610_FLASH_CS2B_OE);

	omap_cfg_reg(L3_1610_FLASH_CS2B_OE);

	omap_cfg_reg(M8_1610_FLASH_CS2B_WE);

	omap_cfg_reg(M8_1610_FLASH_CS2B_WE);





	/* Mux pins for keypad */

	omap_cfg_reg(E2_7XX_KBR0);

	omap_cfg_reg(J7_7XX_KBR1);

	omap_cfg_reg(E1_7XX_KBR2);

	omap_cfg_reg(F3_7XX_KBR3);

	omap_cfg_reg(D2_7XX_KBR4);

	omap_cfg_reg(C2_7XX_KBC0);

	omap_cfg_reg(D3_7XX_KBC1);

	omap_cfg_reg(E4_7XX_KBC2);

	omap_cfg_reg(F4_7XX_KBC3);

	omap_cfg_reg(E3_7XX_KBC4);



	platform_add_devices(devices, ARRAY_SIZE(devices));

	platform_add_devices(devices, ARRAY_SIZE(devices));





	omap_board_config = fsample_config;

	omap_board_config = fsample_config;

arch/arm/mach-omap1/board-h2.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -437,6 +437,19 @@ static void __init h2_init(void) 
	/* omap_cfg_reg(U19_ARMIO1); */		/* CD */

	/* omap_cfg_reg(U19_ARMIO1); */		/* CD */

	omap_cfg_reg(BALLOUT_V8_ARMIO3);	/* WP */

	omap_cfg_reg(BALLOUT_V8_ARMIO3);	/* WP */





	/* Mux pins for keypad */

	omap_cfg_reg(F18_1610_KBC0);

	omap_cfg_reg(D20_1610_KBC1);

	omap_cfg_reg(D19_1610_KBC2);

	omap_cfg_reg(E18_1610_KBC3);

	omap_cfg_reg(C21_1610_KBC4);

	omap_cfg_reg(G18_1610_KBR0);

	omap_cfg_reg(F19_1610_KBR1);

	omap_cfg_reg(H14_1610_KBR2);

	omap_cfg_reg(E20_1610_KBR3);

	omap_cfg_reg(E19_1610_KBR4);

	omap_cfg_reg(N19_1610_KBR5);



	/* Irda */

	/* Irda */

#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)

#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)

	omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);

	omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);

arch/arm/mach-omap1/board-h3.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -397,6 +397,19 @@ static void __init h3_init(void) 
	/* GPIO10 pullup/down register, Enable pullup on GPIO10 */

	/* GPIO10 pullup/down register, Enable pullup on GPIO10 */

	omap_cfg_reg(V2_1710_GPIO10);

	omap_cfg_reg(V2_1710_GPIO10);





	/* Mux pins for keypad */

	omap_cfg_reg(F18_1610_KBC0);

	omap_cfg_reg(D20_1610_KBC1);

	omap_cfg_reg(D19_1610_KBC2);

	omap_cfg_reg(E18_1610_KBC3);

	omap_cfg_reg(C21_1610_KBC4);

	omap_cfg_reg(G18_1610_KBR0);

	omap_cfg_reg(F19_1610_KBR1);

	omap_cfg_reg(H14_1610_KBR2);

	omap_cfg_reg(E20_1610_KBR3);

	omap_cfg_reg(E19_1610_KBR4);

	omap_cfg_reg(N19_1610_KBR5);



	platform_add_devices(devices, ARRAY_SIZE(devices));

	platform_add_devices(devices, ARRAY_SIZE(devices));

	spi_register_board_info(h3_spi_board_info,

	spi_register_board_info(h3_spi_board_info,

				ARRAY_SIZE(h3_spi_board_info));

				ARRAY_SIZE(h3_spi_board_info));

arch/arm/mach-omap1/board-perseus2.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -260,6 +260,18 @@ static void __init omap_perseus2_init(void) 
	omap_cfg_reg(L3_1610_FLASH_CS2B_OE);

	omap_cfg_reg(L3_1610_FLASH_CS2B_OE);

	omap_cfg_reg(M8_1610_FLASH_CS2B_WE);

	omap_cfg_reg(M8_1610_FLASH_CS2B_WE);





	/* Mux pins for keypad */

	omap_cfg_reg(E2_7XX_KBR0);

	omap_cfg_reg(J7_7XX_KBR1);

	omap_cfg_reg(E1_7XX_KBR2);

	omap_cfg_reg(F3_7XX_KBR3);

	omap_cfg_reg(D2_7XX_KBR4);

	omap_cfg_reg(C2_7XX_KBC0);

	omap_cfg_reg(D3_7XX_KBC1);

	omap_cfg_reg(E4_7XX_KBC2);

	omap_cfg_reg(F4_7XX_KBC3);

	omap_cfg_reg(E3_7XX_KBC4);



	platform_add_devices(devices, ARRAY_SIZE(devices));

	platform_add_devices(devices, ARRAY_SIZE(devices));





	omap_board_config = perseus2_config;

	omap_board_config = perseus2_config;

arch/arm/mach-omap2/board-h4.c

+17 −0
Original line number Original line Diff line number Diff line
@@ -363,11 +363,28 @@ static void __init omap_h4_init(void) 
#endif

#endif





#if defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE)

#if defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE)

	omap_mux_init_gpio(88, OMAP_PULL_ENA | OMAP_PULL_UP);

	omap_mux_init_gpio(89, OMAP_PULL_ENA | OMAP_PULL_UP);

	omap_mux_init_gpio(124, OMAP_PULL_ENA | OMAP_PULL_UP);

	omap_mux_init_signal("mcbsp2_dr.gpio_11", OMAP_PULL_ENA | OMAP_PULL_UP);

	if (omap_has_menelaus()) {

	if (omap_has_menelaus()) {

		omap_mux_init_signal("sdrc_a14.gpio0",

			OMAP_PULL_ENA | OMAP_PULL_UP);

		omap_mux_init_signal("vlynq_rx0.gpio_15", 0);

		omap_mux_init_signal("gpio_98", 0);

		row_gpios[5] = 0;

		row_gpios[5] = 0;

		col_gpios[2] = 15;

		col_gpios[2] = 15;

		col_gpios[6] = 18;

		col_gpios[6] = 18;

	} else {

		omap_mux_init_signal("gpio_96", OMAP_PULL_ENA | OMAP_PULL_UP);

		omap_mux_init_signal("gpio_100", 0);

		omap_mux_init_signal("gpio_98", 0);

	}

	}

	omap_mux_init_signal("gpio_90", 0);

	omap_mux_init_signal("gpio_91", 0);

	omap_mux_init_signal("gpio_36", 0);

	omap_mux_init_signal("mcbsp2_clkx.gpio_12", 0);

	omap_mux_init_signal("gpio_97", 0);

#endif

#endif





	i2c_register_board_info(1, h4_i2c_board_info,

	i2c_register_board_info(1, h4_i2c_board_info,