diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-02-21 13:00:21 -0600 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 14:53:44 -0500 |
| commit | 3a544354d5b6e97459ba9c15e9d89dac60023553 (patch) | |
| tree | f5c7abe6a0751abf79b9b1a4140c296662c76cd6 /arch/arm/mach-omap2/gpmc.h | |
| parent | 012e338625f5ea58d2a16cf98a44779255b458ca (diff) | |
| download | blackbird-op-linux-3a544354d5b6e97459ba9c15e9d89dac60023553.tar.gz blackbird-op-linux-3a544354d5b6e97459ba9c15e9d89dac60023553.zip | |
ARM: OMAP2+: Don't configure of chip-select options in gpmc_cs_configure()
With the addition of the gpmc_cs_program_settings(), we no longer need
or use gpmc_cs_configure() to configure some of the GPMC chip-select
options. So rename the function to gpmc_configure() and remove code that
modifies options in the CONFIG1 register.
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Diffstat (limited to 'arch/arm/mach-omap2/gpmc.h')
| -rw-r--r-- | arch/arm/mach-omap2/gpmc.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/gpmc.h b/arch/arm/mach-omap2/gpmc.h index ce6ae218f41f..87d2a226a3ba 100644 --- a/arch/arm/mach-omap2/gpmc.h +++ b/arch/arm/mach-omap2/gpmc.h @@ -59,9 +59,6 @@ #define GPMC_CONFIG1_DEVICETYPE(val) ((val & 3) << 10) #define GPMC_CONFIG1_DEVICETYPE_NOR GPMC_CONFIG1_DEVICETYPE(0) #define GPMC_CONFIG1_MUXTYPE(val) ((val & 3) << 8) -#define GPMC_CONFIG1_MUXNONMUX GPMC_CONFIG1_MUXTYPE(0) -#define GPMC_CONFIG1_MUXAAD GPMC_CONFIG1_MUXTYPE(GPMC_MUX_AAD) -#define GPMC_CONFIG1_MUXADDDATA GPMC_CONFIG1_MUXTYPE(GPMC_MUX_AD) #define GPMC_CONFIG1_TIME_PARA_GRAN (1 << 4) #define GPMC_CONFIG1_FCLK_DIV(val) (val & 3) #define GPMC_CONFIG1_FCLK_DIV2 (GPMC_CONFIG1_FCLK_DIV(1)) @@ -227,6 +224,6 @@ extern int gpmc_cs_request(int cs, unsigned long size, unsigned long *base); extern void gpmc_cs_free(int cs); extern void omap3_gpmc_save_context(void); extern void omap3_gpmc_restore_context(void); -extern int gpmc_cs_configure(int cs, int cmd, int wval); +extern int gpmc_configure(int cmd, int wval); #endif |
