From: Mike Turquette <mturquette@linaro.org>
Date: Thu, 12 Jul 2012 00:57:49 +0000 (-0700)
Subject: Merge branch 'clk/mxs-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6... 
X-Git-Tag: accepted/tizen/common/20141203.182822~4129^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb479129efa4c7d444c5b3f1d271bfdeadd271c8;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'clk/mxs-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into clk-3.6
---

cb479129efa4c7d444c5b3f1d271bfdeadd271c8
diff --cc drivers/clk/mxs/clk-imx23.c
index db2391c,c14b021..844043a
--- a/drivers/clk/mxs/clk-imx23.c
+++ b/drivers/clk/mxs/clk-imx23.c
@@@ -104,9 -104,9 +104,9 @@@ static struct clk_lookup lcdif_lookups[
  	{ .dev_id = "80030000.lcdif", },
  };
  
 -static struct clk_lookup gpmi_lookups[] __initdata = {
 +static struct clk_lookup gpmi_lookups[] = {
  	{ .dev_id = "imx23-gpmi-nand", },
- 	{ .dev_id = "8000c000.gpmi", },
+ 	{ .dev_id = "8000c000.gpmi-nand", },
  };
  
  static const char *sel_pll[]  __initconst = { "pll", "ref_xtal", };
diff --cc drivers/clk/mxs/clk-imx28.c
index 7fad6c8,98624ee..957eaac
--- a/drivers/clk/mxs/clk-imx28.c
+++ b/drivers/clk/mxs/clk-imx28.c
@@@ -172,12 -172,12 +172,12 @@@ static struct clk_lookup lcdif_lookups[
  	{ .dev_id = "80030000.lcdif", },
  };
  
 -static struct clk_lookup gpmi_lookups[] __initdata = {
 +static struct clk_lookup gpmi_lookups[] = {
  	{ .dev_id = "imx28-gpmi-nand", },
- 	{ .dev_id = "8000c000.gpmi", },
+ 	{ .dev_id = "8000c000.gpmi-nand", },
  };
  
 -static struct clk_lookup fec_lookups[] __initdata = {
 +static struct clk_lookup fec_lookups[] = {
  	{ .dev_id = "imx28-fec.0", },
  	{ .dev_id = "imx28-fec.1", },
  	{ .dev_id = "800f0000.ethernet", },