[GIT PULL 2/5] ARM: imx: soc changes for 3.12
Russell King - ARM Linux
linux at arm.linux.org.uk
Fri Aug 23 06:11:14 EDT 2013
On Thu, Aug 22, 2013 at 06:54:35AM -0700, Kevin Hilman wrote:
> This patch causes a conflict with Russell's DEBUG_LL cleanup, which is
> already in linux-next.
> For v3.12, I suggest you drop this patch and rework your new DEBUG_LL
> support on top of Russell's cleanup. Have a look at that and see if you
> can reuse the the generic 8250 stuff added by Russell. While there, you
> might look at imx.S as well.
I'm not sure why you think imx.S may be able to use the generic 8250
stuff, it doesn't seem to have the same register layout or even the
same bit positions as 8250:
str \rd, [\rx, #0x40] @ TXDATA
1002: ldr \rd, [\rx, #0x98] @ SR2
tst \rd, #1 << 3 @ TXDC
beq 1002b @ wait until transmit done
I did convert everything which I considered convertable at the time.
More information about the linux-arm-kernel