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

Commit e59a7943 authored Jul 07, 2011 by Sascha Hauer

Merge remote-tracking branch 'grant/gpio/next-mx' into devel-features



Conflicts:
	arch/arm/mach-imx/mach-mx31_3ds.c
	arch/arm/mach-imx/mach-scb9328.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

parents fad10708 2ce420da

arch/arm/mach-imx/mach-apf9328.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,8 @@ static struct platform_device *devices[] __initdata = {

		static void __init apf9328_init(void)
		{
		imx1_soc_init();

		mxc_gpio_setup_multiple_pins(apf9328_pins,
		ARRAY_SIZE(apf9328_pins),
		"APF9328");

arch/arm/mach-imx/mach-armadillo5x0.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -490,6 +490,8 @@ static struct platform_device *devices[] __initdata = {
		*/
		static void __init armadillo5x0_init(void)
		{
		imx31_soc_init();

		mxc_iomux_setup_multiple_pins(armadillo5x0_pins,
		ARRAY_SIZE(armadillo5x0_pins), "armadillo5x0");

arch/arm/mach-imx/mach-bug.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,8 @@ static const unsigned int bug_pins[] __initconst = {

		static void __init bug_board_init(void)
		{
		imx31_soc_init();

		mxc_iomux_setup_multiple_pins(bug_pins,
		ARRAY_SIZE(bug_pins), "uart-4");
		imx31_add_imx_uart4(&uart_pdata);

arch/arm/mach-imx/mach-cpuimx27.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -250,6 +250,8 @@ __setup("otg_mode=", eukrea_cpuimx27_otg_mode);

		static void __init eukrea_cpuimx27_init(void)
		{
		imx27_soc_init();

		mxc_gpio_setup_multiple_pins(eukrea_cpuimx27_pins,
		ARRAY_SIZE(eukrea_cpuimx27_pins), "CPUIMX27");

arch/arm/mach-imx/mach-cpuimx35.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,8 @@ __setup("otg_mode=", eukrea_cpuimx35_otg_mode);
		*/
		static void __init eukrea_cpuimx35_init(void)
		{
		imx35_soc_init();

		mxc_iomux_v3_setup_multiple_pads(eukrea_cpuimx35_pads,
		ARRAY_SIZE(eukrea_cpuimx35_pads));