]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
imx: iomux-v3: Fix common pad control definitions
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>
Fri, 26 Apr 2013 01:34:44 +0000 (01:34 +0000)
committerStefano Babic <sbabic@denx.de>
Sun, 28 Apr 2013 09:15:06 +0000 (11:15 +0200)
commitd73b97604bf5f08c547c168af89ae85fbf096762
treea64f945d02f4736882d02c1766b4163032c7f0c4
parenteec3f0242df7b96a4dc207515050c20ebaddabb2
imx: iomux-v3: Fix common pad control definitions

Commit dc88403 "iomux-v3: Place pad control definitions into common file" broke
mx51_efikamx because it made i.MX6's pad control definitions conflict with
i.MX51's.

i.MX51's pad control definitions are actually common to some other i.MX
(25/35/53), so move them to the common iomux-v3.h (just like what is done in
Linux's), and select the correct definitions depending on whether CONFIG_MX6 is
defined or not.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
arch/arm/include/asm/arch-mx5/iomux-mx51.h
arch/arm/include/asm/imx-common/iomux-v3.h