xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: OMAP2+: nand: reorganize gpmc timing values

Browse Source 
This patch removes omap2_nand_gpmc_retime() which was used to quirk
some timing values before gpmc_cs_set_timings(). Due to recent changes,
gpmc_cs_set_timings() has evolved so that there is no more need for a
retime function.

To keep the gpmc configuration consistent for legacy board files, this
patch also adds oe_on and we_on to nand_default_timings[] as they
would be by the retime function.

Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Christoph Fritz
2013-04-19 18:29:41 +02:00
committed by Tony Lindgren
parent f722406faa
commit 4d5843616d
2 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-omap2/board-flash.c
View File

@@ -112,6 +112,9 @@ struct gpmc_timings nand_default_timings[1] = {
.cs_rd_off = 36, .cs_rd_off = 36,
.cs_wr_off = 36, .cs_wr_off = 36,
.we_on = 6,
.oe_on = 6,
.adv_on = 6, .adv_on = 6,
.adv_rd_off = 24, .adv_rd_off = 24,
.adv_wr_off = 36, .adv_wr_off = 36,

40
arch/arm/mach-omap2/gpmc-nand.c
View File

@@ -43,44 +43,6 @@ static struct platform_device gpmc_nand_device = {
.resource = gpmc_nand_resource, .resource = gpmc_nand_resource,
}; };
static int omap2_nand_gpmc_retime(
struct omap_nand_platform_data *gpmc_nand_data,
struct gpmc_timings *gpmc_t)
{
struct gpmc_timings t;
int err;
memset(&t, 0, sizeof(t));
t.sync_clk = gpmc_t->sync_clk;
t.cs_on = gpmc_t->cs_on;
t.adv_on = gpmc_t->adv_on;
/* Read */
t.adv_rd_off = gpmc_t->adv_rd_off;
t.oe_on = t.adv_on;
t.access = gpmc_t->access;
t.oe_off = gpmc_t->oe_off;
t.cs_rd_off = gpmc_t->cs_rd_off;
t.rd_cycle = gpmc_t->rd_cycle;
/* Write */
t.adv_wr_off = gpmc_t->adv_wr_off;
t.we_on = t.oe_on;
if (cpu_is_omap34xx()) {
t.wr_data_mux_bus = gpmc_t->wr_data_mux_bus;
t.wr_access = gpmc_t->wr_access;
}
t.we_off = gpmc_t->we_off;
t.cs_wr_off = gpmc_t->cs_wr_off;
t.wr_cycle = gpmc_t->wr_cycle;
err = gpmc_cs_set_timings(gpmc_nand_data->cs, &t);
if (err)
return err;
return 0;
}
static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt) static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt)
{ {
/* support only OMAP3 class */ /* support only OMAP3 class */
@@ -131,7 +93,7 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
gpmc_get_client_irq(GPMC_IRQ_COUNT_EVENT); gpmc_get_client_irq(GPMC_IRQ_COUNT_EVENT);
if (gpmc_t) { if (gpmc_t) {
err = omap2_nand_gpmc_retime(gpmc_nand_data, gpmc_t); err = gpmc_cs_set_timings(gpmc_nand_data->cs, gpmc_t);
if (err < 0) { if (err < 0) {
dev_err(dev, "Unable to set gpmc timings: %d\n", err); dev_err(dev, "Unable to set gpmc timings: %d\n", err);
return err; return err;