From 1441794ce4629524f49d4224bb439a5353b74a21 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Mon, 18 Feb 2013 07:57:39 -0600 Subject: [PATCH] --- yaml --- r: 361159 b: refs/heads/master c: 31d9adca82ce65e5c99d045b5fd917c702b6fce3 h: refs/heads/master i: 361157: 39bea44fc7a00f92076f7d4fe3e72aa7cd0f5ab4 361155: 5745fbd8e97db95e40c2d266cdc71e7dca83c77b 361151: a19e29800a45e353621a46cb3e10b457fbf254fe v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/gpmc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9f0c68d7e4c1..d4bf1199bd04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0adcbaf78f6267baf4eecc201107d8f8ff3b200c +refs/heads/master: 31d9adca82ce65e5c99d045b5fd917c702b6fce3 diff --git a/trunk/arch/arm/mach-omap2/gpmc.c b/trunk/arch/arm/mach-omap2/gpmc.c index e4b16c8efe8b..410e1bac7815 100644 --- a/trunk/arch/arm/mach-omap2/gpmc.c +++ b/trunk/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);