Patchwork [GIT,PULL] i.MX fixes for -rc

login
register
mail settings
Submitter Sascha Hauer
Date Oct. 24, 2012, 7:56 a.m.
Message ID <20121024075656.GW27665@pengutronix.de>
Download mbox
Permalink /patch/193704/
State New
Headers show

Pull-request

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

Comments

Sascha Hauer - Oct. 24, 2012, 7:56 a.m.
Hi Arnd, Olof,

Please pull the following, mostly clock related, i.MX fixes for -rc.

Thanks
 Sascha

The following changes since commit a0d271cbfed1dd50278c6b06bead3d00ba0a88f9:

  Linux 3.6 (2012-09-30 16:47:46 -0700)

are available in the git repository at:

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

for you to fetch changes up to 92063cee118655d25b50d04eb77b012f3287357a:

  ARM i.MX25: Fix PWM per clock lookups (2012-10-10 10:02:42 +0200)

----------------------------------------------------------------
ARM i.MX fixes for 3.7-rc

----------------------------------------------------------------
Fabio Estevam (3):
      ARM: imx_v6_v7_defconfig: Enable CONFIG_GPIO_MC9S08DZ60
      ARM: imx: clk-imx27: Fix divider width field
      ARM: mxc: platform-mxc-mmc: Fix register region size

Sascha Hauer (3):
      ARM i.MX25: Fix lcdc_ipg_per parent clock
      ARM i.MX25 clk: Fix nfc_ipg_per parent
      ARM i.MX25: Fix PWM per clock lookups

Wei Yongjun (2):
      ARM: imx: fix return value check in imx3_init_l2x0()
      ARM: imx: fix the return value check in imx_clk_busy_divider()

 arch/arm/configs/imx_v6_v7_defconfig         |    2 ++
 arch/arm/mach-imx/clk-busy.c                 |    2 +-
 arch/arm/mach-imx/clk-imx25.c                |   12 ++++++------
 arch/arm/mach-imx/clk-imx27.c                |    4 ++--
 arch/arm/mach-imx/mm-imx3.c                  |    5 ++---
 arch/arm/plat-mxc/devices/platform-mxc-mmc.c |    2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)
Arnd Bergmann - Oct. 25, 2012, 1:58 p.m.
On Wednesday 24 October 2012, Sascha Hauer wrote:

> The following changes since commit a0d271cbfed1dd50278c6b06bead3d00ba0a88f9:
> 
>   Linux 3.6 (2012-09-30 16:47:46 -0700)
> 
> are available in the git repository at:
> 
>   git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-fixes

Pulled into fixes branch now, thanks!

	Arnd
Arnd Bergmann - Oct. 26, 2012, 9:01 p.m.
On Wednesday 24 October 2012, Sascha Hauer wrote:
>       ARM i.MX25: Fix PWM per clock lookups

This patch is now causing build errors in imx_v4_v5_defconfig:

arch/arm/mach-imx/clk-imx25.c: In function 'mx25_clocks_init':
arch/arm/mach-imx/clk-imx25.c:206:26: error: 'pwm_ipg_per' undeclared (first use in this function)
arch/arm/mach-imx/clk-imx25.c:206:26: note: each undeclared identifier is reported only once for each function it appears in

Any idea what went wrong? The symbol doesn't seem to exist anywhere in
v3.7-rc2. Should I revert this patch for now?

	Arnd
Sascha Hauer - Oct. 27, 2012, 11:57 a.m.
On Fri, Oct 26, 2012 at 09:01:44PM +0000, Arnd Bergmann wrote:
> On Wednesday 24 October 2012, Sascha Hauer wrote:
> >       ARM i.MX25: Fix PWM per clock lookups
> 
> This patch is now causing build errors in imx_v4_v5_defconfig:
> 
> arch/arm/mach-imx/clk-imx25.c: In function 'mx25_clocks_init':
> arch/arm/mach-imx/clk-imx25.c:206:26: error: 'pwm_ipg_per' undeclared (first use in this function)
> arch/arm/mach-imx/clk-imx25.c:206:26: note: each undeclared identifier is reported only once for each function it appears in
> 
> Any idea what went wrong? The symbol doesn't seem to exist anywhere in
> v3.7-rc2. Should I revert this patch for now?

Yes, please revert it for now.

There are several gates missing in clk-imx25.c. I have a patch which
adds support for them and I seem to have missed that the above depends
on it.

Sascha