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

Commit 5ed3ebe3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'msm-cleanup-3.10' of... 

Merge tag 'msm-cleanup-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup

From David Brown:
Cleanups for MSM for 3.10

These are some patches for various parts of MSM that gradually bring
us closer to being part of single zimage.

* tag 'msm-cleanup-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm

:
  ARM: msm: Remove unused cpu.h header file
  gpio: Make gpio-msm-v1 into a platform driver
  mmc: msm_sdcc: Remove unnecessary include
  ARM: msm: Move dma.h #defines that are private to dma.c

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b9d5868e 641f7169

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,