tag f0d1da29bc1a6630fdca0b1ac7fa61869db4654e
tagger Shawn Guo <shawn.guo@linaro.org> Tue Sep 17 23:10:08 2013 +0800
object 538bcbe251d621aa19c46babafd01ede8fb6ddde

The imx fixes for 3.12:

* A couple of clock driver and device tree fixes
* A bug fix for clk-fixup-mux to get imx6sl back to boot
* A L2 cache setting fix for imx6q
* One pinctrl macro fix for UART2 DTE entries

commit 538bcbe251d621aa19c46babafd01ede8fb6ddde
author Huang Shijie <b32955@freescale.com> Mon Sep 16 17:02:45 2013 +0800
committer Shawn Guo <shawn.guo@linaro.org> Tue Sep 17 10:04:25 2013 +0800
tree 6467f644183a50c268c9fa6050e6270712b0d85c
parent 9779f0e1d75c99c79000ed9e303287fc23da3e9e

ARM: dts: imx6q: fix the wrong offset of the Pad Mux register

The patch "0b7a76a ARM: dts: imx6q{dl}: add DTE pads for uart"
adds the DTE pads for uart. For PAD_EIM_D29, the offset of the
Pad Mux register should be 0x0c8, not 0x0c4.

This patch fixes it.

Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>