diff options
author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2009-10-13 03:24:55 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2009-11-30 20:02:43 -0500 |
commit | a0f266c1fa040e1fe61b51e3de75b6a11e32ceb1 (patch) | |
tree | 0e8c5576e3c6926c874d2960bc1b1e4dd31c5e41 /arch/arm/mach-mmp/include | |
parent | 82b95ecb96122896fd5b7b75001fdda3e047ef38 (diff) |
[ARM] pxa: add nand device and clock for pxa168/pxa910
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-mmp/include')
-rw-r--r-- | arch/arm/mach-mmp/include/mach/pxa168.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-mmp/include/mach/pxa910.h | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/include/mach/pxa168.h b/arch/arm/mach-mmp/include/mach/pxa168.h index 6bf1f0eefcd1..3ad612cbdf09 100644 --- a/arch/arm/mach-mmp/include/mach/pxa168.h +++ b/arch/arm/mach-mmp/include/mach/pxa168.h | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <linux/i2c.h> | 4 | #include <linux/i2c.h> |
5 | #include <mach/devices.h> | 5 | #include <mach/devices.h> |
6 | #include <plat/i2c.h> | 6 | #include <plat/i2c.h> |
7 | #include <plat/pxa3xx_nand.h> | ||
7 | 8 | ||
8 | extern struct pxa_device_desc pxa168_device_uart1; | 9 | extern struct pxa_device_desc pxa168_device_uart1; |
9 | extern struct pxa_device_desc pxa168_device_uart2; | 10 | extern struct pxa_device_desc pxa168_device_uart2; |
@@ -13,6 +14,7 @@ extern struct pxa_device_desc pxa168_device_pwm1; | |||
13 | extern struct pxa_device_desc pxa168_device_pwm2; | 14 | extern struct pxa_device_desc pxa168_device_pwm2; |
14 | extern struct pxa_device_desc pxa168_device_pwm3; | 15 | extern struct pxa_device_desc pxa168_device_pwm3; |
15 | extern struct pxa_device_desc pxa168_device_pwm4; | 16 | extern struct pxa_device_desc pxa168_device_pwm4; |
17 | extern struct pxa_device_desc pxa168_device_nand; | ||
16 | 18 | ||
17 | static inline int pxa168_add_uart(int id) | 19 | static inline int pxa168_add_uart(int id) |
18 | { | 20 | { |
@@ -64,4 +66,9 @@ static inline int pxa168_add_pwm(int id) | |||
64 | 66 | ||
65 | return pxa_register_device(d, NULL, 0); | 67 | return pxa_register_device(d, NULL, 0); |
66 | } | 68 | } |
69 | |||
70 | static inline int pxa168_add_nand(struct pxa3xx_nand_platform_data *info) | ||
71 | { | ||
72 | return pxa_register_device(&pxa168_device_nand, info, sizeof(*info)); | ||
73 | } | ||
67 | #endif /* __ASM_MACH_PXA168_H */ | 74 | #endif /* __ASM_MACH_PXA168_H */ |
diff --git a/arch/arm/mach-mmp/include/mach/pxa910.h b/arch/arm/mach-mmp/include/mach/pxa910.h index 6ae1ed7a0a9f..4f0b4ec6f5d0 100644 --- a/arch/arm/mach-mmp/include/mach/pxa910.h +++ b/arch/arm/mach-mmp/include/mach/pxa910.h | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <linux/i2c.h> | 4 | #include <linux/i2c.h> |
5 | #include <mach/devices.h> | 5 | #include <mach/devices.h> |
6 | #include <plat/i2c.h> | 6 | #include <plat/i2c.h> |
7 | #include <plat/pxa3xx_nand.h> | ||
7 | 8 | ||
8 | extern struct pxa_device_desc pxa910_device_uart1; | 9 | extern struct pxa_device_desc pxa910_device_uart1; |
9 | extern struct pxa_device_desc pxa910_device_uart2; | 10 | extern struct pxa_device_desc pxa910_device_uart2; |
@@ -13,6 +14,7 @@ extern struct pxa_device_desc pxa910_device_pwm1; | |||
13 | extern struct pxa_device_desc pxa910_device_pwm2; | 14 | extern struct pxa_device_desc pxa910_device_pwm2; |
14 | extern struct pxa_device_desc pxa910_device_pwm3; | 15 | extern struct pxa_device_desc pxa910_device_pwm3; |
15 | extern struct pxa_device_desc pxa910_device_pwm4; | 16 | extern struct pxa_device_desc pxa910_device_pwm4; |
17 | extern struct pxa_device_desc pxa910_device_nand; | ||
16 | 18 | ||
17 | static inline int pxa910_add_uart(int id) | 19 | static inline int pxa910_add_uart(int id) |
18 | { | 20 | { |
@@ -64,4 +66,9 @@ static inline int pxa910_add_pwm(int id) | |||
64 | 66 | ||
65 | return pxa_register_device(d, NULL, 0); | 67 | return pxa_register_device(d, NULL, 0); |
66 | } | 68 | } |
69 | |||
70 | static inline int pxa910_add_nand(struct pxa3xx_nand_platform_data *info) | ||
71 | { | ||
72 | return pxa_register_device(&pxa910_device_nand, info, sizeof(*info)); | ||
73 | } | ||
67 | #endif /* __ASM_MACH_PXA910_H */ | 74 | #endif /* __ASM_MACH_PXA910_H */ |