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

Commit 4896e394 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap: mux: Replace omap_cfg_reg() with new style signal or gpio functions 



Replace omap_cfg_reg() with new style signal or gpio functions

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

arch/arm/mach-omap2/board-3430sdp.c

+3 −1
Original line number Diff line number Diff line
@@ -626,7 +626,9 @@ static inline void board_smc91x_init(void) 


static void enable_board_wakeup_source(void)

{

	omap_cfg_reg(AF26_34XX_SYS_NIRQ); /* T2 interrupt line (keypad) */

	/* T2 interrupt line (keypad) */

	omap_mux_init_signal("sys_nirq",

		OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP);

}



static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {

arch/arm/mach-omap2/board-3630sdp.c

+4 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include <mach/board-zoom.h>



#include "mux.h"

#include "sdram-hynix-h8mbx00u0mer-0em.h"



#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
@@ -48,7 +49,9 @@ static inline void board_smc91x_init(void) 


static void enable_board_wakeup_source(void)

{

	omap_cfg_reg(AF26_34XX_SYS_NIRQ); /* T2 interrupt line (keypad) */

	/* T2 interrupt line (keypad) */

	omap_mux_init_signal("sys_nirq",

		OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP);

}



static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {

arch/arm/mach-omap2/board-cm-t35.c

+2 −1
Original line number Diff line number Diff line
@@ -503,7 +503,8 @@ static void __init cm_t35_init(void) 


	usb_musb_init();



	omap_cfg_reg(AF26_34XX_SYS_NIRQ);

	omap_mux_init_signal("sys_nirq",

		OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP);

}



MACHINE_START(CM_T35, "Compulab CM-T35")

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

+5 −5
Original line number Diff line number Diff line
@@ -141,10 +141,10 @@ static int beagle_twl_gpio_setup(struct device *dev, 
		unsigned gpio, unsigned ngpio)

{

	if (system_rev >= 0x20 && system_rev <= 0x34301000) {

		omap_cfg_reg(AG9_34XX_GPIO23);

		omap_mux_init_gpio(23, OMAP_PIN_INPUT);

		mmc[0].gpio_wp = 23;

	} else {

		omap_cfg_reg(AH8_34XX_GPIO29);

		omap_mux_init_gpio(29, OMAP_PIN_INPUT);

	}

	/* gpio + 0 is "mmc0_cd" (input/IRQ) */

	mmc[0].gpio_cd = gpio + 0;
@@ -439,7 +439,7 @@ static void __init omap3_beagle_init(void) 
			ARRAY_SIZE(omap3_beagle_devices));

	omap_serial_init();



	omap_cfg_reg(J25_34XX_GPIO170);

	omap_mux_init_gpio(170, OMAP_PIN_INPUT);

	gpio_request(170, "DVI_nPD");

	/* REVISIT leave DVI powered down until it's needed ... */

	gpio_direction_output(170, true);
@@ -449,8 +449,8 @@ static void __init omap3_beagle_init(void) 
	omap3beagle_flash_init();



	/* Ensure SDRC pins are mux'd for self-refresh */

	omap_cfg_reg(H16_34XX_SDRC_CKE0);

	omap_cfg_reg(H17_34XX_SDRC_CKE1);

	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);

	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);

}



static void __init omap3_beagle_map_io(void)

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

+5 −5
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static int omap3evm_twl_gpio_setup(struct device *dev, 
		unsigned gpio, unsigned ngpio)

{

	/* gpio + 0 is "mmc0_cd" (input/IRQ) */

	omap_cfg_reg(L8_34XX_GPIO63);

	omap_mux_init_gpio(63, OMAP_PIN_INPUT);

	mmc[0].gpio_cd = gpio + 0;

	twl4030_mmc_init(mmc);
@@ -450,24 +450,24 @@ static void __init omap3_evm_init(void) 
#endif

	if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) {

		/* enable EHCI VBUS using GPIO22 */

		omap_cfg_reg(AF9_34XX_GPIO22);

		omap_mux_init_gpio(22, OMAP_PIN_INPUT_PULLUP);

		gpio_request(OMAP3_EVM_EHCI_VBUS, "enable EHCI VBUS");

		gpio_direction_output(OMAP3_EVM_EHCI_VBUS, 0);

		gpio_set_value(OMAP3_EVM_EHCI_VBUS, 1);



		/* Select EHCI port on main board */

		omap_cfg_reg(U3_34XX_GPIO61);

		omap_mux_init_gpio(61, OMAP_PIN_INPUT_PULLUP);

		gpio_request(OMAP3_EVM_EHCI_SELECT, "select EHCI port");

		gpio_direction_output(OMAP3_EVM_EHCI_SELECT, 0);

		gpio_set_value(OMAP3_EVM_EHCI_SELECT, 0);



		/* setup EHCI phy reset config */

		omap_cfg_reg(AH14_34XX_GPIO21);

		omap_mux_init_gpio(21, OMAP_PIN_INPUT_PULLUP);

		ehci_pdata.reset_gpio_port[1] = 21;



	} else {

		/* setup EHCI phy reset on MDC */

		omap_cfg_reg(AF4_34XX_GPIO135_OUT);

		omap_mux_init_gpio(135, OMAP_PIN_OUTPUT);

		ehci_pdata.reset_gpio_port[1] = 135;

	}

	usb_musb_init();