|  | @@ -104,3 +104,170 @@ static void omap2_onenand_set_async_mode(void __iomem *onenand_base)
 | 
	
		
			
				|  |  |  static void set_onenand_cfg(void __iomem *onenand_base)
 | 
	
		
			
				|  |  |  {
 | 
	
		
			
				|  |  |  	u32 reg;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	reg = readw(onenand_base + ONENAND_REG_SYS_CFG1);
 | 
	
		
			
				|  |  | +	reg &= ~((0x7 << ONENAND_SYS_CFG1_BRL_SHIFT) | (0x7 << 9));
 | 
	
		
			
				|  |  | +	reg |=	(latency << ONENAND_SYS_CFG1_BRL_SHIFT) |
 | 
	
		
			
				|  |  | +		ONENAND_SYS_CFG1_BL_16;
 | 
	
		
			
				|  |  | +	if (onenand_flags & ONENAND_FLAG_SYNCREAD)
 | 
	
		
			
				|  |  | +		reg |= ONENAND_SYS_CFG1_SYNC_READ;
 | 
	
		
			
				|  |  | +	else
 | 
	
		
			
				|  |  | +		reg &= ~ONENAND_SYS_CFG1_SYNC_READ;
 | 
	
		
			
				|  |  | +	if (onenand_flags & ONENAND_FLAG_SYNCWRITE)
 | 
	
		
			
				|  |  | +		reg |= ONENAND_SYS_CFG1_SYNC_WRITE;
 | 
	
		
			
				|  |  | +	else
 | 
	
		
			
				|  |  | +		reg &= ~ONENAND_SYS_CFG1_SYNC_WRITE;
 | 
	
		
			
				|  |  | +	if (onenand_flags & ONENAND_FLAG_HF)
 | 
	
		
			
				|  |  | +		reg |= ONENAND_SYS_CFG1_HF;
 | 
	
		
			
				|  |  | +	else
 | 
	
		
			
				|  |  | +		reg &= ~ONENAND_SYS_CFG1_HF;
 | 
	
		
			
				|  |  | +	if (onenand_flags & ONENAND_FLAG_VHF)
 | 
	
		
			
				|  |  | +		reg |= ONENAND_SYS_CFG1_VHF;
 | 
	
		
			
				|  |  | +	else
 | 
	
		
			
				|  |  | +		reg &= ~ONENAND_SYS_CFG1_VHF;
 | 
	
		
			
				|  |  | +	writew(reg, onenand_base + ONENAND_REG_SYS_CFG1);
 | 
	
		
			
				|  |  | +}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +static int omap2_onenand_get_freq(struct omap_onenand_platform_data *cfg,
 | 
	
		
			
				|  |  | +				  void __iomem *onenand_base)
 | 
	
		
			
				|  |  | +{
 | 
	
		
			
				|  |  | +	u16 ver = readw(onenand_base + ONENAND_REG_VERSION_ID);
 | 
	
		
			
				|  |  | +	int freq;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	switch ((ver >> 4) & 0xf) {
 | 
	
		
			
				|  |  | +	case 0:
 | 
	
		
			
				|  |  | +		freq = 40;
 | 
	
		
			
				|  |  | +		break;
 | 
	
		
			
				|  |  | +	case 1:
 | 
	
		
			
				|  |  | +		freq = 54;
 | 
	
		
			
				|  |  | +		break;
 | 
	
		
			
				|  |  | +	case 2:
 | 
	
		
			
				|  |  | +		freq = 66;
 | 
	
		
			
				|  |  | +		break;
 | 
	
		
			
				|  |  | +	case 3:
 | 
	
		
			
				|  |  | +		freq = 83;
 | 
	
		
			
				|  |  | +		break;
 | 
	
		
			
				|  |  | +	case 4:
 | 
	
		
			
				|  |  | +		freq = 104;
 | 
	
		
			
				|  |  | +		break;
 | 
	
		
			
				|  |  | +	default:
 | 
	
		
			
				|  |  | +		freq = 54;
 | 
	
		
			
				|  |  | +		break;
 | 
	
		
			
				|  |  | +	}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	return freq;
 | 
	
		
			
				|  |  | +}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +static struct gpmc_timings
 | 
	
		
			
				|  |  | +omap2_onenand_calc_sync_timings(struct omap_onenand_platform_data *cfg,
 | 
	
		
			
				|  |  | +				int freq)
 | 
	
		
			
				|  |  | +{
 | 
	
		
			
				|  |  | +	struct gpmc_device_timings dev_t;
 | 
	
		
			
				|  |  | +	struct gpmc_timings t;
 | 
	
		
			
				|  |  | +	const int t_cer  = 15;
 | 
	
		
			
				|  |  | +	const int t_avdp = 12;
 | 
	
		
			
				|  |  | +	const int t_cez  = 20; /* max of t_cez, t_oez */
 | 
	
		
			
				|  |  | +	const int t_wpl  = 40;
 | 
	
		
			
				|  |  | +	const int t_wph  = 30;
 | 
	
		
			
				|  |  | +	int min_gpmc_clk_period, t_ces, t_avds, t_avdh, t_ach, t_aavdh, t_rdyo;
 | 
	
		
			
				|  |  | +	int div, gpmc_clk_ns;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	if (cfg->flags & ONENAND_SYNC_READ)
 | 
	
		
			
				|  |  | +		onenand_flags = ONENAND_FLAG_SYNCREAD;
 | 
	
		
			
				|  |  | +	else if (cfg->flags & ONENAND_SYNC_READWRITE)
 | 
	
		
			
				|  |  | +		onenand_flags = ONENAND_FLAG_SYNCREAD | ONENAND_FLAG_SYNCWRITE;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	switch (freq) {
 | 
	
		
			
				|  |  | +	case 104:
 | 
	
		
			
				|  |  | +		min_gpmc_clk_period = 9600; /* 104 MHz */
 | 
	
		
			
				|  |  | +		t_ces   = 3;
 | 
	
		
			
				|  |  | +		t_avds  = 4;
 | 
	
		
			
				|  |  | +		t_avdh  = 2;
 | 
	
		
			
				|  |  | +		t_ach   = 3;
 | 
	
		
			
				|  |  | +		t_aavdh = 6;
 | 
	
		
			
				|  |  | +		t_rdyo  = 6;
 | 
	
		
			
				|  |  | +		break;
 | 
	
		
			
				|  |  | +	case 83:
 | 
	
		
			
				|  |  | +		min_gpmc_clk_period = 12000; /* 83 MHz */
 | 
	
		
			
				|  |  | +		t_ces   = 5;
 | 
	
		
			
				|  |  | +		t_avds  = 4;
 | 
	
		
			
				|  |  | +		t_avdh  = 2;
 | 
	
		
			
				|  |  | +		t_ach   = 6;
 | 
	
		
			
				|  |  | +		t_aavdh = 6;
 | 
	
		
			
				|  |  | +		t_rdyo  = 9;
 | 
	
		
			
				|  |  | +		break;
 | 
	
		
			
				|  |  | +	case 66:
 | 
	
		
			
				|  |  | +		min_gpmc_clk_period = 15000; /* 66 MHz */
 | 
	
		
			
				|  |  | +		t_ces   = 6;
 | 
	
		
			
				|  |  | +		t_avds  = 5;
 | 
	
		
			
				|  |  | +		t_avdh  = 2;
 | 
	
		
			
				|  |  | +		t_ach   = 6;
 | 
	
		
			
				|  |  | +		t_aavdh = 6;
 | 
	
		
			
				|  |  | +		t_rdyo  = 11;
 | 
	
		
			
				|  |  | +		break;
 | 
	
		
			
				|  |  | +	default:
 | 
	
		
			
				|  |  | +		min_gpmc_clk_period = 18500; /* 54 MHz */
 | 
	
		
			
				|  |  | +		t_ces   = 7;
 | 
	
		
			
				|  |  | +		t_avds  = 7;
 | 
	
		
			
				|  |  | +		t_avdh  = 7;
 | 
	
		
			
				|  |  | +		t_ach   = 9;
 | 
	
		
			
				|  |  | +		t_aavdh = 7;
 | 
	
		
			
				|  |  | +		t_rdyo  = 15;
 | 
	
		
			
				|  |  | +		onenand_flags &= ~ONENAND_FLAG_SYNCWRITE;
 | 
	
		
			
				|  |  | +		break;
 | 
	
		
			
				|  |  | +	}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	div = gpmc_calc_divider(min_gpmc_clk_period);
 | 
	
		
			
				|  |  | +	gpmc_clk_ns = gpmc_ticks_to_ns(div);
 | 
	
		
			
				|  |  | +	if (gpmc_clk_ns < 15) /* >66Mhz */
 | 
	
		
			
				|  |  | +		onenand_flags |= ONENAND_FLAG_HF;
 | 
	
		
			
				|  |  | +	else
 | 
	
		
			
				|  |  | +		onenand_flags &= ~ONENAND_FLAG_HF;
 | 
	
		
			
				|  |  | +	if (gpmc_clk_ns < 12) /* >83Mhz */
 | 
	
		
			
				|  |  | +		onenand_flags |= ONENAND_FLAG_VHF;
 | 
	
		
			
				|  |  | +	else
 | 
	
		
			
				|  |  | +		onenand_flags &= ~ONENAND_FLAG_VHF;
 | 
	
		
			
				|  |  | +	if (onenand_flags & ONENAND_FLAG_VHF)
 | 
	
		
			
				|  |  | +		latency = 8;
 | 
	
		
			
				|  |  | +	else if (onenand_flags & ONENAND_FLAG_HF)
 | 
	
		
			
				|  |  | +		latency = 6;
 | 
	
		
			
				|  |  | +	else if (gpmc_clk_ns >= 25) /* 40 MHz*/
 | 
	
		
			
				|  |  | +		latency = 3;
 | 
	
		
			
				|  |  | +	else
 | 
	
		
			
				|  |  | +		latency = 4;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	/* Set synchronous read timings */
 | 
	
		
			
				|  |  | +	memset(&dev_t, 0, sizeof(dev_t));
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	dev_t.mux = true;
 | 
	
		
			
				|  |  | +	dev_t.sync_read = true;
 | 
	
		
			
				|  |  | +	if (onenand_flags & ONENAND_FLAG_SYNCWRITE) {
 | 
	
		
			
				|  |  | +		dev_t.sync_write = true;
 | 
	
		
			
				|  |  | +	} else {
 | 
	
		
			
				|  |  | +		dev_t.t_avdp_w = max(t_avdp, t_cer) * 1000;
 | 
	
		
			
				|  |  | +		dev_t.t_wpl = t_wpl * 1000;
 | 
	
		
			
				|  |  | +		dev_t.t_wph = t_wph * 1000;
 | 
	
		
			
				|  |  | +		dev_t.t_aavdh = t_aavdh * 1000;
 | 
	
		
			
				|  |  | +	}
 | 
	
		
			
				|  |  | +	dev_t.ce_xdelay = true;
 | 
	
		
			
				|  |  | +	dev_t.avd_xdelay = true;
 | 
	
		
			
				|  |  | +	dev_t.oe_xdelay = true;
 | 
	
		
			
				|  |  | +	dev_t.we_xdelay = true;
 | 
	
		
			
				|  |  | +	dev_t.clk = min_gpmc_clk_period;
 | 
	
		
			
				|  |  | +	dev_t.t_bacc = dev_t.clk;
 | 
	
		
			
				|  |  | +	dev_t.t_ces = t_ces * 1000;
 | 
	
		
			
				|  |  | +	dev_t.t_avds = t_avds * 1000;
 | 
	
		
			
				|  |  | +	dev_t.t_avdh = t_avdh * 1000;
 | 
	
		
			
				|  |  | +	dev_t.t_ach = t_ach * 1000;
 | 
	
		
			
				|  |  | +	dev_t.cyc_iaa = (latency + 1);
 | 
	
		
			
				|  |  | +	dev_t.t_cez_r = t_cez * 1000;
 | 
	
		
			
				|  |  | +	dev_t.t_cez_w = dev_t.t_cez_r;
 | 
	
		
			
				|  |  | +	dev_t.cyc_aavdh_oe = 1;
 | 
	
		
			
				|  |  | +	dev_t.t_rdyo = t_rdyo * 1000 + min_gpmc_clk_period;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	gpmc_calc_timings(&t, &dev_t);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +	return t;
 | 
	
		
			
				|  |  | +}
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +static int gpmc_set_sync_mode(int cs, struct gpmc_timings *t)
 |