evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: OMAP2+: gpmc: Introduce gpmc_set_legacy()

Browse source 
Introduce a helper function to complete the setting of some GPMC
parameters, only used when the gpmc is probed from a board file.
As such, it will go away once the DT conversion is completed.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Ezequiel Garcia 2013-10-27 21:51:47 -03:00 • committed by Tony Lindgren
parent e2e699b193
commit d0020cc638
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
arch/arm/mach-omap2/gpmc-nand.c
View file

@ -65,6 +65,17 @@ static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt)
return 1; return 1;
} }
/* This function will go away once the device-tree convertion is complete */
static void gpmc_set_legacy(struct omap_nand_platform_data *gpmc_nand_data,
struct gpmc_settings *s)
{
/* Enable RD PIN Monitoring Reg */
if (gpmc_nand_data->dev_ready) {
s->wait_on_read = true;
s->wait_on_write = true;
}
}
int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data, int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
struct gpmc_timings *gpmc_t) struct gpmc_timings *gpmc_t)
{ {
@ -100,15 +111,10 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
} }
} }
if (gpmc_nand_data->of_node) { if (gpmc_nand_data->of_node)
gpmc_read_settings_dt(gpmc_nand_data->of_node, &s); gpmc_read_settings_dt(gpmc_nand_data->of_node, &s);
} else { else
/* Enable RD PIN Monitoring Reg */ gpmc_set_legacy(gpmc_nand_data, &s);
if (gpmc_nand_data->dev_ready) {
s.wait_on_read = true;
s.wait_on_write = true;
}
}
s.device_nand = true; s.device_nand = true;