From 8021bcc45980e310ea1d20f51ab2bf00e7a1796c Mon Sep 17 00:00:00 2001 From: Huang Shijie Date: Thu, 13 Sep 2012 14:57:58 +0800 Subject: [PATCH] --- yaml --- r: 332771 b: refs/heads/master c: e1ca95e3a93c9a0392163a7a6791deda48b5eeca h: refs/heads/master i: 332769: 6b56b4afb484b72a2dcd2686e52d2ec93ea0ef0c 332767: b8ad64ebc00be098c902777937201d852df6688f v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index f48d9da61643..357cf4c4bc76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c50d35a9fdb628c5fcce5c2d4ab5ad9bedb2edb9 +refs/heads/master: e1ca95e3a93c9a0392163a7a6791deda48b5eeca diff --git a/trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 5999b15f3e87..2bfd44876f81 100644 --- a/trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -516,20 +516,15 @@ static int __devinit gpmi_get_clks(struct gpmi_nand_data *this) r->clock[i] = clk; } - if (GPMI_IS_MX6Q(this)) { + if (GPMI_IS_MX6Q(this)) /* - * Set the default values for the clocks in mx6q: - * The main clock(enfc) : 22MHz - * The others : 44.5MHz + * Set the default value for the gpmi clock in mx6q: * - * These are just the default values. If you want to use - * the ONFI nand which is in the Synchronous Mode, you should - * change the clocks's frequencies as you need. + * If you want to use the ONFI nand which is in the + * Synchronous Mode, you should change the clock as you need. */ clk_set_rate(r->clock[0], 22000000); - for (i = 1; i < GPMI_CLK_MAX && r->clock[i]; i++) - clk_set_rate(r->clock[i], 44500000); - } + return 0; err_clock: