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

Commit 7bce696b authored by Stephen Boyd's avatar Stephen Boyd Committed by David Brown
Browse files

gpio: Make gpio-msm-v1 into a platform driver 



Doing this removes the dependence of this driver on the
msm_iomap.h and cpu.h mach include headers provied by MSM. This
is necessary to support single zImage work in the future and
allows us to remove cpu.h entirely and brings us closer to
removing msm_iomap.h.

Cc: Grant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Tested-by: default avatarRohit Vaswani <rvaswani@codeaurora.org>
Acked-by: default avatarRohit Vaswani <rvaswani@codeaurora.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 805b3e42

arch/arm/mach-msm/board-halibut.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static struct platform_device smc91x_device = { 
};



static struct platform_device *devices[] __initdata = {

	&msm_device_gpio_7201,

	&msm_device_uart3,

	&msm_device_smd,

	&msm_device_nand,

arch/arm/mach-msm/board-msm7x30.c

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS] = { 
};



static struct platform_device *devices[] __initdata = {

	&msm_device_gpio_7x30,

#if defined(CONFIG_SERIAL_MSM) || defined(CONFIG_MSM_SERIAL_DEBUGGER)

        &msm_device_uart2,

#endif

arch/arm/mach-msm/board-qsd8x50.c

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static struct msm_otg_platform_data msm_otg_pdata = { 
};



static struct platform_device *devices[] __initdata = {

	&msm_device_gpio_8x50,

	&msm_device_uart3,

	&msm_device_smd,

	&msm_device_otg,

arch/arm/mach-msm/board-trout.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
extern int trout_init_mmc(unsigned int);



static struct platform_device *devices[] __initdata = {

	&msm_device_gpio_7201,

	&msm_device_uart3,

	&msm_device_smd,

	&msm_device_nand,

arch/arm/mach-msm/devices-msm7x00.c

+31 −0
Original line number Diff line number Diff line
@@ -29,6 +29,37 @@ 
#include "clock-pcom.h"

#include <linux/platform_data/mmc-msm_sdcc.h>



static struct resource msm_gpio_resources[] = {

	{

		.start	= 32 + 0,

		.end	= 32 + 0,

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= 32 + 1,

		.end	= 32 + 1,

		.flags	= IORESOURCE_IRQ,

	},

	{

		.start	= 0xa9200800,

		.end	= 0xa9200800 + SZ_4K - 1,

		.flags	= IORESOURCE_MEM,

		.name  = "gpio1"

	},

	{

		.start	= 0xa9300C00,

		.end	= 0xa9300C00 + SZ_4K - 1,

		.flags	= IORESOURCE_MEM,

		.name  = "gpio2"

	},

};



struct platform_device msm_device_gpio_7201 = {

	.name	= "gpio-msm-7201",

	.num_resources	= ARRAY_SIZE(msm_gpio_resources),

	.resource	= msm_gpio_resources,

};



static struct resource resources_uart1[] = {

	{

		.start	= INT_UART1,