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

Commit 60172215 authored by Qiao Zhou's avatar Qiao Zhou Committed by Mark Brown
Browse files

ARM: MMP: add pxa910-ssp into ssp_id_table 



add pxa910-ssp into ssp_id_table, and fix pxa-ssp compiling issue
under mach-mmp architect.

Signed-off-by: default avatarQiao Zhou <zhouqiao@marvell.com>
Acked-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 69c5b753

arch/arm/plat-pxa/ssp.c

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ static const struct platform_device_id ssp_id_table[] = { 
	{ "pxa25x-nssp",	PXA25x_NSSP },

	{ "pxa27x-ssp",		PXA27x_SSP },

	{ "pxa168-ssp",		PXA168_SSP },

	{ "pxa910-ssp",		PXA910_SSP },

	{ },

};

include/linux/pxa2xx_ssp.h

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ enum pxa_ssp_type { 
	PXA25x_NSSP, /* pxa 255, 26x (including ASSP) */

	PXA27x_SSP,

	PXA168_SSP,

	PXA910_SSP,

	CE4100_SSP,

};

include/linux/spi/pxa2xx_spi.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct pxa2xx_spi_chip { 
	void (*cs_control)(u32 command);

};



#ifdef CONFIG_ARCH_PXA

#if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP)



#include <linux/clk.h>

#include <mach/dma.h>