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

Commit 8c31b163 authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'gpio/next-mx' into gpio/next

parents 121a2dd8 2ce420da

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Sneaky Weasel



# *DOCUMENTATION*

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

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,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");