diff options
| author | Paul Walmsley <paul@pwsan.com> | 2008-10-06 15:49:17 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-10-06 15:49:17 +0300 |
| commit | fd1dc87ded0f29c1ba1e8da62f03ab0d591d9bdd (patch) | |
| tree | 97829327b6ebcd947f9a1c71a4bcb2933688bac7 /arch/arm/plat-omap | |
| parent | 2351872c44be50c27001bbfa91d6e14e3cee8b88 (diff) | |
| download | kernel_samsung_smdk4412-fd1dc87ded0f29c1ba1e8da62f03ab0d591d9bdd.zip kernel_samsung_smdk4412-fd1dc87ded0f29c1ba1e8da62f03ab0d591d9bdd.tar.gz kernel_samsung_smdk4412-fd1dc87ded0f29c1ba1e8da62f03ab0d591d9bdd.tar.bz2 | |
ARM: OMAP2: Fix sparse, checkpatch warnings fro GPMC code, use ioremap
Fix sparse, checkpatch warnings fro GPMC code.
Also change to use ioremap, and add missing function prototypes
to gpmc.h.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/gpmc.h | 5 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/mach/omap24xx.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/mach/gpmc.h b/arch/arm/plat-omap/include/mach/gpmc.h index 6a8e07f..4258e00 100644 --- a/arch/arm/plat-omap/include/mach/gpmc.h +++ b/arch/arm/plat-omap/include/mach/gpmc.h @@ -11,6 +11,9 @@ #ifndef __OMAP2_GPMC_H #define __OMAP2_GPMC_H +/* Maximum Number of Chip Selects */ +#define GPMC_CS_NUM 8 + #define GPMC_CS_CONFIG1 0x00 #define GPMC_CS_CONFIG2 0x04 #define GPMC_CS_CONFIG3 0x08 @@ -81,6 +84,7 @@ struct gpmc_timings { }; extern unsigned int gpmc_ns_to_ticks(unsigned int time_ns); +extern unsigned int gpmc_ticks_to_ns(unsigned int ticks); extern unsigned int gpmc_round_ns_to_ticks(unsigned int time_ns); extern unsigned long gpmc_get_fclk_period(void); @@ -92,5 +96,6 @@ extern int gpmc_cs_request(int cs, unsigned long size, unsigned long *base); extern void gpmc_cs_free(int cs); extern int gpmc_cs_set_reserved(int cs, int reserved); extern int gpmc_cs_reserved(int cs); +extern void gpmc_init(void); #endif diff --git a/arch/arm/plat-omap/include/mach/omap24xx.h b/arch/arm/plat-omap/include/mach/omap24xx.h index bb8319d..556f0eb 100644 --- a/arch/arm/plat-omap/include/mach/omap24xx.h +++ b/arch/arm/plat-omap/include/mach/omap24xx.h @@ -48,6 +48,7 @@ #define OMAP2420_PRM_BASE OMAP2420_CM_BASE #define OMAP2420_SDRC_BASE (L3_24XX_BASE + 0x9000) #define OMAP2420_SMS_BASE 0x68008000 +#define OMAP2420_GPMC_BASE 0x6800a000 #define OMAP2430_32KSYNCT_BASE (L4_WK_243X_BASE + 0x20000) #define OMAP2430_PRCM_BASE (L4_WK_243X_BASE + 0x6000) |