diff options
| -rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index e4b16c8efe8..410e1bac781 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -1122,9 +1122,6 @@ int gpmc_calc_timings(struct gpmc_timings *gpmc_t,  	/* TODO: remove, see function definition */  	gpmc_convert_ps_to_ns(gpmc_t); -	/* Now the GPMC is initialised, unreserve the chip-selects */ -	gpmc_cs_map = 0; -  	return 0;  } @@ -1383,6 +1380,9 @@ static int gpmc_probe(struct platform_device *pdev)  	if (IS_ERR_VALUE(gpmc_setup_irq()))  		dev_warn(gpmc_dev, "gpmc_setup_irq failed\n"); +	/* Now the GPMC is initialised, unreserve the chip-selects */ +	gpmc_cs_map = 0; +  	rc = gpmc_probe_dt(pdev);  	if (rc < 0) {  		clk_disable_unprepare(gpmc_l3_clk);  |