[PATCH 0/2] A couple of imx6q clock patches

[PATCH 0/2] A couple of imx6q clock patches

[Shawn Guo]

Hi Sascha,

These two patches are based on v3.5-rc1 + your imx-clk-common-fixes.
I can wait for your imx-clk-common-fixes hit -rc and then send these
two.  But I think the better approach would be you rebase
imx-clk-common-fixes on -rc1 and then pick up these two into your
fix series.

The first one is a small clean up which can be amended into b0286f2
(ARM: imx6q: prepare and enable init on clks directly instead of
clk_get first), and the second one fixes a suspend regression.

Regards,
Shawn

Shawn Guo (2):
  ARM: imx6q: remove unneeded clkdev lookups
  ARM: imx6q: fix suspend regression caused by common clk migration

 arch/arm/mach-imx/clk-imx6q.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

-- 
1.7.5.4

[PATCH 1/2] ARM: imx6q: remove unneeded clkdev lookups

[Shawn Guo]

There are a number of clkdev lookups left over from commit b0286f2
(ARM: imx6q: prepare and enable init on clks directly instead of
clk_get first), remove them since they are not needed now.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/mach-imx/clk-imx6q.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 17dc66a..34b89e9 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -386,12 +386,9 @@ int __init mx6q_clocks_init(void)
 			pr_err("i.MX6q clk %d: register failed with %ld\n",
 				i, PTR_ERR(clk[i]));
 
-	clk_register_clkdev(clk[mmdc_ch0_axi], NULL, "mmdc_ch0_axi");
-	clk_register_clkdev(clk[mmdc_ch1_axi], NULL, "mmdc_ch1_axi");
 	clk_register_clkdev(clk[gpt_ipg], "ipg", "imx-gpt.0");
 	clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0");
 	clk_register_clkdev(clk[twd], NULL, "smp_twd");
-	clk_register_clkdev(clk[usboh3], NULL, "usboh3");
 	clk_register_clkdev(clk[uart_serial], "per", "2020000.serial");
 	clk_register_clkdev(clk[uart_ipg], "ipg", "2020000.serial");
 	clk_register_clkdev(clk[uart_serial], "per", "21e8000.serial");
-- 
1.7.5.4

[PATCH 2/2] ARM: imx6q: fix suspend regression caused by common clk migration

[Shawn Guo]

When moving to common clk framework, the imx6q clks rom and mmdc_ch1_axi
get different on/off states than old clk driver, which breaks suspend
function.  There might be a better way to manage these clocks, but let's
takes the old clk driver approach to fix the regression first.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/mach-imx/clk-imx6q.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 34b89e9..abb42e7 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -152,13 +152,14 @@ enum mx6q_clks {
 	ssi2, ssi3, uart_ipg, uart_serial, usboh3, usdhc1, usdhc2, usdhc3,
 	usdhc4, vdo_axi, vpu_axi, cko1, pll1_sys, pll2_bus, pll3_usb_otg,
 	pll4_audio, pll5_video, pll6_mlb, pll7_usb_host, pll8_enet, ssi1_ipg,
-	ssi2_ipg, ssi3_ipg, clk_max
+	ssi2_ipg, ssi3_ipg, rom,
+	clk_max
 };
 
 static struct clk *clk[clk_max];
 
 static enum mx6q_clks const clks_init_on[] __initconst = {
-	mmdc_ch0_axi, mmdc_ch1_axi,
+	mmdc_ch0_axi, rom,
 };
 
 int __init mx6q_clocks_init(void)
@@ -364,6 +365,7 @@ int __init mx6q_clocks_init(void)
 	clk[gpmi_bch]     = imx_clk_gate2("gpmi_bch",      "usdhc4",            base + 0x78, 26);
 	clk[gpmi_io]      = imx_clk_gate2("gpmi_io",       "enfc",              base + 0x78, 28);
 	clk[gpmi_apb]     = imx_clk_gate2("gpmi_apb",      "usdhc3",            base + 0x78, 30);
+	clk[rom]          = imx_clk_gate2("rom",           "ahb",               base + 0x7c, 0);
 	clk[sata]         = imx_clk_gate2("sata",          "ipg",               base + 0x7c, 4);
 	clk[sdma]         = imx_clk_gate2("sdma",          "ahb",               base + 0x7c, 6);
 	clk[spba]         = imx_clk_gate2("spba",          "ipg",               base + 0x7c, 12);
-- 
1.7.5.4

[PATCH 0/2] A couple of imx6q clock patches

[Sascha Hauer]

Hi Shawn, Olof,

On Tue, Jun 05, 2012 at 03:16:41PM +0800, Shawn Guo wrote:
> Hi Sascha,
> 
> These two patches are based on v3.5-rc1 + your imx-clk-common-fixes.
> I can wait for your imx-clk-common-fixes hit -rc and then send these
> two.  But I think the better approach would be you rebase
> imx-clk-common-fixes on -rc1 and then pick up these two into your
> fix series.

Olof, what do you prefer? Is there still time to update the
imx-clk-common-fixes you already pulled?

Sascha


