V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

armv7: make gpmc_cfg const 

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
[trini: Adapt am33xx, duovero, omap_zoom1]
Signed-off-by: Tom Rini <trini@konsulko.com>

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Ladislav Michl 2016-07-12 20:28:16 +02:00 committed by Tom Rini
parent b1509e3a4a
commit 0568dd0663
7 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/cpu/armv7/omap-common/mem-common.c
View File

@ -21,7 +21,7 @@
#include <command.h> #include <command.h>
#include <linux/mtd/omap_gpmc.h> #include <linux/mtd/omap_gpmc.h>
struct gpmc *gpmc_cfg; const struct gpmc *gpmc_cfg = (struct gpmc *)GPMC_BASE;
#if defined(CONFIG_OMAP34XX) #if defined(CONFIG_OMAP34XX)
/******************************************************** /********************************************************
@ -50,8 +50,8 @@ u32 mem_ok(u32 cs)
} }
#endif #endif
void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base, void enable_gpmc_cs_config(const u32 *gpmc_config, const struct gpmc_cs *cs,
u32 size) u32 base, u32 size)
{ {
writel(0, &cs->config7); writel(0, &cs->config7);
sdelay(1000); sdelay(1000);
@ -75,8 +75,6 @@ void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
*****************************************************/ *****************************************************/
void gpmc_init(void) void gpmc_init(void)
{ {
/* putting a blanket check on GPMC based on ZeBu for now */
gpmc_cfg = (struct gpmc *)GPMC_BASE;
#if defined(CONFIG_NOR) #if defined(CONFIG_NOR)
/* configure GPMC for NOR */ /* configure GPMC for NOR */
const u32 gpmc_regs[GPMC_MAX_REG] = { STNOR_GPMC_CONFIG1, const u32 gpmc_regs[GPMC_MAX_REG] = { STNOR_GPMC_CONFIG1,

3
arch/arm/include/asm/arch-am33xx/sys_proto.h
View File

@ -25,9 +25,8 @@ void ddr_pll_config(unsigned int ddrpll_M);
void sdelay(unsigned long); void sdelay(unsigned long);
struct gpmc_cs;
void gpmc_init(void); void gpmc_init(void);
void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base, void enable_gpmc_cs_config(const u32 *gpmc_config, const struct gpmc_cs *cs, u32 base,
u32 size); u32 size);
void omap_nand_switch_ecc(uint32_t, uint32_t); void omap_nand_switch_ecc(uint32_t, uint32_t);

4
arch/arm/include/asm/arch-omap3/sys_proto.h
View File

@ -43,8 +43,8 @@ void get_board_mem_timings(struct board_sdrc_timings *timings);
int identify_nand_chip(int *mfr, int *id); int identify_nand_chip(int *mfr, int *id);
void emif4_init(void); void emif4_init(void);
void gpmc_init(void); void gpmc_init(void);
void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base, void enable_gpmc_cs_config(const u32 *gpmc_config, const struct gpmc_cs *cs,
u32 size); u32 base, u32 size);
void watchdog_init(void); void watchdog_init(void);
void set_muxconf_regs(void); void set_muxconf_regs(void);

2
board/gumstix/duovero/duovero.c
View File

@ -128,7 +128,7 @@ void board_mmc_power_init(void)
#define GPMC_BASEADDR_MASK 0x3F #define GPMC_BASEADDR_MASK 0x3F
#define GPMC_CS_ENABLE 0x1 #define GPMC_CS_ENABLE 0x1
static void enable_gpmc_net_config(const u32 *gpmc_config, struct gpmc_cs *cs, static void enable_gpmc_net_config(const u32 *gpmc_config, const struct gpmc_cs *cs,
u32 base, u32 size) u32 base, u32 size)
{ {
writel(0, &cs->config7); writel(0, &cs->config7);

9
board/logicpd/zoom1/zoom1.c
View File

@ -19,6 +19,7 @@
#include <ns16550.h> #include <ns16550.h>
#include <netdev.h> #include <netdev.h>
#include <twl4030.h> #include <twl4030.h>
#include <linux/mtd/omap_gpmc.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/mem.h> #include <asm/arch/mem.h>
#include <asm/arch/mmc_host_def.h> #include <asm/arch/mmc_host_def.h>
@ -29,10 +30,10 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
/* gpmc_cfg is initialized by gpmc_init and we use it here */ /*
extern struct gpmc *gpmc_cfg; * gpmc_cfg is initialized by gpmc_init and we use it here.
* GPMC definitions for Ethenet Controller LAN9211
/* GPMC definitions for Ethenet Controller LAN9211 */ */
static const u32 gpmc_lab_enet[] = { static const u32 gpmc_lab_enet[] = {
ZOOM1_ENET_GPMC_CONF1, ZOOM1_ENET_GPMC_CONF1,
ZOOM1_ENET_GPMC_CONF2, ZOOM1_ENET_GPMC_CONF2,

3
drivers/mtd/nand/omap_gpmc.c
View File

@ -264,7 +264,8 @@ static int omap_calculate_ecc(struct mtd_info *mtd, const uint8_t *dat,
{ {
struct nand_chip *chip = mtd_to_nand(mtd); struct nand_chip *chip = mtd_to_nand(mtd);
struct omap_nand_info *info = nand_get_controller_data(chip); struct omap_nand_info *info = nand_get_controller_data(chip);
uint32_t *ptr, val = 0; const uint32_t *ptr;
uint32_t val = 0;
int8_t i = 0, j; int8_t i = 0, j;
switch (info->ecc_scheme) { switch (info->ecc_scheme) {

2
include/linux/mtd/omap_gpmc.h
View File

@ -92,6 +92,6 @@ struct gpmc {
}; };
/* Used for board specific gpmc initialization */ /* Used for board specific gpmc initialization */
extern struct gpmc *gpmc_cfg; extern const struct gpmc *gpmc_cfg;
#endif /* __ASM_OMAP_GPMC_H */ #endif /* __ASM_OMAP_GPMC_H */