GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-04 21:31:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

OMAP: OneNAND: fix 104MHz support

Browse source 
104MHz needs a latency of 8 clock cycles and the VHF
flag must be set.  Also t_rdyo is specified as
"not applicable" so pick a lower value, and force at
least 1 clk between AVD High to OE Low.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Adrian Hunter 2011-02-07 10:46:58 +02:00 • committed by Tony Lindgren
parent f040d33253
commit 1435ca0fc1
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
arch/arm/mach-omap2/gpmc-onenand.c
View file

@ -94,7 +94,7 @@ static int omap2_onenand_set_async_mode(int cs, void __iomem *onenand_base)
} }
static void set_onenand_cfg(void __iomem *onenand_base, int latency, static void set_onenand_cfg(void __iomem *onenand_base, int latency,
int sync_read, int sync_write, int hf) int sync_read, int sync_write, int hf, int vhf)
{ {
u32 reg; u32 reg;
@ -114,6 +114,10 @@ static void set_onenand_cfg(void __iomem *onenand_base, int latency,
reg |= ONENAND_SYS_CFG1_HF; reg |= ONENAND_SYS_CFG1_HF;
else else
reg &= ~ONENAND_SYS_CFG1_HF; reg &= ~ONENAND_SYS_CFG1_HF;
if (vhf)
reg |= ONENAND_SYS_CFG1_VHF;
else
reg &= ~ONENAND_SYS_CFG1_VHF;
writew(reg, onenand_base + ONENAND_REG_SYS_CFG1); writew(reg, onenand_base + ONENAND_REG_SYS_CFG1);
} }
@ -130,7 +134,7 @@ static int omap2_onenand_set_sync_mode(struct omap_onenand_platform_data *cfg,
const int t_wph = 30; const int t_wph = 30;
int min_gpmc_clk_period, t_ces, t_avds, t_avdh, t_ach, t_aavdh, t_rdyo; int min_gpmc_clk_period, t_ces, t_avds, t_avdh, t_ach, t_aavdh, t_rdyo;
int tick_ns, div, fclk_offset_ns, fclk_offset, gpmc_clk_ns, latency; int tick_ns, div, fclk_offset_ns, fclk_offset, gpmc_clk_ns, latency;
int first_time = 0, hf = 0, sync_read = 0, sync_write = 0; int first_time = 0, hf = 0, vhf = 0, sync_read = 0, sync_write = 0;
int err, ticks_cez; int err, ticks_cez;
int cs = cfg->cs; int cs = cfg->cs;
u32 reg; u32 reg;
@ -180,7 +184,7 @@ static int omap2_onenand_set_sync_mode(struct omap_onenand_platform_data *cfg,
t_avdh = 2; t_avdh = 2;
t_ach = 3; t_ach = 3;
t_aavdh = 6; t_aavdh = 6;
t_rdyo = 9; t_rdyo = 6;
break; break;
case 83: case 83:
min_gpmc_clk_period = 12000; /* 83 MHz */ min_gpmc_clk_period = 12000; /* 83 MHz */
@ -217,7 +221,11 @@ static int omap2_onenand_set_sync_mode(struct omap_onenand_platform_data *cfg,
gpmc_clk_ns = gpmc_ticks_to_ns(div); gpmc_clk_ns = gpmc_ticks_to_ns(div);
if (gpmc_clk_ns < 15) /* >66Mhz */ if (gpmc_clk_ns < 15) /* >66Mhz */
hf = 1; hf = 1;
if (hf) if (gpmc_clk_ns < 12) /* >83Mhz */
vhf = 1;
if (vhf)
latency = 8;
else if (hf)
latency = 6; latency = 6;
else if (gpmc_clk_ns >= 25) /* 40 MHz*/ else if (gpmc_clk_ns >= 25) /* 40 MHz*/
latency = 3; latency = 3;
@ -226,7 +234,7 @@ static int omap2_onenand_set_sync_mode(struct omap_onenand_platform_data *cfg,
if (first_time) if (first_time)
set_onenand_cfg(onenand_base, latency, set_onenand_cfg(onenand_base, latency,
sync_read, sync_write, hf); sync_read, sync_write, hf, vhf);
if (div == 1) { if (div == 1) {
reg = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG2); reg = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG2);
@ -264,6 +272,9 @@ static int omap2_onenand_set_sync_mode(struct omap_onenand_platform_data *cfg,
/* Read */ /* Read */
t.adv_rd_off = gpmc_ticks_to_ns(fclk_offset + gpmc_ns_to_ticks(t_avdh)); t.adv_rd_off = gpmc_ticks_to_ns(fclk_offset + gpmc_ns_to_ticks(t_avdh));
t.oe_on = gpmc_ticks_to_ns(fclk_offset + gpmc_ns_to_ticks(t_ach)); t.oe_on = gpmc_ticks_to_ns(fclk_offset + gpmc_ns_to_ticks(t_ach));
/* Force at least 1 clk between AVD High to OE Low */
if (t.oe_on <= t.adv_rd_off)
t.oe_on = t.adv_rd_off + gpmc_round_ns_to_ticks(1);
t.access = gpmc_ticks_to_ns(fclk_offset + (latency + 1) * div); t.access = gpmc_ticks_to_ns(fclk_offset + (latency + 1) * div);
t.oe_off = t.access + gpmc_round_ns_to_ticks(1); t.oe_off = t.access + gpmc_round_ns_to_ticks(1);
t.cs_rd_off = t.oe_off; t.cs_rd_off = t.oe_off;
@ -317,7 +328,7 @@ static int omap2_onenand_set_sync_mode(struct omap_onenand_platform_data *cfg,
if (err) if (err)
return err; return err;
set_onenand_cfg(onenand_base, latency, sync_read, sync_write, hf); set_onenand_cfg(onenand_base, latency, sync_read, sync_write, hf, vhf);
return 0; return 0;
} }

1
include/linux/mtd/onenand_regs.h
View file

@ -168,6 +168,7 @@
#define ONENAND_SYS_CFG1_INT (1 << 6) #define ONENAND_SYS_CFG1_INT (1 << 6)
#define ONENAND_SYS_CFG1_IOBE (1 << 5) #define ONENAND_SYS_CFG1_IOBE (1 << 5)
#define ONENAND_SYS_CFG1_RDY_CONF (1 << 4) #define ONENAND_SYS_CFG1_RDY_CONF (1 << 4)
#define ONENAND_SYS_CFG1_VHF (1 << 3)
#define ONENAND_SYS_CFG1_HF (1 << 2) #define ONENAND_SYS_CFG1_HF (1 << 2)
#define ONENAND_SYS_CFG1_SYNC_WRITE (1 << 1) #define ONENAND_SYS_CFG1_SYNC_WRITE (1 << 1)