[GIT PULL 2/5] ARM: imx: soc changes for 3.12

[Shawn Guo]

On Thu, Aug 22, 2013 at 06:54:35AM -0700, Kevin Hilman wrote:
> Shawn Guo <shawn.guo at linaro.org> writes:
> 
> > The following changes since commit 5ae90d8e467e625e447000cb4335c4db973b1095:
> >
> >   Linux 3.11-rc3 (2013-07-28 20:53:33 -0700)
> >
> > are available in the git repository at:
> >
> >   git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-soc-3.12
> >
> > for you to fetch changes up to 0c383e6a56c2e70db9f2a68f9fe095645f11c151:
> >
> >   phy: micrel: Add definitions for common Micrel PHY registers (2013-08-18 09:30:39 +0800)
> >
> > ----------------------------------------------------------------
> > It contains a bunch of imx soc updates for 3.12.
> >
> > - Add more ethernet phy fixups for imx6 boards
> > - Add some missing imx6q clocks into clock driver
> > - Add new clock types fixup mux and div to work around some ugly
> >   hardware defect
> > - Consolidate L2 cache initialization function, so that it can be used
> >   on more i.MX SoCs
> > - Replace magic numbers in mach-imx6q.c with well defined macros
> > - Support low-level debug for vybrid
> 
> This patch causes a conflict with Russell's DEBUG_LL cleanup, which is
> already in linux-next.

The vybrid patch is already in linux-next as well.  And conflict was
reported and solved by Stephen one month ago [1].

>From the past experience, such trivial conflict with other tree is
allowed by arm-soc folks, and they will ask Linus to take care of it
when sending patches upstream.  But ...

> For v3.12, I suggest you drop this patch and rework your new DEBUG_LL
> support on top of Russell's cleanup.

... I'm also fine with your suggestion.

> Have a look at that and see if you
> can reuse the the generic 8250 stuff added by Russell.

Seems not.

> While there, you
> might look at imx.S as well.

I think Russell would have converted it if it can reuse 8250 stuff.

> 
> If that's OK with you, can you send an updated pull request without the
> DEBUG_LL changes?  The other changes look OK for v3.12.

Okay, will send you an updated pull request without DEBUG_LL changes.

Shawn

[1] https://lkml.org/lkml/2013/6/3/22