> 
> The first one is a small clean up which can be amended into b0286f2
> (ARM: imx6q: prepare and enable init on clks directly instead of
> clk_get first), and the second one fixes a suspend regression.
> 
> Regards,
> Shawn
> 
> Shawn Guo (2):
>   ARM: imx6q: remove unneeded clkdev lookups
>   ARM: imx6q: fix suspend regression caused by common clk migration
> 
>  arch/arm/mach-imx/clk-imx6q.c |    9 ++++-----
>  1 files changed, 4 insertions(+), 5 deletions(-)
> 
> -- 
> 1.7.5.4
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 0/2] A couple of imx6q clock patches

[Shawn Guo]

On 6 June 2012 18:16, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> Olof, what do you prefer? Is there still time to update the
> imx-clk-common-fixes you already pulled?
>
Oh, I do not know Olof has already pulled imx-clk-common-fixes.  In
that case, I can prepare another -rc fixing request for Olof to pull.

Regards,
Shawn

[PATCH 0/2] A couple of imx6q clock patches

[Sascha Hauer]

On Wed, Jun 06, 2012 at 07:32:04PM +0800, Shawn Guo wrote:
> On 6 June 2012 18:16, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> > Olof, what do you prefer? Is there still time to update the
> > imx-clk-common-fixes you already pulled?
> >
> Oh, I do not know Olof has already pulled imx-clk-common-fixes.  In
> that case, I can prepare another -rc fixing request for Olof to pull.

How about the following, it contains your patches plus the ones I sent
yesterday, based on imx-clk-common. It should contain all currently
pending imx clk fixes.

The following changes since commit
f8f5701bdaf9134b1f90e5044a82c66324d2073f:

  Linux 3.5-rc1 (2012-06-02 18:29:26 -0700)

are available in the git repository at:

  git://git.pengutronix.de/git/imx/linux-2.6.git imx/clk-fixes

for you to fetch changes up to 1173d5ce7fce0fcb1055412288499a4a58b428ef:

  ARM: imx6q: fix suspend regression caused by common clk migration
(2012-06-06 12:17:34 +0200)

----------------------------------------------------------------
Alex Gershgorin (1):
      ARM: i.MX35: Implement camera and keypad clocks

Richard Zhao (2):
      ARM: i.MX: change timer clock from ipg to perclk
      ARM: imx6q: prepare and enable init on clks directly instead of clk_get first

Sascha Hauer (6):
      ARM i.MX5: fix gpt peripheral clock path
      ARM i.MX: remove now unnecessary argument from mxc_timer_init
      ARM i.MX pllv2: use standard register set unconditionally
      ARM i.MX pllv2: make round_rate accurate
      ARM i.MX53: Fix PLL4 base address
      Merge tag 'imx-clk-common-fixes' into imx/imx/clk-fixes

Shawn Guo (2):
      ARM: imx6q: remove unneeded clkdev lookups
      ARM: imx6q: fix suspend regression caused by common clk migration

 arch/arm/mach-imx/clk-imx1.c            |    3 +--
 arch/arm/mach-imx/clk-imx21.c           |    4 +--
 arch/arm/mach-imx/clk-imx25.c           |    2 +-
 arch/arm/mach-imx/clk-imx27.c           |    3 +--
 arch/arm/mach-imx/clk-imx31.c           |    3 +--
 arch/arm/mach-imx/clk-imx35.c           |   17 +++++++-----
 arch/arm/mach-imx/clk-imx51-imx53.c     |   12 ++++-----
 arch/arm/mach-imx/clk-imx6q.c           |   29 +++++++-------------
 arch/arm/mach-imx/clk-pllv2.c           |   93 +++++++++++++++++++++++++++++++++++++--------------------------
 arch/arm/mach-imx/crm-regs-imx5.h       |    2 +-
 arch/arm/plat-mxc/epit.c                |   11 +++++++-
 arch/arm/plat-mxc/include/mach/common.h |    4 +--
 arch/arm/plat-mxc/time.c                |   24 ++++++++---------
 13 files changed, 111 insertions(+), 96 deletions(-)


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH 0/2] A couple of imx6q clock patches

[Shawn Guo]

On 6 June 2012 20:08, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> How about the following, it contains your patches plus the ones I sent
> yesterday, based on imx-clk-common. It should contain all currently
> pending imx clk fixes.
>
Sound good to me.  Olof?

Regards,
Shawn

[PATCH 0/2] A couple of imx6q clock patches

[Olof Johansson]

Hi,

On Wed, Jun 6, 2012 at 4:32 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> On 6 June 2012 18:16, Sascha Hauer <s.hauer@pengutronix.de> wrote:
>> Olof, what do you prefer? Is there still time to update the
>> imx-clk-common-fixes you already pulled?
>>
> Oh, I do not know Olof has already pulled imx-clk-common-fixes. ?In
> that case, I can prepare another -rc fixing request for Olof to pull.
>


Looks like I missed the previous email, it snuck past my filter.

Anyway, I've pulled both branches now, both Sascha's older branch and
the new one from Shawn. Sorry for the delays.


-Olof