diff options
author | Qiao Zhou <zhouqiao@marvell.com> | 2012-06-03 22:41:03 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-11 00:25:50 -0400 |
commit | 601722157b3f6be73623644eeae6f14940f0bd8f (patch) | |
tree | e927c9e5571795a8f99abf623c4c84805f39b892 /include/linux | |
parent | 69c5b7530651c8e375d2fbecd157a9a9a20c4cc9 (diff) |
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: Qiao Zhou <zhouqiao@marvell.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/pxa2xx_ssp.h | 1 | ||||
-rw-r--r-- | include/linux/spi/pxa2xx_spi.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h index 44835fb39793..f9fe15ec2b51 100644 --- a/include/linux/pxa2xx_ssp.h +++ b/include/linux/pxa2xx_ssp.h | |||
@@ -161,6 +161,7 @@ enum pxa_ssp_type { | |||
161 | PXA25x_NSSP, /* pxa 255, 26x (including ASSP) */ | 161 | PXA25x_NSSP, /* pxa 255, 26x (including ASSP) */ |
162 | PXA27x_SSP, | 162 | PXA27x_SSP, |
163 | PXA168_SSP, | 163 | PXA168_SSP, |
164 | PXA910_SSP, | ||
164 | CE4100_SSP, | 165 | CE4100_SSP, |
165 | }; | 166 | }; |
166 | 167 | ||
diff --git a/include/linux/spi/pxa2xx_spi.h b/include/linux/spi/pxa2xx_spi.h index d3e1075f7b60..c73d1445c77e 100644 --- a/include/linux/spi/pxa2xx_spi.h +++ b/include/linux/spi/pxa2xx_spi.h | |||
@@ -43,7 +43,7 @@ struct pxa2xx_spi_chip { | |||
43 | void (*cs_control)(u32 command); | 43 | void (*cs_control)(u32 command); |
44 | }; | 44 | }; |
45 | 45 | ||
46 | #ifdef CONFIG_ARCH_PXA | 46 | #if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP) |
47 | 47 | ||
48 | #include <linux/clk.h> | 48 | #include <linux/clk.h> |
49 | #include <mach/dma.h> | 49 | #include <mach/dma.h> |