From: Huang Shijie Date: Thu, 13 Sep 2012 06:57:58 +0000 (+0800) Subject: mtd: gpmi: do not set the default values for the extra clocks X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e1ca95e3a93c9a0392163a7a6791deda48b5eeca;p=linux-beck.git mtd: gpmi: do not set the default values for the extra clocks The default frequencies of the extra clocks are 200MHz. The current code sets the extra clocks to 44.5MHz. When i add the EDO feature to gpmi, i have to revert the extra clocks to 200MHz. So it is better that we do not set the default values for the extra clocks. The driver runs well even when we do not set the default values for extra clocks. Signed-off-by: Huang Shijie Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse --- diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 5999b15f3e87..2bfd44876f81 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/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: