[GIT PULL] ARM: imx: fixes for 3.18, 2nd round

[GIT PULL] ARM: imx: fixes for 3.18, 2nd round

[Shawn Guo]

Hi Arnd, Olof,

This is the second round of i.MX fixes for 3.18.  The clk-vf610 fix is
relatively big, because it needs some adaption to the change made by
offending commit dc4805c2e78b (ARM: imx: remove ENABLE and BYPASS bits
from clk-pllv3 driver).  And it should have been sent to you for earlier
-rc inclusion, but unfortunately it got delayed for some time because
Stefan wasn't aware of my email address change.

Please consider to send them for 3.18 inclusion.  Thanks.

Shawn

The following changes since commit 0df1f2487d2f0d04703f142813d53615d62a1da4:

  Linux 3.18-rc3 (2014-11-02 15:01:51 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git tags/imx-fixes-3.18-2

for you to fetch changes up to 89fbec5b97fbcf08db3a9cd93a340f21f95d38b8:

  ARM: imx: Fix the removal of CONFIG_SPI option (2014-11-04 19:00:01 +0800)

----------------------------------------------------------------
The i.MX fixes for 3.18, 2nd round:
 - Fix a regression on Vybrid platform which is caused by commit
   dc4805c2e78b (ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3
   driver), and results in a missing configuration on PLL clocks.
 - Fix a regression with i.MX defconfig files where CONFIG_SPI option
   gets lost accidentally.

----------------------------------------------------------------
Fabio Estevam (1):
      ARM: imx: Fix the removal of CONFIG_SPI option

Stefan Agner (1):
      ARM: imx: clk-vf610: define PLL's clock tree

 arch/arm/configs/imx_v4_v5_defconfig    |   1 +
 arch/arm/configs/imx_v6_v7_defconfig    |   1 +
 arch/arm/mach-imx/clk-vf610.c           | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------
 include/dt-bindings/clock/vf610-clock.h |  39 ++++++++++++++++++++++++-------
 4 files changed, 125 insertions(+), 50 deletions(-)

[GIT PULL] ARM: imx: fixes for 3.18, 2nd round

[Olof Johansson]

On Tue, Nov 4, 2014 at 3:20 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> Hi Arnd, Olof,
>
> This is the second round of i.MX fixes for 3.18.  The clk-vf610 fix is
> relatively big, because it needs some adaption to the change made by
> offending commit dc4805c2e78b (ARM: imx: remove ENABLE and BYPASS bits
> from clk-pllv3 driver).  And it should have been sent to you for earlier
> -rc inclusion, but unfortunately it got delayed for some time because
> Stefan wasn't aware of my email address change.
>
> Please consider to send them for 3.18 inclusion.  Thanks.

In the future, feel free to look at our tree when you prepare fixes
and see where our branch is currently at (based on -rc2). If there's
no reason to bring in a newer -rc for your fixes, then keeping your
branch at the same version as ours makes it just slightly tidier here
at our end.

Anyway, that's a minor detail (and it goes for others too, several
other maintainers tend to base on latest -rc out of habit, I think).

Merged this to fixes. Thanks!


-Olof

[GIT PULL] ARM: imx: fixes for 3.18, 2nd round

[Shawn Guo]

On Tue, Nov 04, 2014 at 08:39:57PM -0800, Olof Johansson wrote:
> On Tue, Nov 4, 2014 at 3:20 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> > Hi Arnd, Olof,
> >
> > This is the second round of i.MX fixes for 3.18.  The clk-vf610 fix is
> > relatively big, because it needs some adaption to the change made by
> > offending commit dc4805c2e78b (ARM: imx: remove ENABLE and BYPASS bits
> > from clk-pllv3 driver).  And it should have been sent to you for earlier
> > -rc inclusion, but unfortunately it got delayed for some time because
> > Stefan wasn't aware of my email address change.
> >
> > Please consider to send them for 3.18 inclusion.  Thanks.
> 
> In the future, feel free to look at our tree when you prepare fixes
> and see where our branch is currently at (based on -rc2). If there's
> no reason to bring in a newer -rc for your fixes, then keeping your
> branch at the same version as ours makes it just slightly tidier here
> at our end.

Okay, noted.

Shawn