diff options
Diffstat (limited to 'drivers/mtd/nand/gpmi-nand/gpmi-lib.c')
-rw-r--r-- | drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c index fa5200b8c895..5c55c717fe14 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c | |||
@@ -256,11 +256,12 @@ static unsigned int ns_to_cycles(unsigned int time, | |||
256 | return max(k, min); | 256 | return max(k, min); |
257 | } | 257 | } |
258 | 258 | ||
259 | #define DEF_MIN_PROP_DELAY 5 | ||
260 | #define DEF_MAX_PROP_DELAY 9 | ||
259 | /* Apply timing to current hardware conditions. */ | 261 | /* Apply timing to current hardware conditions. */ |
260 | static int gpmi_nfc_compute_hardware_timing(struct gpmi_nand_data *this, | 262 | static int gpmi_nfc_compute_hardware_timing(struct gpmi_nand_data *this, |
261 | struct gpmi_nfc_hardware_timing *hw) | 263 | struct gpmi_nfc_hardware_timing *hw) |
262 | { | 264 | { |
263 | struct gpmi_nand_platform_data *pdata = this->pdata; | ||
264 | struct timing_threshod *nfc = &timing_default_threshold; | 265 | struct timing_threshod *nfc = &timing_default_threshold; |
265 | struct nand_chip *nand = &this->nand; | 266 | struct nand_chip *nand = &this->nand; |
266 | struct nand_timing target = this->timing; | 267 | struct nand_timing target = this->timing; |
@@ -277,8 +278,8 @@ static int gpmi_nfc_compute_hardware_timing(struct gpmi_nand_data *this, | |||
277 | int ideal_sample_delay_in_ns; | 278 | int ideal_sample_delay_in_ns; |
278 | unsigned int sample_delay_factor; | 279 | unsigned int sample_delay_factor; |
279 | int tEYE; | 280 | int tEYE; |
280 | unsigned int min_prop_delay_in_ns = pdata->min_prop_delay_in_ns; | 281 | unsigned int min_prop_delay_in_ns = DEF_MIN_PROP_DELAY; |
281 | unsigned int max_prop_delay_in_ns = pdata->max_prop_delay_in_ns; | 282 | unsigned int max_prop_delay_in_ns = DEF_MAX_PROP_DELAY; |
282 | 283 | ||
283 | /* | 284 | /* |
284 | * If there are multiple chips, we need to relax the timings to allow | 285 | * If there are multiple chips, we need to relax the timings to allow |