@@ -665,8 +665,8 @@ static const struct edo_mode edo_modes[] = {
* RDN_DELAY = ----------------------- {3}
* RP
*/
-static void gpmi_nfc_compute_timings(struct gpmi_nand_data *this,
- const struct nand_sdr_timings *sdr)
+static int gpmi_nfc_compute_timings(struct gpmi_nand_data *this,
+ const struct nand_sdr_timings *sdr)
{
struct gpmi_nfc_hardware_timing *hw = &this->hw;
struct resources *r = &this->resources;
@@ -679,6 +679,7 @@ static void gpmi_nfc_compute_timings(struct gpmi_nand_data *this,
u16 busy_timeout_cycles;
u8 wrn_dly_sel;
int i, emode = ARRAY_SIZE(edo_modes) - 1;
+ long clk_rate;
/* Search the required EDO mode */
for (i = 0; i < ARRAY_SIZE(edo_modes); i++) {
@@ -688,7 +689,18 @@ static void gpmi_nfc_compute_timings(struct gpmi_nand_data *this,
}
}
- hw->clk_rate = clk_round_rate(r->clock[0], edo_modes[emode].clk_rate);
+ clk_rate = clk_round_rate(r->clock[0], edo_modes[emode].clk_rate);
+ if (emode > 0 && !(clk_rate <= edo_modes[emode].clk_rate &&
+ clk_rate > edo_modes[emode - 1].clk_rate)) {
+ dev_err(this->dev,
+ "edo mode %d clock setting: expected %ld, got %ld\n",
+ emode, edo_modes[emode].clk_rate, clk_rate);
+ return -ENOTSUPP;
+ }
+
+ dev_dbg(this->dev, "edo mode %d @ %ld Hz\n", emode, clk_rate);
+
+ hw->clk_rate = clk_rate;
wrn_dly_sel = edo_modes[emode].wrn_dly_sel;
/* SDR core timings are given in picoseconds */
@@ -731,6 +743,7 @@ static void gpmi_nfc_compute_timings(struct gpmi_nand_data *this,
hw->ctrl1n |= BF_GPMI_CTRL1_RDN_DELAY(sample_delay_factor) |
BM_GPMI_CTRL1_DLL_ENABLE |
(use_half_period ? BM_GPMI_CTRL1_HALF_PERIOD : 0);
+ return 0;
}
static int gpmi_nfc_apply_timings(struct gpmi_nand_data *this)
@@ -786,6 +799,7 @@ static int gpmi_setup_interface(struct nand_chip *chip, int chipnr,
{
struct gpmi_nand_data *this = nand_get_controller_data(chip);
const struct nand_sdr_timings *sdr;
+ int ret;
/* Retrieve required NAND timings */
sdr = nand_get_sdr_timings(conf);
@@ -801,7 +815,9 @@ static int gpmi_setup_interface(struct nand_chip *chip, int chipnr,
return 0;
/* Do the actual derivation of the controller timings */
- gpmi_nfc_compute_timings(this, sdr);
+ ret = gpmi_nfc_compute_timings(this, sdr);
+ if (ret)
+ return ret;
this->hw.must_apply_timings = true;