Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev

66 files changed, 9327 insertions, 12284 deletions

diff --git a/classes/angstrom.bbclass b/classes/angstrom.bbclass
new file mode 100644
index 0000000000..4a810a638a
--- /dev/null
+++ b/classes/angstrom.bbclass
@@ -0,0 +1,19 @@
+# anonymous support class for angstrom
+# 
+# Features:
+#
+# * blacklist handling, set ANGSTROM_BLACKLIST_pn-blah = "message"
+#
+
+python () {
+    import bb
+
+    blacklist = bb.data.getVar("ANGSTROM_BLACKLIST", d, 1)
+    pkgnm = bb.data.getVar("PN", d, 1)
+
+    if blacklist:
+	bb.note("Angstrom DOES NOT support %s because %s" % (pkgnm, blacklist))
+        raise bb.parse.SkipPackage("Angstrom DOES NOT support %s because %s" % (pkgnm, blacklist))
+
+}
+
diff --git a/classes/packagehistory.bbclass b/classes/packagehistory.bbclass
new file mode 100644
index 0000000000..fdc47cb9b4
--- /dev/null
+++ b/classes/packagehistory.bbclass
@@ -0,0 +1,102 @@
+# Must inherit package first before changing PACKAGEFUNCS
+inherit package
+PACKAGEFUNCS += "emit_pkghistory"
+
+PKGHIST_DIR = "${TMPDIR}/pkghistory/"
+
+
+#
+# Called during do_package to write out metadata about this package
+# for comparision when writing future packages
+#
+python emit_pkghistory() {
+	packages = bb.data.getVar('PACKAGES', d, True)
+	pkghistdir = bb.data.getVar('PKGHIST_DIR', d, True)
+
+
+	# Should check PACKAGES here to see if anything removed
+
+	def getpkgvar(pkg, var):
+		val = bb.data.getVar('%s_%s' % (var, pkg), d, 1)
+		if val:
+			return val
+		val = bb.data.getVar('%s' % (var), d, 1)
+
+		return val
+
+	def getlastversion(pkg):
+		try:
+			pe = os.path.basename(os.readlink(os.path.join(pkghistdir, pkg, "latest")))
+			pv = os.path.basename(os.readlink(os.path.join(pkghistdir, pkg, pe, "latest")))
+			pr = os.path.basename(os.readlink(os.path.join(pkghistdir, pkg, pe, pv, "latest")))
+			return (pe, pv, pr)
+		except OSError:
+			return (None, None, None)			
+
+	for pkg in packages.split():
+		pe = getpkgvar(pkg, 'PE') or "0"
+		pv = getpkgvar(pkg, 'PV')
+		pr = getpkgvar(pkg, 'PR')
+		destdir = os.path.join(pkghistdir, pkg, pe, pv, pr)
+		
+		#
+		# Find out what the last version was
+		# Make sure the version did not decrease
+		#
+		lastversion = getlastversion(pkg)
+		(last_pe, last_pv, last_pr) = lastversion
+
+		if last_pe is not None:
+			r = bb.utils.vercmp((pe, pv, pr), lastversion)
+			if r < 0:
+				bb.fatal("Package version for package %s went backwards which would break package feeds from (%s:%s-%s to %s:%s-%s)" % (pkg, last_pe, last_pv, last_pr, pe, pv, pr))
+
+		write_pkghistory(pkg, pe, pv, pr, d)
+
+		if last_pe is not None:
+			check_pkghistory(pkg, pe, pv, pr, lastversion)
+
+		write_latestlink(pkg, pe, pv, pr, d)		
+}
+
+
+def check_pkghistory(pkg, pe, pv, pr, lastversion):
+	import bb
+
+	(last_pe, last_pv, last_pr) = lastversion
+
+	bb.debug(2, "Checking package history")
+	# RDEPENDS removed?
+	# PKG changed?
+	# Each file list of each package for file removals?
+
+
+def write_pkghistory(pkg, pe, pv, pr, d):
+	import bb, os
+	bb.debug(2, "Writing package history")
+
+	pkghistdir = bb.data.getVar('PKGHIST_DIR', d, True)
+
+	verpath = os.path.join(pkghistdir, pkg, pe, pv, pr)
+	if not os.path.exists(verpath):
+		os.makedirs(verpath)
+
+def write_latestlink(pkg, pe, pv, pr, d):
+	import bb, os
+
+	pkghistdir = bb.data.getVar('PKGHIST_DIR', d, True)
+
+	def rm_link(path):
+		try: 
+			os.unlink(path)
+		except OSError:
+			return
+
+	rm_link(os.path.join(pkghistdir, pkg, "latest"))
+	rm_link(os.path.join(pkghistdir, pkg, pe, "latest"))
+	rm_link(os.path.join(pkghistdir, pkg, pe, pv, "latest"))
+
+	os.symlink(os.path.join(pkghistdir, pkg, pe), os.path.join(pkghistdir, pkg, "latest"))
+	os.symlink(os.path.join(pkghistdir, pkg, pe, pv), os.path.join(pkghistdir, pkg, pe, "latest"))
+	os.symlink(os.path.join(pkghistdir, pkg, pe, pv, pr), os.path.join(pkghistdir, pkg, pe, pv, "latest"))
+
diff --git a/conf/checksums.ini b/conf/checksums.ini
index d18ebbcad5..5e635c3198 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -12902,6 +12902,10 @@ sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
 md5=15de3830b751818a54a42899bd3ae72c
 sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
 
+[http://ftp.gnu.org/gnu/libcdio/libcdio-0.81.tar.gz]
+md5=2ad1622b672ccf53a3444a0c55724d38
+sha256=ddeafa5965eaa07f3bd46b0e39b65cba6fa9940d684f7b15bfd615f77eccb51c
+
 [http://libchamplain.pierlux.com/release/0.2.8/libchamplain-0.2.8.tar.gz]
 md5=fa4a620efa1a1c1036b6701b7d4dafe1
 sha256=01e17811a85e93e5158f5d721b9b1b249db44683735a172fa0debd9759d3175c
@@ -17202,6 +17206,10 @@ sha256=30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd
 md5=66817a4b4c05454e6488f6b821f2a6a3
 sha256=0b3926a141873f179efc3c3b9d296b65d332dbb898340ac5e5d1dd0c3dd9fb20
 
+[http://downloads.sourceforge.net/musicpd/mpd-0.15.tar.bz2]
+md5=2ed93a60bd703ba46d6794e12cfb5f1d
+sha256=38d4c4073e81585c0f0b1a3b4909f7fecd0305de90f373a9a1c087090e6ddc20
+
 [http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.0b.tar.gz]
 md5=52d10ea80595ec83d8557ba7ac6dc8e6
 sha256=9416376952812e5b479745d67a2bf874fbcad10137517314ce7de37abb756df8
@@ -17734,6 +17742,10 @@ sha256=fd5a85b48613452fbfc9ce6d6e3fa3f37992731422eb2843235fbf4e02d6f1e9
 md5=35e821cfd888e9523a90fb7e5074a072
 sha256=fd5a85b48613452fbfc9ce6d6e3fa3f37992731422eb2843235fbf4e02d6f1e9
 
+[http://www.nilfs.org/download/nilfs-utils-2.0.13.tar.bz2]
+md5=2621a9f9145c5edfa38e6e5ee79ceca1
+sha256=2f79bba49c075c101963aeff8abbf7acc77f489f0b5d7dddb1e5405f48cbd4d4
+
 [http://ftp.debian.org/debian/pool/main/n/nkf/nkf_2.07.orig.tar.gz]
 md5=af11dcd3fe71d67831c020e3bfd5073b
 sha256=71d2ba992df209a00bb1dca45e3336729dc16e51b71526bd20f897cc6127a275
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 470c31a788..9b1968f343 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -160,6 +160,9 @@ PREFERRED_PROVIDER_bluez-utils-dbus      = "bluez-utils"
 PREFERRED_PROVIDER_bluez-libs            = "bluez4"
 PREFERRED_PROVIDER_bluez-utils           = "bluez4"
 
+ANGSTROM_BLACKLIST_pn-bluez-libs	= "bluez3 has been replace by bluez4"
+ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez3 has been replace by bluez4"
+
 # we don't ship gtk-directfb by default
 PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-ani  ?= "gtk+"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 1f0967a42e..287bd9bd77 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -17,11 +17,9 @@ FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 FULL_OPTIMIZATION_ep9312 = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O -fno-signed-zeros"
 
-BUILD_OPTIMIZATION = "-O2 -ggdb3"
-BUILD_OPTIMIZATION_pn-perl = "-O1"
-BUILD_OPTIMIZATION_pn-glibc = "-O2"
-BUILD_OPTIMIZATION_sparc = "-O2"
-BUILD_OPTIMIZATION_ep9312 = "-O"
+# This is only used for -native packages
+BUILD_OPTIMIZATION = "-O2 -g"
+BUILD_OPTIMIZATION_pn-perl-native = "-O1 -g"
 
 TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 525f949331..669c8ada3c 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -70,6 +70,9 @@ INHERIT += "debian"
 #activate config checker
 INHERIT += "sanity" 
 
+#activate the blacklister
+INHERIT += "angstrom"
+
 #make devshell available as task
 INHERIT += "devshell" 
 
@@ -78,6 +81,7 @@ INHERIT += "angstrom-mirrors"
 
 #run QA tests on builds and packages and log them  
 INHERIT += "insane"
+# INHERIT += "packagehistory"
 QA_LOG = "1"
 
 #run QA tests on recipes
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index ea395b441b..9c3c8f59e1 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r39" 
+MACHINE_KERNEL_PR = "r40" 
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index b1b9d7b834..29b154c1b8 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -104,6 +104,7 @@ do
                       dialog \
                       distcc \
                       dsniff \
+                      dosfstools \
                       duke3d \
                       dvb-apps \
                       dvbstream \
diff --git a/recipes/angstrom/e-wm-config-angstrom.bb b/recipes/angstrom/e-wm-config-angstrom.bb
index 5b3308811c..208ab99c9f 100644
--- a/recipes/angstrom/e-wm-config-angstrom.bb
+++ b/recipes/angstrom/e-wm-config-angstrom.bb
@@ -1,12 +1,10 @@
 DESCRIPTION = "Enlightenment DR17 theme for Angstrom"
 LICENSE = "MIT/BSD"
-DEPENDS = "edje-native eet-native"
-RDEPENDS = "e-wm"
-RRECOMMENDS = "places gnome-icon-theme"
+DEPENDS = "edje-native eet-native e-wm places gnome-icon-theme"
 
 PACKAGES_DYNAMIC = "e-wm-config-angstrom*"
 
-PR = "r11"
+PR = "r13"
 
 SRC_URI = " \
           file://configs \
@@ -39,9 +37,11 @@ do_install() {
 	done
 }
 
+RDEPENDS_${PN} = "e-wm places gnome-icon-theme"
+
 python populate_packages_prepend () {
 	angstrom_e_dir = bb.data.expand('${datadir}/enlightenment/data/config', d)
-	do_split_packages(d, angstrom_e_dir, '(.*)', 'e-wm-config-%s', 'E17 window manager %s config', extra_depends='', allow_links=True, allow_dirs=True)
+	do_split_packages(d, angstrom_e_dir, '(.*)', 'e-wm-config-%s', 'E17 window manager %s config', extra_depends='e-wm places gnome-icon-theme', allow_links=True, allow_dirs=True)
 }
 
 PACKAGE_ARCH = "all"
diff --git a/recipes/bluez/bluez4.inc b/recipes/bluez/bluez4.inc
index 4c3bfb8e8c..d34cdb9d6b 100644
--- a/recipes/bluez/bluez4.inc
+++ b/recipes/bluez/bluez4.inc
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 INC_PR = "r1"
 
 # For angstrom we want this to replace at least bluez-libs
-PROVIDES_append_angstrom = " bluez-utils bluez-libs"
+PROVIDES_append_angstrom = " bluez-utils-dbus bluez-utils bluez-libs"
 
 SRC_URI = "\
   http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
diff --git a/recipes/classpath/classpath.inc b/recipes/classpath/classpath.inc
index 06e236ca60..ab47635d78 100644
--- a/recipes/classpath/classpath.inc
+++ b/recipes/classpath/classpath.inc
@@ -33,7 +33,7 @@ EXTRA_OECONF = "\
   --with-antlr-jar=${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar \
   "
 
-inherit autotools
+inherit autotools java
 
 do_configure_prepend () {
 
diff --git a/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb
index b3786d3c1d..7ab481580a 100644
--- a/recipes/eglibc/eglibc_2.9.bb
+++ b/recipes/eglibc/eglibc_2.9.bb
@@ -4,11 +4,12 @@ DEPENDS += "gperf-native"
 DEFAULT_PREFERENCE = "1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.9"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 SVN_REV="7430"
 EGLIBC_BRANCH="eglibc-2_9"
 SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
+           file://eglibc_adjust_begin_insertion.patch;patch=1 \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
diff --git a/recipes/eglibc/files/eglibc_adjust_begin_insertion.patch b/recipes/eglibc/files/eglibc_adjust_begin_insertion.patch
new file mode 100644
index 0000000000..8f05cc0cab
--- /dev/null
+++ b/recipes/eglibc/files/eglibc_adjust_begin_insertion.patch
@@ -0,0 +1,13 @@
+Index: libc/elf/Makefile
+===================================================================
+--- libc.orig/elf/Makefile	2009-07-15 14:37:34.000000000 -0700
++++ libc/elf/Makefile	2009-07-15 14:37:47.000000000 -0700
+@@ -305,7 +305,7 @@
+ 		  $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 |	\
+ 		  LC_ALL=C \
+ 		  sed -e '/^=========/,/^=========/!d;/^=========/d'	\
+-		      -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \
++		      -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \
+ 		  > $@.lds
+ 	$(LINK.o) -nostdlib -nostartfiles -shared -o $@			\
+ 		  $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now))	\
diff --git a/recipes/glibc/glibc-initial.inc b/recipes/glibc/glibc-initial.inc
index cd65924047..6468f0df6d 100644
--- a/recipes/glibc/glibc-initial.inc
+++ b/recipes/glibc/glibc-initial.inc
@@ -1,7 +1,6 @@
 SECTION = "libs"
 DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-FILESPATHPKG =. "glibc-2.4:"
 
 PACKAGES = ""
 PACKAGES_DYNAMIC = ""
diff --git a/recipes/glibc/glibc-stage.inc b/recipes/glibc/glibc-stage.inc
index 2b7b303c14..cb9ab04e1f 100644
--- a/recipes/glibc/glibc-stage.inc
+++ b/recipes/glibc/glibc-stage.inc
@@ -5,12 +5,10 @@ do_stage() {
 		   '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
 		   install
 
-	install -d ${STAGING_INCDIR}/gnu \
-		   ${STAGING_INCDIR}/bits \
-		   ${STAGING_INCDIR}/rpcsvc
-	install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/
-	install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/
-	install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h
+	# "make install" omits some (not all) RPC headers that other distros
+	# ship.
+	install -d ${STAGING_INCDIR}/rpcsvc
+
 	for r in ${rpcsvc}; do
 		h=`echo $r|sed -e's,\.x$,.h,'`
 		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
diff --git a/recipes/glibc/glibc.inc b/recipes/glibc/glibc.inc
index c2ee5317bf..9a3942169a 100644
--- a/recipes/glibc/glibc.inc
+++ b/recipes/glibc/glibc.inc
@@ -10,6 +10,9 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
 PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES += "virtual/libintl virtual/libiconv"
 
+# INC_PR for glibc.inc, glibc-initial.inc and glibc-stage.inc
+INC_PR = "r32"
+
 inherit autotools
 
 LEAD_SONAME = "libc.so"
diff --git a/recipes/glibc/glibc_2.2.5.bb b/recipes/glibc/glibc_2.2.5.bb
index 49d3a355fd..f810477e73 100644
--- a/recipes/glibc/glibc_2.2.5.bb
+++ b/recipes/glibc/glibc_2.2.5.bb
@@ -1,7 +1,7 @@
 require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r21"
+PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/recipes/glibc/glibc_2.3.2+cvs20040726.bb b/recipes/glibc/glibc_2.3.2+cvs20040726.bb
index 754c85fa27..0799676592 100644
--- a/recipes/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/recipes/glibc/glibc_2.3.2+cvs20040726.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r31"
+PR = "${INC_PR}.0"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/recipes/glibc/glibc_2.3.2.bb b/recipes/glibc/glibc_2.3.2.bb
index 0ed7d3e723..1524420b3b 100644
--- a/recipes/glibc/glibc_2.3.2.bb
+++ b/recipes/glibc/glibc_2.3.2.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r20"
+PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/recipes/glibc/glibc_2.3.3+cvs20041128.bb b/recipes/glibc/glibc_2.3.3+cvs20041128.bb
index 02be256c98..d99bde7384 100644
--- a/recipes/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/recipes/glibc/glibc_2.3.3+cvs20041128.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r16"
+PR = "${INC_PR}.0"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/recipes/glibc/glibc_2.3.3+cvs20050221.bb b/recipes/glibc/glibc_2.3.3+cvs20050221.bb
index 4eff27f26b..7ce4cce907 100644
--- a/recipes/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/recipes/glibc/glibc_2.3.3+cvs20050221.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r16"
+PR = "${INC_PR}.0"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/recipes/glibc/glibc_2.3.3+cvs20050420.bb b/recipes/glibc/glibc_2.3.3+cvs20050420.bb
index 65654dc4b8..ea51f9e4e7 100644
--- a/recipes/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/recipes/glibc/glibc_2.3.3+cvs20050420.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0"
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r14"
+PR = "${INC_PR}.0"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/recipes/glibc/glibc_2.3.3.bb b/recipes/glibc/glibc_2.3.3.bb
index dada4bb2fb..83ef019037 100644
--- a/recipes/glibc/glibc_2.3.3.bb
+++ b/recipes/glibc/glibc_2.3.3.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r17"
+PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/recipes/glibc/glibc_2.3.5+cvs20050627.bb b/recipes/glibc/glibc_2.3.5+cvs20050627.bb
index 1d4dd0d393..04231d1901 100644
--- a/recipes/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/recipes/glibc/glibc_2.3.5+cvs20050627.bb
@@ -2,7 +2,7 @@ require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 SRCDATE = "20050627"
-PR = "r23"
+PR = "${INC_PR}.0"
 
 #Doesnt build for sh3
 DEFAULT_PREFERENCE_sh3="-1"
diff --git a/recipes/glibc/glibc_2.3.6.bb b/recipes/glibc/glibc_2.3.6.bb
index 8d645409dd..9277dd1a54 100644
--- a/recipes/glibc/glibc_2.3.6.bb
+++ b/recipes/glibc/glibc_2.3.6.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r5"
+PR = "${INC_PR}.0"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/recipes/glibc/glibc_2.4.bb b/recipes/glibc/glibc_2.4.bb
index 54fe487bbc..ca6afe284a 100644
--- a/recipes/glibc/glibc_2.4.bb
+++ b/recipes/glibc/glibc_2.4.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r21"
+PR = "${INC_PR}.0"
 
 #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi
 COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'
diff --git a/recipes/glibc/glibc_2.5.bb b/recipes/glibc/glibc_2.5.bb
index 6e2295904b..02cfeaef2b 100644
--- a/recipes/glibc/glibc_2.5.bb
+++ b/recipes/glibc/glibc_2.5.bb
@@ -1,5 +1,5 @@
 require glibc.inc
-PR = "r18"
+PR = "${INC_PR}.0"
 
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/recipes/glibc/glibc_2.6.1.bb b/recipes/glibc/glibc_2.6.1.bb
index 0a8708c1e3..5cbd8b693c 100644
--- a/recipes/glibc/glibc_2.6.1.bb
+++ b/recipes/glibc/glibc_2.6.1.bb
@@ -1,5 +1,5 @@
 require glibc.inc
-PR = "r17"
+PR = "${INC_PR}.0"
 
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
diff --git a/recipes/glibc/glibc_2.7.bb b/recipes/glibc/glibc_2.7.bb
index 447a6956ec..f152756367 100644
--- a/recipes/glibc/glibc_2.7.bb
+++ b/recipes/glibc/glibc_2.7.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
 
-PR = "r10"
+PR = "${INC_PR}.0"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
diff --git a/recipes/glibc/glibc_2.9.bb b/recipes/glibc/glibc_2.9.bb
index b0ba738477..6e323aa61b 100644
--- a/recipes/glibc/glibc_2.9.bb
+++ b/recipes/glibc/glibc_2.9.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
 
-PR = "r2"
+PR = "${INC_PR}.0"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
diff --git a/recipes/glibc/glibc_cvs.bb b/recipes/glibc/glibc_cvs.bb
index 26d29f0390..4d093de722 100644
--- a/recipes/glibc/glibc_cvs.bb
+++ b/recipes/glibc/glibc_cvs.bb
@@ -1,7 +1,7 @@
 require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
-PR = "r12"
+PR = "${INC_PR}.0"
 PV = "2.3.5+cvs${SRCDATE}"
 
 GLIBC_ADDONS ?= "ports,linuxthreads"
diff --git a/recipes/libopie/libopie2_cvs.bb b/recipes/libopie/libopie2_cvs.bb
index c9f11b23e2..427f83b786 100644
--- a/recipes/libopie/libopie2_cvs.bb
+++ b/recipes/libopie/libopie2_cvs.bb
@@ -1,17 +1,18 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r12"
+PR = "r13"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
-           file://c7x0_w100_disable.patch;patch=1 \
            file://include.pro"
 
-# Patches merged upstream, keep for reference (for 1.2.2)
-#           file://ipaq-lcd-rotate-cleanup.patch;patch=1 \
-#           file://exports.patch;patch=1 \
-#	   file://wireless.patch;patch=1"
-
+# FIXME remove this!
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
+
+do_stage_append() {
+        # special case for uic-created header files
+        install -m 0644 opiepim/ui/opimalarmdlgbase.h ${STAGING_INCDIR}/opie2/
+}
+
diff --git a/recipes/libqpe/libqpe-opie_cvs.bb b/recipes/libqpe/libqpe-opie_cvs.bb
index d3b17ac7ee..49c1a934e3 100644
--- a/recipes/libqpe/libqpe-opie_cvs.bb
+++ b/recipes/libqpe/libqpe-opie_cvs.bb
@@ -1,11 +1,11 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/library \
            file://fix-titleheight.patch;patch=1 \
            file://unbreak-logging.patch;patch=1 \
            file://citytime-path-2.patch;patch=1 \
+           file://no-include-pro.patch;patch=1 \
           "
-
diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig
index 290f8df24c..0fd0163521 100644
--- a/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig
+++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.30-rc4
-# Tue Jun 30 22:46:56 2009
+# Thu Jul 16 17:08:59 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -35,7 +35,7 @@ CONFIG_BROKEN_ON_SMP=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -238,7 +238,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PREEMPT=y
 CONFIG_HZ=100
 CONFIG_AEABI=y
-CONFIG_OABI_COMPAT=y
+# CONFIG_OABI_COMPAT is not set
 CONFIG_ARCH_FLATMEM_HAS_HOLES=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
@@ -264,7 +264,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="init=/linuxrc root=1f01 rootfstype=jffs2 ro console=ttymxc0,115200 panic=1"
+CONFIG_CMDLINE=" debug "
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
 
@@ -282,9 +282,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 #
 # At least one emulation must be selected
 #
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
-# CONFIG_FPE_FASTFPE is not set
 CONFIG_VFP=y
 
 #
@@ -369,7 +366,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
+CONFIG_CAN=y
+CONFIG_CAN_RAW=y
+CONFIG_CAN_BCM=y
+
+#
+# CAN Device Drivers
+#
+# CONFIG_CAN_VCAN is not set
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_CAN_FLEXCAN=y
+CONFIG_CAN_FLEXCAN_CAN2=y
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
@@ -461,7 +468,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_GPIO is not set
@@ -469,6 +476,7 @@ CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
 CONFIG_MTD_NAND_MXC=y
 CONFIG_MTD_NAND_MXC_FLASH_BBT=y
 CONFIG_ARCH_MXC_HAS_NFC_V1=y
@@ -490,6 +498,7 @@ CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_LOOP=m
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
@@ -511,9 +520,46 @@ CONFIG_HAVE_IDE=y
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_DMA is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
 CONFIG_NETDEVICES=y
@@ -522,7 +568,7 @@ CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 # CONFIG_VETH is not set
 CONFIG_PHYLIB=y
 
@@ -575,9 +621,28 @@ CONFIG_FEC=y
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
 #
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
 # CONFIG_WAN is not set
-# CONFIG_PPP is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPPOL2TP=m
 # CONFIG_SLIP is not set
+CONFIG_SLHC=m
 CONFIG_NETCONSOLE=y
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
@@ -595,12 +660,12 @@ CONFIG_INPUT=y
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
-CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_EVBUG=m
 # CONFIG_INPUT_APMPOWER is not set
 
@@ -618,11 +683,27 @@ CONFIG_KEYBOARD_GPIO=m
 CONFIG_INPUT_MOUSE=y
 # CONFIG_MOUSE_PS2 is not set
 # CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+CONFIG_TOUCHSCREEN_MXC_TSADCC=y
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_INPUT_MISC is not set
 
 #
@@ -778,22 +859,211 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
 # CONFIG_SOUND is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 CONFIG_HID_DEBUG=y
 # CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
 
 #
 # Special HID drivers
 #
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_MMC is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_DRAGONRISE_FF is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KYE is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_GREENASIA_FF is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_THRUSTMASTER_FF is not set
+# CONFIG_ZEROPLUS_FF is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+CONFIG_USB_EHCI_MXC=y
+CONFIG_ARCH_MXC_EHCI_USBH2=y
+CONFIG_ARCH_MXC_EHCI_USBOTG=y
+CONFIG_ARCH_MXC_HAS_USBH2=y
+CONFIG_ARCH_MXC_HAS_USBOTG=y
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_VST is not set
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_IMX is not set
+CONFIG_USB_GADGET_M66592=y
+CONFIG_USB_M66592=m
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+CONFIG_USB_FILE_STORAGE_TEST=y
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+CONFIG_USB_G_PRINTER=m
+CONFIG_USB_CDC_COMPOSITE=m
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_NOP_USB_XCEIV is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_MXC is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_NEW_LEDS=y
@@ -1151,7 +1421,7 @@ CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_SHA1 is not set
+CONFIG_CRYPTO_SHA1=m
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
@@ -1195,7 +1465,7 @@ CONFIG_CRYPTO_HW=y
 #
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_FIND_LAST_BIT=y
-# CONFIG_CRC_CCITT is not set
+CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_T10DIF is not set
 # CONFIG_CRC_ITU_T is not set
diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-karo3.diff
index 17765b46f6..dad744a629 100644
--- a/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff
+++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-karo3.diff
@@ -1,11 +1,11 @@
-diff -urNp linux-2.6.30-rc4/.config linux-2.6.30-rc4-karo/.config
---- linux-2.6.30-rc4/.config	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/.config	2009-06-08 13:11:18.000000000 +0200
-@@ -0,0 +1,1203 @@
+diff -purN linux-2.6.30-rc4-git/arch/arm/configs/karo_tx25_defconfig linux-2.6.30-rc4-karo3/arch/arm/configs/karo_tx25_defconfig
+--- linux-2.6.30-rc4-git/arch/arm/configs/karo_tx25_defconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/configs/karo_tx25_defconfig	2009-07-14 13:49:57.000000000 +0200
+@@ -0,0 +1,1442 @@
 +#
 +# Automatically generated make config: don't edit
 +# Linux kernel version: 2.6.30-rc4
-+# Fri Jun  5 21:17:57 2009
++# Tue Jul 14 13:40:27 2009
 +#
 +CONFIG_ARM=y
 +CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -76,7 +76,7 @@ diff -urNp linux-2.6.30-rc4/.config linux-2.6.30-rc4-karo/.config
 +CONFIG_UID16=y
 +CONFIG_SYSCTL_SYSCALL=y
 +CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
++CONFIG_KALLSYMS_ALL=y
 +# CONFIG_KALLSYMS_EXTRA_PASS is not set
 +# CONFIG_STRIP_ASM_SYMS is not set
 +CONFIG_HOTPLUG=y
@@ -304,7 +304,7 @@ diff -urNp linux-2.6.30-rc4/.config linux-2.6.30-rc4-karo/.config
 +#
 +CONFIG_PM=y
 +CONFIG_PM_DEBUG=y
-+CONFIG_PM_VERBOSE=y
++# CONFIG_PM_VERBOSE is not set
 +CONFIG_CAN_PM_TRACE=y
 +CONFIG_PM_SLEEP=y
 +CONFIG_SUSPEND=y
@@ -473,6 +473,7 @@ diff -urNp linux-2.6.30-rc4/.config linux-2.6.30-rc4-karo/.config
 +# CONFIG_MTD_NAND_DISKONCHIP is not set
 +# CONFIG_MTD_NAND_NANDSIM is not set
 +# CONFIG_MTD_NAND_PLATFORM is not set
++# CONFIG_MTD_ALAUDA is not set
 +CONFIG_MTD_NAND_MXC=y
 +CONFIG_MTD_NAND_MXC_FLASH_BBT=y
 +CONFIG_ARCH_MXC_HAS_NFC_V1=y
@@ -494,6 +495,7 @@ diff -urNp linux-2.6.30-rc4/.config linux-2.6.30-rc4-karo/.config
 +CONFIG_BLK_DEV_LOOP=m
 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set
 +# CONFIG_BLK_DEV_NBD is not set
++# CONFIG_BLK_DEV_UB is not set
 +CONFIG_BLK_DEV_RAM=y
 +CONFIG_BLK_DEV_RAM_COUNT=16
 +CONFIG_BLK_DEV_RAM_SIZE=8192
@@ -515,1216 +517,42 @@ diff -urNp linux-2.6.30-rc4/.config linux-2.6.30-rc4-karo/.config
 +# SCSI device support
 +#
 +# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
++CONFIG_SCSI=m
++CONFIG_SCSI_DMA=y
++# CONFIG_SCSI_TGT is not set
 +# CONFIG_SCSI_NETLINK is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+CONFIG_NETDEVICES=y
-+CONFIG_COMPAT_NET_DEV_OPS=y
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+# CONFIG_TUN is not set
-+# CONFIG_VETH is not set
-+CONFIG_PHYLIB=y
-+
-+#
-+# MII PHY device drivers
-+#
-+# CONFIG_MARVELL_PHY is not set
-+# CONFIG_DAVICOM_PHY is not set
-+# CONFIG_QSEMI_PHY is not set
-+# CONFIG_LXT_PHY is not set
-+# CONFIG_CICADA_PHY is not set
-+# CONFIG_VITESSE_PHY is not set
-+CONFIG_SMSC_PHY=y
-+# CONFIG_BROADCOM_PHY is not set
-+# CONFIG_ICPLUS_PHY is not set
-+# CONFIG_REALTEK_PHY is not set
-+# CONFIG_NATIONAL_PHY is not set
-+# CONFIG_STE10XP is not set
-+# CONFIG_LSI_ET1011C_PHY is not set
-+# CONFIG_FIXED_PHY is not set
-+# CONFIG_MDIO_BITBANG is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_AX88796 is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_ETHOC is not set
-+# CONFIG_SMC911X is not set
-+# CONFIG_SMSC911X is not set
-+# CONFIG_DNET is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-+# CONFIG_B44 is not set
-+CONFIG_FEC=y
-+# CONFIG_FEC2 is not set
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
++CONFIG_SCSI_PROC_FS=y
 +
 +#
-+# Enable WiMAX (Networking options) to see the WiMAX drivers
++# SCSI support type (disk, tape, CD-ROM)
 +#
-+# CONFIG_WAN is not set
-+# CONFIG_PPP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_NETCONSOLE=y
-+CONFIG_NETCONSOLE_DYNAMIC=y
-+CONFIG_NETPOLL=y
-+# CONFIG_NETPOLL_TRAP is not set
-+CONFIG_NET_POLL_CONTROLLER=y
-+# CONFIG_ISDN is not set
++CONFIG_BLK_DEV_SD=m
++# CONFIG_CHR_DEV_ST is not set
++# CONFIG_CHR_DEV_OSST is not set
++# CONFIG_BLK_DEV_SR is not set
++CONFIG_CHR_DEV_SG=m
++# CONFIG_CHR_DEV_SCH is not set
 +
 +#
-+# Input device support
++# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 +#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
++# CONFIG_SCSI_MULTI_LUN is not set
++# CONFIG_SCSI_CONSTANTS is not set
++# CONFIG_SCSI_LOGGING is not set
++# CONFIG_SCSI_SCAN_ASYNC is not set
++CONFIG_SCSI_WAIT_SCAN=m
 +
 +#
-+# Userland interfaces
++# SCSI Transports
 +#
-+CONFIG_INPUT_MOUSEDEV=m
-+CONFIG_INPUT_MOUSEDEV_PSAUX=y
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=m
-+CONFIG_INPUT_EVBUG=m
-+# CONFIG_INPUT_APMPOWER is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# CONFIG_KEYBOARD_SUNKBD is not set
-+# CONFIG_KEYBOARD_LKKBD is not set
-+# CONFIG_KEYBOARD_XTKBD is not set
-+# CONFIG_KEYBOARD_NEWTON is not set
-+# CONFIG_KEYBOARD_STOWAWAY is not set
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_MOUSE_GPIO is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
-+# CONFIG_INPUT_MISC is not set
-+
-+#
-+# Hardware I/O ports
-+#
-+# CONFIG_SERIO is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_CONSOLE_TRANSLATIONS=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+CONFIG_DEVKMEM=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_IMX=y
-+CONFIG_SERIAL_IMX_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-+CONFIG_LEGACY_PTYS=y
-+CONFIG_LEGACY_PTY_COUNT=16
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+# CONFIG_I2C is not set
-+# CONFIG_SPI is not set
-+CONFIG_ARCH_REQUIRE_GPIOLIB=y
-+CONFIG_GPIOLIB=y
-+CONFIG_DEBUG_GPIO=y
-+CONFIG_GPIO_SYSFS=y
-+
-+#
-+# Memory mapped GPIO expanders:
-+#
-+
-+#
-+# I2C GPIO expanders:
-+#
-+
-+#
-+# PCI GPIO expanders:
-+#
-+
-+#
-+# SPI GPIO expanders:
-+#
-+# CONFIG_W1 is not set
-+# CONFIG_POWER_SUPPLY is not set
-+# CONFIG_HWMON is not set
-+# CONFIG_THERMAL is not set
-+# CONFIG_THERMAL_HWMON is not set
-+# CONFIG_WATCHDOG is not set
-+CONFIG_SSB_POSSIBLE=y
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_CORE is not set
-+# CONFIG_MFD_SM501 is not set
-+# CONFIG_MFD_ASIC3 is not set
-+# CONFIG_HTC_EGPIO is not set
-+# CONFIG_HTC_PASIC3 is not set
-+# CONFIG_MFD_TMIO is not set
-+# CONFIG_MFD_T7L66XB is not set
-+# CONFIG_MFD_TC6387XB is not set
-+# CONFIG_MFD_TC6393XB is not set
-+
-+#
-+# Multimedia devices
-+#
-+
-+#
-+# Multimedia core support
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_VIDEO_MEDIA is not set
-+
-+#
-+# Multimedia drivers
-+#
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_FOREIGN_ENDIAN is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+CONFIG_FB_MODE_HELPERS=y
-+CONFIG_FB_TILEBLITTING=y
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+CONFIG_FB_IMX=y
-+# CONFIG_FB_S1D13XXX is not set
-+# CONFIG_FB_VIRTUAL is not set
-+# CONFIG_FB_METRONOME is not set
-+# CONFIG_FB_MB862XX is not set
-+# CONFIG_FB_BROADSHEET is not set
-+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-+# CONFIG_FONTS is not set
-+CONFIG_FONT_8x8=y
-+CONFIG_FONT_8x16=y
-+CONFIG_LOGO=y
-+CONFIG_LOGO_LINUX_MONO=y
-+CONFIG_LOGO_LINUX_VGA16=y
-+CONFIG_LOGO_LINUX_CLUT224=y
-+# CONFIG_SOUND is not set
-+# CONFIG_HID_SUPPORT is not set
-+# CONFIG_USB_SUPPORT is not set
-+# CONFIG_MMC is not set
-+# CONFIG_MEMSTICK is not set
-+# CONFIG_ACCESSIBILITY is not set
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_GPIO_PLATFORM=y
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+# CONFIG_LEDS_TRIGGER_TIMER is not set
-+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-+# CONFIG_LEDS_TRIGGER_GPIO is not set
-+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
-+
-+#
-+# iptables trigger is under Netfilter config (LED target)
-+#
-+CONFIG_RTC_LIB=y
-+# CONFIG_RTC_CLASS is not set
-+# CONFIG_DMADEVICES is not set
-+# CONFIG_AUXDISPLAY is not set
-+# CONFIG_REGULATOR is not set
-+# CONFIG_UIO is not set
-+# CONFIG_STAGING is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=m
-+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-+CONFIG_EXT3_FS_XATTR=y
-+CONFIG_EXT3_FS_POSIX_ACL=y
-+# CONFIG_EXT3_FS_SECURITY is not set
-+# CONFIG_EXT4_FS is not set
-+CONFIG_JBD=m
-+CONFIG_FS_MBCACHE=m
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+CONFIG_FS_POSIX_ACL=y
-+CONFIG_FILE_LOCKING=y
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_BTRFS_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+# CONFIG_FUSE_FS is not set
-+
-+#
-+# Caches
-+#
-+# CONFIG_FSCACHE is not set
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=y
-+CONFIG_JOLIET=y
-+CONFIG_ZISOFS=y
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=m
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=m
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+CONFIG_NTFS_FS=m
-+# CONFIG_NTFS_DEBUG is not set
-+CONFIG_NTFS_RW=y
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=y
-+CONFIG_MISC_FILESYSTEMS=y
-+# CONFIG_ADFS_FS is not set
-+# CONFIG_AFFS_FS is not set
-+# CONFIG_HFS_FS is not set
-+# CONFIG_HFSPLUS_FS is not set
-+# CONFIG_BEFS_FS is not set
-+# CONFIG_BFS_FS is not set
-+# CONFIG_EFS_FS is not set
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_SQUASHFS is not set
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_OMFS_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+# CONFIG_ROMFS_FS is not set
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+# CONFIG_NILFS2_FS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+CONFIG_ROOT_NFS=y
-+# CONFIG_NFSD is not set
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CIFS is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+
-+#
-+# Partition Types
-+#
-+CONFIG_PARTITION_ADVANCED=y
-+# CONFIG_ACORN_PARTITION is not set
-+# CONFIG_OSF_PARTITION is not set
-+# CONFIG_AMIGA_PARTITION is not set
-+# CONFIG_ATARI_PARTITION is not set
-+# CONFIG_MAC_PARTITION is not set
-+CONFIG_MSDOS_PARTITION=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL is not set
-+# CONFIG_LDM_PARTITION is not set
-+# CONFIG_SGI_PARTITION is not set
-+# CONFIG_ULTRIX_PARTITION is not set
-+# CONFIG_SUN_PARTITION is not set
-+# CONFIG_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="cp437"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=y
-+# CONFIG_NLS_CODEPAGE_852 is not set
-+# CONFIG_NLS_CODEPAGE_855 is not set
-+# CONFIG_NLS_CODEPAGE_857 is not set
-+# CONFIG_NLS_CODEPAGE_860 is not set
-+# CONFIG_NLS_CODEPAGE_861 is not set
-+# CONFIG_NLS_CODEPAGE_862 is not set
-+# CONFIG_NLS_CODEPAGE_863 is not set
-+# CONFIG_NLS_CODEPAGE_864 is not set
-+# CONFIG_NLS_CODEPAGE_865 is not set
-+# CONFIG_NLS_CODEPAGE_866 is not set
-+# CONFIG_NLS_CODEPAGE_869 is not set
-+# CONFIG_NLS_CODEPAGE_936 is not set
-+# CONFIG_NLS_CODEPAGE_950 is not set
-+# CONFIG_NLS_CODEPAGE_932 is not set
-+# CONFIG_NLS_CODEPAGE_949 is not set
-+# CONFIG_NLS_CODEPAGE_874 is not set
-+# CONFIG_NLS_ISO8859_8 is not set
-+CONFIG_NLS_CODEPAGE_1250=m
-+# CONFIG_NLS_CODEPAGE_1251 is not set
-+CONFIG_NLS_ASCII=m
-+CONFIG_NLS_ISO8859_1=m
-+# CONFIG_NLS_ISO8859_2 is not set
-+# CONFIG_NLS_ISO8859_3 is not set
-+# CONFIG_NLS_ISO8859_4 is not set
-+# CONFIG_NLS_ISO8859_5 is not set
-+# CONFIG_NLS_ISO8859_6 is not set
-+# CONFIG_NLS_ISO8859_7 is not set
-+# CONFIG_NLS_ISO8859_9 is not set
-+# CONFIG_NLS_ISO8859_13 is not set
-+# CONFIG_NLS_ISO8859_14 is not set
-+CONFIG_NLS_ISO8859_15=y
-+# CONFIG_NLS_KOI8_R is not set
-+# CONFIG_NLS_KOI8_U is not set
-+CONFIG_NLS_UTF8=y
-+# CONFIG_DLM is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_FRAME_WARN=1024
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
-+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
-+CONFIG_DETECT_HUNG_TASK=y
-+CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
-+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1
-+# CONFIG_SCHED_DEBUG is not set
-+# CONFIG_SCHEDSTATS is not set
-+# CONFIG_TIMER_STATS is not set
-+# CONFIG_DEBUG_OBJECTS is not set
-+CONFIG_DEBUG_SLAB=y
-+CONFIG_DEBUG_SLAB_LEAK=y
-+# CONFIG_DEBUG_PREEMPT is not set
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_LOCK_ALLOC is not set
-+# CONFIG_PROVE_LOCKING is not set
-+# CONFIG_LOCK_STAT is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+# CONFIG_DEBUG_INFO is not set
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_WRITECOUNT is not set
-+# CONFIG_DEBUG_MEMORY_INIT is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+# CONFIG_DEBUG_NOTIFIERS is not set
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_LATENCYTOP is not set
-+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-+# CONFIG_PAGE_POISONING is not set
-+CONFIG_HAVE_FUNCTION_TRACER=y
-+CONFIG_TRACING_SUPPORT=y
-+
-+#
-+# Tracers
-+#
-+# CONFIG_FUNCTION_TRACER is not set
-+# CONFIG_IRQSOFF_TRACER is not set
-+# CONFIG_PREEMPT_TRACER is not set
-+# CONFIG_SCHED_TRACER is not set
-+# CONFIG_CONTEXT_SWITCH_TRACER is not set
-+# CONFIG_EVENT_TRACER is not set
-+# CONFIG_BOOT_TRACER is not set
-+# CONFIG_TRACE_BRANCH_PROFILING is not set
-+# CONFIG_STACK_TRACER is not set
-+# CONFIG_KMEMTRACE is not set
-+# CONFIG_WORKQUEUE_TRACER is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_SAMPLES is not set
-+CONFIG_HAVE_ARCH_KGDB=y
-+# CONFIG_KGDB is not set
-+CONFIG_ARM_UNWIND=y
-+CONFIG_DEBUG_USER=y
-+CONFIG_DEBUG_ERRORS=y
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+# CONFIG_DEBUG_LL is not set
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITYFS is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
-+# CONFIG_CRYPTO_FIPS is not set
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_ALGAPI2=y
-+CONFIG_CRYPTO_AEAD2=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_BLKCIPHER2=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_HASH2=y
-+CONFIG_CRYPTO_RNG2=y
-+CONFIG_CRYPTO_PCOMP=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_MANAGER2=y
-+# CONFIG_CRYPTO_GF128MUL is not set
-+# CONFIG_CRYPTO_NULL is not set
-+CONFIG_CRYPTO_WORKQUEUE=y
-+# CONFIG_CRYPTO_CRYPTD is not set
-+# CONFIG_CRYPTO_AUTHENC is not set
-+# CONFIG_CRYPTO_TEST is not set
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_SEQIV is not set
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=y
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_CTS is not set
-+CONFIG_CRYPTO_ECB=y
-+# CONFIG_CRYPTO_LRW is not set
-+# CONFIG_CRYPTO_PCBC is not set
-+# CONFIG_CRYPTO_XTS is not set
-+
-+#
-+# Hash modes
-+#
-+CONFIG_CRYPTO_HMAC=y
-+# CONFIG_CRYPTO_XCBC is not set
-+
-+#
-+# Digest
-+#
-+# CONFIG_CRYPTO_CRC32C is not set
-+# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD5=y
-+# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+# CONFIG_CRYPTO_RMD128 is not set
-+# CONFIG_CRYPTO_RMD160 is not set
-+# CONFIG_CRYPTO_RMD256 is not set
-+# CONFIG_CRYPTO_RMD320 is not set
-+# CONFIG_CRYPTO_SHA1 is not set
-+# CONFIG_CRYPTO_SHA256 is not set
-+# CONFIG_CRYPTO_SHA512 is not set
-+# CONFIG_CRYPTO_TGR192 is not set
-+# CONFIG_CRYPTO_WP512 is not set
-+
-+#
-+# Ciphers
-+#
-+CONFIG_CRYPTO_AES=y
-+# CONFIG_CRYPTO_ANUBIS is not set
-+CONFIG_CRYPTO_ARC4=y
-+# CONFIG_CRYPTO_BLOWFISH is not set
-+# CONFIG_CRYPTO_CAMELLIA is not set
-+# CONFIG_CRYPTO_CAST5 is not set
-+# CONFIG_CRYPTO_CAST6 is not set
-+CONFIG_CRYPTO_DES=y
-+# CONFIG_CRYPTO_FCRYPT is not set
-+# CONFIG_CRYPTO_KHAZAD is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SERPENT is not set
-+# CONFIG_CRYPTO_TEA is not set
-+# CONFIG_CRYPTO_TWOFISH is not set
-+
-+#
-+# Compression
-+#
-+# CONFIG_CRYPTO_DEFLATE is not set
-+# CONFIG_CRYPTO_ZLIB is not set
-+# CONFIG_CRYPTO_LZO is not set
-+
-+#
-+# Random Number Generation
-+#
-+# CONFIG_CRYPTO_ANSI_CPRNG is not set
-+CONFIG_CRYPTO_HW=y
-+# CONFIG_BINARY_PRINTF is not set
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_GENERIC_FIND_LAST_BIT=y
-+# CONFIG_CRC_CCITT is not set
-+# CONFIG_CRC16 is not set
-+# CONFIG_CRC_T10DIF is not set
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+# CONFIG_LIBCRC32C is not set
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_DECOMPRESS_GZIP=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_IOPORT=y
-+CONFIG_HAS_DMA=y
-+CONFIG_NLATTR=y
-diff -urNp linux-2.6.30-rc4/arch/arm/configs/karo_tx25_defconfig linux-2.6.30-rc4-karo/arch/arm/configs/karo_tx25_defconfig
---- linux-2.6.30-rc4/arch/arm/configs/karo_tx25_defconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/configs/karo_tx25_defconfig	2009-06-08 13:11:18.000000000 +0200
-@@ -0,0 +1,1203 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.30-rc4
-+# Fri Jun  5 21:17:57 2009
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+CONFIG_GENERIC_TIME=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_MMU=y
-+# CONFIG_NO_IOPORT is not set
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ARCH_MTD_XIP=y
-+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+CONFIG_LOCALVERSION_AUTO=y
-+# CONFIG_SWAP is not set
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_POSIX_MQUEUE_SYSCTL=y
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+
-+#
-+# RCU Subsystem
-+#
-+CONFIG_CLASSIC_RCU=y
-+# CONFIG_TREE_RCU is not set
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_TREE_RCU_TRACE is not set
-+# CONFIG_PREEMPT_RCU_TRACE is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=17
-+# CONFIG_GROUP_SCHED is not set
-+# CONFIG_CGROUPS is not set
-+# CONFIG_SYSFS_DEPRECATED_V2 is not set
-+# CONFIG_RELAY is not set
-+# CONFIG_NAMESPACES is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_RD_GZIP=y
-+# CONFIG_RD_BZIP2 is not set
-+# CONFIG_RD_LZMA is not set
-+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-+CONFIG_SYSCTL=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EMBEDDED=y
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+# CONFIG_STRIP_ASM_SYMS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+# CONFIG_ELF_CORE is not set
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+# CONFIG_AIO is not set
-+# CONFIG_VM_EVENT_COUNTERS is not set
-+# CONFIG_COMPAT_BRK is not set
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_HAVE_CLK=y
-+# CONFIG_SLOW_WORK is not set
-+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+# CONFIG_MODULE_FORCE_LOAD is not set
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+CONFIG_MODVERSIONS=y
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_BLOCK=y
-+CONFIG_LBD=y
-+# CONFIG_BLK_DEV_BSG is not set
-+# CONFIG_BLK_DEV_INTEGRITY is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=y
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_AS=y
-+# CONFIG_DEFAULT_DEADLINE is not set
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="anticipatory"
-+CONFIG_FREEZER=y
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_GEMINI is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KIRKWOOD is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_LOKI is not set
-+# CONFIG_ARCH_MV78XX0 is not set
-+CONFIG_ARCH_MXC=y
-+# CONFIG_ARCH_ORION5X is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_MMP is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+# CONFIG_ARCH_S3C2410 is not set
-+# CONFIG_ARCH_S3C64XX is not set
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+# CONFIG_ARCH_MSM is not set
-+# CONFIG_ARCH_W90X900 is not set
-+
-+#
-+# Freescale MXC Implementations
-+#
-+# CONFIG_ARCH_MX1 is not set
-+CONFIG_ARCH_MX2=y
-+# CONFIG_ARCH_MX3 is not set
-+# CONFIG_MACH_MX21 is not set
-+# CONFIG_MACH_MX27 is not set
-+CONFIG_MACH_MX25=y
-+
-+#
-+# MX2 platforms:
-+#
-+CONFIG_MACH_TX25=y
-+# CONFIG_KARO_DEBUG is not set
-+CONFIG_MACH_STK5_BASEBOARD=y
-+# CONFIG_MXC_IRQ_PRIOR is not set
-+# CONFIG_MXC_PWM is not set
-+CONFIG_ARCH_MXC_IOMUX_V3=y
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM926T=y
-+CONFIG_CPU_32v5=y
-+CONFIG_CPU_ABRT_EV5TJ=y
-+CONFIG_CPU_PABRT_NOIFAR=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
-+# CONFIG_OUTER_CACHE is not set
-+CONFIG_COMMON_CLKDEV=y
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+CONFIG_TICK_ONESHOT=y
-+CONFIG_NO_HZ=y
-+# CONFIG_HIGH_RES_TIMERS is not set
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+CONFIG_VMSPLIT_3G=y
-+# CONFIG_VMSPLIT_2G is not set
-+# CONFIG_VMSPLIT_1G is not set
-+CONFIG_PAGE_OFFSET=0xC0000000
-+CONFIG_PREEMPT=y
-+CONFIG_HZ=100
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+CONFIG_ARCH_FLATMEM_HAS_HOLES=y
-+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-+# CONFIG_HIGHMEM is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+CONFIG_PAGEFLAGS_EXTENDED=y
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_PHYS_ADDR_T_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=0
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_UNEVICTABLE_LRU=y
-+CONFIG_HAVE_MLOCK=y
-+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0
-+CONFIG_ZBOOT_ROM_BSS=0
-+CONFIG_CMDLINE="init=/linuxrc root=1f01 rootfstype=jffs2 ro console=ttymxc0,115200 panic=1"
-+# CONFIG_XIP_KERNEL is not set
-+# CONFIG_KEXEC is not set
-+
-+#
-+# CPU Power Management
-+#
-+CONFIG_CPU_IDLE=y
-+CONFIG_CPU_IDLE_GOV_LADDER=y
-+CONFIG_CPU_IDLE_GOV_MENU=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+CONFIG_VFP=y
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+CONFIG_HAVE_AOUT=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_DEBUG=y
-+CONFIG_PM_VERBOSE=y
-+CONFIG_CAN_PM_TRACE=y
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND=y
-+CONFIG_SUSPEND_FREEZER=y
-+CONFIG_APM_EMULATION=y
-+CONFIG_ARCH_SUSPEND_POSSIBLE=y
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+# CONFIG_NET_KEY is not set
-+CONFIG_INET=y
-+# CONFIG_IP_MULTICAST is not set
-+# CONFIG_IP_ADVANCED_ROUTER is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_BOOTP=y
-+# CONFIG_IP_PNP_RARP is not set
-+# CONFIG_NET_IPIP is not set
-+# CONFIG_NET_IPGRE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+# CONFIG_INET_AH is not set
-+# CONFIG_INET_ESP is not set
-+# CONFIG_INET_IPCOMP is not set
-+# CONFIG_INET_XFRM_TUNNEL is not set
-+# CONFIG_INET_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-+# CONFIG_INET_XFRM_MODE_BEET is not set
-+# CONFIG_INET_LRO is not set
-+# CONFIG_INET_DIAG is not set
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+# CONFIG_TCP_MD5SIG is not set
-+# CONFIG_IPV6 is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+# CONFIG_NETFILTER is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+# CONFIG_BRIDGE is not set
-+# CONFIG_NET_DSA is not set
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+# CONFIG_LLC2 is not set
-+# CONFIG_IPX is not set
-+# CONFIG_ATALK is not set
-+# CONFIG_X25 is not set
-+# CONFIG_LAPB is not set
-+# CONFIG_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+# CONFIG_PHONET is not set
-+# CONFIG_NET_SCHED is not set
-+# CONFIG_DCB is not set
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+# CONFIG_BT is not set
-+# CONFIG_AF_RXRPC is not set
-+# CONFIG_WIRELESS is not set
-+# CONFIG_WIMAX is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=y
-+CONFIG_FIRMWARE_IN_KERNEL=y
-+CONFIG_EXTRA_FIRMWARE=""
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+# CONFIG_CONNECTOR is not set
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+CONFIG_MTD_TESTS=m
-+CONFIG_MTD_REDBOOT_PARTS=y
-+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-5
-+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-+CONFIG_MTD_REDBOOT_PARTS_READONLY=y
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+# CONFIG_MTD_AR7_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+# CONFIG_MTD_CFI is not set
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+# CONFIG_MTD_NAND_GPIO is not set
-+CONFIG_MTD_NAND_IDS=y
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+CONFIG_MTD_NAND_MXC=y
-+CONFIG_MTD_NAND_MXC_FLASH_BBT=y
-+CONFIG_ARCH_MXC_HAS_NFC_V1=y
-+CONFIG_ARCH_MXC_HAS_NFC_V1_1=y
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# LPDDR flash memory drivers
-+#
-+# CONFIG_MTD_LPDDR is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=8192
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+# CONFIG_C2PORT is not set
-+
-+#
-+# EEPROM support
-+#
-+# CONFIG_EEPROM_93CX6 is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+# CONFIG_SCSI is not set
-+# CONFIG_SCSI_DMA is not set
-+# CONFIG_SCSI_NETLINK is not set
++# CONFIG_SCSI_SPI_ATTRS is not set
++# CONFIG_SCSI_FC_ATTRS is not set
++# CONFIG_SCSI_ISCSI_ATTRS is not set
++# CONFIG_SCSI_SAS_LIBSAS is not set
++# CONFIG_SCSI_SRP_ATTRS is not set
++# CONFIG_SCSI_LOWLEVEL is not set
++# CONFIG_SCSI_DH is not set
++# CONFIG_SCSI_OSD_INITIATOR is not set
 +# CONFIG_ATA is not set
 +# CONFIG_MD is not set
 +CONFIG_NETDEVICES=y
@@ -1786,6 +614,15 @@ diff -urNp linux-2.6.30-rc4/arch/arm/configs/karo_tx25_defconfig linux-2.6.30-rc
 +#
 +# Enable WiMAX (Networking options) to see the WiMAX drivers
 +#
++
++#
++# USB Network Adapters
++#
++# CONFIG_USB_CATC is not set
++# CONFIG_USB_KAWETH is not set
++# CONFIG_USB_PEGASUS is not set
++# CONFIG_USB_RTL8150 is not set
++# CONFIG_USB_USBNET is not set
 +# CONFIG_WAN is not set
 +# CONFIG_PPP is not set
 +# CONFIG_SLIP is not set
@@ -1829,11 +666,38 @@ diff -urNp linux-2.6.30-rc4/arch/arm/configs/karo_tx25_defconfig linux-2.6.30-rc
 +CONFIG_INPUT_MOUSE=y
 +# CONFIG_MOUSE_PS2 is not set
 +# CONFIG_MOUSE_SERIAL is not set
++# CONFIG_MOUSE_APPLETOUCH is not set
++# CONFIG_MOUSE_BCM5974 is not set
 +# CONFIG_MOUSE_VSXXXAA is not set
 +# CONFIG_MOUSE_GPIO is not set
 +# CONFIG_INPUT_JOYSTICK is not set
 +# CONFIG_INPUT_TABLET is not set
-+# CONFIG_INPUT_TOUCHSCREEN is not set
++CONFIG_INPUT_TOUCHSCREEN=y
++# CONFIG_TOUCHSCREEN_AD7879 is not set
++# CONFIG_TOUCHSCREEN_FUJITSU is not set
++# CONFIG_TOUCHSCREEN_GUNZE is not set
++# CONFIG_TOUCHSCREEN_ELO is not set
++# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
++# CONFIG_TOUCHSCREEN_MTOUCH is not set
++# CONFIG_TOUCHSCREEN_INEXIO is not set
++# CONFIG_TOUCHSCREEN_MK712 is not set
++# CONFIG_TOUCHSCREEN_PENMOUNT is not set
++# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
++# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
++CONFIG_TOUCHSCREEN_MXC_TSADCC=m
++CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
++CONFIG_TOUCHSCREEN_USB_EGALAX=y
++# CONFIG_TOUCHSCREEN_USB_PANJIT is not set
++# CONFIG_TOUCHSCREEN_USB_3M is not set
++# CONFIG_TOUCHSCREEN_USB_ITM is not set
++# CONFIG_TOUCHSCREEN_USB_ETURBO is not set
++# CONFIG_TOUCHSCREEN_USB_GUNZE is not set
++# CONFIG_TOUCHSCREEN_USB_DMC_TSC10 is not set
++# CONFIG_TOUCHSCREEN_USB_IRTOUCH is not set
++# CONFIG_TOUCHSCREEN_USB_IDEALTEK is not set
++# CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH is not set
++# CONFIG_TOUCHSCREEN_USB_GOTOP is not set
++# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 +# CONFIG_INPUT_MISC is not set
 +
 +#
@@ -1995,7 +859,170 @@ diff -urNp linux-2.6.30-rc4/arch/arm/configs/karo_tx25_defconfig linux-2.6.30-rc
 +CONFIG_LOGO_LINUX_CLUT224=y
 +# CONFIG_SOUND is not set
 +# CONFIG_HID_SUPPORT is not set
-+# CONFIG_USB_SUPPORT is not set
++CONFIG_USB_SUPPORT=y
++CONFIG_USB_ARCH_HAS_HCD=y
++# CONFIG_USB_ARCH_HAS_OHCI is not set
++CONFIG_USB_ARCH_HAS_EHCI=y
++CONFIG_USB=m
++CONFIG_USB_DEBUG=y
++CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
++
++#
++# Miscellaneous USB options
++#
++CONFIG_USB_DEVICEFS=y
++CONFIG_USB_DEVICE_CLASS=y
++CONFIG_USB_DYNAMIC_MINORS=y
++CONFIG_USB_SUSPEND=y
++# CONFIG_USB_OTG is not set
++# CONFIG_USB_OTG_WHITELIST is not set
++# CONFIG_USB_OTG_BLACKLIST_HUB is not set
++CONFIG_USB_MON=m
++# CONFIG_USB_WUSB is not set
++# CONFIG_USB_WUSB_CBAF is not set
++
++#
++# USB Host Controller Drivers
++#
++# CONFIG_USB_C67X00_HCD is not set
++CONFIG_USB_EHCI_HCD=m
++CONFIG_USB_EHCI_ROOT_HUB_TT=y
++# CONFIG_USB_EHCI_TT_NEWSCHED is not set
++# CONFIG_USB_OXU210HP_HCD is not set
++CONFIG_USB_EHCI_MXC=y
++CONFIG_ARCH_MXC_EHCI_USBH2=y
++# CONFIG_ARCH_MXC_EHCI_USBOTG is not set
++CONFIG_ARCH_MXC_HAS_USBH2=y
++CONFIG_ARCH_MXC_HAS_USBOTG=y
++# CONFIG_USB_ISP116X_HCD is not set
++# CONFIG_USB_ISP1760_HCD is not set
++# CONFIG_USB_SL811_HCD is not set
++# CONFIG_USB_R8A66597_HCD is not set
++# CONFIG_USB_HWA_HCD is not set
++
++#
++# Enable Host or Gadget support to see Inventra options
++#
++# CONFIG_USB_MUSB_HDRC is not set
++
++#
++# USB Device Class drivers
++#
++CONFIG_USB_ACM=m
++# CONFIG_USB_PRINTER is not set
++# CONFIG_USB_WDM is not set
++# CONFIG_USB_TMC is not set
++
++#
++# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
++#
++
++#
++# also be needed; see USB_STORAGE Help for more info
++#
++CONFIG_USB_STORAGE=m
++# CONFIG_USB_STORAGE_DEBUG is not set
++CONFIG_USB_STORAGE_DATAFAB=m
++# CONFIG_USB_STORAGE_FREECOM is not set
++# CONFIG_USB_STORAGE_ISD200 is not set
++# CONFIG_USB_STORAGE_USBAT is not set
++CONFIG_USB_STORAGE_SDDR09=m
++CONFIG_USB_STORAGE_SDDR55=m
++CONFIG_USB_STORAGE_JUMPSHOT=m
++# CONFIG_USB_STORAGE_ALAUDA is not set
++# CONFIG_USB_STORAGE_ONETOUCH is not set
++# CONFIG_USB_STORAGE_KARMA is not set
++# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
++# CONFIG_USB_LIBUSUAL is not set
++
++#
++# USB Imaging devices
++#
++# CONFIG_USB_MDC800 is not set
++# CONFIG_USB_MICROTEK is not set
++
++#
++# USB port drivers
++#
++CONFIG_USB_SERIAL=m
++# CONFIG_USB_EZUSB is not set
++# CONFIG_USB_SERIAL_GENERIC is not set
++# CONFIG_USB_SERIAL_AIRCABLE is not set
++# CONFIG_USB_SERIAL_ARK3116 is not set
++CONFIG_USB_SERIAL_BELKIN=m
++# CONFIG_USB_SERIAL_CH341 is not set
++# CONFIG_USB_SERIAL_WHITEHEAT is not set
++# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
++# CONFIG_USB_SERIAL_CP210X is not set
++# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
++# CONFIG_USB_SERIAL_EMPEG is not set
++# CONFIG_USB_SERIAL_FTDI_SIO is not set
++# CONFIG_USB_SERIAL_FUNSOFT is not set
++# CONFIG_USB_SERIAL_VISOR is not set
++# CONFIG_USB_SERIAL_IPAQ is not set
++# CONFIG_USB_SERIAL_IR is not set
++# CONFIG_USB_SERIAL_EDGEPORT is not set
++# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
++# CONFIG_USB_SERIAL_GARMIN is not set
++# CONFIG_USB_SERIAL_IPW is not set
++# CONFIG_USB_SERIAL_IUU is not set
++# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
++# CONFIG_USB_SERIAL_KEYSPAN is not set
++# CONFIG_USB_SERIAL_KLSI is not set
++# CONFIG_USB_SERIAL_KOBIL_SCT is not set
++# CONFIG_USB_SERIAL_MCT_U232 is not set
++# CONFIG_USB_SERIAL_MOS7720 is not set
++# CONFIG_USB_SERIAL_MOS7840 is not set
++# CONFIG_USB_SERIAL_MOTOROLA is not set
++# CONFIG_USB_SERIAL_NAVMAN is not set
++# CONFIG_USB_SERIAL_PL2303 is not set
++# CONFIG_USB_SERIAL_OTI6858 is not set
++# CONFIG_USB_SERIAL_QUALCOMM is not set
++# CONFIG_USB_SERIAL_SPCP8X5 is not set
++# CONFIG_USB_SERIAL_HP4X is not set
++# CONFIG_USB_SERIAL_SAFE is not set
++# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
++# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
++# CONFIG_USB_SERIAL_SYMBOL is not set
++# CONFIG_USB_SERIAL_TI is not set
++# CONFIG_USB_SERIAL_CYBERJACK is not set
++# CONFIG_USB_SERIAL_XIRCOM is not set
++# CONFIG_USB_SERIAL_OPTION is not set
++# CONFIG_USB_SERIAL_OMNINET is not set
++# CONFIG_USB_SERIAL_OPTICON is not set
++# CONFIG_USB_SERIAL_DEBUG is not set
++
++#
++# USB Miscellaneous drivers
++#
++# CONFIG_USB_EMI62 is not set
++# CONFIG_USB_EMI26 is not set
++# CONFIG_USB_ADUTUX is not set
++# CONFIG_USB_SEVSEG is not set
++# CONFIG_USB_RIO500 is not set
++# CONFIG_USB_LEGOTOWER is not set
++# CONFIG_USB_LCD is not set
++# CONFIG_USB_BERRY_CHARGE is not set
++# CONFIG_USB_LED is not set
++# CONFIG_USB_CYPRESS_CY7C63 is not set
++# CONFIG_USB_CYTHERM is not set
++# CONFIG_USB_IDMOUSE is not set
++# CONFIG_USB_FTDI_ELAN is not set
++# CONFIG_USB_APPLEDISPLAY is not set
++# CONFIG_USB_SISUSBVGA is not set
++# CONFIG_USB_LD is not set
++# CONFIG_USB_TRANCEVIBRATOR is not set
++# CONFIG_USB_IOWARRIOR is not set
++# CONFIG_USB_TEST is not set
++# CONFIG_USB_ISIGHTFW is not set
++# CONFIG_USB_VST is not set
++# CONFIG_USB_GADGET is not set
++
++#
++# OTG and related infrastructure
++#
++# CONFIG_USB_GPIO_VBUS is not set
++# CONFIG_NOP_USB_XCEIV is not set
 +# CONFIG_MMC is not set
 +# CONFIG_MEMSTICK is not set
 +# CONFIG_ACCESSIBILITY is not set
@@ -2042,6 +1069,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/configs/karo_tx25_defconfig linux-2.6.30-rc
 +# CONFIG_EXT3_FS_SECURITY is not set
 +# CONFIG_EXT4_FS is not set
 +CONFIG_JBD=m
++# CONFIG_JBD_DEBUG is not set
 +CONFIG_FS_MBCACHE=m
 +# CONFIG_REISERFS_FS is not set
 +# CONFIG_JFS_FS is not set
@@ -2217,7 +1245,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/configs/karo_tx25_defconfig linux-2.6.30-rc
 +CONFIG_FRAME_WARN=1024
 +CONFIG_MAGIC_SYSRQ=y
 +# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
++CONFIG_DEBUG_FS=y
 +# CONFIG_HEADERS_CHECK is not set
 +CONFIG_DEBUG_KERNEL=y
 +# CONFIG_DEBUG_SHIRQ is not set
@@ -2236,13 +1264,16 @@ diff -urNp linux-2.6.30-rc4/arch/arm/configs/karo_tx25_defconfig linux-2.6.30-rc
 +# CONFIG_DEBUG_PREEMPT is not set
 +# CONFIG_DEBUG_RT_MUTEXES is not set
 +# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_LOCK_ALLOC is not set
++CONFIG_DEBUG_SPINLOCK=y
++CONFIG_DEBUG_MUTEXES=y
++CONFIG_DEBUG_LOCK_ALLOC=y
 +# CONFIG_PROVE_LOCKING is not set
++CONFIG_LOCKDEP=y
 +# CONFIG_LOCK_STAT is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
++# CONFIG_DEBUG_LOCKDEP is not set
++CONFIG_DEBUG_SPINLOCK_SLEEP=y
 +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
++CONFIG_STACKTRACE=y
 +# CONFIG_DEBUG_KOBJECT is not set
 +CONFIG_DEBUG_BUGVERBOSE=y
 +# CONFIG_DEBUG_INFO is not set
@@ -2279,6 +1310,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/configs/karo_tx25_defconfig linux-2.6.30-rc
 +# CONFIG_KMEMTRACE is not set
 +# CONFIG_WORKQUEUE_TRACER is not set
 +# CONFIG_BLK_DEV_IO_TRACE is not set
++# CONFIG_DYNAMIC_DEBUG is not set
 +# CONFIG_SAMPLES is not set
 +CONFIG_HAVE_ARCH_KGDB=y
 +# CONFIG_KGDB is not set
@@ -2412,10 +1444,10 @@ diff -urNp linux-2.6.30-rc4/arch/arm/configs/karo_tx25_defconfig linux-2.6.30-rc
 +CONFIG_HAS_IOPORT=y
 +CONFIG_HAS_DMA=y
 +CONFIG_NLATTR=y
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/Kconfig linux-2.6.30-rc4-karo/arch/arm/mach-mx2/Kconfig
---- linux-2.6.30-rc4/arch/arm/mach-mx2/Kconfig	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/Kconfig	2009-06-08 12:45:22.000000000 +0200
-@@ -6,14 +6,26 @@ choice
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/Kconfig linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/Kconfig
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/Kconfig	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/Kconfig	2009-07-01 11:09:09.000000000 +0200
+@@ -6,14 +6,32 @@ choice
  
  config MACH_MX21
  	bool "i.MX21 support"
@@ -2428,6 +1460,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/Kconfig linux-2.6.30-rc4-karo/arch
  	bool "i.MX27 support"
 +	select ARCH_MXC_IOMUX_V2
 +	select ARCH_MXC_HAS_NFC_V1
++	select USB_ARCH_HAS_EHCI
++	select ARCH_MXC_HAS_USBH2
++	select ARCH_MXC_HAS_USBOTG
  	help
  	  This enables support for Freescale's MX2 based i.MX27 processor.
  
@@ -2435,6 +1470,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/Kconfig linux-2.6.30-rc4-karo/arch
 +	bool "i.MX25 support"
 +	select ARCH_MXC_IOMUX_V3
 +	select ARCH_MXC_HAS_NFC_V1_1
++	select USB_ARCH_HAS_EHCI
++	select ARCH_MXC_HAS_USBH2
++	select ARCH_MXC_HAS_USBOTG
 +	select PHYLIB if FEC
 +	help
 +	  This enables support for Freescale's MX2 based i.MX25 processor.
@@ -2442,7 +1480,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/Kconfig linux-2.6.30-rc4-karo/arch
  endchoice
  
  comment "MX2 platforms:"
-@@ -39,6 +51,26 @@ config MACH_PCM038
+@@ -39,6 +57,26 @@ config MACH_PCM038
  	  Include support for phyCORE-i.MX27 (aka pcm038) platform. This
  	  includes specific configurations for the module and its peripherals.
  
@@ -2469,14 +1507,14 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/Kconfig linux-2.6.30-rc4-karo/arch
  choice
  	prompt "Baseboard"
  	depends on MACH_PCM038
-@@ -60,3 +92,4 @@ config MACH_MX27_3DS
+@@ -60,3 +98,4 @@ config MACH_MX27_3DS
  	  Include support for MX27PDK platform. This includes specific
  	  configurations for the board and its peripherals.
  endif
 +
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/Makefile linux-2.6.30-rc4-karo/arch/arm/mach-mx2/Makefile
---- linux-2.6.30-rc4/arch/arm/mach-mx2/Makefile	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/Makefile	2009-06-02 17:59:14.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/Makefile linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/Makefile
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/Makefile	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/Makefile	2009-06-02 17:59:14.000000000 +0200
 @@ -2,17 +2,31 @@
  # Makefile for the linux kernel.
  #
@@ -2518,9 +1556,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/Makefile linux-2.6.30-rc4-karo/arc
 +obj-$(CONFIG_MACH_TX27)			+= karo-tx27.o tx27_gpio.o
 +obj-$(CONFIG_MACH_TX25)			+= karo-tx25.o
 +obj-$(CONFIG_MACH_STK5_BASEBOARD)	+= stk5-baseboard.o
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/Makefile.boot linux-2.6.30-rc4-karo/arch/arm/mach-mx2/Makefile.boot
---- linux-2.6.30-rc4/arch/arm/mach-mx2/Makefile.boot	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/Makefile.boot	2009-06-02 17:59:15.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/Makefile.boot linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/Makefile.boot
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/Makefile.boot	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/Makefile.boot	2009-06-02 17:59:15.000000000 +0200
 @@ -5,3 +5,7 @@ initrd_phys-$(CONFIG_MACH_MX21)	:= 0xC08
  zreladdr-$(CONFIG_MACH_MX27)	:= 0xA0008000
  params_phys-$(CONFIG_MACH_MX27)	:= 0xA0000100
@@ -2529,9 +1567,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/Makefile.boot linux-2.6.30-rc4-kar
 +zreladdr-$(CONFIG_MACH_MX25)	:= 0x80008000
 +params_phys-$(CONFIG_MACH_MX25)	:= 0x80000100
 +initrd_phys-$(CONFIG_MACH_MX25)	:= 0x80800000
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx21.c linux-2.6.30-rc4-karo/arch/arm/mach-mx2/clock_imx21.c
---- linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx21.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/clock_imx21.c	2009-06-02 17:59:15.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/clock_imx21.c linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/clock_imx21.c
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/clock_imx21.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/clock_imx21.c	2009-06-02 17:59:15.000000000 +0200
 @@ -890,7 +890,7 @@ static struct clk clko_clk = {
  		.con_id = n, \
  		.clk = &c, \
@@ -2541,10 +1579,10 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx21.c linux-2.6.30-rc4-kar
  /* It's unlikely that any driver wants one of them directly:
  	_REGISTER_CLOCK(NULL, "ckih", ckih_clk)
  	_REGISTER_CLOCK(NULL, "ckil", ckil_clk)
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-karo/arch/arm/mach-mx2/clock_imx25.c
---- linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/clock_imx25.c	2009-06-08 12:46:51.000000000 +0200
-@@ -0,0 +1,1848 @@
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/clock_imx25.c
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/clock_imx25.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/clock_imx25.c	2009-07-06 14:10:59.000000000 +0200
+@@ -0,0 +1,1861 @@
 +/*
 + * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
@@ -2718,7 +1756,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +#define MXC_CCM_CGCR2_SPBA_OFFSET		(42 - 32)
 +#define MXC_CCM_CGCR2_SSI1_OFFSET		(43 - 32)
 +#define MXC_CCM_CGCR2_SSI2_OFFSET		(44 - 32)
-+#define MXC_CCM_CGCR2_TCHSCRN_OFFSET		(45 - 32)
++#define MXC_CCM_CGCR2_TSC_OFFSET		(45 - 32)
 +#define MXC_CCM_CGCR2_UART1_OFFSET		(46 - 32)
 +#define MXC_CCM_CGCR2_UART2_OFFSET		(47 - 32)
 +#define MXC_CCM_CGCR2_UART3_OFFSET		(48 - 32)
@@ -2821,37 +1859,42 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +static int _clk_pll_set_rate(struct clk *clk, unsigned long rate)
 +{
 +	unsigned long reg;
-+	signed long pd = 1;	/* Pre-divider */
-+	signed long mfi;	/* Multiplication Factor (Integer part) */
++	unsigned int pd = 1;	/* Pre-divider */
++	unsigned long mfi;	/* Multiplication Factor (Integer part) */
 +	signed long mfn;	/* Multiplication Factor (Integer part) */
-+	signed long mfd;	/* Multiplication Factor (Denominator Part) */
++	unsigned long mfd;	/* Multiplication Factor (Denominator Part) */
 +	signed long tmp;
 +	unsigned long ref_freq = clk_get_rate(clk->parent);
++	unsigned long err = ~0;
++	int best_mfn = -1;
++	int best_mfd = -1;
 +
 +	while (((ref_freq / pd) * 10) > rate)
 +		pd++;
 +
-+	/* the ref_freq/2 in the following is to round up */
-+	mfi = (((rate / 2) * pd) + (ref_freq / 2)) / ref_freq;
++	mfi = ((rate / 2) * pd) / ref_freq;
 +	if (mfi < 5 || mfi > 15)
 +		return -EINVAL;
 +
-+	/* pick a mfd value that will work
-+	 * then solve for mfn */
-+	mfd = ref_freq / 50000;
-+
-+	/*
-+	 *          pll_freq * pd * mfd
-+	 *   mfn = --------------------  -  (mfi * mfd)
-+	 *           2 * ref_freq
-+	 */
-+	/* the tmp/2 is for rounding */
 +	tmp = ref_freq / 10000;
-+	mfn = ((((((rate / 2) + (tmp / 2)) / tmp) * pd) * mfd) / 10000) -
-+		(mfi * mfd);
-+
-+	printk(KERN_DEBUG "pll freq: %lu PD=%ld MFI=%ld MFD=%ld MFN=%ld (0x%03lx)\n",
-+	       rate, pd, mfi, mfd, mfn, (mfn + ((mfn < 0) ? 1024 : 0)) & 0x3ff);
++	for (mfd = 1; mfd <= 1024; mfd++) {
++		unsigned long act_freq;
++
++		mfn = ((((((rate / 2) + (tmp - 1)) / tmp) * pd) * mfd) / 10000) -
++			(mfi * mfd);
++
++		act_freq = (2 * ref_freq * mfi + (2 * ref_freq * mfn / mfd)) / pd;
++		act_freq -= rate;
++		if (abs(act_freq) < err) {
++			best_mfn = mfn;
++			best_mfd = mfd;
++			err = abs(act_freq);
++			if (err == 0)
++				break;
++		}
++	}
++	mfn = best_mfn;
++	mfd = best_mfd;
 +
 +	mfn = (mfn + ((mfn < 0) ? 1024 : 0)) & 0x3ff;
 +	pd--;
@@ -2880,7 +1923,8 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +static unsigned long _clk_pll_getrate(struct clk *clk)
 +{
 +	unsigned long rate;
-+	signed long mfi, mfn, mfd, pdf;
++	unsigned int mfi, mfd, pdf;
++	int mfn;
 +	unsigned long ref_clk;
 +	unsigned long reg;
 +
@@ -2902,6 +1946,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +		BUG();		/* oops */
 +	}
 +
++	if (mfn >= 512)
++		mfn = 1024 - mfn;
++
 +	mfi = (mfi < 5) ? 5 : mfi;
 +	rate = 2LL * ref_clk * mfn;
 +	do_div(rate, mfd + 1);
@@ -2983,8 +2030,8 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +
 +	pcdr = __raw_readl(pcdr_a[clk->id >> 2]);
 +
-+	perclk_pdf =
-+	    (pcdr >> ((clk->id & 3) << 3)) & MXC_CCM_PCDR1_PERDIV1_MASK;
++	perclk_pdf = (pcdr >> ((clk->id & 3) << 3)) &
++		MXC_CCM_PCDR1_PERDIV1_MASK;
 +
 +	return clk_get_rate(clk->parent) / (perclk_pdf + 1);
 +}
@@ -3013,8 +2060,6 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +		return -EINVAL;
 +
 +	div = clk_get_rate(clk->parent) / rate;
-+	printk(KERN_DEBUG "%s: perclk[%d] parent_rate=%lu rate=%lu div=%lu\n",
-+	       __FUNCTION__, clk->id, clk_get_rate(clk->parent), rate, div);
 +	if (div > 64 || div < 1 || ((clk_get_rate(clk->parent) / div) != rate))
 +		return -EINVAL;
 +	div--;
@@ -3089,7 +2134,8 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +
 +static unsigned long _clk_ipg_getrate(struct clk *clk)
 +{
-+	return clk_get_rate(clk->parent) / 2;	/* Always AHB / 2 */
++	unsigned long rate = clk_get_rate(clk->parent) / 2;	/* Always AHB / 2 */
++	return rate;
 +}
 +
 +/* Top-level clocks */
@@ -3162,7 +2208,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +
 +/* Bottom-level clocks */
 +
-+struct clk usbotg_clk = {
++static struct clk usbotg_clk = {
 +	.id = 0,
 +	.parent = &ahb_clk,
 +	.enable = _clk_enable,
@@ -3171,16 +2217,27 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	.disable = _clk_disable,
 +};
 +
-+struct clk rtic_clk = {
-+	.id = 0,
-+	.parent = &ahb_clk,
-+	.enable = _clk_enable,
-+	.enable_reg = MXC_CCM_CGCR0,
-+	.enable_shift = MXC_CCM_CGCR0_HCLK_RTIC_OFFSET,
-+	.disable = _clk_disable,
++static struct clk rtic_clk[] = {
++	{
++		.id = 0,
++		.parent = &ipg_clk,
++		.enable = _clk_enable,
++		.enable_reg = MXC_CCM_CGCR2,
++		.enable_shift = MXC_CCM_CGCR2_RTIC_OFFSET,
++		.disable = _clk_disable,
++		.secondary = &rtic_clk[1],
++	},
++	{
++		.id = 0,
++		.parent = &ahb_clk,
++		.enable = _clk_enable,
++		.enable_reg = MXC_CCM_CGCR0,
++		.enable_shift = MXC_CCM_CGCR0_HCLK_RTIC_OFFSET,
++		.disable = _clk_disable,
++	},
 +};
 +
-+struct clk emi_clk = {
++static struct clk emi_clk = {
 +	.id = 0,
 +	.parent = &ahb_clk,
 +	.enable = _clk_enable,
@@ -3189,7 +2246,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	.disable = _clk_disable,
 +};
 +
-+struct clk brom_clk = {
++static struct clk brom_clk = {
 +	.id = 0,
 +	.parent = &ahb_clk,
 +	.enable = _clk_enable,
@@ -3250,7 +2307,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +	{
 +		.id = 5,
-+		.parent = &upll_clk,	/* can be AHB or UPLL */
++		.parent = &ahb_clk,	/* can be AHB or UPLL */
 +		.round_rate = _clk_perclkx_round_rate,
 +		.set_rate = _clk_perclkx_set_rate,
 +		.set_parent = _clk_perclkx_set_parent,
@@ -3360,12 +2417,12 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk nfc_clk = {
++static struct clk nfc_clk = {
 +	.id = 0,
 +	.parent = &per_clk[8],
 +};
 +
-+struct clk audmux_clk = {
++static struct clk audmux_clk = {
 +	.id = 0,
 +	.parent = &ipg_clk,
 +	.enable = _clk_enable,
@@ -3374,7 +2431,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	.disable = _clk_disable,
 +};
 +
-+struct clk ata_clk[] = {
++static struct clk ata_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &ipg_clk,
@@ -3394,7 +2451,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk can_clk[] = {
++static struct clk can_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &ipg_clk,
@@ -3413,7 +2470,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk csi_clk[] = {
++static struct clk csi_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &per_clk[0],
@@ -3438,7 +2495,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk cspi_clk[] = {
++static struct clk cspi_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &ipg_clk,
@@ -3465,7 +2522,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk dryice_clk = {
++static struct clk dryice_clk = {
 +	.id = 0,
 +	.parent = &ipg_clk,
 +	.enable = _clk_enable,
@@ -3474,7 +2531,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	.disable = _clk_disable,
 +};
 +
-+struct clk ect_clk = {
++static struct clk ect_clk = {
 +	.id = 0,
 +	.parent = &ipg_clk,
 +	.enable = _clk_enable,
@@ -3483,7 +2540,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	.disable = _clk_disable,
 +};
 +
-+struct clk epit1_clk[] = {
++static struct clk epit1_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &per_clk[1],
@@ -3499,7 +2556,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk epit2_clk[] = {
++static struct clk epit2_clk[] = {
 +	{
 +		.id = 1,
 +		.parent = &per_clk[1],
@@ -3515,7 +2572,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk esai_clk[] = {
++static struct clk esai_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &per_clk[2],
@@ -3540,7 +2597,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk esdhc1_clk[] = {
++static struct clk esdhc1_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &per_clk[3],
@@ -3565,7 +2622,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk esdhc2_clk[] = {
++static struct clk esdhc2_clk[] = {
 +	{
 +		.id = 1,
 +		.parent = &per_clk[4],
@@ -3590,7 +2647,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk fec_clk[] = {
++static struct clk fec_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &ipg_clk,
@@ -3610,7 +2667,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk gpio_clk[] = {
++static struct clk gpio_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &ipg_clk,
@@ -3657,7 +2714,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	{
 +		.id = 1,
 +		.parent = &per_clk[5],
-+		.secondary = &gpt1_clk[1],
++		.secondary = &gpt2_clk[1],
 +	},
 +	{
 +		.id = 1,
@@ -3673,7 +2730,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	{
 +		.id = 2,
 +		.parent = &per_clk[5],
-+		.secondary = &gpt1_clk[1],
++		.secondary = &gpt3_clk[1],
 +	},
 +	{
 +		.id = 2,
@@ -3689,7 +2746,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	{
 +		.id = 3,
 +		.parent = &per_clk[5],
-+		.secondary = &gpt1_clk[1],
++		.secondary = &gpt4_clk[1],
 +	},
 +	{
 +		.id = 3,
@@ -3701,7 +2758,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk i2c_clk[] = {
++static struct clk i2c_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &per_clk[6],
@@ -3716,7 +2773,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk iim_clk = {
++static struct clk iim_clk = {
 +	.id = 0,
 +	.parent = &ipg_clk,
 +	.enable = _clk_enable,
@@ -3725,7 +2782,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	.disable = _clk_disable,
 +};
 +
-+struct clk iomuxc_clk = {
++static struct clk iomuxc_clk = {
 +	.id = 0,
 +	.parent = &ipg_clk,
 +	.enable = _clk_enable,
@@ -3734,7 +2791,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	.disable = _clk_disable,
 +};
 +
-+struct clk kpp_clk = {
++static struct clk kpp_clk = {
 +	.id = 0,
 +	.parent = &ipg_clk,
 +	.enable = _clk_enable,
@@ -3743,7 +2800,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	.disable = _clk_disable,
 +};
 +
-+struct clk lcdc_clk[] = {
++static struct clk lcdc_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &per_clk[7],
@@ -3768,7 +2825,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk owire_clk[] = {
++static struct clk owire_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &per_clk[9],
@@ -3784,7 +2841,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk pwm1_clk[] = {
++static struct clk pwm1_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &per_clk[10],
@@ -3800,7 +2857,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk pwm2_clk[] = {
++static struct clk pwm2_clk[] = {
 +	{
 +		.id = 1,
 +		.parent = &per_clk[10],
@@ -3816,7 +2873,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk pwm3_clk[] = {
++static struct clk pwm3_clk[] = {
 +	{
 +		.id = 2,
 +		.parent = &per_clk[10],
@@ -3832,7 +2889,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk pwm4_clk[] = {
++static struct clk pwm4_clk[] = {
 +	{
 +		.id = 3,
 +		.parent = &per_clk[10],
@@ -3848,7 +2905,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk rngb_clk = {
++static struct clk rngb_clk = {
 +	.id = 0,
 +	.parent = &ipg_clk,
 +	.enable = _clk_enable,
@@ -3857,7 +2914,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	.disable = _clk_disable,
 +};
 +
-+struct clk scc_clk = {
++static struct clk scc_clk = {
 +	.id = 0,
 +	.parent = &ipg_clk,
 +	.enable = _clk_enable,
@@ -3866,7 +2923,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	.disable = _clk_disable,
 +};
 +
-+struct clk sdma_clk[] = {
++static struct clk sdma_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &ipg_clk,
@@ -3886,7 +2943,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk sim1_clk[] = {
++static struct clk sim1_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &per_clk[11],
@@ -3902,7 +2959,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk sim2_clk[] = {
++static struct clk sim2_clk[] = {
 +	{
 +		.id = 1,
 +		.parent = &per_clk[12],
@@ -3918,7 +2975,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk slcdc_clk[] = {
++static struct clk slcdc_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &ipg_clk,
@@ -3938,7 +2995,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk spba_clk = {
++static struct clk spba_clk = {
 +	.id = 0,
 +	.parent = &ipg_clk,
 +	.enable = _clk_enable,
@@ -3947,7 +3004,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	.disable = _clk_disable,
 +};
 +
-+struct clk ssi1_clk[] = {
++static struct clk ssi1_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &per_clk[13],
@@ -3963,7 +3020,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk ssi2_clk[] = {
++static struct clk ssi2_clk[] = {
 +	{
 +		.id = 1,
 +		.parent = &per_clk[14],
@@ -3979,16 +3036,16 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk tchscrn_clk = {
++static struct clk tsc_clk = {
 +	.id = 0,
 +	.parent = &ipg_clk,
 +	.enable = _clk_enable,
 +	.enable_reg = MXC_CCM_CGCR2,
-+	.enable_shift = MXC_CCM_CGCR2_TCHSCRN_OFFSET,
++	.enable_shift = MXC_CCM_CGCR2_TSC_OFFSET,
 +	.disable = _clk_disable,
 +};
 +
-+struct clk uart1_clk[] = {
++static struct clk uart1_clk[] = {
 +	{
 +		.id = 0,
 +		.parent = &per_clk[15],
@@ -4004,7 +3061,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk uart2_clk[] = {
++static struct clk uart2_clk[] = {
 +	{
 +		.id = 1,
 +		.parent = &per_clk[15],
@@ -4020,7 +3077,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk uart3_clk[] = {
++static struct clk uart3_clk[] = {
 +	{
 +		.id = 2,
 +		.parent = &per_clk[15],
@@ -4036,7 +3093,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk uart4_clk[] = {
++static struct clk uart4_clk[] = {
 +	{
 +		.id = 3,
 +		.parent = &per_clk[15],
@@ -4052,7 +3109,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk uart5_clk[] = {
++static struct clk uart5_clk[] = {
 +	{
 +		.id = 4,
 +		.parent = &per_clk[15],
@@ -4068,7 +3125,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	},
 +};
 +
-+struct clk wdog_clk = {
++static struct clk wdog_clk = {
 +	.id = 0,
 +	.parent = &ipg_clk,
 +	.enable = _clk_enable,
@@ -4112,9 +3169,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +
 +static unsigned long _clk_usb_getrate(struct clk *clk)
 +{
-+	unsigned long div =
-+		__raw_readl(MXC_CCM_MCR) & MXC_CCM_CCTL_USB_DIV_MASK;
++	unsigned long div;
 +
++	div = __raw_readl(MXC_CCM_MCR) & MXC_CCM_CCTL_USB_DIV_MASK;
 +	div >>= MXC_CCM_CCTL_USB_DIV_OFFSET;
 +
 +	return clk_get_rate(clk->parent) / (div + 1);
@@ -4147,6 +3204,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	.set_rate = _clk_usb_set_rate,
 +	.round_rate = _clk_usb_round_rate,
 +	.set_parent = _clk_usb_set_parent,
++	.secondary = &usbotg_clk,
 +};
 +
 +/* CLKO */
@@ -4261,7 +3319,8 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	_REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk)
 +	_REGISTER_CLOCK(NULL, "audmux", audmux_clk)
 +	_REGISTER_CLOCK(NULL, "ata", ata_clk[0])
-+	_REGISTER_CLOCK(NULL, "can", can_clk[0])
++	_REGISTER_CLOCK("mxc-flexcan.0", NULL, can_clk[0])
++	_REGISTER_CLOCK("mxc-flexcan.1", NULL, can_clk[1])
 +	_REGISTER_CLOCK(NULL, "csi", csi_clk[0])
 +	_REGISTER_CLOCK(NULL, "cspi.0", cspi_clk[0])
 +	_REGISTER_CLOCK(NULL, "cspi.1", cspi_clk[1])
@@ -4302,7 +3361,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	_REGISTER_CLOCK(NULL, "spba", spba_clk)
 +	_REGISTER_CLOCK(NULL, "ssi1", ssi1_clk[0])
 +	_REGISTER_CLOCK(NULL, "ssi2", ssi2_clk[0])
-+	_REGISTER_CLOCK(NULL, "tchscrn", tchscrn_clk)
++	_REGISTER_CLOCK("mxc-tsadcc.0", NULL, tsc_clk)
 +	_REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk[0])
 +	_REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk[0])
 +	_REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk[0])
@@ -4318,12 +3377,8 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +{
 +	int i;
 +
-+	for (i = 0; i < ARRAY_SIZE(lookups); i++) {
-+		printk(KERN_DEBUG "Registering clock '%s' '%s'\n",
-+		       lookups[i].dev_id ? lookups[i].dev_id : "",
-+		       lookups[i].con_id ? lookups[i].con_id : "");
++	for (i = 0; i < ARRAY_SIZE(lookups); i++)
 +		clkdev_add(&lookups[i]);
-+	}
 +
 +	ckih_rate = fref;
 +#ifndef CONFIG_DEBUG_LL
@@ -4359,23 +3414,19 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +			}
 +		}
 +	}
-+#endif
++
 +	/* the NFC clock must be derived from AHB clock */
 +	clk_set_parent(&per_clk[8], &ahb_clk);
++#endif
 +	clk_set_rate(&per_clk[8], clk_get_rate(&ahb_clk) / 6);
++	clk_set_rate(&per_clk[7], clk_get_rate(per_clk[7].parent));
 +
 +	/* This will propagate to all children and init all the clock rates */
 +#ifdef CONFIG_DEBUG_LL
 +	clk_enable(&uart1_clk[0]);
 +#endif
 +	clk_enable(&emi_clk);
-+	clk_enable(&gpio_clk[0]);
-+	clk_enable(&gpio_clk[1]);
-+	clk_enable(&gpio_clk[2]);
 +	clk_enable(&iim_clk);
-+	clk_enable(&gpt1_clk[0]);
-+	clk_enable(&iomuxc_clk);
-+	clk_enable(&scc_clk);
 +
 +	pr_info("Clock input source is %ld\n", clk_get_rate(&osc24m_clk));
 +
@@ -4390,12 +3441,12 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-kar
 +	clk_set_rate(&mpll_clk, clk_get_rate(&mpll_clk));
 +	clk_set_rate(&upll_clk, clk_get_rate(&upll_clk));
 +
-+	mxc_timer_init(&gpt1_clk[0]);
++	mxc_timer_init(&gpt1_clk[1]);
 +	return 0;
 +}
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx27.c linux-2.6.30-rc4-karo/arch/arm/mach-mx2/clock_imx27.c
---- linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx27.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/clock_imx27.c	2009-06-02 17:59:15.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/clock_imx27.c linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/clock_imx27.c
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/clock_imx27.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/clock_imx27.c	2009-06-02 17:59:15.000000000 +0200
 @@ -621,7 +621,7 @@ DEFINE_CLOCK1(csi_clk,     0, 0,      0,
  		.clk = &c, \
  	},
@@ -4405,9 +3456,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/clock_imx27.c linux-2.6.30-rc4-kar
  	_REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk)
  	_REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk)
  	_REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk)
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/cpu_imx25.c linux-2.6.30-rc4-karo/arch/arm/mach-mx2/cpu_imx25.c
---- linux-2.6.30-rc4/arch/arm/mach-mx2/cpu_imx25.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/cpu_imx25.c	2009-06-02 17:59:17.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/cpu_imx25.c linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/cpu_imx25.c
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/cpu_imx25.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/cpu_imx25.c	2009-06-02 17:59:17.000000000 +0200
 @@ -0,0 +1,65 @@
 +/*
 + * arch/arm/mach-mx2/cpu_mx25.c
@@ -4474,9 +3525,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/cpu_imx25.c linux-2.6.30-rc4-karo/
 +	return cpu_silicon_rev;
 +}
 +EXPORT_SYMBOL(mx25_revision);
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/crm_regs_mx25.h linux-2.6.30-rc4-karo/arch/arm/mach-mx2/crm_regs_mx25.h
---- linux-2.6.30-rc4/arch/arm/mach-mx2/crm_regs_mx25.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/crm_regs_mx25.h	2009-06-02 17:59:17.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/crm_regs_mx25.h linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/crm_regs_mx25.h
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/crm_regs_mx25.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/crm_regs_mx25.h	2009-06-02 17:59:17.000000000 +0200
 @@ -0,0 +1,190 @@
 +/*
 + * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -4668,23 +3719,26 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/crm_regs_mx25.h linux-2.6.30-rc4-k
 +#define MXC_CCM_MCR_PER_CLK_MUX_MASK     (0xFFFF << 0)
 +
 +#endif				/* __ARCH_ARM_MACH_MX25_CRM_REGS_H__ */
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/devices.h linux-2.6.30-rc4-karo/arch/arm/mach-mx2/devices.h
---- linux-2.6.30-rc4/arch/arm/mach-mx2/devices.h	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/devices.h	2009-06-02 17:59:16.000000000 +0200
-@@ -20,3 +20,9 @@ extern struct platform_device mxc_i2c_de
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/devices.h linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/devices.h
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/devices.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/devices.h	2009-07-01 11:10:15.000000000 +0200
+@@ -20,3 +20,12 @@ extern struct platform_device mxc_i2c_de
  extern struct platform_device mxc_i2c_device1;
  extern struct platform_device mxc_sdhc_device0;
  extern struct platform_device mxc_sdhc_device1;
++extern struct platform_device mxc_usbh1_device;
++extern struct platform_device mxc_usbh2_device;
++extern struct platform_device mxc_usbotg_device;
 +#ifdef CONFIG_MACH_MX25
 +extern struct platform_device mx25_i2c_device0;
 +extern struct platform_device mx25_i2c_device1;
 +extern struct platform_device mx25_i2c_device2;
 +extern struct platform_device mxc_sdhc_device2;
 +#endif
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/devices_mx25.c linux-2.6.30-rc4-karo/arch/arm/mach-mx2/devices_mx25.c
---- linux-2.6.30-rc4/arch/arm/mach-mx2/devices_mx25.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/devices_mx25.c	2009-06-02 17:59:17.000000000 +0200
-@@ -0,0 +1,402 @@
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/devices_mx25.c linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/devices_mx25.c
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/devices_mx25.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/devices_mx25.c	2009-06-29 10:48:40.000000000 +0200
+@@ -0,0 +1,452 @@
 +/*
 + * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
@@ -4829,12 +3883,12 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/devices_mx25.c linux-2.6.30-rc4-ka
 + * Resource definition for the CSPI1
 + */
 +static struct resource mx25_spi1_resources[] = {
-+	[0] = {
++	{
 +	       .start = CSPI1_BASE_ADDR,
 +	       .end = CSPI1_BASE_ADDR + SZ_4K - 1,
 +	       .flags = IORESOURCE_MEM,
 +	},
-+	[1] = {
++	{
 +	       .start = MXC_INT_CSPI1,
 +	       .end = MXC_INT_CSPI1,
 +	       .flags = IORESOURCE_IRQ,
@@ -4865,12 +3919,12 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/devices_mx25.c linux-2.6.30-rc4-ka
 + * Resource definition for the CSPI2
 + */
 +static struct resource mx25_spi2_resources[] = {
-+	[0] = {
++	{
 +	       .start = CSPI2_BASE_ADDR,
 +	       .end = CSPI2_BASE_ADDR + SZ_4K - 1,
 +	       .flags = IORESOURCE_MEM,
 +	},
-+	[1] = {
++	{
 +	       .start = MXC_INT_CSPI2,
 +	       .end = MXC_INT_CSPI2,
 +	       .flags = IORESOURCE_IRQ,
@@ -4900,12 +3954,12 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/devices_mx25.c linux-2.6.30-rc4-ka
 + * Resource definition for the CSPI3
 + */
 +static struct resource mx25_spi3_resources[] = {
-+	[0] = {
++	{
 +	       .start = CSPI3_BASE_ADDR,
 +	       .end = CSPI3_BASE_ADDR + SZ_4K - 1,
 +	       .flags = IORESOURCE_MEM,
 +	},
-+	[1] = {
++	{
 +	       .start = MXC_INT_CSPI3,
 +	       .end = MXC_INT_CSPI3,
 +	       .flags = IORESOURCE_IRQ,
@@ -4954,6 +4008,56 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/devices_mx25.c linux-2.6.30-rc4-ka
 +}
 +#endif
 +
++#if defined(CONFIG_USB_EHCI_MXC) || defined(CONFIG_USB_EHCI_MXC_MODULE)
++static struct resource mxc_usbotg_resources[] = {
++	{
++		.start = OTG_BASE_ADDR,
++		.end   = OTG_BASE_ADDR + 0x1ff,
++		.flags = IORESOURCE_MEM,
++	}, {
++		.start = MXC_INT_USB_OTG,
++		.flags = IORESOURCE_IRQ,
++	},
++};
++
++static u64 usbotg_dmamask = (u32)~0;
++
++struct platform_device mxc_usbotg_device = {
++	.name = "mxc-ehci",
++	.id = 0,
++	.dev = {
++		.coherent_dma_mask = 0xffffffff,
++		.dma_mask = &usbotg_dmamask,
++	},
++	.num_resources = ARRAY_SIZE(mxc_usbotg_resources),
++	.resource = mxc_usbotg_resources,
++};
++
++static struct resource mxc_usbh2_resources[] = {
++	{
++		.start = USBH2_BASE_ADDR,
++		.end   = USBH2_BASE_ADDR + 0x1ff,
++		.flags = IORESOURCE_MEM,
++	}, {
++		.start = MXC_INT_USB_H2,
++		.flags = IORESOURCE_IRQ,
++	},
++};
++
++static u64 usbh2_dmamask = (u32)~0;
++
++struct platform_device mxc_usbh2_device = {
++	.name = "mxc-ehci",
++	.id = 1,
++	.dev = {
++		.coherent_dma_mask = 0xffffffff,
++		.dma_mask = &usbh2_dmamask,
++	},
++	.num_resources = ARRAY_SIZE(mxc_usbh2_resources),
++	.resource = mxc_usbh2_resources,
++};
++#endif
++
 +/* I2C controller and device data */
 +#if defined(CONFIG_I2C_IMX) || defined(CONFIG_I2C_IMX_MODULE)
 +
@@ -4961,12 +4065,12 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/devices_mx25.c linux-2.6.30-rc4-ka
 + * Resource definition for the I2C1
 + */
 +static struct resource mx25_i2c1_resources[] = {
-+	[0] = {
++	{
 +		.start = I2C_BASE_ADDR,
 +		.end = I2C_BASE_ADDR + SZ_4K - 1,
 +		.flags = IORESOURCE_MEM,
 +	},
-+	[1] = {
++	{
 +		.start = MXC_INT_I2C,
 +		.end = MXC_INT_I2C,
 +		.flags = IORESOURCE_IRQ,
@@ -4977,12 +4081,12 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/devices_mx25.c linux-2.6.30-rc4-ka
 + * Resource definition for the I2C2
 + */
 +static struct resource mx25_i2c2_resources[] = {
-+	[0] = {
++	{
 +		.start = I2C2_BASE_ADDR,
 +		.end = I2C2_BASE_ADDR + SZ_4K - 1,
 +		.flags = IORESOURCE_MEM,
 +	},
-+	[1] = {
++	{
 +		.start = MXC_INT_I2C2,
 +		.end = MXC_INT_I2C2,
 +		.flags = IORESOURCE_IRQ,
@@ -4993,12 +4097,12 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/devices_mx25.c linux-2.6.30-rc4-ka
 + * Resource definition for the I2C3
 + */
 +static struct resource mx25_i2c3_resources[] = {
-+	[0] = {
++	{
 +		.start = I2C3_BASE_ADDR,
 +		.end = I2C3_BASE_ADDR + SZ_4K - 1,
 +		.flags = IORESOURCE_MEM,
 +	},
-+	[1] = {
++	{
 +		.start = MXC_INT_I2C3,
 +		.end = MXC_INT_I2C3,
 +		.flags = IORESOURCE_IRQ,
@@ -5087,9 +4191,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/devices_mx25.c linux-2.6.30-rc4-ka
 +{
 +	return mxc_gpio_init(mx25_gpio_ports, ARRAY_SIZE(mx25_gpio_ports));
 +}
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/generic.c linux-2.6.30-rc4-karo/arch/arm/mach-mx2/generic.c
---- linux-2.6.30-rc4/arch/arm/mach-mx2/generic.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/generic.c	2009-06-02 17:59:16.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/generic.c linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/generic.c
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/generic.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/generic.c	2009-06-02 17:59:16.000000000 +0200
 @@ -26,6 +26,7 @@
  #include <asm/mach/map.h>
  
@@ -5154,10 +4258,10 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/generic.c linux-2.6.30-rc4-karo/ar
 +	iotable_init(mx25_io_desc, ARRAY_SIZE(mx25_io_desc));
 +}
 +#endif
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/arch/arm/mach-mx2/karo-tx25.c
---- linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/karo-tx25.c	2009-06-08 12:47:51.000000000 +0200
-@@ -0,0 +1,1122 @@
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/karo-tx25.c
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/karo-tx25.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/karo-tx25.c	2009-07-14 13:50:45.000000000 +0200
+@@ -0,0 +1,981 @@
 +/*
 + * arch/arm/mach-mx2/karo-tx25.c
 + *
@@ -5191,8 +4295,6 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +#include <linux/clk.h>
 +#include <linux/delay.h>
 +#include <linux/fb.h>
-+//#include <linux/i2c.h>
-+//#include <linux/i2c/at24.h>
 +#include <linux/spi/spi.h>
 +#include <linux/serial_8250.h>
 +#include <linux/fec_enet.h>
@@ -5221,14 +4323,12 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +#include <mach/irqs.h>
 +#include <mach/clock.h>
 +#include <mach/imxfb.h>
-+//#include <mach/imx_spi.h>
-+//#include <mach/i2c.h>
 +#include <mach/mmc.h>
 +#include <mach/imx-uart.h>
 +#include <mach/mxc_nand.h>
-+//#include <mach/ulpi.h>
-+//#include <mach/mxc_ehci.h>
-+//#include <mach/board-tx25.h>
++#include <mach/mxc_ehci.h>
++#include <mach/mxc_tsadcc.h>
++#include <mach/mxc_can.h>
 +
 +#include "crm_regs.h"
 +#include "devices.h"
@@ -5242,179 +4342,31 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +module_param(tx25_debug, int, 0);
 +#endif
 +
-+//#include "karo.h"
-+
 +int karo_board_type = 0;
 +int karo_mod_type = -1;
 +
 +
-+#ifdef CONFIG_USB_EHCI_MXC
-+
-+#define SMSC_VENDOR_ID		0x0424
-+#define USB3317_PROD_ID		0x0006
-+#define ULPI_FCTL		7
-+
-+static inline const char *ulpi_name(void __iomem *view)
-+{
-+	if ((unsigned long)view & 0x400) {
-+		return "USBH2";
-+	} else {
-+		return "USBOTG";
-+	}
-+}
-+
-+static int usb3317_init(void __iomem *view)
-+{
-+	int vid, pid, ret;
-+#if 1
-+	/* This is a kludge until we know why we sometimes read a wrong
-+	 * vendor or product ID!
-+	 */
-+	int retries = 3;
-+
-+ retry:
-+#endif
-+	ret = ulpi_read(ISP1504_VID_HIGH, view);
-+	if (ret < 0) {
-+		goto err;
-+	}
-+	vid = ret << 8;
-+
-+	ret = ulpi_read(ISP1504_VID_LOW, view);
-+	if (ret < 0) {
-+		goto err;
-+	}
-+	vid |= ret;
-+
-+	ret = ulpi_read(ISP1504_PID_HIGH, view);
-+	if (ret < 0) {
-+		goto err;
-+	}
-+	pid = ret << 8;
-+
-+	ret = ulpi_read(ISP1504_PID_LOW, view);
-+	if (ret < 0) {
-+		goto err;
-+	}
-+	pid |= ret;
-+
-+	pr_info("ULPI on %s port Vendor ID 0x%x Product ID 0x%x\n",
-+		ulpi_name(view), vid, pid);
-+	if (vid != SMSC_VENDOR_ID || pid != USB3317_PROD_ID) {
-+		if (retries-- < 0) {
-+			pr_err("No USB3317 found\n");
-+			return -ENODEV;
-+		}
-+		goto retry;
-+	}
-+ err:
-+	if (ret < 0) {
-+		printk(KERN_ERR "ULPI read on %s port failed with error %d\n",
-+		       ulpi_name(view), ret);
-+		return ret;
-+	}
-+	return 0;
-+}
-+
-+static int usb3317_set_vbus_power(void __iomem *view, int on)
++static int karo_tx25_gpio_config(struct pad_desc *pd, int num)
 +{
 +	int ret;
++	int i;
++	int count = 0;
 +
-+	DBG(0, "%s: Switching %s port VBUS power %s\n", __FUNCTION__,
-+	    ulpi_name(view), on ? "on" : "off");
-+
-+	if (on) {
-+		ret = ulpi_set(DRV_VBUS_EXT |		/* enable external Vbus */
-+			       DRV_VBUS |		/* enable internal Vbus */
-+			       CHRG_VBUS,		/* charge Vbus */
-+			       ISP1504_OTGCTL, view);
-+	} else {
-+		ret = ulpi_clear(DRV_VBUS_EXT |		/* disable external Vbus */
-+				 DRV_VBUS,		/* disable internal Vbus */
-+				 ISP1504_OTGCTL, view);
++	for (i = 0; i < num; i++) {
++		ret = mxc_iomux_v3_setup_pad(&pd[i]);
 +		if (ret == 0) {
-+			ret = ulpi_set(DISCHRG_VBUS,	   /* discharge Vbus */
-+				       ISP1504_OTGCTL, view);
++			DBG(0, "%s: PAD[%d] %s set up as GPIO\n", __FUNCTION__, i,
++			    MXC_PAD_NAME(&pd[i]));
++			count++;
++			mxc_iomux_v3_release_pad(&pd[i]);
++		} else {
++			DBG(0, "%s: PAD[%d] %s skipped\n", __FUNCTION__, i,
++			    MXC_PAD_NAME(&pd[i]));
 +		}
 +	}
-+	if (ret < 0) {
-+		printk(KERN_ERR "ULPI read on %s port failed with error %d\n",
-+		       ulpi_name(view), ret);
-+		return ret;
-+	}
-+	return 0;
++	return count;
 +}
 +
-+static int tx25_usbh2_init(struct platform_device *pdev)
-+{
-+	int ret;
-+	u32 temp;
-+	unsigned long flags;
-+	void __iomem *view = IO_ADDRESS(OTG_BASE_ADDR + 0x570);
-+
-+	local_irq_save(flags);
-+	temp = readl(IO_ADDRESS(OTG_BASE_ADDR) + 0x600);
-+	temp &= ~((3 << 21) | (1 << 0));
-+	temp |= (1 << 5) | (1 << 16) | (1 << 19) | (1 << 20);
-+	writel(temp, IO_ADDRESS(OTG_BASE_ADDR) + 0x600);
-+	local_irq_restore(flags);
-+
-+	/* select ULPI transceiver */
-+	/* this must be done _before_ setting up the GPIOs! */
-+	temp = readl(view + 0x14);
-+	DBG(0, "%s: Changing USBH2_PORTSC1 from %08x to %08x\n", __FUNCTION__,
-+	    temp, (temp & ~(3 << 30)) | (2 << 30));
-+	temp &= ~(3 << 30);
-+	temp |= 2 << 30;
-+	writel(temp, view + 0x14);
-+
-+	/* Set to Host mode */
-+	temp = readl(view + 0x38);
-+	DBG(0, "%s: Changing USBH2_USBMODE from %08x to %08x\n", __FUNCTION__,
-+	    temp, temp | 3);
-+	writel(temp | 0x3, view + 0x38);
-+
-+	ret = gpio_usbh2_active();
-+	if (ret != 0) {
-+		return ret;
-+	}
-+
-+	ret = usb3317_init(view);
-+	if (ret != 0) {
-+		goto err;
-+	}
-+	ret = usb3317_set_vbus_power(view, 1);
-+	if (ret != 0) {
-+		goto err;
-+	}
-+	return 0;
-+
-+ err:
-+	gpio_usbh2_inactive();
-+	return ret;
-+}
-+
-+static int tx25_usbh2_exit(struct platform_device *pdev)
-+{
-+	gpio_usbh2_inactive();
-+	return 0;
-+}
-+
-+static struct mxc_usbh_platform_data tx25_usbh2_data = {
-+	.init = tx25_usbh2_init,
-+	.exit = tx25_usbh2_exit,
-+};
-+
-+int tx25_usbh2_register(void)
-+{
-+	int ret;
-+
-+	ret = mxc_register_device(&mxc_ehci2, &tx25_usbh2_data);
-+	return ret;
-+}
-+device_initcall(tx25_usbh2_register);
-+#endif // CONFIG_USB_EHCI_MXC
-+
 +//#define FEC_MII_IRQ		IRQ_GPIOD(8)
 +
 +#if defined(CONFIG_FEC) || defined(CONFIG_FEC_MODULE)
@@ -5541,17 +4493,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +			return ret;
 +		}
 +		DBG(0, "%s: Switching FEC PHY power on\n", __FUNCTION__);
-+		//gpio_set_value(TX25_FEC_PWR_GPIO, 1);
-+#if 0
-+		while (1) {
-+			gpio_set_value(TX25_FEC_PWR_GPIO, 1);
-+			mdelay(1000);
-+			gpio_set_value(TX25_FEC_PWR_GPIO, 0);
-+			mdelay(1000);
-+		}
-+#endif
 +		DBG(0, "%s: Asserting FEC PHY reset\n", __FUNCTION__);
-+//		gpio_set_value(TX25_FEC_RST_GPIO, 0);
 +		for (i = 0; i < ARRAY_SIZE(karo_tx25_fec_strap_gpios); i++) {
 +			struct gpio_desc *pd = &karo_tx25_fec_strap_gpios[i];
 +
@@ -5621,13 +4563,6 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 + rel_gpio:
 +	while (--i >= 0) {
 +		struct gpio_desc *pd = &karo_tx25_fec_strap_gpios[i];
-+#ifdef DEBUG
-+		int grp = pd->gpio / 32 + 1;
-+		int ofs = pd->gpio % 32;
-+
-+		DBG(0, "%s: Freeing GPIO%d_%d\n", __FUNCTION__,
-+		    grp, ofs);
-+#endif
 +		gpio_free(pd->gpio);
 +	}
 +	mxc_iomux_v3_release_multiple_pads(karo_tx25_fec_pwr_gpios,
@@ -5658,13 +4593,6 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +					   ARRAY_SIZE(karo_tx25_fec_pwr_gpios));
 +	for (i = 0; i < ARRAY_SIZE(karo_tx25_fec_strap_gpios); i++) {
 +		struct gpio_desc *pd = &karo_tx25_fec_strap_gpios[i];
-+#ifdef DEBUG
-+		int grp = pd->gpio / 32 + 1;
-+		int ofs = pd->gpio % 32;
-+
-+		DBG(0, "%s: Freeing GPIO%d_%d\n", __FUNCTION__,
-+		    grp, ofs);
-+#endif
 +		gpio_free(pd->gpio);
 +	}
 +}
@@ -5689,45 +4617,6 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +	return 0;
 +}
 +
-+#if 0
-+/*
-+ * i.MX25 allows RMII mode to be configured via a gasket
-+ */
-+#define FEC_MIIGSK_CFGR_FRCONT (1 << 6)
-+#define FEC_MIIGSK_CFGR_LBMODE (1 << 4)
-+#define FEC_MIIGSK_CFGR_EMODE (1 << 3)
-+#define FEC_MIIGSK_CFGR_IF_MODE_MASK (3 << 0)
-+#define FEC_MIIGSK_CFGR_IF_MODE_MII (0 << 0)
-+#define FEC_MIIGSK_CFGR_IF_MODE_RMII (1 << 0)
-+
-+#define FEC_MIIGSK_ENR_READY (1 << 2)
-+#define FEC_MIIGSK_ENR_EN (1 << 1)
-+
-+#include "../arch/arm/mach-mx25/crm_regs.h"
-+static void __inline__ fec_localhw_setup(struct net_device *dev)
-+{
-+	struct fec_enet_private *fep = netdev_priv(dev);
-+
-+	/*
-+	 * Set up the MII gasket for RMII mode
-+	 */
-+	printk("%s: enable RMII gasket\n", dev->name);
-+
-+	/* disable the gasket and wait */
-+	fec_reg_write16(fep, FEC_MIIGSK_ENR, 0);
-+	while (fec_reg_read16(fep, FEC_MIIGSK_ENR) & FEC_MIIGSK_ENR_READY)
-+		udelay(1);
-+
-+	/* configure the gasket for RMII, 50 MHz, no loopback, no echo */
-+	fec_reg_write16(fep, FEC_MIIGSK_CFGR, FEC_MIIGSK_CFGR_IF_MODE_RMII);
-+
-+	/* re-enable the gasket */
-+	fec_reg_write16(fep, FEC_MIIGSK_ENR, FEC_MIIGSK_ENR_EN);
-+	fec_reg_read16(fep, FEC_MIIGSK_CFGR);
-+	fec_reg_read16(fep, FEC_MIIGSK_ENR);
-+}
-+#endif
-+
 +static int fec_arch_init(struct platform_device *pdev)
 +{
 +	int ret;
@@ -5807,62 +4696,6 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +	MX25_PAD_D0__D0,
 +};
 +
-+#ifdef CONFIG_ARCH_MXC_HAS_NFC_V2
-+static struct mtd_partition tx25_nand_partitions[] = {
-+	{
-+		.name = "RedBoot",
-+		.offset = 0,
-+		.size = 0x00040000,
-+	}, {
-+		.name = "kernel",
-+		.offset = MTDPART_OFS_APPEND,
-+		.size = 0x001A0000,
-+	}, {
-+		.name = "rootfs",
-+		.offset = MTDPART_OFS_APPEND,
-+		.size = 0x07E000000,
-+	}, {
-+		.name = "FIS directory",
-+		.offset = MTDPART_OFS_APPEND,
-+		.size = 0x00003000,
-+		.mask_flags = MTD_WRITEABLE,
-+	}, {
-+		.name = "RedBoot config",
-+		.offset = MTDPART_OFS_APPEND,
-+		.size = 0x00001000,
-+		.mask_flags = MTD_WRITEABLE,
-+	},
-+};
-+
-+static int tx25_nand_init(void)
-+{
-+	int ret;
-+
-+	DBG(0, "%s: Configuring NAND pins\n", __FUNCTION__);
-+	ret = mxc_iomux_v3_setup_multiple_pads(karo_tx25_nand_pads,
-+					       ARRAY_SIZE(karo_tx25_nand_pads));
-+	if (ret) {
-+		return ret;
-+	}
-+	return 0;
-+}
-+
-+static void tx25_nand_exit(void)
-+{
-+	mxc_iomux_v3_release_multiple_pads(karo_tx25_nand_pads,
-+					   ARRAY_SIZE(karo_tx25_nand_pads));
-+}
-+
-+static struct flash_platform_data tx25_nand_data = {
-+	.map_name = "nand_probe",
-+	.name = "tx25-nand",
-+	.parts = tx25_nand_partitions,
-+	.nr_parts = ARRAY_SIZE(tx25_nand_partitions),
-+	.width = 1,
-+	.init = tx25_nand_init,
-+	.exit = tx25_nand_exit,
-+};
-+#else
 +static struct mxc_nand_platform_data tx25_nand_data = {
 +	.hw_ecc = 1,
 +	.width = 1,
@@ -5881,7 +4714,6 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +	return 0;
 +}
 +arch_initcall(tx25_nand_init);
-+#endif
 +
 +static struct resource tx25_nand_resources[] = {
 +	{
@@ -5926,10 +4758,6 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +#if 0
 +#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 +static struct pad_desc mxc_i2c0_pins[] = {
-+	/*
-+	 * it seems the data line misses a pullup, so we must enable
-+	 * the internal pullup as a local workaround
-+	 */
 +	MX25_PAD_I2C1_CLK__I2C1_CLK,
 +	MX25_PAD_I2C1_DAT__I2C1_DAT,
 +};
@@ -5989,6 +4817,146 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +#endif
 +#endif
 +
++#if defined(CONFIG_TOUCHSCREEN_MXC_TSADCC) || defined(CONFIG_TOUCHSCREEN_MXC_TSADCC_MODULE)
++static struct resource mxc_tsadcc_resources[] = {
++	{
++		.start = TSC_BASE_ADDR,
++		.end = TSC_BASE_ADDR + 0x85f,
++		.flags = IORESOURCE_MEM,
++	},
++	{
++		.start = MXC_INT_TSC,
++		.end = MXC_INT_TSC,
++		.flags = IORESOURCE_IRQ,
++	},
++};
++
++static struct mxc_tsadcc_pdata mxc_tsadcc_pdata = {
++	.pen_debounce_time = 32,
++	.intref = 1,
++	.adc_clk = 1750000,
++	.tsc_mode = MXC_TSC_4WIRE,
++	.hsyncen = 0,
++};
++
++static struct platform_device mxc_tsadcc_device = {
++	.id = 0,
++	.name = "mxc-tsadcc",
++	.num_resources = ARRAY_SIZE(mxc_tsadcc_resources),
++	.resource = mxc_tsadcc_resources,
++	.dev = {
++		.platform_data = &mxc_tsadcc_pdata,
++	},
++};
++#endif
++
++#if defined(CONFIG_CAN_FLEXCAN) || defined(CONFIG_CAN_FLEXCAN_MODULE)
++
++#ifdef CONFIG_CAN_FLEXCAN_CAN1
++static struct pad_desc tx25_flexcan1_pads[] = {
++	MX25_PAD_GPIO_A__CAN1_TX,
++	MX25_PAD_GPIO_B__CAN1_RX,
++};
++
++static struct resource tx25_flexcan1_resources[] = {
++	{
++		.start = CAN1_BASE_ADDR,
++		.end = CAN1_BASE_ADDR + 0x97f,
++		.flags = IORESOURCE_MEM,
++	},
++	{
++		.start = MXC_INT_CAN1,
++		.end = MXC_INT_CAN1,
++		.flags = IORESOURCE_IRQ,
++	},
++};
++
++static int tx25_flexcan1_active(struct platform_device *pdev)
++{
++	return mxc_iomux_v3_setup_multiple_pads(tx25_flexcan1_pads,
++					       ARRAY_SIZE(tx25_flexcan1_pads));
++}
++
++static void tx25_flexcan1_inactive(struct platform_device *pdev)
++{
++	mxc_iomux_v3_release_multiple_pads(tx25_flexcan1_pads,
++					   ARRAY_SIZE(tx25_flexcan1_pads));
++	karo_tx25_gpio_config(tx25_flexcan1_pads,
++			      ARRAY_SIZE(tx25_flexcan1_pads));
++}
++
++static struct flexcan_platform_data tx25_flexcan1_pdata = {
++	//.core_reg = NULL;
++	//.io_reg = NULL;
++	//.xcvr_enable = NULL,
++	.active = tx25_flexcan1_active,
++	.inactive = tx25_flexcan1_inactive,
++};
++
++static struct platform_device tx25_flexcan1_device = {
++	.id = 0,
++	.name = "mxc-flexcan",
++	.num_resources = ARRAY_SIZE(tx25_flexcan1_resources),
++	.resource = tx25_flexcan1_resources,
++	.dev = {
++		.platform_data = &tx25_flexcan1_pdata,
++	},
++};
++#endif // CONFIG_CAN_FLEXCAN_CAN1
++
++#ifdef CONFIG_CAN_FLEXCAN_CAN2
++static struct pad_desc tx25_flexcan2_pads[] = {
++	MX25_PAD_GPIO_C__CAN2_TX,
++	MX25_PAD_GPIO_D__CAN2_RX,
++};
++
++static struct resource tx25_flexcan2_resources[] = {
++	{
++		.start = CAN2_BASE_ADDR,
++		.end = CAN2_BASE_ADDR + 0x97f,
++		.flags = IORESOURCE_MEM,
++	},
++	{
++		.start = MXC_INT_CAN2,
++		.end = MXC_INT_CAN2,
++		.flags = IORESOURCE_IRQ,
++	},
++};
++
++static int tx25_flexcan2_active(struct platform_device *pdev)
++{
++	return mxc_iomux_v3_setup_multiple_pads(tx25_flexcan2_pads,
++					       ARRAY_SIZE(tx25_flexcan2_pads));
++}
++
++static void tx25_flexcan2_inactive(struct platform_device *pdev)
++{
++	mxc_iomux_v3_release_multiple_pads(tx25_flexcan2_pads,
++					   ARRAY_SIZE(tx25_flexcan2_pads));
++	karo_tx25_gpio_config(tx25_flexcan2_pads,
++			      ARRAY_SIZE(tx25_flexcan2_pads));
++}
++
++static struct flexcan_platform_data tx25_flexcan2_pdata = {
++	//.core_reg = NULL;
++	//.io_reg = NULL;
++	//.xcvr_enable = NULL,
++	.active = tx25_flexcan2_active,
++	.inactive = tx25_flexcan2_inactive,
++};
++
++static struct platform_device tx25_flexcan2_device = {
++	.id = 1,
++	.name = "mxc-flexcan",
++	.num_resources = ARRAY_SIZE(tx25_flexcan2_resources),
++	.resource = tx25_flexcan2_resources,
++	.dev = {
++		.platform_data = &tx25_flexcan2_pdata,
++	},
++};
++#endif // CONFIG_CAN_FLEXCAN_CAN2
++#endif // CONFIG_CAN_FLEXCAN || CONFIG_CAN_FLEXCAN_MODULE
++
 +struct platform_dev_list {
 +	struct platform_device *pdev;
 +	int flag;
@@ -5997,19 +4965,28 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +	{ .pdev = &mxc_rtc_device, .flag = -1, },
 +#endif
 +#if defined(CONFIG_MTD_NAND_MXC) || defined(CONFIG_MTD_NAND_MXC_MODULE)
-+	{ .pdev = &tx25_nand_mtd_device, .flag = 1, },
++	{ .pdev = &tx25_nand_mtd_device, .flag = -1, },
 +#endif
 +#if defined(CONFIG_FEC) || defined(CONFIG_FEC_MODULE)
-+	{ .pdev = &fec_device, .flag = 1, },
++	{ .pdev = &fec_device, .flag = -1, },
 +#endif
 +#if defined(CONFIG_SPI_MXC) || defined(CONFIG_SPI_MXC_MODULE)
-+	{ .pdev = &mxcspi1_device, .flag = 1, },
++	{ .pdev = &mxcspi1_device, .flag = -1, },
 +#endif
 +#if defined(CONFIG_VIDEO_MXC_EMMA_OUTPUT) || defined(CONFIG_VIDEO_MXC_EMMA_OUTPUT_MODULE)
-+	{ .pdev = &tx25_v4l2out_device, .flag = 1, },
++	{ .pdev = &tx25_v4l2out_device, .flag = -1, },
 +#endif
 +#if defined(CONFIG_MXC_VPU) || defined(CONFIG_MXC_VPU_MODULE)
-+	{ .pdev = &mxc_vpu_device, .flag = 1, },
++	{ .pdev = &mxc_vpu_device, .flag = -1, },
++#endif
++#if defined(CONFIG_TOUCHSCREEN_MXC_TSADCC) || defined(CONFIG_TOUCHSCREEN_MXC_TSADCC_MODULE)
++	{ .pdev = &mxc_tsadcc_device, .flag = -1, },
++#endif
++#ifdef CONFIG_CAN_FLEXCAN_CAN1
++	{ .pdev = &tx25_flexcan1_device, .flag = -1, },
++#endif
++#ifdef CONFIG_CAN_FLEXCAN_CAN2
++	{ .pdev = &tx25_flexcan2_device, .flag = -1, },
 +#endif
 +};
 +#define TX25_NUM_DEVICES		ARRAY_SIZE(tx25_devices)
@@ -6180,17 +5157,20 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +
 +static int __init karo_tx25_setup_gpios(void)
 +{
++#if 1
++	int count;
++
++	count = karo_tx25_gpio_config(karo_tx25_gpios, ARRAY_SIZE(karo_tx25_gpios));
++	DBG(0, "%s: %d out of %d pins set up as GPIO\n", __FUNCTION__,
++	    count, ARRAY_SIZE(karo_tx25_gpios));
++#else
 +	int i;
 +	int ret;
 +	int count = 0;
 +
 +	for (i = 0; i < ARRAY_SIZE(karo_tx25_gpios); i++) {
 +		struct pad_desc *pd = &karo_tx25_gpios[i];
-+#if 0
-+		if (i - 64 >= 16 && i - 64 < 32) {
-+			continue;
-+		}
-+#endif
++
 +		ret = mxc_iomux_v3_setup_pad(pd);
 +		if (ret == 0) {
 +#ifdef IOMUX_DEBUG
@@ -6209,23 +5189,6 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +		}
 +	}
 +	DBG(0, "%s: %d out of %d pins set up as GPIO\n", __FUNCTION__, count, i);
-+#if 0
-+	if (gpio_request(42, "TEST") == 0) {
-+		gpio_direction_output(42, 1);
-+		while (1) {
-+			gpio_set_value(42, 0);
-+			if (gpio_get_value(42)) {
-+				DBG(0, "%s: GPIO 42 is HIGH instead of LOW\n", __FUNCTION__);
-+			}
-+			msleep(1000);
-+			gpio_set_value(42, 1);
-+			if (!gpio_get_value(42)) {
-+				DBG(0, "%s: GPIO 42 is LOW instead of HIGH\n", __FUNCTION__);
-+			}
-+			msleep(1000);
-+		}
-+	}
-+	gpio_free(42);
 +#endif
 +	return 0;
 +}
@@ -6280,9 +5243,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo/
 +	.init_machine   = karo_tx25_board_init,
 +	.timer          = &karo_tx25_timer,
 +MACHINE_END
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo.h linux-2.6.30-rc4-karo/arch/arm/mach-mx2/karo.h
---- linux-2.6.30-rc4/arch/arm/mach-mx2/karo.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/karo.h	2009-06-02 17:59:18.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/karo.h linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/karo.h
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/karo.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/karo.h	2009-06-02 17:59:18.000000000 +0200
 @@ -0,0 +1,99 @@
 +/*
 + * arch/arm/mach-mx2/karo.h
@@ -6383,9 +5346,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/karo.h linux-2.6.30-rc4-karo/arch/
 +		SHOW_GPIO_REG(i, ISR);
 +	}
 +}
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/sdma_script_code.h linux-2.6.30-rc4-karo/arch/arm/mach-mx2/sdma_script_code.h
---- linux-2.6.30-rc4/arch/arm/mach-mx2/sdma_script_code.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/sdma_script_code.h	2009-06-02 17:59:18.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/sdma_script_code.h linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/sdma_script_code.h
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/sdma_script_code.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/sdma_script_code.h	2009-06-02 17:59:18.000000000 +0200
 @@ -0,0 +1,159 @@
 +
 +/*
@@ -6546,10 +5509,10 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/sdma_script_code.h linux-2.6.30-rc
 +	0xc2d1, 0x0458, 0x0454, 0x6add, 0x7ff6, 0xc261, 0x98c6
 +};
 +#endif
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/stk5-baseboard.c linux-2.6.30-rc4-karo/arch/arm/mach-mx2/stk5-baseboard.c
---- linux-2.6.30-rc4/arch/arm/mach-mx2/stk5-baseboard.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx2/stk5-baseboard.c	2009-06-02 17:59:18.000000000 +0200
-@@ -0,0 +1,1003 @@
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx2/stk5-baseboard.c linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/stk5-baseboard.c
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx2/stk5-baseboard.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx2/stk5-baseboard.c	2009-07-14 13:51:43.000000000 +0200
+@@ -0,0 +1,1187 @@
 +/*
 + * arch/arm/mach-mx2/stk5-baseboard.c
 + *
@@ -6586,7 +5549,6 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/stk5-baseboard.c linux-2.6.30-rc4-
 +#include <linux/i2c.h>
 +#include <linux/i2c/at24.h>
 +#include <linux/spi/spi.h>
-+//#include <linux/serial_8250.h>
 +
 +#include <linux/serial.h>
 +#include <linux/fsl_devices.h>
@@ -6611,8 +5573,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/stk5-baseboard.c linux-2.6.30-rc4-
 +#include <mach/i2c.h>
 +#include <mach/mmc.h>
 +#include <mach/imx-uart.h>
-+//#include <mach/ulpi.h>
-+//#include <mach/mxc_ehci.h>
++#include <mach/mxc_ehci.h>
 +#include <mach/board-stk5.h>
 +
 +#include "crm_regs.h"
@@ -6693,209 +5654,354 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/stk5-baseboard.c linux-2.6.30-rc4-
 +	},
 +};
 +
-+static struct platform_device *stk5_uart_devices[] = {
-+#if UART1_ENABLED
-+	&mxc_uart_device0,
-+#endif
-+#if UART2_ENABLED
-+	&mxc_uart_device1,
-+#endif
-+#if UART3_ENABLED
-+	&mxc_uart_device2,
-+#endif
-+#if UART4_ENABLED
-+	&mxc_uart_device3,
-+#endif
-+#if UART5_ENABLED
-+	&mxc_uart_device4,
-+#endif
-+};
++#ifdef CONFIG_USB_EHCI_MXC
 +
-+static void __init karo_stk5_serial_init(void)
++/* USB register offsets */
++#define REG_USBCTRL		0x600
++#define REG_PHY_CTRL		0x608
++
++#define PHY_CTRL_USBEN		(1 << 24)
++
++/* USB Host/OTG register offsets */
++#define REG_USBCMD		0x140
++#define REG_USBSTS		0x144
++#define REG_PORTSC1		0x184
++#define REG_USBMODE		0x1a8
++
++#define USBCMD_RST		(1 << 1)
++#define USBCMD_RUN		(1 << 0)
++
++#define USBSTS_HCH		(1 << 12)
++
++/* USB_CTRL register bits */
++#define USBCTRL_OCPOL_HST	(1 << 2)
++#define USBCTRL_OCPOL_OTG	(1 << 3)
++#define USBCTRL_USBTE		(1 << 4)
++#define USBCTRL_HSDT		(1 << 5)
++#define USBCTRL_PUE_DWN		(1 << 6)
++#define USBCTRL_XCSH		(1 << 9)
++#define USBCTRL_XCSO		(1 << 10)
++#define USBCTRL_PP_OTG		(1 << 11)
++#define USBCTRL_HLKEN		(1 << 12)
++#define USBCTRL_OLKEN		(1 << 13)
++#define USBCTRL_HPM		(1 << 16)
++#define USBCTRL_PP_HST		(1 << 18)
++#define USBCTRL_HWIE		(1 << 19)
++#define USBCTRL_HUIE		(1 << 20)
++#define USBCTRL_OPM		(1 << 24)
++#define USBCTRL_OEXTEN		(1 << 25)
++#define USBCTRL_HEXTEN		(1 << 26)
++#define USBCTRL_OWIE		(1 << 27)
++#define USBCTRL_OUIE		(1 << 28)
++
++#ifdef DEBUG
++#define usb_reg_write(v,b,r)	_usb_reg_write(v,b,r,#r)
++static inline void _usb_reg_write(unsigned long val, void __iomem *base, int reg,
++				  const char *name)
 +{
-+	int i;
++	DBG(0, "%s: Writing %08lx to %s[%03x]\n", __FUNCTION__, val, name, reg);
++	__raw_writel(val, base + reg);
++}
 +
-+	for (i = 0; i < ARRAY_SIZE(stk5_uart_devices); i++) {
-+		int ret;
-+		int port = stk5_uart_devices[i]->id;
++#define usb_reg_read(b,r)	_usb_reg_read(b,r,#r)
++static inline unsigned long _usb_reg_read(void __iomem *base, int reg, const char *name)
++{
++	unsigned long val;
 +
-+		DBG(0, "%s: Registering platform device[%d] @ %p dev %p: %s\n",
-+		    __FUNCTION__, i, stk5_uart_devices[i],
-+		    &stk5_uart_devices[i]->dev, stk5_uart_devices[i]->name);
-+		ret = mxc_register_device(stk5_uart_devices[i],
-+					  &stk5_uart_ports[port]);
-+		if (ret != 0) {
-+			printk(KERN_WARNING "%s: Failed to register platform_device[%d]: %s: %d\n",
-+			       __FUNCTION__, i, stk5_uart_devices[i]->name, ret);
-+		}
-+	}
++	val = __raw_readl(base + reg);
++	DBG(0, "%s: Read %08lx from %s[%03x]\n", __FUNCTION__, val, name, reg);
++	return val;
 +}
 +#else
-+static void __init karo_stk5_serial_init(void)
++static inline void usb_reg_write(unsigned long val, void __iomem *base, int reg)
 +{
++	__raw_writel(val, base + reg);
 +}
-+#endif
-+
-+#ifdef CONFIG_USB_EHCI_MXC
 +
-+#define SMSC_VENDOR_ID		0x0424
-+#define USB3317_PROD_ID		0x0006
-+#define ULPI_FCTL		7
-+
-+static inline const char *ulpi_name(void __iomem *view)
++static inline unsigned long usb_reg_read(void __iomem *base, int reg)
 +{
-+	if ((unsigned long)view & 0x400) {
-+		return "USBH2";
-+	} else {
-+		return "USBOTG";
-+	}
++	return __raw_readl(base + reg);
 +}
++#endif
 +
-+static int usb3317_init(void __iomem *view)
++static int tx25_usb_init(struct platform_device *pdev, void __iomem *base, int host_mode)
 +{
-+	int vid, pid, ret;
-+
-+	ret = ulpi_read(ISP1504_VID_HIGH, view);
-+	if (ret < 0) {
-+		goto err;
++	unsigned long val;
++	unsigned long flags;
++	const char __maybe_unused *name = pdev->id ? "USBH2" : "USBOTG";
++	unsigned int loops = 0;
++	void __iomem *otg_base = IO_ADDRESS(OTG_BASE_ADDR);
++	int ll = console_loglevel;
++
++	console_loglevel = 8;
++
++	if (!(usb_reg_read(base, REG_USBSTS) & USBSTS_HCH)) {
++		unsigned int loops = 0;
++
++		DBG(0, "%s: %s[%p] is busy: %08lx\n", __FUNCTION__, name,
++		    base + REG_USBSTS, usb_reg_read(base, REG_USBSTS));
++		usb_reg_write(usb_reg_read(base, REG_USBCTRL) & ~USBCMD_RUN,
++			      base, REG_USBCTRL);
++		while (usb_reg_read(base, REG_USBCTRL) & USBCMD_RUN) {
++			usb_reg_write(usb_reg_read(base, REG_USBCTRL) & ~USBCMD_RUN,
++				      base, REG_USBCTRL);
++			cpu_relax();
++			loops++;
++			if (loops > 100)
++				break;
++		}
++		if (usb_reg_read(base, REG_USBSTS) & USBSTS_HCH) {
++			DBG(0, "USB controller idle after %u loops\n", loops);
++		} else {
++			DBG(0, "USB controller NOT idle after %u loops\n", loops);
++		}
 +	}
-+	vid = ret << 8;
-+
-+	ret = ulpi_read(ISP1504_VID_LOW, view);
-+	if (ret < 0) {
-+		goto err;
++	DBG(0, "%s: PHY_CTRL[%p]=%08lx\n", __FUNCTION__, otg_base + REG_PHY_CTRL,
++	    usb_reg_read(otg_base, REG_PHY_CTRL));
++	DBG(0, "%s: USBCMD[%p]=%08lx\n", __FUNCTION__, base + REG_USBCMD,
++	    usb_reg_read(base, REG_USBCMD));
++	DBG(0, "%s: USBSTS[%p]=%08lx\n", __FUNCTION__, base + REG_USBSTS,
++	    usb_reg_read(base, REG_USBSTS));
++
++	/* reset USB Host controller */
++	usb_reg_write(USBCMD_RST, base, REG_USBCMD);
++	while (usb_reg_read(base, REG_USBCMD) & USBCMD_RST) {
++		cpu_relax();
++		loops++;
 +	}
-+	vid |= ret;
++	DBG(0, "USB controller reset finished after %u loops\n", loops);
 +
-+	ret = ulpi_read(ISP1504_PID_HIGH, view);
-+	if (ret < 0) {
-+		goto err;
-+	}
-+	pid = ret << 8;
++	/* Switch to Host mode */
++	val = usb_reg_read(base, REG_USBMODE);
++	DBG(0, "%s: Changing %s_USBMODE from %08lx to %08lx\n", __FUNCTION__, name,
++	    val, val | (host_mode ? 0x3 : 0x02));
++	usb_reg_write(val | (host_mode ? 0x3 : 0x02), base, REG_USBMODE);
 +
-+	ret = ulpi_read(ISP1504_PID_LOW, view);
-+	if (ret < 0) {
-+		goto err;
++	local_irq_save(flags);
++	val = usb_reg_read(otg_base, REG_USBCTRL);
++	if (pdev->id == 1) {
++		val &= ~(USBCTRL_OCPOL_HST | USBCTRL_HPM |
++			 USBCTRL_HEXTEN | USBCTRL_HWIE);
++		val |= USBCTRL_PP_HST | USBCTRL_HSDT | USBCTRL_USBTE |
++			USBCTRL_XCSH | USBCTRL_PUE_DWN;
++	} else {
++		val &= ~(USBCTRL_OCPOL_OTG | USBCTRL_OPM |
++			 USBCTRL_OEXTEN | USBCTRL_OWIE);
++		val |= USBCTRL_PP_OTG | USBCTRL_XCSO;
 +	}
-+	pid |= ret;
++	DBG(0, "%s: Changing %s_USBCTRL from %08lx to %08lx\n", __FUNCTION__, name,
++	    usb_reg_read(otg_base, REG_USBCTRL), val);
++	usb_reg_write(val, otg_base, REG_USBCTRL);
++	local_irq_restore(flags);
 +
-+	pr_info("ULPI on %s port Vendor ID 0x%x Product ID 0x%x\n",
-+		ulpi_name(view), vid, pid);
-+	if (vid != SMSC_VENDOR_ID || pid != USB3317_PROD_ID) {
-+		pr_err("No USB3317 found\n");
-+		return -ENODEV;
-+	}
-+ err:
-+	if (ret < 0) {
-+		printk(KERN_ERR "ULPI read on %s port failed with error %d\n",
-+		       ulpi_name(view), ret);
-+		return ret;
++	val = usb_reg_read(base, REG_PORTSC1);
++	if (pdev->id == 1) {
++		/* select serial transceiver */
++		val = (val & ~(3 << 30)) | (3 << 30);
++	} else {
++		/* select UTMI transceiver */
++		val = (val & ~((3 << 30) | (0 << 28))) | (0 << 30);
 +	}
++	DBG(0, "%s: Changing %s_PORTSC1 from %08lx to %08lx\n", __FUNCTION__, name,
++	    usb_reg_read(base, REG_PORTSC1), val);
++	usb_reg_write(val, base, REG_PORTSC1);
++
++	console_loglevel = ll;
 +	return 0;
 +}
 +
-+static int usb3317_set_vbus_power(void __iomem *view, int on)
++#ifdef CONFIG_ARCH_MXC_EHCI_USBH2
++/*
++ * The USB power switch (MAX893L) used on the STK5 base board
++ * produces a pulse (~100us) on the OC output whenever
++ * the ON input is activated. This disturbs the USB controller.
++ * As a workaround don't use USB power switching.
++ * If you have a hardware that works cleanly you may
++ * #define USE_USB_PWR to enable port power control for
++ * the EHCI controller.
++ */
++static struct pad_desc karo_tx25_usbh2_pads[] = {
++#ifdef USE_USB_PWR
++	MX25_PAD_D9__USBH2_PWR,
++#endif
++	MX25_PAD_D8__USBH2_OC,
++};
++
++static int tx25_usbh2_init(struct platform_device *pdev)
 +{
 +	int ret;
-+
-+	DBG(0, "%s: Switching %s port VBUS power %s\n", __FUNCTION__,
-+	    ulpi_name(view), on ? "on" : "off");
-+
-+	if (on) {
-+		ret = ulpi_set(DRV_VBUS_EXT |		/* enable external Vbus */
-+			       DRV_VBUS |		/* enable internal Vbus */
-+			       CHRG_VBUS,		/* charge Vbus */
-+			       ISP1504_OTGCTL, view);
-+	} else {
-+		ret = ulpi_clear(DRV_VBUS_EXT |		/* disable external Vbus */
-+				 DRV_VBUS,		/* disable internal Vbus */
-+				 ISP1504_OTGCTL, view);
-+		if (ret == 0) {
-+			ret = ulpi_set(DISCHRG_VBUS,	   /* discharge Vbus */
-+				       ISP1504_OTGCTL, view);
-+		}
++	void __iomem *base = IO_ADDRESS(OTG_BASE_ADDR + 0x400);
++#ifndef USE_USB_PWR
++	const int pwr_gpio = 3 * 32 + 11;
++#endif
++	ret = mxc_iomux_v3_setup_multiple_pads(karo_tx25_usbh2_pads,
++					       ARRAY_SIZE(karo_tx25_usbh2_pads));
++#ifdef USE_USB_PWR
++	if (ret) {
++		return ret;
 +	}
-+	if (ret < 0) {
-+		printk(KERN_ERR "ULPI read on %s port failed with error %d\n",
-+		       ulpi_name(view), ret);
++#else
++	ret = gpio_request(pwr_gpio, "USBH2_PWR");
++	if (ret) {
++		DBG(0, "%s: Failed to request GPIO %d\n", __FUNCTION__,
++		    pwr_gpio);
++		mxc_iomux_v3_release_multiple_pads(karo_tx25_usbh2_pads,
++						   ARRAY_SIZE(karo_tx25_usbh2_pads));
 +		return ret;
 +	}
++
++	gpio_direction_output(pwr_gpio, 1);
++#endif
++	if (ret != 0) {
++		mxc_iomux_v3_release_multiple_pads(karo_tx25_usbh2_pads,
++						   ARRAY_SIZE(karo_tx25_usbh2_pads));
++		goto exit;
++	}
++	ret = tx25_usb_init(pdev, base, 1);
++
++ exit:
++#ifndef USE_USB_PWR
++	gpio_free(pwr_gpio);
++#endif
++	return ret;
++}
++
++static int tx25_usbh2_exit(struct platform_device *pdev)
++{
++	mxc_iomux_v3_release_multiple_pads(karo_tx25_usbh2_pads,
++					   ARRAY_SIZE(karo_tx25_usbh2_pads));
 +	return 0;
 +}
 +
-+static int stk5_usbh2_init(struct platform_device *pdev)
++static struct mxc_usbh_platform_data tx25_usbh2_data = {
++	.init = tx25_usbh2_init,
++	.exit = tx25_usbh2_exit,
++};
++
++int tx25_usbh2_register(void)
 +{
 +	int ret;
-+	u32 temp;
-+	unsigned long flags;
-+	void __iomem *view = IO_ADDRESS(OTG_BASE_ADDR + 0x570);
 +
-+	local_irq_save(flags);
-+	temp = readl(IO_ADDRESS(OTG_BASE_ADDR) + 0x600);
-+	temp &= ~((3 << 21) | (1 << 0));
-+	temp |= (1 << 5) | (1 << 16) | (1 << 19) | (1 << 20);
-+	writel(temp, IO_ADDRESS(OTG_BASE_ADDR) + 0x600);
-+	local_irq_restore(flags);
++	ret = mxc_register_device(&mxc_usbh2_device, &tx25_usbh2_data);
++	return ret;
++}
++device_initcall(tx25_usbh2_register);
++#endif // CONFIG_ARCH_MXC_EHCI_USBH2
 +
-+	/* select ULPI transceiver */
-+	/* this must be done _before_ setting up the GPIOs! */
-+	temp = readl(view + 0x14);
-+	DBG(0, "%s: Changing USBH2_PORTSC1 from %08x to %08x\n", __FUNCTION__,
-+	    temp, (temp & ~(3 << 30)) | (2 << 30));
-+	temp &= ~(3 << 30);
-+	temp |= 2 << 30;
-+	writel(temp, view + 0x14);
++#ifdef CONFIG_ARCH_MXC_EHCI_USBOTG
++static struct pad_desc karo_tx25_usbotg_pads[] = {
++#ifdef USE_USB_PWR
++	MX25_PAD_GPIO_A__USBOTG_PWR,
++#endif
++	MX25_PAD_GPIO_B__USBOTG_OC,
++};
 +
-+	/* Set to Host mode */
-+	temp = readl(view + 0x38);
-+	DBG(0, "%s: Changing USBH2_USBMODE from %08x to %08x\n", __FUNCTION__,
-+	    temp, temp | 3);
-+	writel(temp | 0x3, view + 0x38);
++static int tx25_usbotg_init(struct platform_device *pdev)
++{
++	int ret;
++	void __iomem *base = IO_ADDRESS(OTG_BASE_ADDR + 0x000);
++#ifndef USE_USB_PWR
++	const int pwr_gpio = 0 * 32 + 0;
++#endif
++	DBG(0, "%s: \n", __FUNCTION__);
 +
-+	ret = gpio_usbh2_active();
-+	if (ret != 0) {
++	ret = mxc_iomux_v3_setup_multiple_pads(karo_tx25_usbotg_pads,
++					       ARRAY_SIZE(karo_tx25_usbotg_pads));
++#ifdef USE_USB_PWR
++	if (ret) {
 +		return ret;
 +	}
-+
-+	ret = usb3317_init(view);
-+	if (ret != 0) {
-+		goto err;
++#else
++	ret = gpio_request(pwr_gpio, "USBOTG_PWR");
++	if (ret) {
++		DBG(0, "%s: Failed to request GPIO %d\n", __FUNCTION__,
++		    pwr_gpio);
++		mxc_iomux_v3_release_multiple_pads(karo_tx25_usbh2_pads,
++						   ARRAY_SIZE(karo_tx25_usbh2_pads));
++		return ret;
 +	}
-+	ret = usb3317_set_vbus_power(view, 1);
++
++	gpio_direction_output(pwr_gpio, 1);
++#endif
 +	if (ret != 0) {
-+		goto err;
++		mxc_iomux_v3_release_multiple_pads(karo_tx25_usbotg_pads,
++						   ARRAY_SIZE(karo_tx25_usbotg_pads));
++		goto exit;
 +	}
-+	return 0;
++	ret = tx25_usb_init(pdev, base, 1);
 +
-+ err:
-+	gpio_usbh2_inactive();
++ exit:
++#ifndef USE_USB_PWR
++	gpio_free(pwr_gpio);
++#endif
 +	return ret;
 +}
 +
-+static int stk5_usbh2_exit(struct platform_device *pdev)
++static int tx25_usbotg_exit(struct platform_device *pdev)
 +{
-+	gpio_usbh2_inactive();
++	mxc_iomux_v3_release_multiple_pads(karo_tx25_usbotg_pads,
++					   ARRAY_SIZE(karo_tx25_usbotg_pads));
 +	return 0;
 +}
 +
-+static struct mxc_usbh_platform_data stk5_usbh2_data = {
-+	.init = stk5_usbh2_init,
-+	.exit = stk5_usbh2_exit,
++static struct mxc_usbh_platform_data tx25_usbotg_data = {
++	.init = tx25_usbotg_init,
++	.exit = tx25_usbotg_exit,
 +};
 +
-+static int __init karo_stk5_usbh2_register(void)
++int tx25_usbotg_register(void)
 +{
 +	int ret;
 +
-+	ret = mxc_register_device(&mxc_ehci2, &stk5_usbh2_data);
++	ret = mxc_register_device(&mxc_usbotg_device, &tx25_usbotg_data);
 +	return ret;
 +}
++device_initcall(tx25_usbotg_register);
++#endif // CONFIG_ARCH_MXC_EHCI_USBOTG
++#endif // CONFIG_USB_EHCI_MXC
++
++static struct platform_device *stk5_uart_devices[] = {
++#if UART1_ENABLED
++	&mxc_uart_device0,
++#endif
++#if UART2_ENABLED
++	&mxc_uart_device1,
++#endif
++#if UART3_ENABLED
++	&mxc_uart_device2,
++#endif
++#if UART4_ENABLED
++	&mxc_uart_device3,
++#endif
++#if UART5_ENABLED
++	&mxc_uart_device4,
++#endif
++};
++
++static void __init karo_stk5_serial_init(void)
++{
++	int i;
++
++	for (i = 0; i < ARRAY_SIZE(stk5_uart_devices); i++) {
++		int ret;
++		int port = stk5_uart_devices[i]->id;
++
++		DBG(0, "%s: Registering platform device[%d] @ %p dev %p: %s\n",
++		    __FUNCTION__, i, stk5_uart_devices[i],
++		    &stk5_uart_devices[i]->dev, stk5_uart_devices[i]->name);
++		ret = mxc_register_device(stk5_uart_devices[i],
++					  &stk5_uart_ports[port]);
++		if (ret != 0) {
++			printk(KERN_WARNING "%s: Failed to register platform_device[%d]: %s: %d\n",
++			       __FUNCTION__, i, stk5_uart_devices[i]->name, ret);
++		}
++	}
++}
 +#else
-+static inline int karo_stk5_usbh2_register(void)
++static void __init karo_stk5_serial_init(void)
 +{
-+	return 0;
 +}
-+#endif // CONFIG_USB_EHCI_MXC
++#endif
 +
 +#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
 +static struct gpio_led stk5_leds[] = {
@@ -7022,25 +6128,71 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/stk5-baseboard.c linux-2.6.30-rc4-
 +
 +static struct imx_fb_platform_data stk5_fb_data[] __initdata = {
 +	{
++#if 1
 +		//.fb_mode = "Xenarc_700_Y-18",
 +		.init = stk5_gpio_lcdc_active,
 +		.exit = stk5_gpio_lcdc_inactive,
 +		.lcd_power = NULL,
 +		.backlight_power = NULL,
 +
++		.pixclock	= 45833,
++
++		.xres		= 640,
++		.yres		= 480,
++
++		.bpp		= 8,
++
++		.hsync_len	= 64,
++		.right_margin	= 28 + 1,
++		.left_margin	= 20 + 3,
++
++		.vsync_len	= 1,
++		.lower_margin	= 0,
++		.upper_margin	= 16,
++
++		.pcr		= PCR_TFT | PCR_COLOR | PCR_END_BYTE_SWAP |
++		PCR_BPIX_8 | PCR_FLMPOL | PCR_LPPOL | PCR_SCLK_SEL,
++		.dmacr		= 0x80040060,
++
++		.cmap_greyscale	= 0,
++		.cmap_inverse	= 0,
++		.cmap_static	= 0,
++
++		.fixed_screen_cpu = NULL,
++	}, {
++#endif
++		//.fb_mode = "Xenarc_700_Y-18",
++		.init = stk5_gpio_lcdc_active,
++		.exit = stk5_gpio_lcdc_inactive,
++		.lcd_power = NULL,
++		.backlight_power = NULL,
++#if 1
 +		.pixclock	= 34576,
++#else
++		.pixclock	= 38033,
++#endif
 +		.xres		= 640,
 +		.yres		= 480,
 +
 +		.bpp		= 32,
-+
++#if 1
 +		.hsync_len	= 64,
 +		.right_margin	= 60 + 1,
 +		.left_margin	= 80 + 3,
-+
++#else
++		.hsync_len	= 64,
++		.right_margin	= 79 + 1,
++		.left_margin	= 57 + 3,
++#endif
++#if 1
 +		.vsync_len	= 2,
++		.lower_margin	= 54,
 +		.upper_margin	= 54,
++#else
++		.vsync_len	= 4,
 +		.lower_margin	= 54,
++		.upper_margin	= 54,
++#endif
 +#if 0
 +		/* currently not used by driver! */
 +		.sync		= ((0*FB_SYNC_HOR_HIGH_ACT) |
@@ -7049,7 +6201,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/stk5-baseboard.c linux-2.6.30-rc4-
 +#else
 +		.pcr		= PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 |
 +		PCR_BPIX_18 | PCR_END_SEL | PCR_FLMPOL | PCR_LPPOL | PCR_SCLK_SEL,
-+		.dmacr		= 0x800a0078,
++		.dmacr		= 0x80040060,
 +#endif
 +		.cmap_greyscale	= 0,
 +		.cmap_inverse	= 0,
@@ -7074,8 +6226,8 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/stk5-baseboard.c linux-2.6.30-rc4-
 +		.left_margin	= 118 + 3,
 +
 +		.vsync_len	= 7,
-+		.upper_margin	= 44,
 +		.lower_margin	= 44,
++		.upper_margin	= 44,
 +#if 0
 +		/* currently not used by driver! */
 +		.sync		= ((0*FB_SYNC_HOR_HIGH_ACT) |
@@ -7112,8 +6264,8 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/stk5-baseboard.c linux-2.6.30-rc4-
 +		.left_margin	= 118 + 3,
 +
 +		.vsync_len	= 7,
-+		.upper_margin	= 28,
 +		.lower_margin	= 60,
++		.upper_margin	= 28,
 +#if 0
 +		/* currently not used by driver! */
 +		.sync		= ((0*FB_SYNC_HOR_HIGH_ACT) |
@@ -7154,8 +6306,8 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/stk5-baseboard.c linux-2.6.30-rc4-
 +		.left_margin	= 0 + 3,
 +
 +		.vsync_len	= 35,
-+		.upper_margin	= 0,
 +		.lower_margin	= 0,
++		.upper_margin	= 0,
 +#if 0
 +		/* currently not used by driver! */
 +		.sync		= ((0*FB_SYNC_HOR_HIGH_ACT) |
@@ -7526,11 +6678,6 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/stk5-baseboard.c linux-2.6.30-rc4-
 +		printk(KERN_WARNING "%s: karo_stk5_fb_register() failed: %d\n",
 +		       __FUNCTION__, ret);
 +	}
-+	ret = karo_stk5_usbh2_register();
-+	if (ret) {
-+		printk(KERN_WARNING "%s: karo_stk5_usbh2_register() failed: %d\n",
-+		       __FUNCTION__, ret);
-+	}
 +
 +	for (i = 0; i < STK5_NUM_DEVICES; i++) {
 +		if (stk5_devices[i].pdev == NULL) continue;
@@ -7553,9 +6700,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx2/stk5-baseboard.c linux-2.6.30-rc4-
 +	return 0;
 +}
 +subsys_initcall(karo_stk5_board_init);
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx3/clock-imx35.c linux-2.6.30-rc4-karo/arch/arm/mach-mx3/clock-imx35.c
---- linux-2.6.30-rc4/arch/arm/mach-mx3/clock-imx35.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx3/clock-imx35.c	2009-06-02 17:59:19.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx3/clock-imx35.c linux-2.6.30-rc4-karo3/arch/arm/mach-mx3/clock-imx35.c
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx3/clock-imx35.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx3/clock-imx35.c	2009-06-02 17:59:19.000000000 +0200
 @@ -381,7 +381,7 @@ DEFINE_CLOCK(gpu2d_clk,  0, CCM_CGR3,  4
  		.clk = &c,		\
  	},
@@ -7565,9 +6712,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx3/clock-imx35.c linux-2.6.30-rc4-kar
  	_REGISTER_CLOCK(NULL, "asrc", asrc_clk)
  	_REGISTER_CLOCK(NULL, "ata", ata_clk)
  	_REGISTER_CLOCK(NULL, "audmux", audmux_clk)
-diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx3/clock.c linux-2.6.30-rc4-karo/arch/arm/mach-mx3/clock.c
---- linux-2.6.30-rc4/arch/arm/mach-mx3/clock.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/mach-mx3/clock.c	2009-06-02 17:59:19.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/mach-mx3/clock.c linux-2.6.30-rc4-karo3/arch/arm/mach-mx3/clock.c
+--- linux-2.6.30-rc4-git/arch/arm/mach-mx3/clock.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/mach-mx3/clock.c	2009-06-02 17:59:19.000000000 +0200
 @@ -516,7 +516,7 @@ DEFINE_CLOCK(ipg_clk,     0, NULL,      
  		.clk = &c, \
  	},
@@ -7577,9 +6724,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/mach-mx3/clock.c linux-2.6.30-rc4-karo/arch
  	_REGISTER_CLOCK(NULL, "emi", emi_clk)
  	_REGISTER_CLOCK(NULL, "cspi", cspi1_clk)
  	_REGISTER_CLOCK(NULL, "cspi", cspi2_clk)
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/Kconfig linux-2.6.30-rc4-karo/arch/arm/plat-mxc/Kconfig
---- linux-2.6.30-rc4/arch/arm/plat-mxc/Kconfig	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/Kconfig	2009-06-02 18:01:59.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/Kconfig linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/Kconfig
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/Kconfig	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/Kconfig	2009-06-02 18:01:59.000000000 +0200
 @@ -56,6 +56,9 @@ config ARCH_HAS_RNGA
  	bool
  	depends on ARCH_MXC
@@ -7590,9 +6737,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/Kconfig linux-2.6.30-rc4-karo/arch
  config ARCH_MXC_IOMUX_V3
  	bool
  endif
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/Makefile linux-2.6.30-rc4-karo/arch/arm/plat-mxc/Makefile
---- linux-2.6.30-rc4/arch/arm/plat-mxc/Makefile	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/Makefile	2009-06-02 18:02:00.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/Makefile linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/Makefile
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/Makefile	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/Makefile	2009-06-02 18:02:00.000000000 +0200
 @@ -5,7 +5,7 @@
  # Common support
  obj-y := irq.o clock.o gpio.o time.o devices.o cpu.o system.o
@@ -7605,9 +6752,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/Makefile linux-2.6.30-rc4-karo/arc
 +obj-$(CONFIG_ARCH_MXC_IOMUX_V3)	+= iomux-v3.o
 +obj-$(CONFIG_MXC_PWM)		+= pwm.o
 +obj-$(CONFIG_MACH_MX25)		+= spba.o
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/board-stk5.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/board-stk5.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/board-stk5.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/board-stk5.h	2009-06-02 18:02:13.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/board-stk5.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/board-stk5.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/board-stk5.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/board-stk5.h	2009-06-02 18:02:13.000000000 +0200
 @@ -0,0 +1,17 @@
 +/*
 + * Copyright 2009 <LW@KARO-electronics.de>
@@ -7626,9 +6773,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/board-stk5.h linux-2.
 +/* Not available on TX25 */
 +#define UART4_ENABLED		0
 +#define UART5_ENABLED		0
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/board-tx25.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/board-tx25.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/board-tx25.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/board-tx25.h	2009-06-02 18:02:13.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/board-tx25.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/board-tx25.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/board-tx25.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/board-tx25.h	2009-06-02 18:02:13.000000000 +0200
 @@ -0,0 +1,13 @@
 +/*
 + * Copyright 2009 <LW@KARO-electronics.de>
@@ -7643,9 +6790,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/board-tx25.h linux-2.
 +
 +#define MXC_LL_UART_PADDR	UART1_BASE_ADDR
 +#define MXC_LL_UART_VADDR	AIPS1_IO_ADDRESS(UART1_BASE_ADDR)
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/common.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/common.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/common.h	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/common.h	2009-06-02 18:02:05.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/common.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/common.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/common.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/common.h	2009-06-02 18:02:05.000000000 +0200
 @@ -17,6 +17,7 @@ struct clk;
  extern void mx1_map_io(void);
  extern void mx21_map_io(void);
@@ -7662,9 +6809,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/common.h linux-2.6.30
  extern int mx31_clocks_init(unsigned long fref);
  extern int mx35_clocks_init(void);
  extern int mxc_register_gpios(void);
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/dma.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/dma.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/dma.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/dma.h	2009-06-02 18:02:13.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/dma.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/dma.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/dma.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/dma.h	2009-06-02 18:02:13.000000000 +0200
 @@ -0,0 +1,259 @@
 +/*
 + * Copyright 2004-2008 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -7925,9 +7072,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/dma.h linux-2.6.30-rc
 +extern int mxc_dma_enable(int channel_num);
 +
 +#endif
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/hardware.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/hardware.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/hardware.h	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/hardware.h	2009-06-02 18:02:06.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/hardware.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/hardware.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/hardware.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/hardware.h	2009-06-02 18:02:06.000000000 +0200
 @@ -29,13 +29,18 @@
  #endif
  
@@ -7947,9 +7094,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/hardware.h linux-2.6.
  #endif
  
  #ifdef CONFIG_ARCH_MX1
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/imxfb.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/imxfb.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/imxfb.h	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/imxfb.h	2009-06-02 18:02:06.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/imxfb.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/imxfb.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/imxfb.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/imxfb.h	2009-06-02 18:02:06.000000000 +0200
 @@ -13,7 +13,8 @@
  #define PCR_BPIX_4	(2 << 25)
  #define PCR_BPIX_8	(3 << 25)
@@ -7960,10 +7107,10 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/imxfb.h linux-2.6.30-
  #define PCR_PIXPOL	(1 << 24)
  #define PCR_FLMPOL	(1 << 23)
  #define PCR_LPPOL	(1 << 22)
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/iomux-mx25.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/iomux-mx25.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/iomux-mx25.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/iomux-mx25.h	2009-06-02 18:02:13.000000000 +0200
-@@ -0,0 +1,905 @@
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/iomux-mx25.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/iomux-mx25.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/iomux-mx25.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/iomux-mx25.h	2009-07-01 11:50:13.000000000 +0200
+@@ -0,0 +1,774 @@
 +/*
 + * arch/arm/plat-mxc/include/mach/iomux-mx25.h
 + *
@@ -8000,475 +7147,345 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/iomux-mx25.h linux-2.
 + * IOMUX/PAD Bit field definitions
 + */
 +
-+#define MX25_PAD_A10__A10			IOMUX_PAD(A10, A10, 0x000, 0x008, 0x00, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_A10__GPIO_4_0			IOMUX_PAD(A10, GPIO_4_0, 0x000, 0x008, 0x05, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_A13__A13			IOMUX_PAD(A13, A13, 0x22C, 0x00c, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A13__GPIO_4_1			IOMUX_PAD(A13, GPIO_4_1, 0x22C, 0x00c, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A14__A14			IOMUX_PAD(A14, A14, 0x230, 0x010, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A14__GPIO_2_0			IOMUX_PAD(A14, GPIO_2_0, 0x230, 0x010, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A15__A15			IOMUX_PAD(A15, A15, 0x234, 0x014, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A15__GPIO_2_1			IOMUX_PAD(A15, GPIO_2_1, 0x234, 0x014, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A16__A16			IOMUX_PAD(A16, A16, 0x000, 0x018, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_A16__GPIO_2_2			IOMUX_PAD(A16, GPIO_2_2, 0x000, 0x018, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_A17__A17			IOMUX_PAD(A17, A17, 0x238, 0x01c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A17__GPIO_2_3			IOMUX_PAD(A17, GPIO_2_3, 0x238, 0x01c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A18__A18			IOMUX_PAD(A18, A18, 0x23c, 0x020, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A18__GPIO_2_4			IOMUX_PAD(A18, GPIO_2_4, 0x23c, 0x020, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A18__FEC_COL			IOMUX_PAD(A18, FEC_COL, 0x23c, 0x020, 0x17, 0x504, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_A19__A19			IOMUX_PAD(A19, A19, 0x240, 0x024, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A19__FEC_RX_ER			IOMUX_PAD(A19, FEC_RX_ER, 0x240, 0x024, 0x17, 0x518, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_A19__GPIO_2_5			IOMUX_PAD(A19, GPIO_2_5, 0x240, 0x024, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A20__A20			IOMUX_PAD(A20, A20, 0x244, 0x028, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A20__GPIO_2_6			IOMUX_PAD(A20, GPIO_2_6, 0x244, 0x028, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A20__FEC_RDATA2		IOMUX_PAD(A20, FEC_RDATA2, 0x244, 0x028, 0x17, 0x50c, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_A21__A21			IOMUX_PAD(A21, A21, 0x248, 0x02c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A21__GPIO_2_7			IOMUX_PAD(A21, GPIO_2_7, 0x248, 0x02c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A21__FEC_RDATA3		IOMUX_PAD(A21, FEC_RDATA3, 0x248, 0x02c, 0x17, 0x510, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_A22__A22			IOMUX_PAD(A22, A22, 0x000, 0x030, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A22__GPIO_2_8			IOMUX_PAD(A22, GPIO_2_8, 0x000, 0x030, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A23__A23			IOMUX_PAD(A23, A23, 0x24c, 0x034, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A23__GPIO_2_9			IOMUX_PAD(A23, GPIO_2_9, 0x24c, 0x034, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A24__A24			IOMUX_PAD(A24, A24, 0x250, 0x038, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A24__GPIO_2_10			IOMUX_PAD(A24, GPIO_2_10, 0x250, 0x038, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A24__FEC_RX_CLK		IOMUX_PAD(A24, FEC_RX_CLK, 0x250, 0x038, 0x17, 0x514, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_A25__A25			IOMUX_PAD(A25, A25, 0x254, 0x03c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A25__GPIO_2_11			IOMUX_PAD(A25, GPIO_2_11, 0x254, 0x03c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A25__FEC_CRS			IOMUX_PAD(A25, FEC_CRS, 0x254, 0x03c, 0x17, 0x508, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_EB0__EB0			IOMUX_PAD(EB0, EB0, 0x258, 0x040, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_EB0__AUD4_TXD			IOMUX_PAD(EB0, AUD4_TXD, 0x258, 0x040, 0x14, 0x464, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_EB0__GPIO_2_12			IOMUX_PAD(EB0, GPIO_2_12, 0x258, 0x040, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_EB1__EB1			IOMUX_PAD(EB1, EB1, 0x25c, 0x044, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_EB1__AUD4_RXD			IOMUX_PAD(EB1, AUD4_RXD, 0x25c, 0x044, 0x14, 0x460, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_EB1__GPIO_2_13			IOMUX_PAD(EB1, GPIO_2_13, 0x25c, 0x044, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_OE__OE				IOMUX_PAD(OE, OE, 0x260, 0x048, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_OE__AUD4_TXC			IOMUX_PAD(OE, AUD4_TXC, 0x260, 0x048, 0x14, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_OE__GPIO_2_14			IOMUX_PAD(OE, GPIO_2_14, 0x260, 0x048, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CS0__CS0			IOMUX_PAD(CS0, CS0, 0x000, 0x04c, 0x00, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CS0__GPIO_4_2			IOMUX_PAD(CS0, GPIO_4_2, 0x000, 0x04c, 0x05, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CS1__CS1			IOMUX_PAD(CS1, CS1, 0x000, 0x050, 0x00, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CS1__GPIO_4_3			IOMUX_PAD(CS1, GPIO_4_3, 0x000, 0x050, 0x05, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CS4__CS4			IOMUX_PAD(CS4, CS4, 0x264, 0x054, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CS4__UART5_CTS			IOMUX_PAD(CS4, UART5_CTS, 0x264, 0x054, 0x13, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CS4__GPIO_3_20			IOMUX_PAD(CS4, GPIO_3_20, 0x264, 0x054, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CS5__CS5			IOMUX_PAD(CS5, CS5, 0x268, 0x058, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CS5__UART5_RTS			IOMUX_PAD(CS5, UART5_RTS, 0x268, 0x058, 0x13, 0x574, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CS5__GPIO_3_21			IOMUX_PAD(CS5, GPIO_3_21, 0x268, 0x058, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_NF_CE0__NF_CE0			IOMUX_PAD(NF_CE0, NF_CE0, 0x26c, 0x05c, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_NF_CE0__GPIO_3_22		IOMUX_PAD(NF_CE0, GPIO_3_22, 0x26c, 0x05c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_ECB__ECB			IOMUX_PAD(ECB, ECB, 0x270, 0x060, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_ECB__UART5_TXD_MUX		IOMUX_PAD(ECB, UART5_TXD_MUX, 0x270, 0x060, 0x13, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_ECB__GPIO_3_23			IOMUX_PAD(ECB, GPIO_3_23, 0x270, 0x060, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LBA__LBA			IOMUX_PAD(LBA, LBA, 0x274, 0x064, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LBA__UART5_RXD_MUX		IOMUX_PAD(LBA, UART5_RXD_MUX, 0x274, 0x064, 0x13, 0x578, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LBA__GPIO_3_24			IOMUX_PAD(LBA, GPIO_3_24, 0x274, 0x064, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_BCLK__BCLK			IOMUX_PAD(BCLK, BCLK, 0x000, 0x068, 0x00, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_BCLK__GPIO_4_4			IOMUX_PAD(BCLK, GPIO_4_4, 0x000, 0x068, 0x05, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_RW__RW				IOMUX_PAD(RW, RW, 0x278, 0x06c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_RW__AUD4_TXFS			IOMUX_PAD(RW, AUD4_TXFS, 0x278, 0x06c, 0x14, 0x474, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_RW__GPIO_3_25			IOMUX_PAD(RW, GPIO_3_25, 0x278, 0x06c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_NFWE_B__NFWE_B			IOMUX_PAD(NFWE_B, NFWE_B, 0x000, 0x070, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFWE_B__GPIO_3_26		IOMUX_PAD(NFWE_B, GPIO_3_26, 0x000, 0x070, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFRE_B__NFRE_B			IOMUX_PAD(NFRE_B, NFRE_B, 0x000, 0x074, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFRE_B__GPIO_3_27		IOMUX_PAD(NFRE_B, GPIO_3_27, 0x000, 0x074, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFALE__NFALE			IOMUX_PAD(NFALE, NFALE, 0x000, 0x078, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFALE__GPIO_3_28		IOMUX_PAD(NFALE, GPIO_3_28, 0x000, 0x078, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFCLE__NFCLE			IOMUX_PAD(NFCLE, NFCLE, 0x000, 0x07c, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFCLE__GPIO_3_29		IOMUX_PAD(NFCLE, GPIO_3_29, 0x000, 0x07c, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFWP_B__NFWP_B			IOMUX_PAD(NFWP_B, NFWP_B, 0x000, 0x080, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFWP_B__GPIO_3_30		IOMUX_PAD(NFWP_B, GPIO_3_30, 0x000, 0x080, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFRB__NFRB			IOMUX_PAD(NFRB, NFRB, 0x27c, 0x084, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_NFRB__GPIO_3_31		IOMUX_PAD(NFRB, GPIO_3_31, 0x27c, 0x084, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D15__D15			IOMUX_PAD(D15, D15, 0x280, 0x088, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D15__LD16			IOMUX_PAD(D15, LD16, 0x280, 0x088, 0x01, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D15__GPIO_4_5			IOMUX_PAD(D15, GPIO_4_5, 0x280, 0x088, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D14__D14			IOMUX_PAD(D14, D14, 0x284, 0x08c, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D14__LD17			IOMUX_PAD(D14, LD17, 0x284, 0x08c, 0x01, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D14__GPIO_4_6			IOMUX_PAD(D14, GPIO_4_6, 0x284, 0x08c, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D13__D13			IOMUX_PAD(D13, D13, 0x288, 0x090, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D13__LD18			IOMUX_PAD(D13, LD18, 0x288, 0x090, 0x01, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D13__GPIO_4_7			IOMUX_PAD(D13, GPIO_4_7, 0x288, 0x090, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D12__D12			IOMUX_PAD(D12, D12, 0x28c, 0x094, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D12__GPIO_4_8			IOMUX_PAD(D12, GPIO_4_8, 0x28c, 0x094, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D11__D11			IOMUX_PAD(D11, D11, 0x290, 0x098, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D11__GPIO_4_9			IOMUX_PAD(D11, GPIO_4_9, 0x290, 0x098, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D10__D10			IOMUX_PAD(D10, D10, 0x294, 0x09c, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D10__GPIO_4_10			IOMUX_PAD(D10, GPIO_4_10, 0x294, 0x09c, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D10__USBOTG_OC			IOMUX_PAD(D10, USBOTG_OC, 0x294, 0x09c, 0x06, 0x57c, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D9__D9				IOMUX_PAD(D9, D9, 0x298, 0x0a0, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D9__GPIO_4_11			IOMUX_PAD(D9, GPIO_4_11, 0x298, 0x0a0, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D9__USBH2_PWR			IOMUX_PAD(D9, USBH2_PWR, 0x298, 0x0a0, 0x06, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D8__D8				IOMUX_PAD(D8, D8, 0x29c, 0x0a4, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D8__GPIO_4_12			IOMUX_PAD(D8, GPIO_4_12, 0x29c, 0x0a4, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D8__USBH2_OC			IOMUX_PAD(D8, USBH2_OC, 0x29c, 0x0a4, 0x06, 0x580, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D7__D7				IOMUX_PAD(D7, D7, 0x2a0, 0x0a8, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D7__GPIO_4_13			IOMUX_PAD(D7, GPIO_4_13, 0x2a0, 0x0a8, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D6__D6				IOMUX_PAD(D6, D6, 0x2a4, 0x0ac, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D6__GPIO_4_14			IOMUX_PAD(D6, GPIO_4_14, 0x2a4, 0x0ac, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D5__D5				IOMUX_PAD(D5, D5, 0x2a8, 0x0b0, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D5__GPIO_4_15			IOMUX_PAD(D5, GPIO_4_15, 0x2a8, 0x0b0, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D4__D4				IOMUX_PAD(D4, D4, 0x2ac, 0x0b4, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D4__GPIO_4_16			IOMUX_PAD(D4, GPIO_4_16, 0x2ac, 0x0b4, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D3__D3				IOMUX_PAD(D3, D3, 0x2b0, 0x0b8, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D3__GPIO_4_17			IOMUX_PAD(D3, GPIO_4_17, 0x2b0, 0x0b8, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D2__D2				IOMUX_PAD(D2, D2, 0x2b4, 0x0bc, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D2__GPIO_4_18			IOMUX_PAD(D2, GPIO_4_18, 0x2b4, 0x0bc, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D1__D1				IOMUX_PAD(D1, D1, 0x2b8, 0x0c0, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D1__GPIO_4_19			IOMUX_PAD(D1, GPIO_4_19, 0x2b8, 0x0c0, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D0__D0				IOMUX_PAD(D0, D0, 0x2bc, 0x0c4, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D0__GPIO_4_20			IOMUX_PAD(D0, GPIO_4_20, 0x2bc, 0x0c4, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD0__LD0			IOMUX_PAD(LD0, LD0, 0x2c0, 0x0c8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD0__CSI_D0			IOMUX_PAD(LD0, CSI_D0, 0x2c0, 0x0c8, 0x12, 0x488, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD0__GPIO_2_15			IOMUX_PAD(LD0, GPIO_2_15, 0x2c0, 0x0c8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD1__LD1			IOMUX_PAD(LD1, LD1, 0x2c4, 0x0cc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD1__CSI_D1			IOMUX_PAD(LD1, CSI_D1, 0x2c4, 0x0cc, 0x12, 0x48c, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD1__GPIO_2_16			IOMUX_PAD(LD1, GPIO_2_16, 0x2c4, 0x0cc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD2__LD2			IOMUX_PAD(LD2, LD2, 0x2c8, 0x0d0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD2__GPIO_2_17			IOMUX_PAD(LD2, GPIO_2_17, 0x2c8, 0x0d0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD3__LD3			IOMUX_PAD(LD3, LD3, 0x2cc, 0x0d4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD3__GPIO_2_18			IOMUX_PAD(LD3, GPIO_2_18, 0x2cc, 0x0d4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD4__LD4			IOMUX_PAD(LD4, LD4, 0x2d0, 0x0d8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD4__GPIO_2_19			IOMUX_PAD(LD4, GPIO_2_19, 0x2d0, 0x0d8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD5__LD5			IOMUX_PAD(LD5, LD5, 0x2d4, 0x0dc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD5__GPIO_1_19			IOMUX_PAD(LD5, GPIO_1_19, 0x2d4, 0x0dc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD6__LD6			IOMUX_PAD(LD6, LD6, 0x2d8, 0x0e0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD6__GPIO_1_20			IOMUX_PAD(LD6, GPIO_1_20, 0x2d8, 0x0e0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD7__LD7			IOMUX_PAD(LD7, LD7, 0x2dc, 0x0e4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD7__GPIO_1_21			IOMUX_PAD(LD7, GPIO_1_21, 0x2dc, 0x0e4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD8__LD8			IOMUX_PAD(LD8, LD8, 0x2e0, 0x0e8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD8__FEC_TX_ERR		IOMUX_PAD(LD8, FEC_TX_ERR, 0x2e0, 0x0e8, 0x15, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD9__LD9			IOMUX_PAD(LD9, LD9, 0x2e4, 0x0ec, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD9__FEC_COL			IOMUX_PAD(LD9, FEC_COL, 0x2e4, 0x0ec, 0x15, 0x504, 1, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD10__LD10			IOMUX_PAD(LD10, LD10, 0x2e8, 0x0f0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD10__FEC_RX_ER		IOMUX_PAD(LD10, FEC_RX_ER, 0x2e8, 0x0f0, 0x15, 0x518, 1, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD11__LD11			IOMUX_PAD(LD11, LD11, 0x2ec, 0x0f4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD11__FEC_RDATA2		IOMUX_PAD(LD11, FEC_RDATA2, 0x2ec, 0x0f4, 0x15, 0x50c, 1, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD12__LD12			IOMUX_PAD(LD12, LD12, 0x2f0, 0x0f8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD12__FEC_RDATA3		IOMUX_PAD(LD12, FEC_RDATA3, 0x2f0, 0x0f8, 0x15, 0x510, 1, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD13__LD13			IOMUX_PAD(LD13, LD13, 0x2f4, 0x0fc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD13__FEC_TDATA2		IOMUX_PAD(LD13, FEC_TDATA2, 0x2f4, 0x0fc, 0x15, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD14__LD14			IOMUX_PAD(LD14, LD14, 0x2f8, 0x100, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD14__FEC_TDATA3		IOMUX_PAD(LD14, FEC_TDATA3, 0x2f8, 0x100, 0x15, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD15__LD15			IOMUX_PAD(LD15, LD15, 0x2fc, 0x104, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD15__FEC_RX_CLK		IOMUX_PAD(LD15, FEC_RX_CLK, 0x2fc, 0x104, 0x15, 0x514, 1, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_HSYNC__HSYNC			IOMUX_PAD(HSYNC, HSYNC, 0x300, 0x108, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_HSYNC__GPIO_1_22		IOMUX_PAD(HSYNC, GPIO_1_22, 0x300, 0x108, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_VSYNC__VSYNC			IOMUX_PAD(VSYNC, VSYNC, 0x304, 0x10c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_VSYNC__GPIO_1_23		IOMUX_PAD(VSYNC, GPIO_1_23, 0x304, 0x10c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LSCLK__LSCLK			IOMUX_PAD(LSCLK, LSCLK, 0x308, 0x110, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LSCLK__GPIO_1_24		IOMUX_PAD(LSCLK, GPIO_1_24, 0x308, 0x110, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_OE_ACD__OE_ACD			IOMUX_PAD(OE_ACD, OE_ACD, 0x30c, 0x114, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_OE_ACD__GPIO_1_25		IOMUX_PAD(OE_ACD, GPIO_1_25, 0x30c, 0x114, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CONTRAST__CONTRAST		IOMUX_PAD(CONTRAST, CONTRAST, 0x310, 0x118, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CONTRAST__FEC_CRS		IOMUX_PAD(CONTRAST, FEC_CRS, 0x310, 0x118, 0x15, 0x508, 1, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_PWM__PWM			IOMUX_PAD(PWM, PWM, 0x314, 0x11c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_PWM__GPIO_1_26			IOMUX_PAD(PWM, GPIO_1_26, 0x314, 0x11c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_PWM__USBH2_OC			IOMUX_PAD(PWM, USBH2_OC, 0x314, 0x11c, 0x16, 0x580, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D2__CSI_D2			IOMUX_PAD(CSI_D2, CSI_D2, 0x318, 0x120, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D2__UART5_RXD_MUX		IOMUX_PAD(CSI_D2, UART5_RXD_MUX, 0x318, 0x120, 0x11, 0x578, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D2__GPIO_1_27		IOMUX_PAD(CSI_D2, GPIO_1_27, 0x318, 0x120, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D3__CSI_D3			IOMUX_PAD(CSI_D3, CSI_D3, 0x31c, 0x124, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D3__GPIO_1_28		IOMUX_PAD(CSI_D3, GPIO_1_28, 0x31c, 0x124, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D4__CSI_D4			IOMUX_PAD(CSI_D4, CSI_D4, 0x320, 0x128, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D4__UART5_RTS		IOMUX_PAD(CSI_D4, UART5_RTS, 0x320, 0x128, 0x11, 0x574, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D4__GPIO_1_29		IOMUX_PAD(CSI_D4, GPIO_1_29, 0x320, 0x128, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D5__CSI_D5			IOMUX_PAD(CSI_D5, CSI_D5, 0x324, 0x12c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D5__GPIO_1_30		IOMUX_PAD(CSI_D5, GPIO_1_30, 0x324, 0x12c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D6__CSI_D6			IOMUX_PAD(CSI_D6, CSI_D6, 0x328, 0x130, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D6__GPIO_1_31		IOMUX_PAD(CSI_D6, GPIO_1_31, 0x328, 0x130, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D7__CSI_D7			IOMUX_PAD(CSI_D7, CSI_D7, 0x32c, 0x134, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D7__GPIO_1_6		IOMUX_PAD(CSI_D7, GPIO_1_6, 0x32c, 0x134, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D8__CSI_D8			IOMUX_PAD(CSI_D8, CSI_D8, 0x330, 0x138, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D8__GPIO_1_7		IOMUX_PAD(CSI_D8, GPIO_1_7, 0x330, 0x138, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D9__CSI_D9			IOMUX_PAD(CSI_D9, CSI_D9, 0x334, 0x13c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D9__GPIO_4_21		IOMUX_PAD(CSI_D9, GPIO_4_21, 0x334, 0x13c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_MCLK__CSI_MCLK		IOMUX_PAD(CSI_MCLK, CSI_MCLK, 0x338, 0x140, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_MCLK__GPIO_1_8		IOMUX_PAD(CSI_MCLK, GPIO_1_8, 0x338, 0x140, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_VSYNC__CSI_VSYNC		IOMUX_PAD(CSI_VSYNC, CSI_VSYNC, 0x33c, 0x144, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_VSYNC__GPIO_1_9		IOMUX_PAD(CSI_VSYNC, GPIO_1_9, 0x33c, 0x144, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_HSYNC__CSI_HSYNC		IOMUX_PAD(CSI_HSYNC, CSI_HSYNC, 0x340, 0x148, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_HSYNC__GPIO_1_10		IOMUX_PAD(CSI_HSYNC, GPIO_1_10, 0x340, 0x148, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_PIXCLK__CSI_PIXCLK		IOMUX_PAD(CSI_PIXCLK, CSI_PIXCLK, 0x344, 0x14c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_PIXCLK__GPIO_1_11		IOMUX_PAD(CSI_PIXCLK, GPIO_1_11, 0x344, 0x14c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_I2C1_CLK__I2C1_CLK		IOMUX_PAD(I2C1_CLK, I2C1_CLK, 0x348, 0x150, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_I2C1_CLK__GPIO_1_12		IOMUX_PAD(I2C1_CLK, GPIO_1_12, 0x348, 0x150, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_I2C1_DAT__I2C1_DAT		IOMUX_PAD(I2C1_DAT, I2C1_DAT, 0x34c, 0x154, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_I2C1_DAT__GPIO_1_13		IOMUX_PAD(I2C1_DAT, GPIO_1_13, 0x34c, 0x154, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_MOSI__CSPI1_MOSI		IOMUX_PAD(CSPI1_MOSI, CSPI1_MOSI, 0x350, 0x158, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_MOSI__GPIO_1_14		IOMUX_PAD(CSPI1_MOSI, GPIO_1_14, 0x350, 0x158, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_MISO__CSPI1_MISO		IOMUX_PAD(CSPI1_MISO, CSPI1_MISO, 0x354, 0x15c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_MISO__GPIO_1_15		IOMUX_PAD(CSPI1_MISO, GPIO_1_15, 0x354, 0x15c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_SS0__CSPI1_SS0		IOMUX_PAD(CSPI1_SS0, CSPI1_SS0, 0x358, 0x160, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_SS0__GPIO_1_16		IOMUX_PAD(CSPI1_SS0, GPIO_1_16, 0x358, 0x160, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_SS1__CSPI1_SS1		IOMUX_PAD(CSPI1_SS1, CSPI1_SS1, 0x35c, 0x164, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_SS1__GPIO_1_17		IOMUX_PAD(CSPI1_SS1, GPIO_1_17, 0x35c, 0x164, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_SCLK__CSPI1_SCLK		IOMUX_PAD(CSPI1_SCLK, CSPI1_SCLK, 0x360, 0x168, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_SCLK__GPIO_1_18		IOMUX_PAD(CSPI1_SCLK, GPIO_1_18, 0x360, 0x168, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_RDY__CSPI1_RDY		IOMUX_PAD(CSPI1_RDY, CSPI1_RDY, 0x364, 0x16c, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_CSPI1_RDY__GPIO_2_22		IOMUX_PAD(CSPI1_RDY, GPIO_2_22, 0x364, 0x16c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_RXD__UART1_RXD		IOMUX_PAD(UART1_RXD, UART1_RXD, 0x368, 0x170, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K)
-+#define MX25_PAD_UART1_RXD__GPIO_4_22		IOMUX_PAD(UART1_RXD, GPIO_4_22, 0x368, 0x170, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_TXD__UART1_TXD		IOMUX_PAD(UART1_TXD, UART1_TXD, 0x36c, 0x174, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_TXD__GPIO_4_23		IOMUX_PAD(UART1_TXD, GPIO_4_23, 0x36c, 0x174, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_RTS__UART1_RTS		IOMUX_PAD(UART1_RTS, UART1_RTS, 0x370, 0x178, 0x10, 0, 0, PAD_CTL_PULL_UP_100K)
-+#define MX25_PAD_UART1_RTS__CSI_D0		IOMUX_PAD(UART1_RTS, CSI_D0, 0x370, 0x178, 0x11, 0x488, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_RTS__GPIO_4_24		IOMUX_PAD(UART1_RTS, GPIO_4_24, 0x370, 0x178, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_CTS__UART1_CTS		IOMUX_PAD(UART1_CTS, UART1_CTS, 0x374, 0x17c, 0x10, 0, 0, PAD_CTL_PULL_UP_100K)
-+#define MX25_PAD_UART1_CTS__CSI_D1		IOMUX_PAD(UART1_CTS, CSI_D1, 0x374, 0x17c, 0x11, 0x48c, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_CTS__GPIO_4_25		IOMUX_PAD(UART1_CTS, GPIO_4_25, 0x374, 0x17c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_RXD__UART2_RXD		IOMUX_PAD(UART2_RXD, UART2_RXD, 0x378, 0x180, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_RXD__GPIO_4_26		IOMUX_PAD(UART2_RXD, GPIO_4_26, 0x378, 0x180, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_TXD__UART2_TXD		IOMUX_PAD(UART2_TXD, UART2_TXD, 0x37c, 0x184, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_TXD__GPIO_4_27		IOMUX_PAD(UART2_TXD, GPIO_4_27, 0x37c, 0x184, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_RTS__UART2_RTS		IOMUX_PAD(UART2_RTS, UART2_RTS, 0x380, 0x188, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_RTS__FEC_COL		IOMUX_PAD(UART2_RTS, FEC_COL, 0x380, 0x188, 0x12, 0x504, 2, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_UART2_RTS__GPIO_4_28		IOMUX_PAD(UART2_RTS, GPIO_4_28, 0x380, 0x188, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_CTS__FEC_RX_ER		IOMUX_PAD(UART2_CTS, FEC_RX_ER, 0x384, 0x18c, 0x12, 0x518, 2, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_UART2_CTS__UART2_CTS		IOMUX_PAD(UART2_CTS, UART2_CTS, 0x384, 0x18c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_CTS__GPIO_4_29		IOMUX_PAD(UART2_CTS, GPIO_4_29, 0x384, 0x18c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_CMD__SD1_CMD		IOMUX_PAD(SD1_CMD, SD1_CMD, 0x388, 0x190, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_CMD__FEC_RDATA2		IOMUX_PAD(SD1_CMD, FEC_RDATA2, 0x388, 0x190, 0x12, 0x50c, 2, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_CMD__GPIO_2_23		IOMUX_PAD(SD1_CMD, GPIO_2_23, 0x388, 0x190, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_CLK__SD1_CLK		IOMUX_PAD(SD1_CLK, SD1_CLK, 0x38c, 0x194, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_CLK__FEC_RDATA3		IOMUX_PAD(SD1_CLK, FEC_RDATA3, 0x38c, 0x194, 0x12, 0x510, 2, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_CLK__GPIO_2_24		IOMUX_PAD(SD1_CLK, GPIO_2_24, 0x38c, 0x194, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_DATA0__SD1_DATA0		IOMUX_PAD(SD1_DATA0, SD1_DATA0, 0x390, 0x198, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_DATA0__GPIO_2_25		IOMUX_PAD(SD1_DATA0, GPIO_2_25, 0x390, 0x198, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_DATA1__SD1_DATA1		IOMUX_PAD(SD1_DATA1, SD1_DATA1, 0x394, 0x19c, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_DATA1__AUD7_RXD		IOMUX_PAD(SD1_DATA1, AUD7_RXD, 0x394, 0x19c, 0x13, 0x478, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_DATA1__GPIO_2_26		IOMUX_PAD(SD1_DATA1, GPIO_2_26, 0x394, 0x19c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_DATA2__SD1_DATA2		IOMUX_PAD(SD1_DATA2, SD1_DATA2, 0x398, 0x1a0, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_DATA2__FEC_RX_CLK		IOMUX_PAD(SD1_DATA2, FEC_RX_CLK, 0x398, 0x1a0, 0x15, 0x514, 2, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_DATA2__GPIO_2_27		IOMUX_PAD(SD1_DATA2, GPIO_2_27, 0x398, 0x1a0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_DATA3__SD1_DATA3		IOMUX_PAD(SD1_DATA3, SD1_DATA3, 0x39c, 0x1a4, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_DATA3__FEC_CRS		IOMUX_PAD(SD1_DATA3, FEC_CRS, 0x39c, 0x1a4, 0x10, 0x508, 2, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_DATA3__GPIO_2_28		IOMUX_PAD(SD1_DATA3, GPIO_2_28, 0x39c, 0x1a4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_ROW0__KPP_ROW0		IOMUX_PAD(KPP_ROW0, KPP_ROW0, 0x3a0, 0x1a8, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_KPP_ROW0__GPIO_2_29		IOMUX_PAD(KPP_ROW0, GPIO_2_29, 0x3a0, 0x1a8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_ROW1__KPP_ROW1		IOMUX_PAD(KPP_ROW1, KPP_ROW1, 0x3a4, 0x1ac, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_KPP_ROW1__GPIO_2_30		IOMUX_PAD(KPP_ROW1, GPIO_2_30, 0x3a4, 0x1ac, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_ROW2__KPP_ROW2		IOMUX_PAD(KPP_ROW2, KPP_ROW2, 0x3a8, 0x1b0, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_KPP_ROW2__CSI_D0		IOMUX_PAD(KPP_ROW2, CSI_D0, 0x3a8, 0x1b0, 0x13, 0x488, 2, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_ROW2__GPIO_2_31		IOMUX_PAD(KPP_ROW2, GPIO_2_31, 0x3a8, 0x1b0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_ROW3__KPP_ROW3		IOMUX_PAD(KPP_ROW3, KPP_ROW3, 0x3ac, 0x1b4, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_KPP_ROW3__CSI_LD1		IOMUX_PAD(KPP_ROW3, CSI_LD1, 0x3ac, 0x1b4, 0x13, 0x48c, 2, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_ROW3__GPIO_3_0		IOMUX_PAD(KPP_ROW3, GPIO_3_0, 0x3ac, 0x1b4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_COL0__KPP_COL0		IOMUX_PAD(KPP_COL0, KPP_COL0, 0x3b0, 0x1b8, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
-+#define MX25_PAD_KPP_COL0__GPIO_3_1		IOMUX_PAD(KPP_COL0, GPIO_3_1, 0x3b0, 0x1b8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_COL1__KPP_COL1		IOMUX_PAD(KPP_COL1, KPP_COL1, 0x3b4, 0x1bc, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
-+#define MX25_PAD_KPP_COL1__GPIO_3_2		IOMUX_PAD(KPP_COL1, GPIO_3_2, 0x3b4, 0x1bc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_COL2__KPP_COL2		IOMUX_PAD(KPP_COL2, KPP_COL2, 0x3b8, 0x1c0, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
-+#define MX25_PAD_KPP_COL2__GPIO_3_3		IOMUX_PAD(KPP_COL2, GPIO_3_3, 0x3b8, 0x1c0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_COL3__KPP_COL3		IOMUX_PAD(KPP_COL3, KPP_COL3, 0x3bc, 0x1c4, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
-+#define MX25_PAD_KPP_COL3__GPIO_3_4		IOMUX_PAD(KPP_COL3, GPIO_3_4, 0x3bc, 0x1c4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_MDC__FEC_MDC		IOMUX_PAD(FEC_MDC, FEC_MDC, 0x3c0, 0x1c8, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_MDC__AUD4_TXD		IOMUX_PAD(FEC_MDC, AUD4_TXD, 0x3c0, 0x1c8, 0x12, 0x464, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_MDC__GPIO_3_5		IOMUX_PAD(FEC_MDC, GPIO_3_5, 0x3c0, 0x1c8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_MDIO__FEC_MDIO		IOMUX_PAD(FEC_MDIO, FEC_MDIO, 0x3c4, 0x1cc, 0x10, 0, 0, PAD_CTL_HYSTERESIS | PAD_CTL_PULL_UP_22K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_MDIO__AUD4_RXD		IOMUX_PAD(FEC_MDIO, AUD4_RXD, 0x3c4, 0x1cc, 0x12, 0x460, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_MDIO__GPIO_3_6		IOMUX_PAD(FEC_MDIO, GPIO_3_6, 0x3c4, 0x1cc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_TDATA0__FEC_TDATA0		IOMUX_PAD(FEC_TDATA0, FEC_TDATA0, 0x3c8, 0x1d0, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_TDATA0__GPIO_3_7		IOMUX_PAD(FEC_TDATA0, GPIO_3_7, 0x3c8, 0x1d0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_TDATA1__FEC_TDATA1		IOMUX_PAD(FEC_TDATA1, FEC_TDATA1, 0x3cc, 0x1d4, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_TDATA1__AUD4_TXFS		IOMUX_PAD(FEC_TDATA1, AUD4_TXFS, 0x3cc, 0x1d4, 0x12, 0x474, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_TDATA1__GPIO_3_8		IOMUX_PAD(FEC_TDATA1, GPIO_3_8, 0x3cc, 0x1d4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_TX_EN__FEC_TX_EN		IOMUX_PAD(FEC_TX_EN, FEC_TX_EN, 0x3d0, 0x1d8, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_TX_EN__GPIO_3_9   		IOMUX_PAD(FEC_TX_EN, GPIO_3_9   , 0x3d0, 0x1d8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_RDATA0__FEC_RDATA0		IOMUX_PAD(FEC_RDATA0, FEC_RDATA0, 0x3d4, 0x1dc, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_RDATA0__GPIO_3_10		IOMUX_PAD(FEC_RDATA0, GPIO_3_10, 0x3d4, 0x1dc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_RDATA1__FEC_RDATA1		IOMUX_PAD(FEC_RDATA1, FEC_RDATA1, 0x3d8, 0x1e0, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_RDATA1__GPIO_3_11		IOMUX_PAD(FEC_RDATA1, GPIO_3_11, 0x3d8, 0x1e0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_RX_DV__FEC_RX_DV		IOMUX_PAD(FEC_RX_DV, FEC_RX_DV, 0x3dc, 0x1e4, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_RX_DV__CAN2_RX		IOMUX_PAD(FEC_RX_DV, CAN2_RX, 0x3dc, 0x1e4, 0x14, 0x484, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_RX_DV__GPIO_3_12		IOMUX_PAD(FEC_RX_DV, GPIO_3_12, 0x3dc, 0x1e4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_TX_CLK__FEC_TX_CLK		IOMUX_PAD(FEC_TX_CLK, FEC_TX_CLK, 0x3e0, 0x1e8, 0x10, 0, 0, PAD_CTL_HYSTERESIS | PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_TX_CLK__GPIO_3_13		IOMUX_PAD(FEC_TX_CLK, GPIO_3_13, 0x3e0, 0x1e8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_RTCK__RTCK			IOMUX_PAD(RTCK, RTCK, 0x3e4, 0x1ec, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_RTCK__OWIRE			IOMUX_PAD(RTCK, OWIRE, 0x3e4, 0x1ec, 0x11, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_RTCK__GPIO_3_14		IOMUX_PAD(RTCK, GPIO_3_14, 0x3e4, 0x1ec, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_DE_B__DE_B			IOMUX_PAD(DE_B, DE_B, 0x3ec, 0x1f0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_DE_B__GPIO_2_20		IOMUX_PAD(DE_B, GPIO_2_20, 0x3ec, 0x1f0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_TDO__TDO			IOMUX_PAD(TDO, TDO, 0x3e8, 0x000, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_A__GPIO_A			IOMUX_PAD(GPIO_A, GPIO_A, 0x3f0, 0x1f4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_A__USBOTG_PWR		IOMUX_PAD(GPIO_A, USBOTG_PWR, 0x3f0, 0x1f4, 0x12, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_B__GPIO_B			IOMUX_PAD(GPIO_B, GPIO_B, 0x3f4, 0x1f8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_B__USBOTG_OC		IOMUX_PAD(GPIO_B, USBOTG_OC, 0x3f4, 0x1f8, 0x12, 0x57c, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_C__GPIO_C			IOMUX_PAD(GPIO_C, GPIO_C, 0x3f8, 0x1fc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_C__CAN2_TX		IOMUX_PAD(GPIO_C, CAN2_TX, 0x3f8, 0x1fc, 0x16, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_D__GPIO_D			IOMUX_PAD(GPIO_D, GPIO_D, 0x3fc, 0x200, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_D__CAN2_RX		IOMUX_PAD(GPIO_D, CAN2_RX, 0x3fc, 0x200, 0x16, 0x484, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_E__GPIO_E			IOMUX_PAD(GPIO_E, GPIO_E, 0x400, 0x204, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_E__AUD7_TXD		IOMUX_PAD(GPIO_E, AUD7_TXD, 0x400, 0x204, 0x14, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_F__GPIO_F			IOMUX_PAD(GPIO_F, GPIO_F, 0x404, 0x208, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_F__AUD7_TXC		IOMUX_PAD(GPIO_F, AUD7_TXC, 0x404, 0x208, 0x14, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_EXT_ARMCLK__EXT_ARMCLK		IOMUX_PAD(EXT_ARMCLK, EXT_ARMCLK, 0x000, 0x20c, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_EXT_ARMCLK__GPIO_3_15		IOMUX_PAD(EXT_ARMCLK, GPIO_3_15, 0x000, 0x20c, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_UPLL_BYPCLK__UPLL_BYPCLK	IOMUX_PAD(UPLL_BYPCLK, UPLL_BYPCLK, 0x000, 0x210, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_UPLL_BYPCLK__GPIO_3_16		IOMUX_PAD(UPLL_BYPCLK, GPIO_3_16, 0x000, 0x210, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_VSTBY_REQ__VSTBY_REQ		IOMUX_PAD(VSTBY_REQ, VSTBY_REQ, 0x408, 0x214, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_VSTBY_REQ__AUD7_TXFS		IOMUX_PAD(VSTBY_REQ, AUD7_TXFS, 0x408, 0x214, 0x14, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_VSTBY_REQ__GPIO_3_17		IOMUX_PAD(VSTBY_REQ, GPIO_3_17, 0x408, 0x214, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_VSTBY_ACK__VSTBY_ACK		IOMUX_PAD(VSTBY_ACK, VSTBY_ACK, 0x40c, 0x218, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_VSTBY_ACK__GPIO_3_18		IOMUX_PAD(VSTBY_ACK, GPIO_3_18, 0x40c, 0x218, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_POWER_FAIL__POWER_FAIL		IOMUX_PAD(POWER_FAIL, POWER_FAIL, 0x410, 0x21c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_POWER_FAIL__AUD7_RXD		IOMUX_PAD(POWER_FAIL, AUD7_RXD, 0x410, 0x21c, 0x14, 0x478, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_POWER_FAIL__GPIO_3_19		IOMUX_PAD(POWER_FAIL, GPIO_3_19, 0x410, 0x21c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CLKO__CLKO			IOMUX_PAD(CLKO, CLKO, 0x414, 0x220, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CLKO__GPIO_2_21		IOMUX_PAD(CLKO, GPIO_2_21, 0x414, 0x220, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_BOOT_MODE0__BOOT_MODE0		IOMUX_PAD(BOOT_MODE0, BOOT_MODE0, 0x000, 0x224, 0x00, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_BOOT_MODE0__GPIO_4_30		IOMUX_PAD(BOOT_MODE0, GPIO_4_30, 0x000, 0x224, 0x05, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_BOOT_MODE1__BOOT_MODE1		IOMUX_PAD(BOOT_MODE1, BOOT_MODE1, 0x000, 0x228, 0x00, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_BOOT_MODE1__GPIO_4_31		IOMUX_PAD(BOOT_MODE1, GPIO_4_31, 0x000, 0x228, 0x05, 0, 0, NO_PAD_CTRL)
-+
-+#define MX25_PAD_CTL_GRP_DVS_MISC		IOMUX_PAD(0x418, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_FEC		IOMUX_PAD(0x41c, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DVS_JTAG		IOMUX_PAD(0x420, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_NFC		IOMUX_PAD(0x424, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_CSI		IOMUX_PAD(0x428, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_WEIM		IOMUX_PAD(0x42c, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_DDR		IOMUX_PAD(0x430, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DVS_CRM		IOMUX_PAD(0x434, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_KPP		IOMUX_PAD(0x438, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_SDHC1		IOMUX_PAD(0x43c, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_LCD		IOMUX_PAD(0x440, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_UART		IOMUX_PAD(0x444, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DVS_NFC		IOMUX_PAD(0x448, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DVS_CSI		IOMUX_PAD(0x44c, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_CSPI1		IOMUX_PAD(0x450, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DDRTYPE		IOMUX_PAD(0x454, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DVS_SDHC1		IOMUX_PAD(0x458, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DVS_LCD		IOMUX_PAD(0x45c, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+
-+#if 0
-+enum {
-+	GPIO_A,
-+	GPIO_B,
-+	GPIO_C,
-+	GPIO_D,
-+	GPIO_E,
-+	GPIO_F,
-+	GPIO_1_6,
-+	GPIO_1_7,
-+	GPIO_1_8,
-+	GPIO_1_9,
-+	GPIO_1_10,
-+	GPIO_1_11,
-+	GPIO_1_12,
-+	GPIO_1_13,
-+	GPIO_1_14,
-+	GPIO_1_15,
-+	GPIO_1_16,
-+	GPIO_1_17,
-+	GPIO_1_18,
-+	GPIO_1_19,
-+	GPIO_1_20,
-+	GPIO_1_21,
-+	GPIO_1_22,
-+	GPIO_1_23,
-+	GPIO_1_24,
-+	GPIO_1_25,
-+	GPIO_1_26,
-+	GPIO_1_27,
-+	GPIO_1_28,
-+	GPIO_1_29,
-+	GPIO_1_30,
-+	GPIO_1_31,
-+	GPIO_2_0,
-+	GPIO_2_1,
-+	GPIO_2_2,
-+	GPIO_2_3,
-+	GPIO_2_4,
-+	GPIO_2_5,
-+	GPIO_2_6,
-+	GPIO_2_7,
-+	GPIO_2_8,
-+	GPIO_2_9,
-+	GPIO_2_10,
-+	GPIO_2_11,
-+	GPIO_2_12,
-+	GPIO_2_13,
-+	GPIO_2_14,
-+	GPIO_2_15,
-+	GPIO_2_16,
-+	GPIO_2_17,
-+	GPIO_2_18,
-+	GPIO_2_19,
-+	GPIO_2_20,
-+	GPIO_2_21,
-+	GPIO_2_22,
-+	GPIO_2_23,
-+	GPIO_2_24,
-+	GPIO_2_25,
-+	GPIO_2_26,
-+	GPIO_2_27,
-+	GPIO_2_28,
-+	GPIO_2_29,
-+	GPIO_2_30,
-+	GPIO_2_31,
-+	GPIO_3_0,
-+	GPIO_3_1,
-+	GPIO_3_2,
-+	GPIO_3_3,
-+	GPIO_3_4,
-+	GPIO_3_5,
-+	GPIO_3_6,
-+	GPIO_3_7,
-+	GPIO_3_8,
-+	GPIO_3_9,
-+	GPIO_3_10,
-+	GPIO_3_11,
-+	GPIO_3_12,
-+	GPIO_3_13,
-+	GPIO_3_14,
-+	GPIO_3_15,
-+	GPIO_3_16,
-+	GPIO_3_17,
-+	GPIO_3_18,
-+	GPIO_3_19,
-+	GPIO_3_20,
-+	GPIO_3_21,
-+	GPIO_3_22,
-+	GPIO_3_23,
-+	GPIO_3_24,
-+	GPIO_3_25,
-+	GPIO_3_26,
-+	GPIO_3_27,
-+	GPIO_3_28,
-+	GPIO_3_29,
-+	GPIO_3_30,
-+	GPIO_3_31,
-+	GPIO_4_0,
-+	GPIO_4_1,
-+	GPIO_4_2,
-+	GPIO_4_3,
-+	GPIO_4_4,
-+	GPIO_4_5,
-+	GPIO_4_6,
-+	GPIO_4_7,
-+	GPIO_4_8,
-+	GPIO_4_9,
-+	GPIO_4_10,
-+	GPIO_4_11,
-+	GPIO_4_12,
-+	GPIO_4_13,
-+	GPIO_4_14,
-+	GPIO_4_15,
-+	GPIO_4_16,
-+	GPIO_4_17,
-+	GPIO_4_18,
-+	GPIO_4_19,
-+	GPIO_4_20,
-+	GPIO_4_21,
-+	GPIO_4_22,
-+	GPIO_4_23,
-+	GPIO_4_24,
-+	GPIO_4_25,
-+	GPIO_4_26,
-+	GPIO_4_27,
-+	GPIO_4_28,
-+	GPIO_4_29,
-+	GPIO_4_30,
-+	GPIO_4_31,
-+};
++#define MX25_PAD_A10__A10		IOMUX_PAD(A10, A10, 0x000, 0x008, 0x00, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_A10__GPIO_4_0		IOMUX_PAD(A10, GPIO_4_0, 0x000, 0x008, 0x05, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_A13__A13		IOMUX_PAD(A13, A13, 0x22C, 0x00c, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A13__GPIO_4_1		IOMUX_PAD(A13, GPIO_4_1, 0x22C, 0x00c, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A14__A14		IOMUX_PAD(A14, A14, 0x230, 0x010, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A14__GPIO_2_0		IOMUX_PAD(A14, GPIO_2_0, 0x230, 0x010, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A15__A15		IOMUX_PAD(A15, A15, 0x234, 0x014, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A15__GPIO_2_1		IOMUX_PAD(A15, GPIO_2_1, 0x234, 0x014, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A16__A16		IOMUX_PAD(A16, A16, 0x000, 0x018, 0x10, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_A16__GPIO_2_2		IOMUX_PAD(A16, GPIO_2_2, 0x000, 0x018, 0x15, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_A17__A17		IOMUX_PAD(A17, A17, 0x238, 0x01c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A17__GPIO_2_3		IOMUX_PAD(A17, GPIO_2_3, 0x238, 0x01c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A18__A18		IOMUX_PAD(A18, A18, 0x23c, 0x020, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A18__GPIO_2_4		IOMUX_PAD(A18, GPIO_2_4, 0x23c, 0x020, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A18__FEC_COL		IOMUX_PAD(A18, FEC_COL, 0x23c, 0x020, 0x17, 0x504, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_A19__A19		IOMUX_PAD(A19, A19, 0x240, 0x024, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A19__FEC_RX_ER		IOMUX_PAD(A19, FEC_RX_ER, 0x240, 0x024, 0x17, 0x518, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_A19__GPIO_2_5		IOMUX_PAD(A19, GPIO_2_5, 0x240, 0x024, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A20__A20		IOMUX_PAD(A20, A20, 0x244, 0x028, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A20__GPIO_2_6		IOMUX_PAD(A20, GPIO_2_6, 0x244, 0x028, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A20__FEC_RDATA2	IOMUX_PAD(A20, FEC_RDATA2, 0x244, 0x028, 0x17, 0x50c, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_A21__A21		IOMUX_PAD(A21, A21, 0x248, 0x02c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A21__GPIO_2_7		IOMUX_PAD(A21, GPIO_2_7, 0x248, 0x02c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A21__FEC_RDATA3	IOMUX_PAD(A21, FEC_RDATA3, 0x248, 0x02c, 0x17, 0x510, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_A22__A22		IOMUX_PAD(A22, A22, 0x000, 0x030, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A22__GPIO_2_8		IOMUX_PAD(A22, GPIO_2_8, 0x000, 0x030, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A23__A23		IOMUX_PAD(A23, A23, 0x24c, 0x034, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A23__GPIO_2_9		IOMUX_PAD(A23, GPIO_2_9, 0x24c, 0x034, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A24__A24		IOMUX_PAD(A24, A24, 0x250, 0x038, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A24__GPIO_2_10		IOMUX_PAD(A24, GPIO_2_10, 0x250, 0x038, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A24__FEC_RX_CLK	IOMUX_PAD(A24, FEC_RX_CLK, 0x250, 0x038, 0x17, 0x514, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_A25__A25		IOMUX_PAD(A25, A25, 0x254, 0x03c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A25__GPIO_2_11		IOMUX_PAD(A25, GPIO_2_11, 0x254, 0x03c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_A25__FEC_CRS		IOMUX_PAD(A25, FEC_CRS, 0x254, 0x03c, 0x17, 0x508, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_EB0__EB0		IOMUX_PAD(EB0, EB0, 0x258, 0x040, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_EB0__AUD4_TXD		IOMUX_PAD(EB0, AUD4_TXD, 0x258, 0x040, 0x14, 0x464, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_EB0__GPIO_2_12		IOMUX_PAD(EB0, GPIO_2_12, 0x258, 0x040, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_EB1__EB1		IOMUX_PAD(EB1, EB1, 0x25c, 0x044, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_EB1__AUD4_RXD		IOMUX_PAD(EB1, AUD4_RXD, 0x25c, 0x044, 0x14, 0x460, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_EB1__GPIO_2_13		IOMUX_PAD(EB1, GPIO_2_13, 0x25c, 0x044, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_OE__OE			IOMUX_PAD(OE, OE, 0x260, 0x048, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_OE__AUD4_TXC		IOMUX_PAD(OE, AUD4_TXC, 0x260, 0x048, 0x14, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_OE__GPIO_2_14		IOMUX_PAD(OE, GPIO_2_14, 0x260, 0x048, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CS0__CS0		IOMUX_PAD(CS0, CS0, 0x000, 0x04c, 0x00, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CS0__GPIO_4_2		IOMUX_PAD(CS0, GPIO_4_2, 0x000, 0x04c, 0x05, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CS1__CS1		IOMUX_PAD(CS1, CS1, 0x000, 0x050, 0x00, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CS1__GPIO_4_3		IOMUX_PAD(CS1, GPIO_4_3, 0x000, 0x050, 0x05, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CS4__CS4		IOMUX_PAD(CS4, CS4, 0x264, 0x054, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CS4__UART5_CTS		IOMUX_PAD(CS4, UART5_CTS, 0x264, 0x054, 0x13, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CS4__GPIO_3_20		IOMUX_PAD(CS4, GPIO_3_20, 0x264, 0x054, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CS5__CS5		IOMUX_PAD(CS5, CS5, 0x268, 0x058, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CS5__UART5_RTS		IOMUX_PAD(CS5, UART5_RTS, 0x268, 0x058, 0x13, 0x574, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CS5__GPIO_3_21		IOMUX_PAD(CS5, GPIO_3_21, 0x268, 0x058, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_NF_CE0__NF_CE0		IOMUX_PAD(NF_CE0, NF_CE0, 0x26c, 0x05c, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_NF_CE0__GPIO_3_22	IOMUX_PAD(NF_CE0, GPIO_3_22, 0x26c, 0x05c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_ECB__ECB		IOMUX_PAD(ECB, ECB, 0x270, 0x060, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_ECB__UART5_TXD_MUX	IOMUX_PAD(ECB, UART5_TXD_MUX, 0x270, 0x060, 0x13, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_ECB__GPIO_3_23		IOMUX_PAD(ECB, GPIO_3_23, 0x270, 0x060, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LBA__LBA		IOMUX_PAD(LBA, LBA, 0x274, 0x064, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LBA__UART5_RXD_MUX	IOMUX_PAD(LBA, UART5_RXD_MUX, 0x274, 0x064, 0x13, 0x578, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LBA__GPIO_3_24		IOMUX_PAD(LBA, GPIO_3_24, 0x274, 0x064, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_BCLK__BCLK		IOMUX_PAD(BCLK, BCLK, 0x000, 0x068, 0x00, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_BCLK__GPIO_4_4		IOMUX_PAD(BCLK, GPIO_4_4, 0x000, 0x068, 0x05, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_RW__RW			IOMUX_PAD(RW, RW, 0x278, 0x06c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_RW__AUD4_TXFS		IOMUX_PAD(RW, AUD4_TXFS, 0x278, 0x06c, 0x14, 0x474, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_RW__GPIO_3_25		IOMUX_PAD(RW, GPIO_3_25, 0x278, 0x06c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_NFWE_B__NFWE_B		IOMUX_PAD(NFWE_B, NFWE_B, 0x000, 0x070, 0x10, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_NFWE_B__GPIO_3_26	IOMUX_PAD(NFWE_B, GPIO_3_26, 0x000, 0x070, 0x15, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_NFRE_B__NFRE_B		IOMUX_PAD(NFRE_B, NFRE_B, 0x000, 0x074, 0x10, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_NFRE_B__GPIO_3_27	IOMUX_PAD(NFRE_B, GPIO_3_27, 0x000, 0x074, 0x15, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_NFALE__NFALE		IOMUX_PAD(NFALE, NFALE, 0x000, 0x078, 0x10, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_NFALE__GPIO_3_28	IOMUX_PAD(NFALE, GPIO_3_28, 0x000, 0x078, 0x15, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_NFCLE__NFCLE		IOMUX_PAD(NFCLE, NFCLE, 0x000, 0x07c, 0x10, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_NFCLE__GPIO_3_29	IOMUX_PAD(NFCLE, GPIO_3_29, 0x000, 0x07c, 0x15, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_NFWP_B__NFWP_B		IOMUX_PAD(NFWP_B, NFWP_B, 0x000, 0x080, 0x10, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_NFWP_B__GPIO_3_30	IOMUX_PAD(NFWP_B, GPIO_3_30, 0x000, 0x080, 0x15, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_NFRB__NFRB		IOMUX_PAD(NFRB, NFRB, 0x27c, 0x084, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
++#define MX25_PAD_NFRB__GPIO_3_31	IOMUX_PAD(NFRB, GPIO_3_31, 0x27c, 0x084, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D15__D15		IOMUX_PAD(D15, D15, 0x280, 0x088, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D15__LD16		IOMUX_PAD(D15, LD16, 0x280, 0x088, 0x01, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D15__GPIO_4_5		IOMUX_PAD(D15, GPIO_4_5, 0x280, 0x088, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D14__D14		IOMUX_PAD(D14, D14, 0x284, 0x08c, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D14__LD17		IOMUX_PAD(D14, LD17, 0x284, 0x08c, 0x01, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D14__GPIO_4_6		IOMUX_PAD(D14, GPIO_4_6, 0x284, 0x08c, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D13__D13		IOMUX_PAD(D13, D13, 0x288, 0x090, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D13__LD18		IOMUX_PAD(D13, LD18, 0x288, 0x090, 0x01, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D13__GPIO_4_7		IOMUX_PAD(D13, GPIO_4_7, 0x288, 0x090, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D12__D12		IOMUX_PAD(D12, D12, 0x28c, 0x094, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D12__GPIO_4_8		IOMUX_PAD(D12, GPIO_4_8, 0x28c, 0x094, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D11__D11		IOMUX_PAD(D11, D11, 0x290, 0x098, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D11__GPIO_4_9		IOMUX_PAD(D11, GPIO_4_9, 0x290, 0x098, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D10__D10		IOMUX_PAD(D10, D10, 0x294, 0x09c, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D10__GPIO_4_10		IOMUX_PAD(D10, GPIO_4_10, 0x294, 0x09c, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D10__USBOTG_OC		IOMUX_PAD(D10, USBOTG_OC, 0x294, 0x09c, 0x06, 0x57c, 0, PAD_CTL_PULL_UP_100K)
++#define MX25_PAD_D9__D9			IOMUX_PAD(D9, D9, 0x298, 0x0a0, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D9__GPIO_4_11		IOMUX_PAD(D9, GPIO_4_11, 0x298, 0x0a0, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D9__USBH2_PWR		IOMUX_PAD(D9, USBH2_PWR, 0x298, 0x0a0, 0x06, 0, 0, PAD_CTL_PULL_KEEPER)
++#define MX25_PAD_D8__D8			IOMUX_PAD(D8, D8, 0x29c, 0x0a4, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D8__GPIO_4_12		IOMUX_PAD(D8, GPIO_4_12, 0x29c, 0x0a4, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D8__USBH2_OC		IOMUX_PAD(D8, USBH2_OC, 0x29c, 0x0a4, 0x06, 0x580, 0, PAD_CTL_PULL_UP_100K)
++#define MX25_PAD_D7__D7			IOMUX_PAD(D7, D7, 0x2a0, 0x0a8, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D7__GPIO_4_13		IOMUX_PAD(D7, GPIO_4_13, 0x2a0, 0x0a8, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D6__D6			IOMUX_PAD(D6, D6, 0x2a4, 0x0ac, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D6__GPIO_4_14		IOMUX_PAD(D6, GPIO_4_14, 0x2a4, 0x0ac, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D5__D5			IOMUX_PAD(D5, D5, 0x2a8, 0x0b0, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D5__GPIO_4_15		IOMUX_PAD(D5, GPIO_4_15, 0x2a8, 0x0b0, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D4__D4			IOMUX_PAD(D4, D4, 0x2ac, 0x0b4, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D4__GPIO_4_16		IOMUX_PAD(D4, GPIO_4_16, 0x2ac, 0x0b4, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D3__D3			IOMUX_PAD(D3, D3, 0x2b0, 0x0b8, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D3__GPIO_4_17		IOMUX_PAD(D3, GPIO_4_17, 0x2b0, 0x0b8, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D2__D2			IOMUX_PAD(D2, D2, 0x2b4, 0x0bc, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D2__GPIO_4_18		IOMUX_PAD(D2, GPIO_4_18, 0x2b4, 0x0bc, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D1__D1			IOMUX_PAD(D1, D1, 0x2b8, 0x0c0, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D1__GPIO_4_19		IOMUX_PAD(D1, GPIO_4_19, 0x2b8, 0x0c0, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D0__D0			IOMUX_PAD(D0, D0, 0x2bc, 0x0c4, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_D0__GPIO_4_20		IOMUX_PAD(D0, GPIO_4_20, 0x2bc, 0x0c4, 0x05, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD0__LD0		IOMUX_PAD(LD0, LD0, 0x2c0, 0x0c8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD0__CSI_D0		IOMUX_PAD(LD0, CSI_D0, 0x2c0, 0x0c8, 0x12, 0x488, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD0__GPIO_2_15		IOMUX_PAD(LD0, GPIO_2_15, 0x2c0, 0x0c8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD1__LD1		IOMUX_PAD(LD1, LD1, 0x2c4, 0x0cc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD1__CSI_D1		IOMUX_PAD(LD1, CSI_D1, 0x2c4, 0x0cc, 0x12, 0x48c, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD1__GPIO_2_16		IOMUX_PAD(LD1, GPIO_2_16, 0x2c4, 0x0cc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD2__LD2		IOMUX_PAD(LD2, LD2, 0x2c8, 0x0d0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD2__GPIO_2_17		IOMUX_PAD(LD2, GPIO_2_17, 0x2c8, 0x0d0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD3__LD3		IOMUX_PAD(LD3, LD3, 0x2cc, 0x0d4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD3__GPIO_2_18		IOMUX_PAD(LD3, GPIO_2_18, 0x2cc, 0x0d4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD4__LD4		IOMUX_PAD(LD4, LD4, 0x2d0, 0x0d8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD4__GPIO_2_19		IOMUX_PAD(LD4, GPIO_2_19, 0x2d0, 0x0d8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD5__LD5		IOMUX_PAD(LD5, LD5, 0x2d4, 0x0dc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD5__GPIO_1_19		IOMUX_PAD(LD5, GPIO_1_19, 0x2d4, 0x0dc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD6__LD6		IOMUX_PAD(LD6, LD6, 0x2d8, 0x0e0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD6__GPIO_1_20		IOMUX_PAD(LD6, GPIO_1_20, 0x2d8, 0x0e0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD7__LD7		IOMUX_PAD(LD7, LD7, 0x2dc, 0x0e4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD7__GPIO_1_21		IOMUX_PAD(LD7, GPIO_1_21, 0x2dc, 0x0e4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD8__LD8		IOMUX_PAD(LD8, LD8, 0x2e0, 0x0e8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD8__FEC_TX_ERR	IOMUX_PAD(LD8, FEC_TX_ERR, 0x2e0, 0x0e8, 0x15, 0, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_LD9__LD9		IOMUX_PAD(LD9, LD9, 0x2e4, 0x0ec, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD9__FEC_COL		IOMUX_PAD(LD9, FEC_COL, 0x2e4, 0x0ec, 0x15, 0x504, 1, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_LD10__LD10		IOMUX_PAD(LD10, LD10, 0x2e8, 0x0f0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD10__FEC_RX_ER	IOMUX_PAD(LD10, FEC_RX_ER, 0x2e8, 0x0f0, 0x15, 0x518, 1, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_LD11__LD11		IOMUX_PAD(LD11, LD11, 0x2ec, 0x0f4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD11__FEC_RDATA2	IOMUX_PAD(LD11, FEC_RDATA2, 0x2ec, 0x0f4, 0x15, 0x50c, 1, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_LD12__LD12		IOMUX_PAD(LD12, LD12, 0x2f0, 0x0f8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD12__FEC_RDATA3	IOMUX_PAD(LD12, FEC_RDATA3, 0x2f0, 0x0f8, 0x15, 0x510, 1, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_LD13__LD13		IOMUX_PAD(LD13, LD13, 0x2f4, 0x0fc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD13__FEC_TDATA2	IOMUX_PAD(LD13, FEC_TDATA2, 0x2f4, 0x0fc, 0x15, 0, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_LD14__LD14		IOMUX_PAD(LD14, LD14, 0x2f8, 0x100, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD14__FEC_TDATA3	IOMUX_PAD(LD14, FEC_TDATA3, 0x2f8, 0x100, 0x15, 0, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_LD15__LD15		IOMUX_PAD(LD15, LD15, 0x2fc, 0x104, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LD15__FEC_RX_CLK	IOMUX_PAD(LD15, FEC_RX_CLK, 0x2fc, 0x104, 0x15, 0x514, 1, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_HSYNC__HSYNC		IOMUX_PAD(HSYNC, HSYNC, 0x300, 0x108, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_HSYNC__GPIO_1_22	IOMUX_PAD(HSYNC, GPIO_1_22, 0x300, 0x108, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_VSYNC__VSYNC		IOMUX_PAD(VSYNC, VSYNC, 0x304, 0x10c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_VSYNC__GPIO_1_23	IOMUX_PAD(VSYNC, GPIO_1_23, 0x304, 0x10c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LSCLK__LSCLK		IOMUX_PAD(LSCLK, LSCLK, 0x308, 0x110, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_LSCLK__GPIO_1_24	IOMUX_PAD(LSCLK, GPIO_1_24, 0x308, 0x110, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_OE_ACD__OE_ACD		IOMUX_PAD(OE_ACD, OE_ACD, 0x30c, 0x114, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_OE_ACD__GPIO_1_25	IOMUX_PAD(OE_ACD, GPIO_1_25, 0x30c, 0x114, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CONTRAST__CONTRAST	IOMUX_PAD(CONTRAST, CONTRAST, 0x310, 0x118, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CONTRAST__FEC_CRS	IOMUX_PAD(CONTRAST, FEC_CRS, 0x310, 0x118, 0x15, 0x508, 1, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_PWM__PWM		IOMUX_PAD(PWM, PWM, 0x314, 0x11c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_PWM__GPIO_1_26		IOMUX_PAD(PWM, GPIO_1_26, 0x314, 0x11c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_PWM__USBH2_OC		IOMUX_PAD(PWM, USBH2_OC, 0x314, 0x11c, 0x16, 0x580, 1, PAD_CTL_PULL_UP_100K)
++#define MX25_PAD_CSI_D2__CSI_D2		IOMUX_PAD(CSI_D2, CSI_D2, 0x318, 0x120, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D2__UART5_RXD_MUX	IOMUX_PAD(CSI_D2, UART5_RXD_MUX, 0x318, 0x120, 0x11, 0x578, 1, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D2__GPIO_1_27	IOMUX_PAD(CSI_D2, GPIO_1_27, 0x318, 0x120, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D3__CSI_D3		IOMUX_PAD(CSI_D3, CSI_D3, 0x31c, 0x124, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D3__GPIO_1_28	IOMUX_PAD(CSI_D3, GPIO_1_28, 0x31c, 0x124, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D4__CSI_D4		IOMUX_PAD(CSI_D4, CSI_D4, 0x320, 0x128, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D4__UART5_RTS	IOMUX_PAD(CSI_D4, UART5_RTS, 0x320, 0x128, 0x11, 0x574, 1, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D4__GPIO_1_29	IOMUX_PAD(CSI_D4, GPIO_1_29, 0x320, 0x128, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D5__CSI_D5		IOMUX_PAD(CSI_D5, CSI_D5, 0x324, 0x12c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D5__GPIO_1_30	IOMUX_PAD(CSI_D5, GPIO_1_30, 0x324, 0x12c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D6__CSI_D6		IOMUX_PAD(CSI_D6, CSI_D6, 0x328, 0x130, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D6__GPIO_1_31	IOMUX_PAD(CSI_D6, GPIO_1_31, 0x328, 0x130, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D7__CSI_D7		IOMUX_PAD(CSI_D7, CSI_D7, 0x32c, 0x134, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D7__GPIO_1_6	IOMUX_PAD(CSI_D7, GPIO_1_6, 0x32c, 0x134, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D8__CSI_D8		IOMUX_PAD(CSI_D8, CSI_D8, 0x330, 0x138, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D8__GPIO_1_7	IOMUX_PAD(CSI_D8, GPIO_1_7, 0x330, 0x138, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D9__CSI_D9		IOMUX_PAD(CSI_D9, CSI_D9, 0x334, 0x13c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_D9__GPIO_4_21	IOMUX_PAD(CSI_D9, GPIO_4_21, 0x334, 0x13c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_MCLK__CSI_MCLK	IOMUX_PAD(CSI_MCLK, CSI_MCLK, 0x338, 0x140, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_MCLK__GPIO_1_8	IOMUX_PAD(CSI_MCLK, GPIO_1_8, 0x338, 0x140, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_VSYNC__CSI_VSYNC	IOMUX_PAD(CSI_VSYNC, CSI_VSYNC, 0x33c, 0x144, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_VSYNC__GPIO_1_9	IOMUX_PAD(CSI_VSYNC, GPIO_1_9, 0x33c, 0x144, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_HSYNC__CSI_HSYNC	IOMUX_PAD(CSI_HSYNC, CSI_HSYNC, 0x340, 0x148, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_HSYNC__GPIO_1_10	IOMUX_PAD(CSI_HSYNC, GPIO_1_10, 0x340, 0x148, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_PIXCLK__CSI_PIXCLK	IOMUX_PAD(CSI_PIXCLK, CSI_PIXCLK, 0x344, 0x14c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSI_PIXCLK__GPIO_1_11	IOMUX_PAD(CSI_PIXCLK, GPIO_1_11, 0x344, 0x14c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_I2C1_CLK__I2C1_CLK	IOMUX_PAD(I2C1_CLK, I2C1_CLK, 0x348, 0x150, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_I2C1_CLK__GPIO_1_12	IOMUX_PAD(I2C1_CLK, GPIO_1_12, 0x348, 0x150, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_I2C1_DAT__I2C1_DAT	IOMUX_PAD(I2C1_DAT, I2C1_DAT, 0x34c, 0x154, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_I2C1_DAT__GPIO_1_13	IOMUX_PAD(I2C1_DAT, GPIO_1_13, 0x34c, 0x154, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSPI1_MOSI__CSPI1_MOSI	IOMUX_PAD(CSPI1_MOSI, CSPI1_MOSI, 0x350, 0x158, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSPI1_MOSI__GPIO_1_14	IOMUX_PAD(CSPI1_MOSI, GPIO_1_14, 0x350, 0x158, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSPI1_MISO__CSPI1_MISO	IOMUX_PAD(CSPI1_MISO, CSPI1_MISO, 0x354, 0x15c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSPI1_MISO__GPIO_1_15	IOMUX_PAD(CSPI1_MISO, GPIO_1_15, 0x354, 0x15c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSPI1_SS0__CSPI1_SS0	IOMUX_PAD(CSPI1_SS0, CSPI1_SS0, 0x358, 0x160, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSPI1_SS0__GPIO_1_16	IOMUX_PAD(CSPI1_SS0, GPIO_1_16, 0x358, 0x160, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSPI1_SS1__CSPI1_SS1	IOMUX_PAD(CSPI1_SS1, CSPI1_SS1, 0x35c, 0x164, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSPI1_SS1__GPIO_1_17	IOMUX_PAD(CSPI1_SS1, GPIO_1_17, 0x35c, 0x164, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSPI1_SCLK__CSPI1_SCLK	IOMUX_PAD(CSPI1_SCLK, CSPI1_SCLK, 0x360, 0x168, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSPI1_SCLK__GPIO_1_18	IOMUX_PAD(CSPI1_SCLK, GPIO_1_18, 0x360, 0x168, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CSPI1_RDY__CSPI1_RDY	IOMUX_PAD(CSPI1_RDY, CSPI1_RDY, 0x364, 0x16c, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
++#define MX25_PAD_CSPI1_RDY__GPIO_2_22	IOMUX_PAD(CSPI1_RDY, GPIO_2_22, 0x364, 0x16c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART1_RXD__UART1_RXD	IOMUX_PAD(UART1_RXD, UART1_RXD, 0x368, 0x170, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K)
++#define MX25_PAD_UART1_RXD__GPIO_4_22	IOMUX_PAD(UART1_RXD, GPIO_4_22, 0x368, 0x170, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART1_TXD__UART1_TXD	IOMUX_PAD(UART1_TXD, UART1_TXD, 0x36c, 0x174, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART1_TXD__GPIO_4_23	IOMUX_PAD(UART1_TXD, GPIO_4_23, 0x36c, 0x174, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART1_RTS__UART1_RTS	IOMUX_PAD(UART1_RTS, UART1_RTS, 0x370, 0x178, 0x10, 0, 0, PAD_CTL_PULL_UP_100K)
++#define MX25_PAD_UART1_RTS__CSI_D0	IOMUX_PAD(UART1_RTS, CSI_D0, 0x370, 0x178, 0x11, 0x488, 1, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART1_RTS__GPIO_4_24	IOMUX_PAD(UART1_RTS, GPIO_4_24, 0x370, 0x178, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART1_CTS__UART1_CTS	IOMUX_PAD(UART1_CTS, UART1_CTS, 0x374, 0x17c, 0x10, 0, 0, PAD_CTL_PULL_UP_100K)
++#define MX25_PAD_UART1_CTS__CSI_D1	IOMUX_PAD(UART1_CTS, CSI_D1, 0x374, 0x17c, 0x11, 0x48c, 1, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART1_CTS__GPIO_4_25	IOMUX_PAD(UART1_CTS, GPIO_4_25, 0x374, 0x17c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART2_RXD__UART2_RXD	IOMUX_PAD(UART2_RXD, UART2_RXD, 0x378, 0x180, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART2_RXD__GPIO_4_26	IOMUX_PAD(UART2_RXD, GPIO_4_26, 0x378, 0x180, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART2_TXD__UART2_TXD	IOMUX_PAD(UART2_TXD, UART2_TXD, 0x37c, 0x184, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART2_TXD__GPIO_4_27	IOMUX_PAD(UART2_TXD, GPIO_4_27, 0x37c, 0x184, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART2_RTS__UART2_RTS	IOMUX_PAD(UART2_RTS, UART2_RTS, 0x380, 0x188, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART2_RTS__FEC_COL	IOMUX_PAD(UART2_RTS, FEC_COL, 0x380, 0x188, 0x12, 0x504, 2, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_UART2_RTS__GPIO_4_28	IOMUX_PAD(UART2_RTS, GPIO_4_28, 0x380, 0x188, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART2_CTS__FEC_RX_ER	IOMUX_PAD(UART2_CTS, FEC_RX_ER, 0x384, 0x18c, 0x12, 0x518, 2, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_UART2_CTS__UART2_CTS	IOMUX_PAD(UART2_CTS, UART2_CTS, 0x384, 0x18c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_UART2_CTS__GPIO_4_29	IOMUX_PAD(UART2_CTS, GPIO_4_29, 0x384, 0x18c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_SD1_CMD__SD1_CMD	IOMUX_PAD(SD1_CMD, SD1_CMD, 0x388, 0x190, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_SD1_CMD__FEC_RDATA2	IOMUX_PAD(SD1_CMD, FEC_RDATA2, 0x388, 0x190, 0x12, 0x50c, 2, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_SD1_CMD__GPIO_2_23	IOMUX_PAD(SD1_CMD, GPIO_2_23, 0x388, 0x190, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_SD1_CLK__SD1_CLK	IOMUX_PAD(SD1_CLK, SD1_CLK, 0x38c, 0x194, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_SD1_CLK__FEC_RDATA3	IOMUX_PAD(SD1_CLK, FEC_RDATA3, 0x38c, 0x194, 0x12, 0x510, 2, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_SD1_CLK__GPIO_2_24	IOMUX_PAD(SD1_CLK, GPIO_2_24, 0x38c, 0x194, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_SD1_DATA0__SD1_DATA0	IOMUX_PAD(SD1_DATA0, SD1_DATA0, 0x390, 0x198, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_SD1_DATA0__GPIO_2_25	IOMUX_PAD(SD1_DATA0, GPIO_2_25, 0x390, 0x198, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_SD1_DATA1__SD1_DATA1	IOMUX_PAD(SD1_DATA1, SD1_DATA1, 0x394, 0x19c, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_SD1_DATA1__AUD7_RXD	IOMUX_PAD(SD1_DATA1, AUD7_RXD, 0x394, 0x19c, 0x13, 0x478, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_SD1_DATA1__GPIO_2_26	IOMUX_PAD(SD1_DATA1, GPIO_2_26, 0x394, 0x19c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_SD1_DATA2__SD1_DATA2	IOMUX_PAD(SD1_DATA2, SD1_DATA2, 0x398, 0x1a0, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_SD1_DATA2__FEC_RX_CLK	IOMUX_PAD(SD1_DATA2, FEC_RX_CLK, 0x398, 0x1a0, 0x15, 0x514, 2, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_SD1_DATA2__GPIO_2_27	IOMUX_PAD(SD1_DATA2, GPIO_2_27, 0x398, 0x1a0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_SD1_DATA3__SD1_DATA3	IOMUX_PAD(SD1_DATA3, SD1_DATA3, 0x39c, 0x1a4, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_SD1_DATA3__FEC_CRS	IOMUX_PAD(SD1_DATA3, FEC_CRS, 0x39c, 0x1a4, 0x10, 0x508, 2, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_SD1_DATA3__GPIO_2_28	IOMUX_PAD(SD1_DATA3, GPIO_2_28, 0x39c, 0x1a4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_KPP_ROW0__KPP_ROW0	IOMUX_PAD(KPP_ROW0, KPP_ROW0, 0x3a0, 0x1a8, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
++#define MX25_PAD_KPP_ROW0__GPIO_2_29	IOMUX_PAD(KPP_ROW0, GPIO_2_29, 0x3a0, 0x1a8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_KPP_ROW1__KPP_ROW1	IOMUX_PAD(KPP_ROW1, KPP_ROW1, 0x3a4, 0x1ac, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
++#define MX25_PAD_KPP_ROW1__GPIO_2_30	IOMUX_PAD(KPP_ROW1, GPIO_2_30, 0x3a4, 0x1ac, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_KPP_ROW2__KPP_ROW2	IOMUX_PAD(KPP_ROW2, KPP_ROW2, 0x3a8, 0x1b0, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
++#define MX25_PAD_KPP_ROW2__CSI_D0	IOMUX_PAD(KPP_ROW2, CSI_D0, 0x3a8, 0x1b0, 0x13, 0x488, 2, 0 | NO_PAD_CTRL)
++#define MX25_PAD_KPP_ROW2__GPIO_2_31	IOMUX_PAD(KPP_ROW2, GPIO_2_31, 0x3a8, 0x1b0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_KPP_ROW3__KPP_ROW3	IOMUX_PAD(KPP_ROW3, KPP_ROW3, 0x3ac, 0x1b4, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
++#define MX25_PAD_KPP_ROW3__CSI_LD1	IOMUX_PAD(KPP_ROW3, CSI_LD1, 0x3ac, 0x1b4, 0x13, 0x48c, 2, 0 | NO_PAD_CTRL)
++#define MX25_PAD_KPP_ROW3__GPIO_3_0	IOMUX_PAD(KPP_ROW3, GPIO_3_0, 0x3ac, 0x1b4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_KPP_COL0__KPP_COL0	IOMUX_PAD(KPP_COL0, KPP_COL0, 0x3b0, 0x1b8, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
++#define MX25_PAD_KPP_COL0__GPIO_3_1	IOMUX_PAD(KPP_COL0, GPIO_3_1, 0x3b0, 0x1b8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_KPP_COL1__KPP_COL1	IOMUX_PAD(KPP_COL1, KPP_COL1, 0x3b4, 0x1bc, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
++#define MX25_PAD_KPP_COL1__GPIO_3_2	IOMUX_PAD(KPP_COL1, GPIO_3_2, 0x3b4, 0x1bc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_KPP_COL2__KPP_COL2	IOMUX_PAD(KPP_COL2, KPP_COL2, 0x3b8, 0x1c0, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
++#define MX25_PAD_KPP_COL2__GPIO_3_3	IOMUX_PAD(KPP_COL2, GPIO_3_3, 0x3b8, 0x1c0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_KPP_COL3__KPP_COL3	IOMUX_PAD(KPP_COL3, KPP_COL3, 0x3bc, 0x1c4, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
++#define MX25_PAD_KPP_COL3__GPIO_3_4	IOMUX_PAD(KPP_COL3, GPIO_3_4, 0x3bc, 0x1c4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_FEC_MDC__FEC_MDC	IOMUX_PAD(FEC_MDC, FEC_MDC, 0x3c0, 0x1c8, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_FEC_MDC__AUD4_TXD	IOMUX_PAD(FEC_MDC, AUD4_TXD, 0x3c0, 0x1c8, 0x12, 0x464, 1, 0 | NO_PAD_CTRL)
++#define MX25_PAD_FEC_MDC__GPIO_3_5	IOMUX_PAD(FEC_MDC, GPIO_3_5, 0x3c0, 0x1c8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_FEC_MDIO__FEC_MDIO	IOMUX_PAD(FEC_MDIO, FEC_MDIO, 0x3c4, 0x1cc, 0x10, 0, 0, PAD_CTL_HYSTERESIS | PAD_CTL_PULL_UP_22K | PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_FEC_MDIO__AUD4_RXD	IOMUX_PAD(FEC_MDIO, AUD4_RXD, 0x3c4, 0x1cc, 0x12, 0x460, 1, 0 | NO_PAD_CTRL)
++#define MX25_PAD_FEC_MDIO__GPIO_3_6	IOMUX_PAD(FEC_MDIO, GPIO_3_6, 0x3c4, 0x1cc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_FEC_TDATA0__FEC_TDATA0	IOMUX_PAD(FEC_TDATA0, FEC_TDATA0, 0x3c8, 0x1d0, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_FEC_TDATA0__GPIO_3_7	IOMUX_PAD(FEC_TDATA0, GPIO_3_7, 0x3c8, 0x1d0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_FEC_TDATA1__FEC_TDATA1	IOMUX_PAD(FEC_TDATA1, FEC_TDATA1, 0x3cc, 0x1d4, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_FEC_TDATA1__AUD4_TXFS	IOMUX_PAD(FEC_TDATA1, AUD4_TXFS, 0x3cc, 0x1d4, 0x12, 0x474, 1, 0 | NO_PAD_CTRL)
++#define MX25_PAD_FEC_TDATA1__GPIO_3_8	IOMUX_PAD(FEC_TDATA1, GPIO_3_8, 0x3cc, 0x1d4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_FEC_TX_EN__FEC_TX_EN	IOMUX_PAD(FEC_TX_EN, FEC_TX_EN, 0x3d0, 0x1d8, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_FEC_TX_EN__GPIO_3_9   	IOMUX_PAD(FEC_TX_EN, GPIO_3_9   , 0x3d0, 0x1d8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_FEC_RDATA0__FEC_RDATA0	IOMUX_PAD(FEC_RDATA0, FEC_RDATA0, 0x3d4, 0x1dc, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_FEC_RDATA0__GPIO_3_10	IOMUX_PAD(FEC_RDATA0, GPIO_3_10, 0x3d4, 0x1dc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_FEC_RDATA1__FEC_RDATA1	IOMUX_PAD(FEC_RDATA1, FEC_RDATA1, 0x3d8, 0x1e0, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_FEC_RDATA1__GPIO_3_11	IOMUX_PAD(FEC_RDATA1, GPIO_3_11, 0x3d8, 0x1e0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_FEC_RX_DV__FEC_RX_DV	IOMUX_PAD(FEC_RX_DV, FEC_RX_DV, 0x3dc, 0x1e4, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_FEC_RX_DV__CAN2_RX	IOMUX_PAD(FEC_RX_DV, CAN2_RX, 0x3dc, 0x1e4, 0x14, 0x484, 0, PAD_CTL_PULL_UP_22K)
++#define MX25_PAD_FEC_RX_DV__GPIO_3_12	IOMUX_PAD(FEC_RX_DV, GPIO_3_12, 0x3dc, 0x1e4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_FEC_TX_CLK__FEC_TX_CLK	IOMUX_PAD(FEC_TX_CLK, FEC_TX_CLK, 0x3e0, 0x1e8, 0x10, 0, 0, PAD_CTL_HYSTERESIS | PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
++#define MX25_PAD_FEC_TX_CLK__GPIO_3_13	IOMUX_PAD(FEC_TX_CLK, GPIO_3_13, 0x3e0, 0x1e8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_RTCK__RTCK		IOMUX_PAD(RTCK, RTCK, 0x3e4, 0x1ec, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_RTCK__OWIRE		IOMUX_PAD(RTCK, OWIRE, 0x3e4, 0x1ec, 0x11, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_RTCK__GPIO_3_14	IOMUX_PAD(RTCK, GPIO_3_14, 0x3e4, 0x1ec, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_DE_B__DE_B		IOMUX_PAD(DE_B, DE_B, 0x3ec, 0x1f0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_DE_B__GPIO_2_20	IOMUX_PAD(DE_B, GPIO_2_20, 0x3ec, 0x1f0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_TDO__TDO		IOMUX_PAD(TDO, TDO, 0x3e8, 0x000, 0x00, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_GPIO_A__GPIO_A		IOMUX_PAD(GPIO_A, GPIO_A, 0x3f0, 0x1f4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_GPIO_A__CAN1_TX	IOMUX_PAD(GPIO_A, CAN1_TX, 0x3f0, 0x1f4, 0x16, 0, 0, PAD_CTL_PULL_UP_22K | PAD_CTL_OUTPUT_OPEN_DRAIN | PAD_CTL_DRIVE_STRENGTH_MAX)
++#define MX25_PAD_GPIO_A__USBOTG_PWR	IOMUX_PAD(GPIO_A, USBOTG_PWR, 0x3f0, 0x1f4, 0x12, 0, 0, PAD_CTL_PULL_KEEPER)
++#define MX25_PAD_GPIO_B__GPIO_B		IOMUX_PAD(GPIO_B, GPIO_B, 0x3f4, 0x1f8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_GPIO_B__CAN1_RX	IOMUX_PAD(GPIO_B, CAN1_RX, 0x3f4, 0x1f8, 0x16, 0x480, 1, PAD_CTL_PULL_UP_22K | PAD_CTL_OUTPUT_OPEN_DRAIN)
++#define MX25_PAD_GPIO_B__USBOTG_OC	IOMUX_PAD(GPIO_B, USBOTG_OC, 0x3f4, 0x1f8, 0x12, 0x57c, 1, PAD_CTL_PULL_UP_100K)
++#define MX25_PAD_GPIO_C__GPIO_C		IOMUX_PAD(GPIO_C, GPIO_C, 0x3f8, 0x1fc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_GPIO_C__CAN2_TX	IOMUX_PAD(GPIO_C, CAN2_TX, 0x3f8, 0x1fc, 0x16, 0, 0, PAD_CTL_PULL_UP_22K | PAD_CTL_OUTPUT_OPEN_DRAIN | PAD_CTL_DRIVE_STRENGTH_MAX)
++#define MX25_PAD_GPIO_D__GPIO_D		IOMUX_PAD(GPIO_D, GPIO_D, 0x3fc, 0x200, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_GPIO_D__CAN2_RX	IOMUX_PAD(GPIO_D, CAN2_RX, 0x3fc, 0x200, 0x16, 0x484, 1, PAD_CTL_PULL_UP_22K)
++#define MX25_PAD_GPIO_E__GPIO_E		IOMUX_PAD(GPIO_E, GPIO_E, 0x400, 0x204, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_GPIO_E__AUD7_TXD	IOMUX_PAD(GPIO_E, AUD7_TXD, 0x400, 0x204, 0x14, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_GPIO_F__GPIO_F		IOMUX_PAD(GPIO_F, GPIO_F, 0x404, 0x208, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_GPIO_F__AUD7_TXC	IOMUX_PAD(GPIO_F, AUD7_TXC, 0x404, 0x208, 0x14, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_EXT_ARMCLK__EXT_ARMCLK	IOMUX_PAD(EXT_ARMCLK, EXT_ARMCLK, 0x000, 0x20c, 0x10, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_EXT_ARMCLK__GPIO_3_15	IOMUX_PAD(EXT_ARMCLK, GPIO_3_15, 0x000, 0x20c, 0x15, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_UPLL_BYPCLK__UPLL_BYPCLK IOMUX_PAD(UPLL_BYPCLK, UPLL_BYPCLK, 0x000, 0x210, 0x10, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_UPLL_BYPCLK__GPIO_3_16	IOMUX_PAD(UPLL_BYPCLK, GPIO_3_16, 0x000, 0x210, 0x15, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_VSTBY_REQ__VSTBY_REQ	IOMUX_PAD(VSTBY_REQ, VSTBY_REQ, 0x408, 0x214, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_VSTBY_REQ__AUD7_TXFS	IOMUX_PAD(VSTBY_REQ, AUD7_TXFS, 0x408, 0x214, 0x14, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_VSTBY_REQ__GPIO_3_17	IOMUX_PAD(VSTBY_REQ, GPIO_3_17, 0x408, 0x214, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_VSTBY_ACK__VSTBY_ACK	IOMUX_PAD(VSTBY_ACK, VSTBY_ACK, 0x40c, 0x218, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_VSTBY_ACK__GPIO_3_18	IOMUX_PAD(VSTBY_ACK, GPIO_3_18, 0x40c, 0x218, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_POWER_FAIL__POWER_FAIL	IOMUX_PAD(POWER_FAIL, POWER_FAIL, 0x410, 0x21c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_POWER_FAIL__AUD7_RXD	IOMUX_PAD(POWER_FAIL, AUD7_RXD, 0x410, 0x21c, 0x14, 0x478, 1, 0 | NO_PAD_CTRL)
++#define MX25_PAD_POWER_FAIL__GPIO_3_19	IOMUX_PAD(POWER_FAIL, GPIO_3_19, 0x410, 0x21c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CLKO__CLKO		IOMUX_PAD(CLKO, CLKO, 0x414, 0x220, 0x10, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_CLKO__GPIO_2_21	IOMUX_PAD(CLKO, GPIO_2_21, 0x414, 0x220, 0x15, 0, 0, 0 | NO_PAD_CTRL)
++#define MX25_PAD_BOOT_MODE0__BOOT_MODE0	IOMUX_PAD(BOOT_MODE0, BOOT_MODE0, 0x000, 0x224, 0x00, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_BOOT_MODE0__GPIO_4_30	IOMUX_PAD(BOOT_MODE0, GPIO_4_30, 0x000, 0x224, 0x05, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_BOOT_MODE1__BOOT_MODE1	IOMUX_PAD(BOOT_MODE1, BOOT_MODE1, 0x000, 0x228, 0x00, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_BOOT_MODE1__GPIO_4_31	IOMUX_PAD(BOOT_MODE1, GPIO_4_31, 0x000, 0x228, 0x05, 0, 0, NO_PAD_CTRL)
++
++#define MX25_PAD_CTL_GRP_DVS_MISC	IOMUX_PAD(0x418, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DSE_FEC	IOMUX_PAD(0x41c, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DVS_JTAG	IOMUX_PAD(0x420, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DSE_NFC	IOMUX_PAD(0x424, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DSE_CSI	IOMUX_PAD(0x428, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DSE_WEIM	IOMUX_PAD(0x42c, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DSE_DDR	IOMUX_PAD(0x430, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DVS_CRM	IOMUX_PAD(0x434, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DSE_KPP	IOMUX_PAD(0x438, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DSE_SDHC1	IOMUX_PAD(0x43c, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DSE_LCD	IOMUX_PAD(0x440, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DSE_UART	IOMUX_PAD(0x444, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DVS_NFC	IOMUX_PAD(0x448, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DVS_CSI	IOMUX_PAD(0x44c, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DSE_CSPI1	IOMUX_PAD(0x450, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DDRTYPE	IOMUX_PAD(0x454, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DVS_SDHC1	IOMUX_PAD(0x458, 0x000, 0, 0, 0, NO_PAD_CTRL)
++#define MX25_PAD_CTL_GRP_DVS_LCD	IOMUX_PAD(0x45c, 0x000, 0, 0, 0, NO_PAD_CTRL)
 +
 +#define IOMUX_TO_GPIO(__pad_desc) ({		\
 +	int __gpio = -1;			\
@@ -8476,412 +7493,446 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/iomux-mx25.h linux-2.
 +						\
 +	switch (__pd->mux_ctrl_ofs) {		\
 +	case MX25_PAD_GPIO_A__GPIO_A:		\
-+		__gpio = GPIO_A;		\
-+		break;				\
++	__gpio = GPIO_A;			\
++	break;					\
 +	case MX25_PAD_GPIO_B__GPIO_B:		\
-+		__gpio = GPIO_B;		\
-+		break;				\
++	__gpio = GPIO_B;			\
++	break;					\
 +	case MX25_PAD_GPIO_C__GPIO_C:		\
-+		__gpio = GPIO_C;		\
-+		break;				\
++	__gpio = GPIO_C;			\
++	break;					\
 +	case MX25_PAD_GPIO_D__GPIO_D:		\
-+		__gpio = GPIO_D;		\
-+		break;				\
++	__gpio = GPIO_D;			\
++	break;					\
 +	case MX25_PAD_GPIO_E__GPIO_E:		\
-+		__gpio = GPIO_E;		\
-+		break;				\
++	__gpio = GPIO_E;			\
++	break;					\
 +	case MX25_PAD_GPIO_F__GPIO_F:		\
-+		__gpio = GPIO_F;		\
-+		break;				\
++	__gpio = GPIO_F;			\
++	break;					\
 +	case MX25_PAD_CSI_D7__GPIO_1_6:		\
-+		__gpio = GPIO_1_6;		\
-+		break;				\
++	__gpio = GPIO_1_6;			\
++	break;					\
 +	case MX25_PAD_CSI_D8__GPIO_1_7:		\
-+		__gpio = GPIO_1_7;		\
-+		break;				\
++	__gpio = GPIO_1_7;			\
++	break;					\
 +	case MX25_PAD_CSI_MCLK__GPIO_1_8:	\
-+		__gpio = GPIO_1_8;		\
-+		break;				\
++	__gpio = GPIO_1_8;			\
++	break;					\
 +	case MX25_PAD_CSI_VSYNC__GPIO_1_9:	\
-+		__gpio = GPIO_1_9;		\
-+		break;				\
++	__gpio = GPIO_1_9;			\
++	break;					\
 +	case MX25_PAD_CSI_HSYNC__GPIO_1_10:	\
-+		__gpio = GPIO_1_10;		\
-+		break;				\
++	__gpio = GPIO_1_10;			\
++	break;					\
 +	case MX25_PAD_CSI_PIXCLK__GPIO_1_11:	\
-+		__gpio = GPIO_1_11;		\
-+		break;				\
++	__gpio = GPIO_1_11;			\
++	break;					\
 +	case MX25_PAD_I2C1_CLK__GPIO_1_12:	\
-+		__gpio = GPIO_1_12;		\
-+		break;				\
++	__gpio = GPIO_1_12;			\
++	break;					\
 +	case MX25_PAD_I2C1_DAT__GPIO_1_13:	\
-+		__gpio = GPIO_1_13;		\
-+		break;				\
++	__gpio = GPIO_1_13;			\
++	break;					\
 +	case MX25_PAD_CSPI1_MOSI__GPIO_1_14:	\
-+		__gpio = GPIO_1_14;		\
-+		break;				\
++	__gpio = GPIO_1_14;			\
++	break;					\
 +	case MX25_PAD_CSPI1_MISO__GPIO_1_15:	\
-+		__gpio = GPIO_1_15;		\
-+		break;				\
++	__gpio = GPIO_1_15;			\
++	break;					\
 +	case MX25_PAD_CSPI1_SS0__GPIO_1_16:	\
-+		__gpio = GPIO_1_16;		\
-+		break;				\
++	__gpio = GPIO_1_16;			\
++	break;					\
 +	case MX25_PAD_CSPI1_SS1__GPIO_1_17:	\
-+		__gpio = GPIO_1_17;		\
-+		break;				\
++	__gpio = GPIO_1_17;			\
++	break;					\
 +	case MX25_PAD_CSPI1_SCLK__GPIO_1_18:	\
-+		__gpio = GPIO_1_18;		\
-+		break;				\
++	__gpio = GPIO_1_18;			\
++	break;					\
 +	case MX25_PAD_LD5__GPIO_1_19:		\
-+		__gpio = GPIO_1_19;		\
-+		break;				\
++	__gpio = GPIO_1_19;			\
++	break;					\
 +	case MX25_PAD_LD6__GPIO_1_20:		\
-+		__gpio = GPIO_1_20;		\
-+		break;				\
++	__gpio = GPIO_1_20;			\
++	break;					\
 +	case MX25_PAD_LD7__GPIO_1_21:		\
-+		__gpio = GPIO_1_21;		\
-+		break;				\
++	__gpio = GPIO_1_21;			\
++	break;					\
 +	case MX25_PAD_HSYNC__GPIO_1_22:		\
-+		__gpio = GPIO_1_22;		\
-+		break;				\
++	__gpio = GPIO_1_22;			\
++	break;					\
 +	case MX25_PAD_VSYNC__GPIO_1_23:		\
-+		__gpio = GPIO_1_23;		\
-+		break;				\
++	__gpio = GPIO_1_23;			\
++	break;					\
 +	case MX25_PAD_LSCLK__GPIO_1_24:		\
-+		__gpio = GPIO_1_24;		\
-+		break;				\
++	__gpio = GPIO_1_24;			\
++	break;					\
 +	case MX25_PAD_OE_ACD__GPIO_1_25:	\
-+		__gpio = GPIO_1_25;		\
-+		break;				\
++	__gpio = GPIO_1_25;			\
++	break;					\
 +	case MX25_PAD_PWM__GPIO_1_26:		\
-+		__gpio = GPIO_1_26;		\
-+		break;				\
++	__gpio = GPIO_1_26;			\
++	break;					\
 +	case MX25_PAD_CSI_D2__GPIO_1_27:	\
-+		__gpio = GPIO_1_27;		\
-+		break;				\
++	__gpio = GPIO_1_27;			\
++	break;					\
 +	case MX25_PAD_CSI_D3__GPIO_1_28:	\
-+		__gpio = GPIO_1_28;		\
-+		break;				\
++	__gpio = GPIO_1_28;			\
++	break;					\
 +	case MX25_PAD_CSI_D4__GPIO_1_29:	\
-+		__gpio = GPIO_1_29;		\
-+		break;				\
++	__gpio = GPIO_1_29;			\
++	break;					\
 +	case MX25_PAD_CSI_D5__GPIO_1_30:	\
-+		__gpio = GPIO_1_30;		\
-+		break;				\
++	__gpio = GPIO_1_30;			\
++	break;					\
 +	case MX25_PAD_CSI_D6__GPIO_1_31:	\
-+		__gpio = GPIO_1_31;		\
-+		break;				\
++	__gpio = GPIO_1_31;			\
++	break;					\
 +						\
 +	case MX25_PAD_A14__GPIO_2_0:		\
-+		__gpio = GPIO_2_0;		\
-+		break;				\
++	__gpio = GPIO_2_0;			\
++	break;					\
 +	case MX25_PAD_A15__GPIO_2_1:		\
-+		__gpio = GPIO_2_1;		\
-+		break;				\
++	__gpio = GPIO_2_1;			\
++	break;					\
 +	case MX25_PAD_A16__GPIO_2_2:		\
-+		__gpio = GPIO_2_2;		\
-+		break;				\
++	__gpio = GPIO_2_2;			\
++	break;					\
 +	case MX25_PAD_A17__GPIO_2_3:		\
-+		__gpio = GPIO_2_3;		\
-+		break;				\
++	__gpio = GPIO_2_3;			\
++	break;					\
 +	case MX25_PAD_A18__GPIO_2_4:		\
-+		__gpio = GPIO_2_4;		\
-+		break;				\
++	__gpio = GPIO_2_4;			\
++	break;					\
 +	case MX25_PAD_A19__GPIO_2_5:		\
-+		__gpio = GPIO_2_5;		\
-+		break;				\
++	__gpio = GPIO_2_5;			\
++	break;					\
 +	case MX25_PAD_A20__GPIO_2_6:		\
-+		__gpio = GPIO_2_6;		\
-+		break;				\
++	__gpio = GPIO_2_6;			\
++	break;					\
 +	case MX25_PAD_A21__GPIO_2_7:		\
-+		__gpio = GPIO_2_7;		\
-+		break;				\
++	__gpio = GPIO_2_7;			\
++	break;					\
 +	case MX25_PAD_A22__GPIO_2_8:		\
-+		__gpio = GPIO_2_8;		\
-+		break;				\
++	__gpio = GPIO_2_8;			\
++	break;					\
 +	case MX25_PAD_A23__GPIO_2_9:		\
-+		__gpio = GPIO_2_9;		\
-+		break;				\
++	__gpio = GPIO_2_9;			\
++	break;					\
 +	case MX25_PAD_A24__GPIO_2_10:		\
-+		__gpio = GPIO_2_10;		\
-+		break;				\
++	__gpio = GPIO_2_10;			\
++	break;					\
 +	case MX25_PAD_A25__GPIO_2_11:		\
-+		__gpio = GPIO_2_11;		\
-+		break;				\
++	__gpio = GPIO_2_11;			\
++	break;					\
 +	case MX25_PAD_EB0__GPIO_2_12:		\
-+		__gpio = GPIO_2_12;		\
-+		break;				\
++	__gpio = GPIO_2_12;			\
++	break;					\
 +	case MX25_PAD_EB1__GPIO_2_13:		\
-+		__gpio = GPIO_2_13;		\
-+		break;				\
++	__gpio = GPIO_2_13;			\
++	break;					\
 +	case MX25_PAD_OE__GPIO_2_14:		\
-+		__gpio = GPIO_2_14;		\
-+		break;				\
++	__gpio = GPIO_2_14;			\
++	break;					\
 +	case MX25_PAD_LD0__GPIO_2_15:		\
-+		__gpio = GPIO_2_15;		\
-+		break;				\
++	__gpio = GPIO_2_15;			\
++	break;					\
 +	case MX25_PAD_LD1__GPIO_2_16:		\
-+		__gpio = GPIO_2_16;		\
-+		break;				\
++	__gpio = GPIO_2_16;			\
++	break;					\
 +	case MX25_PAD_LD2__GPIO_2_17:		\
-+		__gpio = GPIO_2_17;		\
-+		break;				\
++	__gpio = GPIO_2_17;			\
++	break;					\
 +	case MX25_PAD_LD3__GPIO_2_18:		\
-+		__gpio = GPIO_2_18;		\
-+		break;				\
++	__gpio = GPIO_2_18;			\
++	break;					\
 +	case MX25_PAD_LD4__GPIO_2_19:		\
-+		__gpio = GPIO_2_19;		\
-+		break;				\
++	__gpio = GPIO_2_19;			\
++	break;					\
 +	case MX25_PAD_DE_B__GPIO_2_20:		\
-+		__gpio = GPIO_2_20;		\
-+		break;				\
++	__gpio = GPIO_2_20;			\
++	break;					\
 +	case MX25_PAD_CLKO__GPIO_2_21:		\
-+		__gpio = GPIO_2_21;		\
-+		break;				\
++	__gpio = GPIO_2_21;			\
++	break;					\
 +	case MX25_PAD_CSPI1_RDY__GPIO_2_22:	\
-+		__gpio = GPIO_2_22;		\
-+		break;				\
++	__gpio = GPIO_2_22;			\
++	break;					\
 +	case MX25_PAD_SD1_CMD__GPIO_2_23:	\
-+		__gpio = GPIO_2_23;		\
-+		break;				\
++	__gpio = GPIO_2_23;			\
++	break;					\
 +	case MX25_PAD_SD1_CLK__GPIO_2_24:	\
-+		__gpio = GPIO_2_24;		\
-+		break;				\
++	__gpio = GPIO_2_24;			\
++	break;					\
 +	case MX25_PAD_SD1_DATA0__GPIO_2_25:	\
-+		__gpio = GPIO_2_25;		\
-+		break;				\
++	__gpio = GPIO_2_25;			\
++	break;					\
 +	case MX25_PAD_SD1_DATA1__GPIO_2_26:	\
-+		__gpio = GPIO_2_26;		\
-+		break;				\
++	__gpio = GPIO_2_26;			\
++	break;					\
 +	case MX25_PAD_SD1_DATA2__GPIO_2_27:	\
-+		__gpio = GPIO_2_27;		\
-+		break;				\
++	__gpio = GPIO_2_27;			\
++	break;					\
 +	case MX25_PAD_SD1_DATA3__GPIO_2_28:	\
-+		__gpio = GPIO_2_28;		\
-+		break;				\
++	__gpio = GPIO_2_28;			\
++	break;					\
 +	case MX25_PAD_KPP_ROW0__GPIO_2_29:	\
-+		__gpio = GPIO_2_29;		\
-+		break;				\
++	__gpio = GPIO_2_29;			\
++	break;					\
 +	case MX25_PAD_KPP_ROW1__GPIO_2_30:	\
-+		__gpio = GPIO_2_30;		\
-+		break;				\
++	__gpio = GPIO_2_30;			\
++	break;					\
 +	case MX25_PAD_KPP_ROW2__GPIO_2_31:	\
-+		__gpio = GPIO_2_31;		\
-+		break;				\
++	__gpio = GPIO_2_31;			\
++	break;					\
 +						\
 +	case MX25_PAD_KPP_ROW3__GPIO_3_0:	\
-+		__gpio = GPIO_3_0;		\
-+		break;				\
++	__gpio = GPIO_3_0;			\
++	break;					\
 +	case MX25_PAD_KPP_COL0__GPIO_3_1:	\
-+		__gpio = GPIO_3_1;		\
-+		break;				\
++	__gpio = GPIO_3_1;			\
++	break;					\
 +	case MX25_PAD_KPP_COL1__GPIO_3_2:	\
-+		__gpio = GPIO_3_2;		\
-+		break;				\
++	__gpio = GPIO_3_2;			\
++	break;					\
 +	case MX25_PAD_KPP_COL2__GPIO_3_3:	\
-+		__gpio = GPIO_3_3;		\
-+		break;				\
++	__gpio = GPIO_3_3;			\
++	break;					\
 +	case MX25_PAD_KPP_COL3__GPIO_3_4:	\
-+		__gpio = GPIO_3_4;		\
-+		break;				\
++	__gpio = GPIO_3_4;			\
++	break;					\
 +	case MX25_PAD_FEC_MDC__GPIO_3_5:	\
-+		__gpio = GPIO_3_5;		\
-+		break;				\
++	__gpio = GPIO_3_5;			\
++	break;					\
 +	case MX25_PAD_FEC_MDIO__GPIO_3_6:	\
-+		__gpio = GPIO_3_6;		\
-+		break;				\
++	__gpio = GPIO_3_6;			\
++	break;					\
 +	case MX25_PAD_FEC_TDATA0__GPIO_3_7:	\
-+		__gpio = GPIO_3_7;		\
-+		break;				\
++	__gpio = GPIO_3_7;			\
++	break;					\
 +	case MX25_PAD_FEC_TDATA1__GPIO_3_8:	\
-+		__gpio = GPIO_3_8;		\
-+		break;				\
++	__gpio = GPIO_3_8;			\
++	break;					\
 +	case MX25_PAD_FEC_TX_EN__GPIO_3_9:	\
-+		__gpio = GPIO_3_9;		\
-+		break;				\
++	__gpio = GPIO_3_9;			\
++	break;					\
 +	case MX25_PAD_FEC_RDATA0__GPIO_3_10:	\
-+		__gpio = GPIO_3_10;		\
-+		break;				\
++	__gpio = GPIO_3_10;			\
++	break;					\
 +	case MX25_PAD_FEC_RDATA1__GPIO_3_11:	\
-+		__gpio = GPIO_3_11;		\
-+		break;				\
++	__gpio = GPIO_3_11;			\
++	break;					\
 +	case MX25_PAD_FEC_RX_DV__GPIO_3_12:	\
-+		__gpio = GPIO_3_12;		\
-+		break;				\
++	__gpio = GPIO_3_12;			\
++	break;					\
 +	case MX25_PAD_FEC_TX_CLK__GPIO_3_13:	\
-+		__gpio = GPIO_3_13;		\
-+		break;				\
++	__gpio = GPIO_3_13;			\
++	break;					\
 +	case MX25_PAD_RTCK__GPIO_3_14:		\
-+		__gpio = GPIO_3_14;		\
-+		break;				\
++	__gpio = GPIO_3_14;			\
++	break;					\
 +	case MX25_PAD_EXT_ARMCLK__GPIO_3_15:	\
-+		__gpio = GPIO_3_15;		\
-+		break;				\
++	__gpio = GPIO_3_15;			\
++	break;					\
 +	case MX25_PAD_UPLL_BYPCLK__GPIO_3_16:	\
-+		__gpio = GPIO_3_16;		\
-+		break;				\
++	__gpio = GPIO_3_16;			\
++	break;					\
 +	case MX25_PAD_VSTBY_REQ__GPIO_3_17:	\
-+		__gpio = GPIO_3_17;		\
-+		break;				\
++	__gpio = GPIO_3_17;			\
++	break;					\
 +	case MX25_PAD_VSTBY_ACK__GPIO_3_18:	\
-+		__gpio = GPIO_3_18;		\
-+		break;				\
++	__gpio = GPIO_3_18;			\
++	break;					\
 +	case MX25_PAD_POWER_FAIL__GPIO_3_19:	\
-+		__gpio = GPIO_3_19;		\
-+		break;				\
++	__gpio = GPIO_3_19;			\
++	break;					\
 +	case MX25_PAD_CS4__GPIO_3_20:		\
-+		__gpio = GPIO_3_20;		\
-+		break;				\
++	__gpio = GPIO_3_20;			\
++	break;					\
 +	case MX25_PAD_CS5__GPIO_3_21:		\
-+		__gpio = GPIO_3_21;		\
-+		break;				\
++	__gpio = GPIO_3_21;			\
++	break;					\
 +	case MX25_PAD_NF_CE0__GPIO_3_22:	\
-+		__gpio = GPIO_3_22;		\
-+		break;				\
++	__gpio = GPIO_3_22;			\
++	break;					\
 +	case MX25_PAD_ECB__GPIO_3_23:		\
-+		__gpio = GPIO_3_23;		\
-+		break;				\
++	__gpio = GPIO_3_23;			\
++	break;					\
 +	case MX25_PAD_LBA__GPIO_3_24:		\
-+		__gpio = GPIO_3_24;		\
-+		break;				\
++	__gpio = GPIO_3_24;			\
++	break;					\
 +	case MX25_PAD_RW__GPIO_3_25:		\
-+		__gpio = GPIO_3_25;		\
-+		break;				\
++	__gpio = GPIO_3_25;			\
++	break;					\
 +	case MX25_PAD_NFWE_B__GPIO_3_26:	\
-+		__gpio = GPIO_3_26;		\
-+		break;				\
++	__gpio = GPIO_3_26;			\
++	break;					\
 +	case MX25_PAD_NFRE_B__GPIO_3_27:	\
-+		__gpio = GPIO_3_27;		\
-+		break;				\
++	__gpio = GPIO_3_27;			\
++	break;					\
 +	case MX25_PAD_NFALE__GPIO_3_28:		\
-+		__gpio = GPIO_3_28;		\
-+		break;				\
++	__gpio = GPIO_3_28;			\
++	break;					\
 +	case MX25_PAD_NFCLE__GPIO_3_29:		\
-+		__gpio = GPIO_3_29;		\
-+		break;				\
++	__gpio = GPIO_3_29;			\
++	break;					\
 +	case MX25_PAD_NFWP_B__GPIO_3_30:	\
-+		__gpio = GPIO_3_30;		\
-+		break;				\
++	__gpio = GPIO_3_30;			\
++	break;					\
 +	case MX25_PAD_NFRB__GPIO_3_31:		\
-+		__gpio = GPIO_3_31;		\
-+		break;				\
++	__gpio = GPIO_3_31;			\
++	break;					\
 +						\
 +	case MX25_PAD_A10__GPIO_4_0:		\
-+		__gpio = GPIO_4_0;		\
-+		break;				\
++	__gpio = GPIO_4_0;			\
++	break;					\
 +	case MX25_PAD_A13__GPIO_4_1:		\
-+		__gpio = GPIO_4_1;		\
-+		break;				\
++	__gpio = GPIO_4_1;			\
++	break;					\
 +	case MX25_PAD_CS0__GPIO_4_2:		\
-+		__gpio = GPIO_4_2;		\
-+		break;				\
++	__gpio = GPIO_4_2;			\
++	break;					\
 +	case MX25_PAD_CS1__GPIO_4_3:		\
-+		__gpio = GPIO_4_3;		\
-+		break;				\
++	__gpio = GPIO_4_3;			\
++	break;					\
 +	case MX25_PAD_BCLK__GPIO_4_4:		\
-+		__gpio = GPIO_4_4;		\
-+		break;				\
++	__gpio = GPIO_4_4;			\
++	break;					\
 +	case MX25_PAD_D15__GPIO_4_5:		\
-+		__gpio = GPIO_4_5;		\
-+		break;				\
++	__gpio = GPIO_4_5;			\
++	break;					\
 +	case MX25_PAD_D14__GPIO_4_6:		\
-+		__gpio = GPIO_4_6;		\
-+		break;				\
++	__gpio = GPIO_4_6;			\
++	break;					\
 +	case MX25_PAD_D13__GPIO_4_7:		\
-+		__gpio = GPIO_4_7;		\
-+		break;				\
++	__gpio = GPIO_4_7;			\
++	break;					\
 +	case MX25_PAD_D12__GPIO_4_8:		\
-+		__gpio = GPIO_4_8;		\
-+		break;				\
++	__gpio = GPIO_4_8;			\
++	break;					\
 +	case MX25_PAD_D11__GPIO_4_9:		\
-+		__gpio = GPIO_4_9;		\
-+		break;				\
++	__gpio = GPIO_4_9;			\
++	break;					\
 +	case MX25_PAD_D10__GPIO_4_10:		\
-+		__gpio = GPIO_4_10;		\
-+		break;				\
++	__gpio = GPIO_4_10;			\
++	break;					\
 +	case MX25_PAD_D9__GPIO_4_11:		\
-+		__gpio = GPIO_4_11;		\
-+		break;				\
++	__gpio = GPIO_4_11;			\
++	break;					\
 +	case MX25_PAD_D8__GPIO_4_12:		\
-+		__gpio = GPIO_4_12;		\
-+		break;				\
++	__gpio = GPIO_4_12;			\
++	break;					\
 +	case MX25_PAD_D7__GPIO_4_13:		\
-+		__gpio = GPIO_4_13;		\
-+		break;				\
++	__gpio = GPIO_4_13;			\
++	break;					\
 +	case MX25_PAD_D6__GPIO_4_14:		\
-+		__gpio = GPIO_4_14;		\
-+		break;				\
++	__gpio = GPIO_4_14;			\
++	break;					\
 +	case MX25_PAD_D5__GPIO_4_15:		\
-+		__gpio = GPIO_4_15;		\
-+		break;				\
++	__gpio = GPIO_4_15;			\
++	break;					\
 +	case MX25_PAD_D4__GPIO_4_16:		\
-+		__gpio = GPIO_4_16;		\
-+		break;				\
++	__gpio = GPIO_4_16;			\
++	break;					\
 +	case MX25_PAD_D3__GPIO_4_17:		\
-+		__gpio = GPIO_4_17;		\
-+		break;				\
++	__gpio = GPIO_4_17;			\
++	break;					\
 +	case MX25_PAD_D2__GPIO_4_18:		\
-+		__gpio = GPIO_4_18;		\
-+		break;				\
++	__gpio = GPIO_4_18;			\
++	break;					\
 +	case MX25_PAD_D1__GPIO_4_19:		\
-+		__gpio = GPIO_4_19;		\
-+		break;				\
++	__gpio = GPIO_4_19;			\
++	break;					\
 +	case MX25_PAD_D0__GPIO_4_20:		\
-+		__gpio = GPIO_4_20;		\
-+		break;				\
++	__gpio = GPIO_4_20;			\
++	break;					\
 +	case MX25_PAD_CSI_D9__GPIO_4_21:	\
-+		__gpio = GPIO_4_21;		\
-+		break;				\
++	__gpio = GPIO_4_21;			\
++	break;					\
 +	case MX25_PAD_UART1_RXD__GPIO_4_22:	\
-+		__gpio = GPIO_4_22;		\
-+		break;				\
++	__gpio = GPIO_4_22;			\
++	break;					\
 +	case MX25_PAD_UART1_TXD__GPIO_4_23:	\
-+		__gpio = GPIO_4_23;		\
-+		break;				\
++	__gpio = GPIO_4_23;			\
++	break;					\
 +	case MX25_PAD_UART1_RTS__GPIO_4_24:	\
-+		__gpio = GPIO_4_24;		\
-+		break;				\
++	__gpio = GPIO_4_24;			\
++	break;					\
 +	case MX25_PAD_UART1_CTS__GPIO_4_25:	\
-+		__gpio = GPIO_4_25;		\
-+		break;				\
++	__gpio = GPIO_4_25;			\
++	break;					\
 +	case MX25_PAD_UART2_RXD__GPIO_4_26:	\
-+		__gpio = GPIO_4_26;		\
-+		break;				\
++	__gpio = GPIO_4_26;			\
++	break;					\
 +	case MX25_PAD_UART2_TXD__GPIO_4_27:	\
-+		__gpio = GPIO_4_27;		\
-+		break;				\
++	__gpio = GPIO_4_27;			\
++	break;					\
 +	case MX25_PAD_UART2_RTS__GPIO_4_28:	\
-+		__gpio = GPIO_4_28;		\
-+		break;				\
++	__gpio = GPIO_4_28;			\
++	break;					\
 +	case MX25_PAD_UART2_CTS__GPIO_4_29:	\
-+		__gpio = GPIO_4_29;		\
-+		break;				\
++	__gpio = GPIO_4_29;			\
++	break;					\
 +	case MX25_PAD_BOOT_MODE0__GPIO_4_30:	\
-+		__gpio = GPIO_4_30;		\
-+		break;				\
++	__gpio = GPIO_4_30;			\
++	break;					\
 +	case MX25_PAD_BOOT_MODE1__GPIO_4_31:	\
-+		__gpio = GPIO_4_31;		\
-+		break;				\
++	__gpio = GPIO_4_31;			\
++	break;					\
 +	}					\
 +	__gpio;					\
 +})
-+#endif
 +
 +#endif // __ASSEMBLY__
 +#endif // __IOMUX_MX25_H__
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/iomux-v3.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/iomux-v3.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/iomux-v3.h	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/iomux-v3.h	2009-06-02 18:02:08.000000000 +0200
-@@ -54,7 +54,7 @@ struct pad_desc {
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/iomux-v3.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/iomux-v3.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/iomux-v3.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/iomux-v3.h	2009-06-25 15:27:32.000000000 +0200
+@@ -52,44 +52,63 @@ struct pad_desc {
+ 	unsigned pad_ctrl:17;
+ 	unsigned select_input_ofs:12; /* IOMUXC_SELECT_INPUT offset */
  	unsigned select_input:3;
++#ifdef IOMUX_DEBUG
++	char *name;
++#endif
  };
  
 -#define IOMUX_PAD(_pad_ctrl_ofs, _mux_ctrl_ofs, _mux_mode, _select_input_ofs, \
-+#define IOMUX_PAD(_pad, _func, _pad_ctrl_ofs, _mux_ctrl_ofs, _mux_mode, _select_input_ofs, \
- 		_select_input, _pad_ctrl)				\
- 		{							\
- 			.mux_ctrl_ofs     = _mux_ctrl_ofs,		\
-@@ -68,28 +68,28 @@ struct pad_desc {
+-		_select_input, _pad_ctrl)				\
+-		{							\
+-			.mux_ctrl_ofs     = _mux_ctrl_ofs,		\
+-			.mux_mode         = _mux_mode,			\
+-			.pad_ctrl_ofs     = _pad_ctrl_ofs,		\
+-			.pad_ctrl         = _pad_ctrl,			\
+-			.select_input_ofs = _select_input_ofs,		\
+-			.select_input     = _select_input,		\
++#ifdef IOMUX_DEBUG
++#define MXC_PAD_NAME(pd)	(pd)->name
++#define IOMUX_PAD(_pad, _func, _pad_ctrl_ofs, _mux_ctrl_ofs, _mux_mode, _select_input_ofs,	\
++		_select_input, _pad_ctrl)							\
++		{										\
++			.mux_ctrl_ofs     = _mux_ctrl_ofs,					\
++			.mux_mode         = _mux_mode,						\
++			.pad_ctrl_ofs     = _pad_ctrl_ofs,					\
++			.pad_ctrl         = _pad_ctrl,						\
++			.select_input_ofs = _select_input_ofs,					\
++			.select_input     = _select_input,					\
++			.name		  = #_pad"__"#_func,					\
+ 		}
++#else
++#define MXC_PAD_NAME(pd)	""
++#define IOMUX_PAD(_pad, _func, _pad_ctrl_ofs, _mux_ctrl_ofs, _mux_mode, _select_input_ofs,	\
++		_select_input, _pad_ctrl)							\
++		{										\
++			.mux_ctrl_ofs     = _mux_ctrl_ofs,					\
++			.mux_mode         = _mux_mode,						\
++			.pad_ctrl_ofs     = _pad_ctrl_ofs,					\
++			.pad_ctrl         = _pad_ctrl,						\
++			.select_input_ofs = _select_input_ofs,					\
++			.select_input     = _select_input,					\
++		}
++#endif
+ 
  /*
   * Use to set PAD control
   */
@@ -8929,9 +7980,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/iomux-v3.h linux-2.6.
  
  /*
   * setups a single pad:
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/iomux.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/iomux.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/iomux.h	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/iomux.h	2009-06-02 18:02:08.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/iomux.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/iomux.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/iomux.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/iomux.h	2009-06-02 18:02:08.000000000 +0200
 @@ -24,10 +24,14 @@
  *  GPIO Module and I/O Multiplexer
  *  x = 0..3 for reg_A, reg_B, reg_C, reg_D
@@ -8976,9 +8027,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/iomux.h linux-2.6.30-
  #endif
  
  
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/irqs.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/irqs.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/irqs.h	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/irqs.h	2009-06-02 18:02:09.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/irqs.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/irqs.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/irqs.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/irqs.h	2009-06-02 18:02:09.000000000 +0200
 @@ -21,7 +21,11 @@
  #if defined CONFIG_ARCH_MX1
  #define MXC_GPIO_IRQS		(32 * 4)
@@ -8991,9 +8042,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/irqs.h linux-2.6.30-r
  #elif defined CONFIG_ARCH_MX3
  #define MXC_GPIO_IRQS		(32 * 3)
  #endif
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/memory.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/memory.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/memory.h	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/memory.h	2009-06-02 18:02:09.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/memory.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/memory.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/memory.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/memory.h	2009-06-02 18:02:09.000000000 +0200
 @@ -14,12 +14,13 @@
  #if defined CONFIG_ARCH_MX1
  #define PHYS_OFFSET		UL(0x08000000)
@@ -9012,10 +8063,10 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/memory.h linux-2.6.30
  #elif defined CONFIG_ARCH_MX3
  #define PHYS_OFFSET		UL(0x80000000)
  #endif
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/mx25.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/mx25.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/mx25.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/mx25.h	2009-06-02 18:02:13.000000000 +0200
-@@ -0,0 +1,482 @@
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/mx25.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/mx25.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/mx25.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/mx25.h	2009-07-01 11:21:51.000000000 +0200
+@@ -0,0 +1,483 @@
 +/*
 + * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
 + */
@@ -9097,7 +8148,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/mx25.h linux-2.6.30-r
 +#define I2C_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00080000)
 +#define I2C3_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00084000)
 +#define CAN1_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00088000)
-+#define CAN3_BASE_ADDR		(AIPS1_BASE_ADDR + 0x0008C000)
++#define CAN2_BASE_ADDR		(AIPS1_BASE_ADDR + 0x0008C000)
 +#define UART1_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00090000)
 +#define UART2_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00094000)
 +#define I2C2_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00098000)
@@ -9217,7 +8268,8 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/mx25.h linux-2.6.30-r
 +#define RTIC_BASE_ADDR			(AIPS2_BASE_ADDR + 0x000EC000)
 +#define IIM_BASE_ADDR			(AIPS2_BASE_ADDR + 0x000F0000)
 +#define USBOTG_BASE_ADDR		(AIPS2_BASE_ADDR + 0x000F4000)
-+#define OTG_BASE_ADDR			USBOTG_BASE_ADDR
++#define OTG_BASE_ADDR			(USBOTG_BASE_ADDR + 0x000)
++#define USBH2_BASE_ADDR			(USBOTG_BASE_ADDR + 0x400)
 +#define CSI_BASE_ADDR			(AIPS2_BASE_ADDR + 0x000F8000)
 +#define DRYICE_BASE_ADDR		(AIPS2_BASE_ADDR + 0x000FC000)
 +
@@ -9424,7 +8476,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/mx25.h linux-2.6.30-r
 +#define MXC_INT_UART2			32
 +#define MXC_INT_NANDFC			33
 +#define MXC_INT_SDMA			34
-+#define MXC_INT_USB_HTG			35
++#define MXC_INT_USB_H2			35
 +#define MXC_INT_PWM2			36
 +#define MXC_INT_USB_OTG			37
 +#define MXC_INT_SLCDC			38
@@ -9498,9 +8550,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/mx25.h linux-2.6.30-r
 +#endif
 +
 +#endif /* __ASM_ARCH_MXC_MX25_H__ */
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/mx2x.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/mx2x.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/mx2x.h	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/mx2x.h	2009-06-02 18:02:11.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/mx2x.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/mx2x.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/mx2x.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/mx2x.h	2009-06-02 18:02:11.000000000 +0200
 @@ -79,7 +79,7 @@
   * This macro defines the physical to virtual address mapping for all the
   * peripheral modules. It is used by passing in the physical address as x
@@ -9519,9 +8571,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/mx2x.h linux-2.6.30-r
  
  /* define the address mapping macros: in physical address order */
  #define AIPI_IO_ADDRESS(x)  \
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/mxc.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/mxc.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/mxc.h	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/mxc.h	2009-06-02 18:02:12.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/mxc.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/mxc.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/mxc.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/mxc.h	2009-06-02 18:02:12.000000000 +0200
 @@ -27,6 +27,7 @@
  #define MXC_CPU_MX1		1
  #define MXC_CPU_MX21		21
@@ -9557,9 +8609,84 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/mxc.h linux-2.6.30-rc
 +#define cpu_is_mx2()	(cpu_is_mx21() || cpu_is_mx25() || cpu_is_mx27())
  
  #endif /*  __ASM_ARCH_MXC_H__ */
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/sdma.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/sdma.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/sdma.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/sdma.h	2009-06-02 18:02:13.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/mxc_can.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/mxc_can.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/mxc_can.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/mxc_can.h	2009-07-01 11:31:19.000000000 +0200
+@@ -0,0 +1,26 @@
++/*
++ * Copyright (C) 2009  Lothar Wassmann <LW@KARO-electronics.de>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * version 2 as published by the Free Software Foundation
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the:
++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
++ */
++
++#include <linux/platform_device.h>
++
++struct flexcan_platform_data {
++	char *core_reg;
++	char *io_reg;
++	int (*xcvr_enable)(struct platform_device *pdev, int en);
++	int (*active)(struct platform_device *pdev);
++	void (*inactive)(struct platform_device *pdev);
++};
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/mxc_ehci.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/mxc_ehci.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/mxc_ehci.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/mxc_ehci.h	2009-07-01 11:31:34.000000000 +0200
+@@ -0,0 +1,9 @@
++#ifndef __INCLUDE_ASM_ARCH_MXC_EHCI_H
++#define __INCLUDE_ASM_ARCH_MXC_EHCI_H
++
++struct mxc_usbh_platform_data {
++	int (*init)(struct platform_device *pdev);
++	int (*exit)(struct platform_device *pdev);
++};
++#endif /* __INCLUDE_ASM_ARCH_MXC_EHCI_H */
++
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/mxc_tsadcc.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/mxc_tsadcc.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/mxc_tsadcc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/mxc_tsadcc.h	2009-07-01 11:23:07.000000000 +0200
+@@ -0,0 +1,28 @@
++/*
++ *  Freescale i.MX25 Touch Screen Driver
++ *
++ *  Copyright (c) 2009 Lothar Wassmann <LW@KARO-electronics.de>
++ *
++ * Based on code from Freescale BSP
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License version 2 as
++ *  published by the Free Software Foundation.
++ */
++
++typedef enum {
++	MXC_TSC_4WIRE,
++	MXC_TSC_5WIRE,
++} mxc_tsc_mode;
++
++struct mxc_tsadcc_pdata {
++	int pen_debounce_time;	/* 0: disable debounce;
++				 * 1..128: # of ADC clock cycles / 8 */
++	unsigned int intref:1,	/* 0|1: internal reference disabled|enabled */
++		     hsyncen:1;	/* synchronize measurements with LCD HSYNC */
++	unsigned int r_xplate;	/* resistance (in Ohms) of X plate
++				 * (required for pressure measurement */
++	int adc_clk;		/* ADC clock frequency in Hz (max. 1750000);
++				 * <= 0: use default (1666667) */
++	mxc_tsc_mode tsc_mode;	/* select 4 wire or 5 wire mode */
++};
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/sdma.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/sdma.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/sdma.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/sdma.h	2009-06-02 18:02:13.000000000 +0200
 @@ -0,0 +1,504 @@
 +
 +/*
@@ -10065,9 +9192,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/sdma.h linux-2.6.30-r
 +#define DEFAULT_ERR     1
 +
 +#endif
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/spba.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/spba.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/spba.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/spba.h	2009-06-02 18:02:13.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/spba.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/spba.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/spba.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/spba.h	2009-06-02 18:02:13.000000000 +0200
 @@ -0,0 +1,66 @@
 +
 +/*
@@ -10135,9 +9262,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/spba.h linux-2.6.30-r
 +#endif				/* __KERNEL__ */
 +
 +#endif				/* __ASM_ARCH_MXC_SPBA_H__ */
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/timex.h linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/timex.h
---- linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/timex.h	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/timex.h	2009-06-02 18:02:12.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/timex.h linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/timex.h
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/include/mach/timex.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/include/mach/timex.h	2009-07-02 16:20:37.000000000 +0200
 @@ -23,7 +23,11 @@
  #if defined CONFIG_ARCH_MX1
  #define CLOCK_TICK_RATE		16000000
@@ -10145,14 +9272,14 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/include/mach/timex.h linux-2.6.30-
 +#ifndef CONFIG_MACH_MX25
  #define CLOCK_TICK_RATE		13300000
 +#else
-+#define CLOCK_TICK_RATE		12000000
++#define CLOCK_TICK_RATE		66500000
 +#endif
  #elif defined CONFIG_ARCH_MX3
  #define CLOCK_TICK_RATE		16625000
  #endif
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/iomux-mx1-mx2.c linux-2.6.30-rc4-karo/arch/arm/plat-mxc/iomux-mx1-mx2.c
---- linux-2.6.30-rc4/arch/arm/plat-mxc/iomux-mx1-mx2.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/iomux-mx1-mx2.c	2009-06-02 18:02:01.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/iomux-mx1-mx2.c linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/iomux-mx1-mx2.c
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/iomux-mx1-mx2.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/iomux-mx1-mx2.c	2009-06-02 18:02:01.000000000 +0200
 @@ -74,11 +74,12 @@ void mxc_gpio_mode(int gpio_mode)
  	__raw_writel(tmp, VA_GPIO_BASE + MXC_GIUS(port));
  
@@ -10182,9 +9309,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/iomux-mx1-mx2.c linux-2.6.30-rc4-k
  		tmp = __raw_readl(VA_GPIO_BASE + MXC_ICONFA2(port));
  		tmp &= ~(3 << (pin * 2));
  		tmp |= ((gpio_mode >> GPIO_AOUT_SHIFT) & 3) << (pin * 2);
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/iomux-v3.c linux-2.6.30-rc4-karo/arch/arm/plat-mxc/iomux-v3.c
---- linux-2.6.30-rc4/arch/arm/plat-mxc/iomux-v3.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/iomux-v3.c	2009-06-02 18:02:02.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/iomux-v3.c linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/iomux-v3.c
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/iomux-v3.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/iomux-v3.c	2009-06-02 18:02:02.000000000 +0200
 @@ -31,7 +31,24 @@
  
  #define IOMUX_BASE	IO_ADDRESS(IOMUXC_BASE_ADDR)
@@ -10241,9 +9368,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/iomux-v3.c linux-2.6.30-rc4-karo/a
  
  	clear_bit(pad_ofs >> 2, iomux_v3_pad_alloc_map);
  }
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/pwm.c linux-2.6.30-rc4-karo/arch/arm/plat-mxc/pwm.c
---- linux-2.6.30-rc4/arch/arm/plat-mxc/pwm.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/pwm.c	2009-06-02 18:02:02.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/pwm.c linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/pwm.c
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/pwm.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/pwm.c	2009-06-02 18:02:02.000000000 +0200
 @@ -55,7 +55,7 @@ int pwm_config(struct pwm_device *pwm, i
  	if (pwm == NULL || period_ns == 0 || duty_ns > period_ns)
  		return -EINVAL;
@@ -10253,9 +9380,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/pwm.c linux-2.6.30-rc4-karo/arch/a
  		unsigned long long c;
  		unsigned long period_cycles, duty_cycles, prescale;
  		c = clk_get_rate(pwm->clk);
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/spba.c linux-2.6.30-rc4-karo/arch/arm/plat-mxc/spba.c
---- linux-2.6.30-rc4/arch/arm/plat-mxc/spba.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/spba.c	2009-06-02 18:02:03.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/spba.c linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/spba.c
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/spba.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/spba.c	2009-06-02 18:02:03.000000000 +0200
 @@ -0,0 +1,143 @@
 +/*
 + * Copyright 2004-2008 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -10400,9 +9527,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/spba.c linux-2.6.30-rc4-karo/arch/
 +MODULE_AUTHOR("Freescale Semiconductor, Inc.");
 +MODULE_DESCRIPTION("SPBA");
 +MODULE_LICENSE("GPL");
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/system.c linux-2.6.30-rc4-karo/arch/arm/plat-mxc/system.c
---- linux-2.6.30-rc4/arch/arm/plat-mxc/system.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/system.c	2009-06-08 12:48:23.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/system.c linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/system.c
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/system.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/system.c	2009-06-29 10:49:32.000000000 +0200
 @@ -21,6 +21,7 @@
   */
  
@@ -10411,14 +9538,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/system.c linux-2.6.30-rc4-karo/arc
  #include <linux/clk.h>
  #include <linux/io.h>
  #include <linux/err.h>
-@@ -38,18 +39,15 @@
- #define WDOG_WCR_ENABLE		(1 << 2)
- #endif
- 
-+static struct clk *mxc_wdt_clk;
-+
- /*
-  * Reset the system. It is called by machine_restart().
+@@ -43,14 +44,6 @@
   */
  void arch_reset(char mode, const char *cmd)
  {
@@ -10429,35 +9549,36 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/system.c linux-2.6.30-rc4-karo/arc
 -		if (!IS_ERR(clk))
 -			clk_enable(clk);
 -	}
-+	if (mxc_wdt_clk)
-+		clk_enable(mxc_wdt_clk);
- 
+-
  	/* Assert SRS signal */
  	__raw_writew(WDOG_WCR_ENABLE, WDOG_WCR_REG);
-@@ -65,3 +63,20 @@ void arch_reset(char mode, const char *c
+ 
+@@ -65,3 +58,22 @@ void arch_reset(char mode, const char *c
  	/* we'll take a jump through zero as a poor second */
  	cpu_reset(0);
  }
 +
 +static int mxc_wdt_init(void)
 +{
++	struct clk *wdt_clk;
++
 +	if (cpu_is_mx1())
 +		return 0;
 +
-+	mxc_wdt_clk = clk_get_sys("imx-wdt.0", NULL);
-+	if (IS_ERR(mxc_wdt_clk)) {
-+		int ret = PTR_ERR(mxc_wdt_clk);
-+
-+		printk(KERN_ERR "%s: Failed to get imx-wdt.0 clk: %d\n", __FUNCTION__, ret);
-+		mxc_wdt_clk = NULL;
-+		return ret;
++	wdt_clk = clk_get_sys("imx-wdt.0", NULL);
++	if (IS_ERR(wdt_clk)) {
++		printk(KERN_ERR "%s: Failed to get imx-wdt.0 clk: %ld\n",
++		       __FUNCTION__, PTR_ERR(wdt_clk));
++		return PTR_ERR(wdt_clk);
 +	}
++	clk_enable(wdt_clk);
++	clk_put(wdt_clk);
 +	return 0;
 +}
 +arch_initcall(mxc_wdt_init);
-diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/time.c linux-2.6.30-rc4-karo/arch/arm/plat-mxc/time.c
---- linux-2.6.30-rc4/arch/arm/plat-mxc/time.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/plat-mxc/time.c	2009-06-02 18:02:02.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/plat-mxc/time.c linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/time.c
+--- linux-2.6.30-rc4-git/arch/arm/plat-mxc/time.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/plat-mxc/time.c	2009-07-06 14:12:36.000000000 +0200
 @@ -66,7 +66,7 @@ static inline void gpt_irq_disable(void)
  {
  	unsigned int tmp;
@@ -10524,23 +9645,7 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/time.c linux-2.6.30-rc4-karo/arch/
  		clockevent_mxc.set_next_event = mx3_set_next_event;
  
  	clockevent_mxc.mult = div_sc(c, NSEC_PER_SEC,
-@@ -287,6 +287,7 @@ void __init mxc_timer_init(struct clk *t
- 	int irq;
- 
- 	clk_enable(timer_clk);
-+printk(KERN_DEBUG "%s: \n", __FUNCTION__);
- 
- 	if (cpu_is_mx1()) {
- #ifdef CONFIG_ARCH_MX1
-@@ -306,6 +307,7 @@ void __init mxc_timer_init(struct clk *t
- 	} else
- 		BUG();
- 
-+printk(KERN_DEBUG "%s: timer_base=%p IRQ=%d\n", __FUNCTION__, timer_base, irq);
- 	/*
- 	 * Initialise to a known state (all timers off, and timing reset)
- 	 */
-@@ -313,7 +315,7 @@ void __init mxc_timer_init(struct clk *t
+@@ -313,7 +313,7 @@ void __init mxc_timer_init(struct clk *t
  	__raw_writel(0, timer_base + MXC_TCTL);
  	__raw_writel(0, timer_base + MXC_TPRER); /* see datasheet note */
  
@@ -10549,9 +9654,9 @@ diff -urNp linux-2.6.30-rc4/arch/arm/plat-mxc/time.c linux-2.6.30-rc4-karo/arch/
  		tctl_val = MX3_TCTL_CLK_IPG | MX3_TCTL_FRR | MX3_TCTL_WAITEN | MXC_TCTL_TEN;
  	else
  		tctl_val = MX1_2_TCTL_FRR | MX1_2_TCTL_CLK_PCLK1 | MXC_TCTL_TEN;
-diff -urNp linux-2.6.30-rc4/arch/arm/tools/mach-types linux-2.6.30-rc4-karo/arch/arm/tools/mach-types
---- linux-2.6.30-rc4/arch/arm/tools/mach-types	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/arch/arm/tools/mach-types	2009-06-02 18:02:54.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/arch/arm/tools/mach-types linux-2.6.30-rc4-karo3/arch/arm/tools/mach-types
+--- linux-2.6.30-rc4-git/arch/arm/tools/mach-types	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/arch/arm/tools/mach-types	2009-06-02 18:02:54.000000000 +0200
 @@ -12,7 +12,7 @@
  #
  #   http://www.arm.linux.org.uk/developer/machines/?action=new
@@ -10612,9 +9717,1207 @@ diff -urNp linux-2.6.30-rc4/arch/arm/tools/mach-types linux-2.6.30-rc4-karo/arch
 +pxa255			MACH_PXA255		PXA255			2180
 +lal43			MACH_LAL43		LAL43			2181
 +htcraphael_cdma500	MACH_HTCRAPHAEL_CDMA500	HTCRAPHAEL_CDMA500	2182
-diff -urNp linux-2.6.30-rc4/drivers/leds/leds-gpio.c linux-2.6.30-rc4-karo/drivers/leds/leds-gpio.c
---- linux-2.6.30-rc4/drivers/leds/leds-gpio.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/drivers/leds/leds-gpio.c	2009-06-02 18:36:36.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/drivers/input/touchscreen/Kconfig linux-2.6.30-rc4-karo3/drivers/input/touchscreen/Kconfig
+--- linux-2.6.30-rc4-git/drivers/input/touchscreen/Kconfig	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/input/touchscreen/Kconfig	2009-06-23 13:33:58.000000000 +0200
+@@ -287,6 +287,18 @@ config TOUCHSCREEN_ATMEL_TSADCC
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called atmel_tsadcc.
+ 
++config TOUCHSCREEN_MXC_TSADCC
++	tristate "i.MX25 Touchscreen Interface"
++	depends on MACH_MX25
++	help
++	  Say Y here if you have a 4-wire touchscreen connected to the
++          ADC Controller on your Freescale i.MX25 SoC.
++
++	  If unsure, say N.
++
++	  To compile this driver as a module, choose M here: the
++	  module will be called atmel_tsadcc.
++
+ config TOUCHSCREEN_UCB1400
+ 	tristate "Philips UCB1400 touchscreen"
+ 	depends on AC97_BUS
+diff -purN linux-2.6.30-rc4-git/drivers/input/touchscreen/Makefile linux-2.6.30-rc4-karo3/drivers/input/touchscreen/Makefile
+--- linux-2.6.30-rc4-git/drivers/input/touchscreen/Makefile	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/input/touchscreen/Makefile	2009-06-23 13:33:59.000000000 +0200
+@@ -16,19 +16,20 @@ obj-$(CONFIG_TOUCHSCREEN_GUNZE)		+= gunz
+ obj-$(CONFIG_TOUCHSCREEN_ELO)		+= elo.o
+ obj-$(CONFIG_TOUCHSCREEN_FUJITSU)	+= fujitsu_ts.o
+ obj-$(CONFIG_TOUCHSCREEN_INEXIO)	+= inexio.o
+-obj-$(CONFIG_TOUCHSCREEN_MIGOR)		+= migor_ts.o
+-obj-$(CONFIG_TOUCHSCREEN_MTOUCH)	+= mtouch.o
+-obj-$(CONFIG_TOUCHSCREEN_MK712)		+= mk712.o
+ obj-$(CONFIG_TOUCHSCREEN_HP600)		+= hp680_ts_input.o
+ obj-$(CONFIG_TOUCHSCREEN_HP7XX)		+= jornada720_ts.o
+ obj-$(CONFIG_TOUCHSCREEN_HTCPEN)	+= htcpen.o
+-obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE)	+= usbtouchscreen.o
++obj-$(CONFIG_TOUCHSCREEN_MIGOR)		+= migor_ts.o
++obj-$(CONFIG_TOUCHSCREEN_MTOUCH)	+= mtouch.o
++obj-$(CONFIG_TOUCHSCREEN_MK712)		+= mk712.o
++obj-$(CONFIG_TOUCHSCREEN_MXC_TSADCC)	+= mxc_tsadcc.o
+ obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)	+= penmount.o
+ obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213)	+= touchit213.o
+ obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)	+= touchright.o
+ obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)	+= touchwin.o
+ obj-$(CONFIG_TOUCHSCREEN_TSC2007)	+= tsc2007.o
+ obj-$(CONFIG_TOUCHSCREEN_UCB1400)	+= ucb1400_ts.o
++obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE)	+= usbtouchscreen.o
+ obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001)	+= wacom_w8001.o
+ obj-$(CONFIG_TOUCHSCREEN_WM97XX)	+= wm97xx-ts.o
+ obj-$(CONFIG_TOUCHSCREEN_DA9034)	+= da9034-ts.o
+diff -purN linux-2.6.30-rc4-git/drivers/input/touchscreen/mxc_tsadcc.c linux-2.6.30-rc4-karo3/drivers/input/touchscreen/mxc_tsadcc.c
+--- linux-2.6.30-rc4-git/drivers/input/touchscreen/mxc_tsadcc.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/drivers/input/touchscreen/mxc_tsadcc.c	2009-07-01 11:27:20.000000000 +0200
+@@ -0,0 +1,897 @@
++/*
++ *  Freescale i.MX25 Touch Screen Driver
++ *
++ *  Copyright (c) 2009 Lothar Wassmann <LW@KARO-electronics.de>
++ *
++ * Based on atmel_tsadcc.c
++ *  Copyright (c) 2008 ATMEL et. al.
++ * and code from Freescale BSP
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License version 2 as
++ *  published by the Free Software Foundation.
++ */
++
++#include <linux/module.h>
++#include <linux/err.h>
++#include <linux/input.h>
++#include <linux/timer.h>
++#include <linux/interrupt.h>
++#include <linux/clk.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <mach/mxc_tsadcc.h>
++
++#include "mxc_tsadcc.h"
++
++#define TSC_NUM_SAMPLES		1
++#define ADC_NUM_SAMPLES		1
++
++#ifdef DEBUG
++static int debug = 4;
++#define dbg_lvl(n)	((n) < debug)
++module_param(debug, int, S_IRUGO | S_IWUSR);
++
++#define DBG(lvl, fmt...)	do { if (dbg_lvl(lvl)) printk(KERN_DEBUG fmt); } while (0)
++#else
++static int debug;
++#define dbg_lvl(n)	0
++module_param(debug, int, 0);
++
++#define DBG(lvl, fmt...)	do { } while (0)
++#endif
++
++#define DEFAULT_ADC_CLOCK	1666667
++#define DEFAULT_RX_VALUE	360
++
++//#define REPORT_PRESSURE
++
++struct mxc_tsadcc_fifo_data {
++	unsigned int id:4,
++		data:12;
++};
++
++/* The layout of this structure depends on the setup created by mxc_tsadcc_config() */
++struct mxc_tsadcc_tsc_data {
++	struct mxc_tsadcc_fifo_data pendown[TSC_NUM_SAMPLES];
++	struct mxc_tsadcc_fifo_data pos_x[TSC_NUM_SAMPLES];
++	struct mxc_tsadcc_fifo_data pos_y[TSC_NUM_SAMPLES];
++#ifdef REPORT_PRESSURE
++	struct mxc_tsadcc_fifo_data yn[TSC_NUM_SAMPLES];
++	struct mxc_tsadcc_fifo_data xp[TSC_NUM_SAMPLES];
++#endif
++	struct mxc_tsadcc_fifo_data pendown2[TSC_NUM_SAMPLES];
++};
++
++struct mxc_tsadcc_adc_data {
++	struct mxc_tsadcc_fifo_data data[ADC_NUM_SAMPLES];
++};
++
++struct mxc_tsadcc {
++	struct input_dev	*input;
++	char			phys[32];
++	void __iomem		*reg_base;
++	struct clk		*clk;
++	int			irq;
++	struct work_struct	work;
++	struct timer_list	timer;
++	wait_queue_head_t	wq;
++	unsigned int		pendown:1,
++				clk_enabled:1,
++				attrs:1,
++				valid_measure:1;
++	mxc_tsc_mode		tsc_mode;
++	struct mxc_tsadcc_tsc_data *tsc_data;
++	struct mxc_tsadcc_adc_data *adc_data;
++	unsigned int		r_xplate;
++
++	struct mutex		convert_mutex;
++	unsigned short		pressure;
++	unsigned short		prev_absx;
++	unsigned short		prev_absy;
++};
++
++#ifdef DEBUG
++#define mxc_tsadcc_read(s,reg)		_mxc_tsadcc_read(s,reg,#reg,__FUNCTION__)
++#define mxc_tsadcc_write(s,reg,val)	_mxc_tsadcc_write(s,reg,val,#reg,__FUNCTION__)
++
++static inline unsigned long _mxc_tsadcc_read(struct mxc_tsadcc *ts_dev, int reg,
++				   const char *name, const char *fn)
++{
++	unsigned long val = __raw_readl(ts_dev->reg_base + reg);
++	DBG(3, "%s: Read %08lx from %s\n", fn, val, name);
++	return val;
++}
++
++static inline void _mxc_tsadcc_write(struct mxc_tsadcc *ts_dev, int reg, unsigned long val,
++				     const char *name, const char *fn)
++{
++	__raw_writel(val, ts_dev->reg_base + reg);
++	DBG(3, "%s: Wrote %08lx to %s\n", fn, val, name);
++}
++#else
++static inline unsigned long mxc_tsadcc_read(struct mxc_tsadcc *ts_dev, int reg)
++{
++	return __raw_readl(ts_dev->reg_base + reg);
++}
++static inline void mxc_tsadcc_write(struct mxc_tsadcc *ts_dev, int reg, unsigned long val)
++{
++	__raw_writel(val, ts_dev->reg_base + reg);
++}
++#endif
++
++static void tsc_clk_enable(struct mxc_tsadcc *ts_dev)
++{
++	if (!ts_dev->clk_enabled) {
++		unsigned long reg;
++		clk_enable(ts_dev->clk);
++
++		reg = mxc_tsadcc_read(ts_dev, TGCR);
++		reg |= TGCR_IPG_CLK_EN;
++		mxc_tsadcc_write(ts_dev, TGCR, reg);
++		ts_dev->clk_enabled = 1;
++	}
++}
++
++static void tsc_clk_disable(struct mxc_tsadcc *ts_dev)
++{
++	if (ts_dev->clk_enabled) {
++		unsigned long reg;
++
++		reg = mxc_tsadcc_read(ts_dev, TGCR);
++		reg &= ~TGCR_IPG_CLK_EN;
++		mxc_tsadcc_write(ts_dev, TGCR, reg);
++
++		clk_disable(ts_dev->clk);
++		ts_dev->clk_enabled = 0;
++	}
++}
++
++static inline int mxc_tsadcc_pendown(struct mxc_tsadcc *ts_dev)
++{
++	return ts_dev->pendown;
++}
++
++static int mxc_tsadcc_read_adc(struct mxc_tsadcc *ts_dev, int chan)
++{
++	int ret = 1;
++	unsigned long reg;
++	unsigned int data_num = 0;
++	int i;
++	union {
++		unsigned int fifo[sizeof(struct mxc_tsadcc_tsc_data) / sizeof(int)];
++		struct mxc_tsadcc_tsc_data data;
++	} *fifo_data = (void *)ts_dev->adc_data;
++	struct mxc_tsadcc_adc_data *adc_data = ts_dev->adc_data;
++	int lastitemid = 0;
++	struct input_dev *input_dev = ts_dev->input;
++	long timeout = msecs_to_jiffies(1 * ADC_NUM_SAMPLES);
++
++	mutex_lock(&ts_dev->convert_mutex);
++	reg = (0xf << CQCR_FIFOWATERMARK_SHIFT) |
++		(lastitemid << CQCR_LAST_ITEM_ID_SHIFT) | CQCR_QSM_FQS;
++	mxc_tsadcc_write(ts_dev, GCQCR, reg);
++
++	reg = ((ADC_NUM_SAMPLES - 1) << CC_NOS_SHIFT) |
++		(16 << CC_SETTLING_TIME_SHIFT) |
++		CC_YPLLSW_OFF | CC_XNURSW_OFF | CC_XPULSW |
++		CC_SELREFP_INT | chan | CC_SEL_REFN_AGND;
++	mxc_tsadcc_write(ts_dev, GCC0, reg);
++
++	memset(adc_data, 0, sizeof(*adc_data));
++
++	reg = mxc_tsadcc_read(ts_dev, GCQCR);
++	reg |= CQCR_FQS;
++	mxc_tsadcc_write(ts_dev, GCQCR, reg);
++
++	/* enable end of conversion interrupt */
++	reg = mxc_tsadcc_read(ts_dev, GCQMR);
++	reg &= ~CQMR_EOQ_IRQ_MSK;
++	mxc_tsadcc_write(ts_dev, GCQMR, reg);
++
++	timeout = wait_event_timeout(ts_dev->wq,
++				     mxc_tsadcc_read(ts_dev, GCQSR) &
++				     CQSR_EOQ, timeout);
++	if (timeout == 0 &&
++	    !(mxc_tsadcc_read(ts_dev, GCQSR) & CQSR_EOQ)) {
++		dev_err(&input_dev->dev,
++			"Timeout waiting for data on channel %d\n",
++			chan);
++		ret = -ETIME;
++		goto exit;
++	}
++
++	reg = mxc_tsadcc_read(ts_dev, GCQCR);
++	reg &= ~CQCR_FQS;
++	mxc_tsadcc_write(ts_dev, GCQCR, reg);
++	reg = mxc_tsadcc_read(ts_dev, GCQSR);
++
++	/* clear interrupt status bit */
++	reg = CQSR_EOQ;
++	mxc_tsadcc_write(ts_dev, GCQSR, reg);
++
++	while (!(mxc_tsadcc_read(ts_dev, GCQSR) & CQSR_EMPT)) {
++		BUG_ON(data_num >= ARRAY_SIZE(fifo_data->fifo));
++		reg = mxc_tsadcc_read(ts_dev, GCQFIFO);
++		fifo_data->fifo[data_num] = reg;
++		data_num++;
++	}
++	DBG(0, "%s: Read %u words from fifo\n", __FUNCTION__, data_num);
++	for (i = 0; i < data_num; i++) {
++		DBG(0, "%s: data[%d]=%03x ID %d\n", __FUNCTION__, i,
++		    adc_data->data[i].data, adc_data->data[i].id);
++	}
++ exit:
++	mutex_unlock(&ts_dev->convert_mutex);
++
++	return ret;
++}
++
++struct mxc_tsadcc_attr {
++	struct device_attribute attr;
++	unsigned int reg;
++};
++
++#define to_mxc_tsadcc_attr(a)		container_of(a, struct mxc_tsadcc_attr, attr)
++
++#define MXC_TSADCC_DEV_ATTR(_name, _mode, _reg, _read, _write)	\
++	struct mxc_tsadcc_attr mxc_tsadcc_attr_##_name = {	\
++		.attr = __ATTR(_name,_mode,_read,_write),	\
++		.reg = _reg,					\
++	}
++
++static ssize_t mxc_tsadcc_attr_get(struct device *dev, struct device_attribute *attr, char *buf)
++{
++	ssize_t ret = -EIO;
++	struct mxc_tsadcc *ts_dev = dev_get_drvdata(dev);
++	struct mxc_tsadcc_attr *mxc_tsadcc_attr = to_mxc_tsadcc_attr(attr);
++
++	if (mxc_tsadcc_read_adc(ts_dev, mxc_tsadcc_attr->reg)) {
++		ret = sprintf(buf, "0x%04x\n", ts_dev->adc_data->data[0].data);
++	}
++	return ret;
++}
++
++#if 0
++static ssize_t mxc_tsadcc_attr_set(struct device *dev, struct device_attribute *attr,
++			       const char *buf, size_t count)
++{
++	ssize_t ret;
++	struct mxc_tsadcc *ts_dev = dev_get_drvdata(dev);
++	struct mxc_tsadcc_attr *mxc_tsadcc_attr = to_mxc_tsadcc_attr(attr);
++	unsigned long val = simple_strtoul(buf, NULL, 0);
++
++	mxc_tsadcc_write(ts_dev, mxc_tsadcc_attr->reg, val);
++	return count;
++}
++#endif
++
++MXC_TSADCC_DEV_ATTR(inaux0, S_IRUGO, CC_SELIN_INAUX0, mxc_tsadcc_attr_get, NULL);
++MXC_TSADCC_DEV_ATTR(inaux1, S_IRUGO, CC_SELIN_INAUX1, mxc_tsadcc_attr_get, NULL);
++MXC_TSADCC_DEV_ATTR(inaux2, S_IRUGO, CC_SELIN_INAUX2, mxc_tsadcc_attr_get, NULL);
++
++static struct attribute *mxc_tsadcc_attrs[] = {
++	&mxc_tsadcc_attr_inaux0.attr.attr,
++	&mxc_tsadcc_attr_inaux1.attr.attr,
++	&mxc_tsadcc_attr_inaux2.attr.attr,
++	NULL
++};
++
++static const struct attribute_group mxc_tsadcc_attr_group = {
++	.attrs = mxc_tsadcc_attrs,
++};
++
++static int mxc_tsadcc_read_ts(struct mxc_tsadcc *ts_dev, int force)
++{
++	int ret;
++	unsigned long reg;
++	unsigned int data_num = 0;
++	union {
++		unsigned int fifo[sizeof(struct mxc_tsadcc_tsc_data) / sizeof(int)];
++		struct mxc_tsadcc_tsc_data data;
++	} *fifo_data = (void *)ts_dev->tsc_data;
++	struct mxc_tsadcc_tsc_data *tsc_data = ts_dev->tsc_data;
++	struct input_dev *input_dev = ts_dev->input;
++	long timeout = msecs_to_jiffies(1 * TSC_NUM_SAMPLES);
++
++	mutex_lock(&ts_dev->convert_mutex);
++	memset(tsc_data, 0, sizeof(*tsc_data));
++	if (force) {
++		reg = (0x1 << CC_YPLLSW_SHIFT) | (0x1 << CC_XNURSW_SHIFT) |
++		      CC_XPULSW;
++		mxc_tsadcc_write(ts_dev, TICR, reg);
++
++		/* FQS */
++		reg = mxc_tsadcc_read(ts_dev, TCQCR);
++		reg &= ~CQCR_QSM_MASK;
++		reg |= CQCR_QSM_FQS;
++		mxc_tsadcc_write(ts_dev, TCQCR, reg);
++		reg = mxc_tsadcc_read(ts_dev, TCQCR);
++		reg |= CQCR_FQS;
++		mxc_tsadcc_write(ts_dev, TCQCR, reg);
++
++		timeout = wait_event_timeout(ts_dev->wq,
++					     mxc_tsadcc_read(ts_dev, TCQSR) &
++					     CQSR_EOQ, timeout);
++		if (timeout == 0 &&
++		    !(mxc_tsadcc_read(ts_dev, TCQSR) & CQSR_EOQ)) {
++			dev_err(&input_dev->dev,
++				"Timeout waiting for TSC data\n");
++			ret = -ETIME;
++			goto exit;
++		}
++
++		/* stop FQS */
++		reg = mxc_tsadcc_read(ts_dev, TCQCR);
++		reg &= ~CQCR_QSM_MASK;
++		mxc_tsadcc_write(ts_dev, TCQCR, reg);
++		reg = mxc_tsadcc_read(ts_dev, TCQCR);
++		reg &= ~CQCR_FQS;
++		mxc_tsadcc_write(ts_dev, TCQCR, reg);
++
++		/* clear status bit */
++		reg = mxc_tsadcc_read(ts_dev, TCQSR);
++		reg = CQSR_EOQ;
++		mxc_tsadcc_write(ts_dev, TCQSR, reg);
++	} else {
++		/* Config idle for 4-wire */
++		reg = TSC_4WIRE_TOUCH_DETECT;
++		mxc_tsadcc_write(ts_dev, TICR, reg);
++
++		/* Pen interrupt starts new conversion queue */
++		reg = mxc_tsadcc_read(ts_dev, TCQCR);
++		reg &= ~CQCR_QSM_MASK;
++		reg |= CQCR_QSM_PEN;
++		mxc_tsadcc_write(ts_dev, TCQCR, reg);
++
++		/* PDEN and PDBEN */
++		reg = mxc_tsadcc_read(ts_dev, TGCR);
++		reg |= (TGCR_PDB_EN | TGCR_PD_EN);
++		mxc_tsadcc_write(ts_dev, TGCR, reg);
++
++		wait_event_timeout(ts_dev->wq,
++				   mxc_tsadcc_read(ts_dev, TCQSR) &
++				   CQSR_EOQ, timeout);
++		if (timeout == 0 &&
++		    !(mxc_tsadcc_read(ts_dev, TCQSR) & CQSR_EOQ)) {
++			dev_err(&input_dev->dev,
++				"Timeout waiting for TSC data\n");
++			ret = -ETIME;
++			goto exit;
++		}
++
++		/* stop the conversion */
++		reg = mxc_tsadcc_read(ts_dev, TCQCR);
++		reg &= ~CQCR_QSM_MASK;
++		mxc_tsadcc_write(ts_dev, TCQCR, reg);
++
++		/* clear interrupt status flags */
++		reg = CQSR_PD | CQSR_EOQ;
++		mxc_tsadcc_write(ts_dev, TCQSR, reg);
++
++		/* change configuration for FQS mode */
++		reg = (0x1 << CC_YPLLSW_SHIFT) | (0x1 << CC_XNURSW_SHIFT) |
++		      CC_XPULSW;
++		mxc_tsadcc_write(ts_dev, TICR, reg);
++	}
++
++	while (!(mxc_tsadcc_read(ts_dev, TCQSR) & CQSR_EMPT)) {
++		BUG_ON(data_num >= ARRAY_SIZE(fifo_data->fifo));
++		reg = mxc_tsadcc_read(ts_dev, TCQFIFO);
++		fifo_data->fifo[data_num] = reg;
++		data_num++;
++	}
++	DBG(0, "%s: Read %u words from fifo\n", __FUNCTION__, data_num);
++
++	ret = tsc_data->pendown[0].data <= 0x600 &&
++		tsc_data->pendown2[0].data <= 0x600;
++
++	if (ret) {
++		DBG(0, "%s: pos_x=%03x pos_y=%03x\n",
++		    __FUNCTION__, tsc_data->pos_x[0].data,
++		    tsc_data->pos_y[0].data);
++#ifdef REPORT_PRESSURE
++		DBG(0, "%s: pos_x=%03x pos_y=%03x xp=%03x yn=%03x\n",
++		    __FUNCTION__, tsc_data->xp[0].data,
++		    tsc_data->yn[0].data);
++#endif
++		if (/*(mxc_tsadcc_read(ts_dev, TCQSR) & CQSR_PD) && */
++		    tsc_data->pos_x[0].data &&
++		    tsc_data->pos_x[1].data &&
++		    tsc_data->pos_x[2].data) {
++#ifdef REPORT_PRESSURE
++			ts_dev->pressure = ts_dev->r_xplate *
++				(tsc_data->pos_x[0].data / 4096) *
++				((tsc_data->yn[0].data - tsc_data->xp[0].data) /
++				 tsc_data->xp[0].data);
++#else
++			ts_dev->pressure = 4095;
++#endif
++			DBG(0, "%s: Detected PEN DOWN with pressure %03x\n",
++			    __FUNCTION__, ts_dev->pressure);
++			ts_dev->pendown = 1;
++		} else {
++			DBG(0, "%s: Detected PEN UP\n", __FUNCTION__);
++			ts_dev->pendown = 0;
++		}
++	} else {
++		DBG(0, "%s: Discarding measurement\n", __FUNCTION__);
++		ts_dev->pendown = 0;
++	}
++ exit:
++	mutex_unlock(&ts_dev->convert_mutex);
++
++	return ret;
++}
++
++static inline void mxc_tsadcc_enable_pendown(struct mxc_tsadcc *ts_dev)
++{
++	unsigned long reg;
++
++	/* Config idle for 4-wire */
++	reg = TSC_4WIRE_TOUCH_DETECT;
++	mxc_tsadcc_write(ts_dev, TICR, reg);
++
++	DBG(0, "%s: Enable PD detect\n", __FUNCTION__);
++	reg = mxc_tsadcc_read(ts_dev, TGCR);
++	reg |= TGCR_PD_EN;
++	mxc_tsadcc_write(ts_dev, TGCR, reg);
++}
++
++static void mxc_tsadcc_work(struct work_struct *w)
++{
++	struct mxc_tsadcc *ts_dev = container_of(w, struct mxc_tsadcc, work);
++	struct input_dev *input_dev = ts_dev->input;
++
++	if (mxc_tsadcc_read_ts(ts_dev, 1)) {
++		DBG(0, "%s: Got sample %d\n", __FUNCTION__, ts_dev->pendown);
++		if (mxc_tsadcc_pendown(ts_dev)) {
++			if (!ts_dev->valid_measure) {
++				ts_dev->valid_measure = 1;
++			} else {
++				DBG(0, "%s: Reporting PD event %03x @ %03x,%03x\n",
++				    __FUNCTION__, ts_dev->pressure,
++				    ts_dev->tsc_data->pos_x[0].data,
++				    ts_dev->tsc_data->pos_y[0].data);
++
++				input_report_abs(input_dev, ABS_X,
++						 ts_dev->tsc_data->pos_x[0].data);
++				input_report_abs(input_dev, ABS_Y,
++						 ts_dev->tsc_data->pos_y[0].data);
++#ifdef REPORT_PRESSURE
++				input_report_abs(input_dev, ABS_PRESSURE,
++						 ts_dev->pressure);
++#endif
++				input_report_key(input_dev, BTN_TOUCH, 1);
++				input_sync(input_dev);
++			}
++			ts_dev->prev_absx = ts_dev->tsc_data->pos_x[0].data;
++			ts_dev->prev_absy = ts_dev->tsc_data->pos_y[0].data;
++			DBG(0, "%s: Enabling timer\n", __FUNCTION__);
++			mod_timer(&ts_dev->timer, jiffies +
++				  msecs_to_jiffies(10));
++			return;
++		}
++	}
++	if (ts_dev->valid_measure) {
++		DBG(0, "%s: Reporting PU event: %03x,%03x\n", __FUNCTION__,
++		    ts_dev->prev_absx, ts_dev->prev_absy);
++		input_report_abs(input_dev, ABS_X,
++				 ts_dev->prev_absx);
++		input_report_abs(input_dev, ABS_Y,
++				 ts_dev->prev_absy);
++#ifdef REPORT_PRESSURE
++		input_report_abs(input_dev, ABS_PRESSURE, 0);
++#endif
++		input_report_key(input_dev, BTN_TOUCH, 0);
++		input_sync(input_dev);
++	}
++	ts_dev->valid_measure = 0;
++	mxc_tsadcc_enable_pendown(ts_dev);
++}
++
++static void mxc_tsadcc_timer(unsigned long data)
++{
++	struct mxc_tsadcc *ts_dev = (void *)data;
++	schedule_work(&ts_dev->work);
++}
++
++static irqreturn_t mxc_tsadcc_interrupt(int irq, void *dev)
++{
++	struct mxc_tsadcc *ts_dev = dev;
++	//struct input_dev *input_dev = ts_dev->input;
++	unsigned long reg;
++	unsigned long status = mxc_tsadcc_read(ts_dev, TGSR);
++
++	DBG(0, "%s: TCSR= %08lx\n", __FUNCTION__, status);
++
++	if (status & TGSR_TCQ_INT) {
++		DBG(0, "%s: TCQSR=%08lx\n", __FUNCTION__,
++		    mxc_tsadcc_read(ts_dev, TCQSR));
++		reg = mxc_tsadcc_read(ts_dev, TCQSR);
++		if (reg & CQSR_PD) {
++			/* disable pen down detect */
++			DBG(0, "%s: Disable PD detect\n", __FUNCTION__);
++			reg = mxc_tsadcc_read(ts_dev, TGCR);
++			reg &= ~TGCR_PD_EN;
++			mxc_tsadcc_write(ts_dev, TGCR, reg);
++
++			/* Now schedule new measurement */
++			schedule_work(&ts_dev->work);
++		}
++	}
++	if (status & TGSR_GCQ_INT) {
++		DBG(0, "%s: GCQSR=%08lx\n", __FUNCTION__,
++		    mxc_tsadcc_read(ts_dev, GCQSR));
++		reg = mxc_tsadcc_read(ts_dev, GCQSR);
++		if (reg & CQSR_EOQ) {
++			reg = mxc_tsadcc_read(ts_dev, GCQMR);
++			reg |= CQMR_EOQ_IRQ_MSK;
++			mxc_tsadcc_write(ts_dev, GCQMR, reg);
++		}
++	}
++	return IRQ_HANDLED;
++}
++
++static void mxc_tsadcc_4wire_config(struct mxc_tsadcc *ts_dev)
++{
++	unsigned long reg;
++	int lastitemid;
++
++	/* Level sense */
++	reg = mxc_tsadcc_read(ts_dev, TCQCR);
++	reg |= CQCR_PD_CFG;
++	reg |= (0xf << CQCR_FIFOWATERMARK_SHIFT);  /* watermark */
++	mxc_tsadcc_write(ts_dev, TCQCR, reg);
++
++	/* Configure 4-wire */
++	reg = TSC_4WIRE_PRECHARGE;
++	reg |= CC_IGS;
++	mxc_tsadcc_write(ts_dev, TCC0, reg);
++
++	reg = TSC_4WIRE_TOUCH_DETECT;
++	reg |= (TSC_NUM_SAMPLES - 1) << CC_NOS_SHIFT;	/* 4 samples */
++	reg |= 32 << CC_SETTLING_TIME_SHIFT;	/* it's important! */
++	mxc_tsadcc_write(ts_dev, TCC1, reg);
++
++	reg = TSC_4WIRE_X_MEASURE;
++	reg |= (TSC_NUM_SAMPLES - 1) << CC_NOS_SHIFT;	/* 4 samples */
++	reg |= 16 << CC_SETTLING_TIME_SHIFT;	/* settling time */
++	mxc_tsadcc_write(ts_dev, TCC2, reg);
++
++	reg = TSC_4WIRE_Y_MEASURE;
++	reg |= (TSC_NUM_SAMPLES - 1) << CC_NOS_SHIFT;	/* 4 samples */
++	reg |= 16 << CC_SETTLING_TIME_SHIFT;	/* settling time */
++	mxc_tsadcc_write(ts_dev, TCC3, reg);
++
++	reg = TSC_4WIRE_YN_MEASURE;
++	reg |= (TSC_NUM_SAMPLES - 1) << CC_NOS_SHIFT;	/* 4 samples */
++	reg |= 16 << CC_SETTLING_TIME_SHIFT;	/* settling time */
++	mxc_tsadcc_write(ts_dev, TCC4, reg);
++
++	reg = TSC_4WIRE_XP_MEASURE;
++	reg |= (TSC_NUM_SAMPLES - 1) << CC_NOS_SHIFT;	/* 4 samples */
++	reg |= 16 << CC_SETTLING_TIME_SHIFT;	/* settling time */
++	mxc_tsadcc_write(ts_dev, TCC5, reg);
++
++	reg = (TCQ_ITEM_TCC0 << CQ_ITEM0_SHIFT) |
++		(TCQ_ITEM_TCC1 << CQ_ITEM1_SHIFT) |
++		(TCQ_ITEM_TCC2 << CQ_ITEM2_SHIFT) |
++		(TCQ_ITEM_TCC3 << CQ_ITEM3_SHIFT) |
++		(TCQ_ITEM_TCC0 << CQ_ITEM4_SHIFT) |
++		(TCQ_ITEM_TCC1 << CQ_ITEM5_SHIFT);
++	mxc_tsadcc_write(ts_dev, TCQ_ITEM_7_0, reg);
++
++	lastitemid = 5;
++	reg = mxc_tsadcc_read(ts_dev, TCQCR);
++	reg = (reg & ~CQCR_LAST_ITEM_ID_MASK) |
++	      (lastitemid << CQCR_LAST_ITEM_ID_SHIFT);
++	mxc_tsadcc_write(ts_dev, TCQCR, reg);
++
++	/* pen down enable */
++	reg = mxc_tsadcc_read(ts_dev, TCQCR);
++	reg &= ~CQCR_PD_MSK;
++	mxc_tsadcc_write(ts_dev, TCQCR, reg);
++	reg = mxc_tsadcc_read(ts_dev, TCQMR);
++	reg &= ~CQMR_PD_IRQ_MSK;
++	mxc_tsadcc_write(ts_dev, TCQMR, reg);
++
++	/* Config idle for 4-wire */
++	reg = TSC_4WIRE_TOUCH_DETECT;
++	mxc_tsadcc_write(ts_dev, TICR, reg);
++
++	/* Pen interrupt starts new conversion queue */
++	reg = mxc_tsadcc_read(ts_dev, TCQCR);
++	reg &= ~CQCR_QSM_MASK;
++	reg |= CQCR_QSM_PEN;
++	mxc_tsadcc_write(ts_dev, TCQCR, reg);
++}
++
++static void mxc_tsadcc_config(struct platform_device *pdev)
++{
++	struct mxc_tsadcc *ts_dev = platform_get_drvdata(pdev);
++	struct mxc_tsadcc_pdata *pdata = pdev->dev.platform_data;
++	unsigned int tgcr;
++	unsigned int pdbt;
++	unsigned int pdben;
++	unsigned int intref;
++	unsigned int adc_clk = DEFAULT_ADC_CLOCK;
++	unsigned long ipg_clk;
++	unsigned int clkdiv;
++
++	if (pdata) {
++		pdbt = pdata->pen_debounce_time - 1;
++		pdben = pdata->pen_debounce_time > 0;
++		intref = !!pdata->intref;
++		if (pdata->adc_clk > 0) {
++			adc_clk = pdata->adc_clk;
++		}
++		ts_dev->r_xplate = pdata->r_xplate;
++	} else {
++		dev_dbg(&pdev->dev, "No platform_data; using defaults\n");
++		pdbt = TGCR_PDBTIME128;
++		pdben = 1;
++		intref = 1;
++	}
++	if (ts_dev->r_xplate == 0) {
++		ts_dev->r_xplate = DEFAULT_RX_VALUE;
++		DBG(0, "%s: Assuming default Rx value of %u Ohms\n",
++		    __FUNCTION__, ts_dev->r_xplate);
++	}
++	ipg_clk = clk_get_rate(ts_dev->clk);
++	dev_info(&pdev->dev, "Master clock is: %lu.%06luMHz requested ADC clock: %u.%06uMHz\n",
++		 ipg_clk / 1000000, ipg_clk % 1000000,
++		 adc_clk / 1000000, adc_clk % 1000000);
++	/*
++	 * adc_clk = ipg_clk / (2 * clkdiv + 2)
++	 * The exact formula for the clock divider would be:
++	 * clkdiv = ipg_clk / (2 * adc_clk) - 1
++	 * but we drop the '- 1' due to integer truncation
++	 * and to make sure the actual clock is always less or equal
++	 * to the designated clock.
++	*/
++	clkdiv = ipg_clk / (2 * adc_clk + 1);
++	if (clkdiv > 31) {
++		clkdiv = 31;
++		dev_warn(&pdev->dev,
++			 "cannot accomodate designated clock of %u.%06uMHz; using %lu.%06luMHz\n",
++			 adc_clk / 1000000, adc_clk % 1000000,
++			 ipg_clk / (2 * clkdiv + 2) / 1000000,
++			 ipg_clk / (2 * clkdiv + 2) % 1000000);
++	} else {
++		dev_dbg(&pdev->dev,
++			"clkdiv=%u actual ADC clock: %lu.%06luMHz\n",
++			clkdiv, ipg_clk / (2 * (clkdiv + 1)) / 1000000,
++			ipg_clk / (2 * clkdiv + 2) % 1000000);
++	}
++
++	tgcr = ((pdbt << TGCR_PDBTIME_SHIFT) & TGCR_PDBTIME_MASK) | /* pen debounce time */
++		(pdben * TGCR_PDB_EN) | /* pen debounce enable */
++		(intref * TGCR_INTREFEN) | /* pen debounce enable */
++		TGCR_POWER_SAVE | /* Switch TSC on */
++		TGCR_PD_EN |	/* Enable Pen Detect */
++		((clkdiv << TGCR_ADCCLKCFG_SHIFT) & TGCR_ADCCLKCFG_MASK);
++
++	/* reset TSC */
++	mxc_tsadcc_write(ts_dev, TGCR, TGCR_TSC_RST);
++	while (mxc_tsadcc_read(ts_dev, TGCR) & TGCR_TSC_RST) {
++		cpu_relax();
++	}
++	mxc_tsadcc_write(ts_dev, TGCR, tgcr);
++
++	mxc_tsadcc_4wire_config(ts_dev);
++	tsc_clk_enable(ts_dev);
++}
++
++static int __devinit mxc_tsadcc_probe(struct platform_device *pdev)
++{
++	int err;
++	struct mxc_tsadcc *ts_dev;
++	struct input_dev *input_dev;
++	struct resource	*res;
++	int irq;
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!res) {
++		dev_err(&pdev->dev, "No mmio resource defined\n");
++		return -ENODEV;
++	}
++
++	irq = platform_get_irq(pdev, 0);
++	if (irq < 0) {
++		dev_err(&pdev->dev, "No IRQ assigned\n");
++		return -ENODEV;
++	}
++
++	if (!request_mem_region(res->start, resource_size(res),
++				"mxc tsadcc regs")) {
++		return -EBUSY;
++	}
++
++	/* Allocate memory for device */
++	ts_dev = kzalloc(sizeof(struct mxc_tsadcc), GFP_KERNEL);
++	if (!ts_dev) {
++		dev_err(&pdev->dev, "Failed to allocate memory\n");
++		err = -ENOMEM;
++		goto err_release_mem;
++	}
++
++	/* allocate conversion buffers separately to prevent
++	 * cacheline alignment issues when using DMA */
++	ts_dev->tsc_data = kzalloc(sizeof(struct mxc_tsadcc_tsc_data), GFP_KERNEL);
++	ts_dev->adc_data = kzalloc(sizeof(struct mxc_tsadcc_adc_data), GFP_KERNEL);
++	if (ts_dev->tsc_data == NULL || ts_dev->adc_data == NULL) {
++		err = -ENOMEM;
++		goto err_free_mem;
++	}
++	ts_dev->irq = irq;
++	INIT_WORK(&ts_dev->work, mxc_tsadcc_work);
++	mutex_init(&ts_dev->convert_mutex);
++	setup_timer(&ts_dev->timer, mxc_tsadcc_timer, (unsigned long)ts_dev);
++	init_waitqueue_head(&ts_dev->wq);
++
++	platform_set_drvdata(pdev, ts_dev);
++
++	input_dev = input_allocate_device();
++	if (!input_dev) {
++		dev_err(&pdev->dev, "Failed to allocate input device\n");
++		err = -ENOMEM;
++		goto err_free_mem;
++	}
++
++	ts_dev->reg_base = ioremap(res->start, resource_size(res));
++	if (!ts_dev->reg_base) {
++		dev_err(&pdev->dev, "Failed to map registers\n");
++		err = -ENOMEM;
++		goto err_free_dev;
++	}
++
++	err = request_irq(ts_dev->irq, mxc_tsadcc_interrupt, 0,
++			pdev->dev.driver->name, ts_dev);
++	if (err) {
++		dev_err(&pdev->dev, "Failed to install irq handler: %d\n", err);
++		goto err_unmap_regs;
++	}
++
++	ts_dev->clk = clk_get(&pdev->dev, NULL);
++	if (IS_ERR(ts_dev->clk)) {
++		dev_err(&pdev->dev, "Failed to get ts_clk\n");
++		err = PTR_ERR(ts_dev->clk);
++		goto err_free_irq;
++	}
++
++	ts_dev->input = input_dev;
++
++	snprintf(ts_dev->phys, sizeof(ts_dev->phys),
++		 "%s/input0", dev_name(&pdev->dev));
++
++	input_dev->name = "mxc touch screen controller";
++	input_dev->phys = ts_dev->phys;
++	input_dev->dev.parent = &pdev->dev;
++
++	input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
++	input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
++	input_dev->absbit[0] = BIT_MASK(ABS_X) |
++		BIT_MASK(ABS_Y) |
++		BIT_MASK(ABS_PRESSURE);
++
++	input_set_abs_params(input_dev, ABS_X, 0, 0xFFF, 0, 0);
++	input_set_abs_params(input_dev, ABS_Y, 0, 0xFFF, 0, 0);
++	input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xFFF, 0, 0);
++
++	mxc_tsadcc_config(pdev);
++
++	/* All went ok, so register to the input system */
++	err = input_register_device(input_dev);
++	if (err)
++		goto err_fail;
++
++	err = sysfs_create_group(&pdev->dev.kobj, &mxc_tsadcc_attr_group);
++	if (err) {
++		dev_warn(&pdev->dev, "Failed to create sysfs attributes: %d\n",
++			 err);
++	}
++	ts_dev->attrs = !err;
++
++	return 0;
++
++err_fail:
++	clk_disable(ts_dev->clk);
++	clk_put(ts_dev->clk);
++err_free_irq:
++	free_irq(ts_dev->irq, ts_dev);
++err_unmap_regs:
++	iounmap(ts_dev->reg_base);
++err_free_dev:
++	input_free_device(ts_dev->input);
++err_free_mem:
++	kfree(ts_dev->tsc_data);
++	kfree(ts_dev->adc_data);
++	kfree(ts_dev);
++err_release_mem:
++	release_mem_region(res->start, resource_size(res));
++	return err;
++}
++
++static int __devexit mxc_tsadcc_remove(struct platform_device *pdev)
++{
++	struct mxc_tsadcc *ts_dev = dev_get_drvdata(&pdev->dev);
++	struct resource *res;
++
++	if (ts_dev->attrs) {
++		DBG(0, "%s: Removing sysfs attributes\n", __FUNCTION__);
++		sysfs_remove_group(&pdev->dev.kobj, &mxc_tsadcc_attr_group);
++	}
++	del_timer_sync(&ts_dev->timer);
++	input_unregister_device(ts_dev->input);
++
++	clk_disable(ts_dev->clk);
++	clk_put(ts_dev->clk);
++
++	free_irq(ts_dev->irq, ts_dev);
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	iounmap(ts_dev->reg_base);
++	release_mem_region(res->start, resource_size(res));
++
++	kfree(ts_dev->tsc_data);
++	kfree(ts_dev->adc_data);
++	kfree(ts_dev);
++	return 0;
++}
++
++#ifdef CONFIG_PM
++static int mxc_tsadcc_suspend(struct platform_device *pdev, pm_message_t msg)
++{
++	struct mxc_tsadcc *ts_dev = dev_get_drvdata(&pdev->dev);
++
++	if (ts_dev->clk_enabled) {
++		tsc_clk_disable(ts_dev);
++		ts_dev->clk_enabled = 1;
++	}
++	return 0;
++}
++
++static int mxc_tsadcc_resume(struct platform_device *pdev)
++{
++	struct mxc_tsadcc *ts_dev = dev_get_drvdata(&pdev->dev);
++
++	if (ts_dev->clk_enabled) {
++		ts_dev->clk_enabled = 0;
++		tsc_clk_enable(ts_dev);
++	}
++	return 0;
++}
++#else
++#define mxc_tsadcc_suspend	NULL
++#define mxc_tsadcc_resume	NULL
++#endif
++
++static struct platform_driver mxc_tsadcc_driver = {
++	.probe		= mxc_tsadcc_probe,
++	.remove		= __devexit_p(mxc_tsadcc_remove),
++	.suspend	= mxc_tsadcc_suspend,
++	.resume		= mxc_tsadcc_resume,
++	.driver		= {
++		.name	= "mxc-tsadcc",
++	},
++};
++
++static int __init mxc_tsadcc_init(void)
++{
++	return platform_driver_register(&mxc_tsadcc_driver);
++}
++
++static void __exit mxc_tsadcc_exit(void)
++{
++	platform_driver_unregister(&mxc_tsadcc_driver);
++}
++
++module_init(mxc_tsadcc_init);
++module_exit(mxc_tsadcc_exit);
++
++
++MODULE_LICENSE("GPL");
++MODULE_DESCRIPTION("i.MX25 TouchScreen Driver");
++MODULE_AUTHOR("Lothar Wassmann <LW@KARO-electronics.de>");
++
+diff -purN linux-2.6.30-rc4-git/drivers/input/touchscreen/mxc_tsadcc.h linux-2.6.30-rc4-karo3/drivers/input/touchscreen/mxc_tsadcc.h
+--- linux-2.6.30-rc4-git/drivers/input/touchscreen/mxc_tsadcc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/drivers/input/touchscreen/mxc_tsadcc.h	2009-07-01 11:27:51.000000000 +0200
+@@ -0,0 +1,243 @@
++/*
++ *  Freescale i.MX25 Touch Screen Driver
++ *
++ *  Copyright (c) 2009 Lothar Wassmann <LW@KARO-electronics.de>
++ *
++ * Based on code from Freescale BSP
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License version 2 as
++ *  published by the Free Software Foundation.
++ */
++
++/* TSC General Config Register */
++#define TGCR			0x000
++#define TGCR_IPG_CLK_EN		(1 << 0)
++#define TGCR_TSC_RST		(1 << 1)
++#define TGCR_FUNC_RST		(1 << 2)
++#define TGCR_SLPC		(1 << 4)
++#define TGCR_STLC		(1 << 5)
++#define TGCR_HSYNC_EN		(1 << 6)
++#define TGCR_HSYNC_POL		(1 << 7)
++#define TGCR_POWERMODE_SHIFT	8
++#define TGCR_POWER_OFF		(0x0 << TGCR_POWERMODE_SHIFT)
++#define TGCR_POWER_SAVE		(0x1 << TGCR_POWERMODE_SHIFT)
++#define TGCR_POWER_ON		(0x3 << TGCR_POWERMODE_SHIFT)
++#define TGCR_POWER_MASK		(0x3 << TGCR_POWERMODE_SHIFT)
++#define TGCR_INTREFEN		(1 << 10)
++#define TGCR_ADCCLKCFG_SHIFT	16
++#define TGCR_ADCCLKCFG_MASK	(0x1f << TGCR_ADCCLKCFG_SHIFT)
++#define TGCR_PD_EN		(1 << 23)
++#define TGCR_PDB_EN		(1 << 24)
++#define TGCR_PDBTIME_SHIFT	25
++#define TGCR_PDBTIME128		(0x3f << TGCR_PDBTIME_SHIFT)
++#define TGCR_PDBTIME_MASK	(0x7f << TGCR_PDBTIME_SHIFT)
++
++/* TSC General Status Register */
++#define TGSR			0x004
++#define TGSR_TCQ_INT		(1 << 0)
++#define TGSR_GCQ_INT		(1 << 1)
++#define TGSR_SLP_INT		(1 << 2)
++#define TGSR_TCQ_DMA		(1 << 16)
++#define TGSR_GCQ_DMA		(1 << 17)
++
++/* TSC IDLE Config Register */
++#define TICR			0x008
++
++/* TouchScreen Convert Queue FIFO Register */
++#define TCQFIFO			0x400
++/* TouchScreen Convert Queue Control Register */
++#define TCQCR			0x404
++#define CQCR_QSM_SHIFT		0
++#define CQCR_QSM_STOP		(0x0 << CQCR_QSM_SHIFT)
++#define CQCR_QSM_PEN		(0x1 << CQCR_QSM_SHIFT)
++#define CQCR_QSM_FQS		(0x2 << CQCR_QSM_SHIFT)
++#define CQCR_QSM_FQS_PEN	(0x3 << CQCR_QSM_SHIFT)
++#define CQCR_QSM_MASK		(0x3 << CQCR_QSM_SHIFT)
++#define CQCR_FQS		(1 << 2)
++#define CQCR_RPT		(1 << 3)
++#define CQCR_LAST_ITEM_ID_SHIFT 4
++#define CQCR_LAST_ITEM_ID_MASK	(0xf << CQCR_LAST_ITEM_ID_SHIFT)
++#define CQCR_FIFOWATERMARK_SHIFT 8
++#define CQCR_FIFOWATERMARK_MASK (0xf << CQCR_FIFOWATERMARK_SHIFT)
++#define CQCR_REPEATWAIT_SHIFT	12
++#define CQCR_REPEATWAIT_MASK	(0xf << CQCR_REPEATWAIT_SHIFT)
++#define CQCR_QRST		(1 << 16)
++#define CQCR_FRST		(1 << 17)
++#define CQCR_PD_MSK		(1 << 18)
++#define CQCR_PD_CFG		(1 << 19)
++
++/* TouchScreen Convert Queue Status Register */
++#define TCQSR			0x408
++#define CQSR_PD			(1 << 0)
++#define CQSR_EOQ		(1 << 1)
++#define CQSR_FOR		(1 << 4)
++#define CQSR_FUR		(1 << 5)
++#define CQSR_FER		(1 << 6)
++#define CQSR_EMPT		(1 << 13)
++#define CQSR_FULL		(1 << 14)
++#define CQSR_FDRY		(1 << 15)
++
++/* TouchScreen Convert Queue Mask Register */
++#define TCQMR			0x40c
++#define CQMR_PD_IRQ_MSK		(1 << 0)
++#define CQMR_EOQ_IRQ_MSK	(1 << 1)
++#define CQMR_FOR_IRQ_MSK	(1 << 4)
++#define CQMR_FUR_IRQ_MSK	(1 << 5)
++#define CQMR_FER_IRQ_MSK	(1 << 6)
++#define CQMR_PD_DMA_MSK		(1 << 16)
++#define CQMR_EOQ_DMA_MSK	(1 << 17)
++#define CQMR_FOR_DMA_MSK	(1 << 20)
++#define CQMR_FUR_DMA_MSK	(1 << 21)
++#define CQMR_FER_DMA_MSK	(1 << 22)
++#define CQMR_FDRY_DMA_MSK	(1 << 31)
++
++/* TouchScreen Convert Queue ITEM 7~0 */
++#define TCQ_ITEM_7_0		0x420
++
++/* TouchScreen Convert Queue ITEM 15~8 */
++#define TCQ_ITEM_15_8		0x424
++
++#define TCQ_ITEM_TCC0		0x0
++#define TCQ_ITEM_TCC1		0x1
++#define TCQ_ITEM_TCC2		0x2
++#define TCQ_ITEM_TCC3		0x3
++#define TCQ_ITEM_TCC4		0x4
++#define TCQ_ITEM_TCC5		0x5
++#define TCQ_ITEM_TCC6		0x6
++#define TCQ_ITEM_TCC7		0x7
++#define TCQ_ITEM_GCC7		0x8
++#define TCQ_ITEM_GCC6		0x9
++#define TCQ_ITEM_GCC5		0xa
++#define TCQ_ITEM_GCC4		0xb
++#define TCQ_ITEM_GCC3		0xc
++#define TCQ_ITEM_GCC2		0xd
++#define TCQ_ITEM_GCC1		0xe
++#define TCQ_ITEM_GCC0		0xf
++
++/* TouchScreen Convert Config 0-7 */
++#define TCC0			0x440
++#define TCC1			0x444
++#define TCC2			0x448
++#define TCC3			0x44c
++#define TCC4			0x450
++#define TCC5			0x454
++#define TCC6			0x458
++#define TCC7			0x45c
++#define CC_PEN_IACK		(1 << 1)
++#define CC_SEL_REFN_SHIFT	2
++#define CC_SEL_REFN_YNLR	(0x1 << CC_SEL_REFN_SHIFT)
++#define CC_SEL_REFN_AGND	(0x2 << CC_SEL_REFN_SHIFT)
++#define CC_SEL_REFN_MASK	(0x3 << CC_SEL_REFN_SHIFT)
++#define CC_SELIN_SHIFT		4
++#define CC_SELIN_XPUL		(0x0 << CC_SELIN_SHIFT)
++#define CC_SELIN_YPLL		(0x1 << CC_SELIN_SHIFT)
++#define CC_SELIN_XNUR		(0x2 << CC_SELIN_SHIFT)
++#define CC_SELIN_YNLR		(0x3 << CC_SELIN_SHIFT)
++#define CC_SELIN_WIPER		(0x4 << CC_SELIN_SHIFT)
++#define CC_SELIN_INAUX0		(0x5 << CC_SELIN_SHIFT)
++#define CC_SELIN_INAUX1		(0x6 << CC_SELIN_SHIFT)
++#define CC_SELIN_INAUX2		(0x7 << CC_SELIN_SHIFT)
++#define CC_SELIN_MASK		(0x7 << CC_SELIN_SHIFT)
++#define CC_SELREFP_SHIFT	7
++#define CC_SELREFP_YPLL		(0x0 << CC_SELREFP_SHIFT)
++#define CC_SELREFP_XPUL		(0x1 << CC_SELREFP_SHIFT)
++#define CC_SELREFP_EXT		(0x2 << CC_SELREFP_SHIFT)
++#define CC_SELREFP_INT		(0x3 << CC_SELREFP_SHIFT)
++#define CC_SELREFP_MASK		(0x3 << CC_SELREFP_SHIFT)
++#define CC_XPULSW		(1 << 9)
++#define CC_XNURSW_SHIFT		10
++#define CC_XNURSW_HIGH		(0x0 << CC_XNURSW_SHIFT)
++#define CC_XNURSW_OFF		(0x1 << CC_XNURSW_SHIFT)
++#define CC_XNURSW_LOW		(0x3 << CC_XNURSW_SHIFT)
++#define CC_XNURSW_MASK		(0x3 << CC_XNURSW_SHIFT)
++#define CC_YPLLSW_SHIFT		12
++#define CC_YPLLSW_HIGH		(0x0 << CC_YPLLSW_SHIFT)
++#define CC_YPLLSW_OFF		(0x1 << CC_YPLLSW_SHIFT)
++#define CC_YPLLSW_LOW		(0x3 << CC_YPLLSW_SHIFT)
++#define CC_YPLLSW_MASK		(0x3 << CC_YPLLSW_SHIFT)
++#define CC_YNLRSW		(1 << 14)
++#define CC_WIPERSW		(1 << 15)
++#define CC_NOS_SHIFT		16
++#define CC_NOS_MASK		(0xf << CC_NOS_SHIFT)
++#define CC_IGS			(1 << 20)
++#define CC_SETTLING_TIME_SHIFT	24
++#define CC_SETTLING_TIME_MASK	(0xff << CC_SETTLING_TIME_SHIFT)
++
++#define TSC_4WIRE_PRECHARGE	0x158c
++#define TSC_4WIRE_TOUCH_DETECT	0x578e
++
++#define TSC_4WIRE_X_MEASURE	0x1c90
++#define TSC_4WIRE_Y_MEASURE	0x4604
++#define TSC_4WIRE_XP_MEASURE	0x0f8c
++#define TSC_4WIRE_YN_MEASURE	0x0fbc
++
++#define TSC_GENERAL_ADC_GCC0	0x17dc
++#define TSC_GENERAL_ADC_GCC1	0x17ec
++#define TSC_GENERAL_ADC_GCC2	0x17fc
++
++/* GeneralADC Convert Queue FIFO Register */
++#define GCQFIFO			0x800
++#define GCQFIFO_ADCOUT_SHIFT	4
++#define GCQFIFO_ADCOUT_MASK	(0xfff << GCQFIFO_ADCOUT_SHIFT)
++
++/* GeneralADC Convert Queue Control Register */
++#define GCQCR			0x804
++
++/* GeneralADC Convert Queue Status Register */
++#define GCQSR			0x808
++
++/* GeneralADC Convert Queue Mask Register */
++#define GCQMR			0x80c
++
++/* GeneralADC Convert Queue ITEM 7~0 */
++#define GCQ_ITEM_7_0		0x820
++
++/* GeneralADC Convert Queue ITEM 15~8 */
++#define GCQ_ITEM_15_8		0x824
++
++#define CQ_ITEM7_SHIFT		28
++#define CQ_ITEM6_SHIFT		24
++#define CQ_ITEM5_SHIFT		20
++#define CQ_ITEM4_SHIFT		16
++#define CQ_ITEM3_SHIFT		12
++#define CQ_ITEM2_SHIFT		 8
++#define CQ_ITEM1_SHIFT		 4
++#define CQ_ITEM0_SHIFT		 0
++
++#define CQ_ITEM8_SHIFT		28
++#define CQ_ITEM9_SHIFT		24
++#define CQ_ITEM10_SHIFT		20
++#define CQ_ITEM11_SHIFT		16
++#define CQ_ITEM12_SHIFT		12
++#define CQ_ITEM13_SHIFT		 8
++#define CQ_ITEM14_SHIFT		 4
++#define CQ_ITEM15_SHIFT		 0
++
++#define GCQ_ITEM_GCC0		0x0
++#define GCQ_ITEM_GCC1		0x1
++#define GCQ_ITEM_GCC2		0x2
++#define GCQ_ITEM_GCC3		0x3
++
++/* GeneralADC Convert Config 0-7 */
++#define GCC0			0x840
++#define GCC1			0x844
++#define GCC2			0x848
++#define GCC3			0x84c
++#define GCC4			0x850
++#define GCC5			0x854
++#define GCC6			0x858
++#define GCC7			0x85c
++
++/* TSC Test Register R/W */
++#define TTR			0xc00
++/* TSC Monitor Register 1, 2 */
++#define MNT1			0xc04
++#define MNT2			0xc04
++
++#define DETECT_ITEM_ID_1	1
++#define DETECT_ITEM_ID_2	5
++#define TS_X_ITEM_ID		2
++#define TS_Y_ITEM_ID		3
++#define TSI_DATA		1
++#define FQS_DATA		0
+diff -purN linux-2.6.30-rc4-git/drivers/leds/leds-gpio.c linux-2.6.30-rc4-karo3/drivers/leds/leds-gpio.c
+--- linux-2.6.30-rc4-git/drivers/leds/leds-gpio.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/leds/leds-gpio.c	2009-06-02 18:36:36.000000000 +0200
 @@ -82,7 +82,7 @@ static int __devinit create_gpio_led(con
  	if (!gpio_is_valid(template->gpio)) {
  		printk(KERN_INFO "Skipping unavilable LED gpio %d (%s)\n", 
@@ -10624,9 +10927,9 @@ diff -urNp linux-2.6.30-rc4/drivers/leds/leds-gpio.c linux-2.6.30-rc4-karo/drive
  	}
  
  	ret = gpio_request(template->gpio, template->name);
-diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/Kconfig linux-2.6.30-rc4-karo/drivers/mtd/nand/Kconfig
---- linux-2.6.30-rc4/drivers/mtd/nand/Kconfig	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/drivers/mtd/nand/Kconfig	2009-06-02 18:42:05.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/drivers/mtd/nand/Kconfig linux-2.6.30-rc4-karo3/drivers/mtd/nand/Kconfig
+--- linux-2.6.30-rc4-git/drivers/mtd/nand/Kconfig	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/mtd/nand/Kconfig	2009-06-02 18:42:05.000000000 +0200
 @@ -420,6 +420,27 @@ config MTD_NAND_MXC
  	  This enables the driver for the NAND flash controller on the
  	  MXC processors.
@@ -10655,15 +10958,18 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/Kconfig linux-2.6.30-rc4-karo/drive
  config MTD_NAND_SH_FLCTL
  	tristate "Support for NAND on Renesas SuperH FLCTL"
  	depends on MTD_NAND && SUPERH && CPU_SUBTYPE_SH7723
-diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/drivers/mtd/nand/mxc_nand.c
---- linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/drivers/mtd/nand/mxc_nand.c	2009-06-08 12:51:07.000000000 +0200
-@@ -34,23 +34,52 @@
+diff -purN linux-2.6.30-rc4-git/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo3/drivers/mtd/nand/mxc_nand.c
+--- linux-2.6.30-rc4-git/drivers/mtd/nand/mxc_nand.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/mtd/nand/mxc_nand.c	2009-07-14 14:10:27.000000000 +0200
+@@ -32,25 +32,58 @@
+ #include <linux/io.h>
+ 
  #include <asm/mach/flash.h>
++#include <mach/hardware.h>
  #include <mach/mxc_nand.h>
  
 +#ifdef CONFIG_MTD_DEBUG
-+static int debug = 0;
++static int debug;
 +module_param(debug, int, S_IRUGO | S_IWUSR);
 +
 +#define dbg_lvl(n)	((n) < debug)
@@ -10702,12 +11008,15 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 +#define NFC_FLASH_CMD		0x008
 +#define NFC_CONFIG		0x00A
 +#define NFC_ECC_STATUS_RESULT	0x00C
-+#define NFC_RSLTMAIN_AREA	0x00E
-+#define NFC_RSLTSPARE_AREA	0x010
 +#define NFC_WRPROT		0x012
 +#ifndef CONFIG_ARCH_MXC_HAS_NFC_V1_1
++#define NFC_RSLTMAIN_AREA	0x00E
++#define NFC_RSLTSPARE_AREA	0x010
 +#define NFC_UNLOCKSTART_BLKADDR	0x014
 +#define NFC_UNLOCKEND_BLKADDR	0x016
++#else
++#define NFC_ECC_STATUS_RESULT2	0x00E
++#define NFC_SPAS		0x010
 +#endif
 +#define NFC_NF_WRPRST		0x018
 +#define NFC_CONFIG1		0x01A
@@ -10725,7 +11034,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  
  /* Addresses for NFC RAM BUFFER Main area 0 */
  #define MAIN_AREA0		0x000
-@@ -59,10 +88,27 @@
+@@ -59,10 +92,27 @@
  #define MAIN_AREA3		0x600
  
  /* Addresses for NFC SPARE BUFFER Spare area 0 */
@@ -10753,7 +11062,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  
  /* Set INT to 0, FCMD to 1, rest to 0 in NFC_CONFIG2 Register
   * for Command operation */
-@@ -107,6 +153,7 @@ struct mxc_nand_host {
+@@ -107,10 +157,12 @@ struct mxc_nand_host {
  	struct device		*dev;
  
  	void __iomem		*regs;
@@ -10761,7 +11070,12 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  	int			spare_only;
  	int			status_request;
  	int			pagesize_2k;
-@@ -120,40 +167,149 @@ struct mxc_nand_host {
+ 	uint16_t		col_addr;
++	unsigned int		page_addr;
+ 	struct clk		*clk;
+ 	int			clk_act;
+ 	int			irq;
+@@ -120,40 +172,134 @@ struct mxc_nand_host {
  
  /* Define delays in microsec for NAND device operations */
  #define TROP_US_DELAY   2000
@@ -10776,31 +11090,23 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 +#ifndef CONFIG_ARCH_MXC_HAS_NFC_V1_1
  /* OOB placement block for use with hardware ecc generation */
 +static struct nand_ecclayout nand_hw_eccoob2k_8 = {
-+	.eccbytes = 5,
-+	.eccpos = {6, 7, 8, 9, 10},
-+	.oobfree = {{0, 5}, {11, 11}, {27, 11}, {43, 5}}
++	.eccbytes = 20,
++	.eccpos = {
++		6, 7, 8, 9, 10,
++		22, 23, 24, 25, 26,
++		38, 39, 40, 41, 42,
++		54, 55, 56, 57, 58,
++	},
++	.oobfree = {{2, 4}, {11, 11}, {27, 11}, {43, 11}, {59, 5}},
 +};
 +
  static struct nand_ecclayout nand_hw_eccoob_8 = {
  	.eccbytes = 5,
- 	.eccpos = {6, 7, 8, 9, 10},
+-	.eccpos = {6, 7, 8, 9, 10},
 -	.oobfree = {{0, 5}, {11, 5}, }
-+	.oobfree = {{0, 5}, {11, 5}}
++	.eccpos = { 6, 7, 8, 9, 10 },
++	.oobfree = {{0, 6}, {11, 5}}
 +};
-+
-+static struct nand_ecclayout nand_hw_eccoob2k_16 = {
-+	.eccbytes = 5,
-+	.eccpos = {6, 7, 8, 9, 10},
-+	.oobfree = {{0, 6}, {12, 10}, {28, 10}, {44, 4}}
- };
- 
- static struct nand_ecclayout nand_hw_eccoob_16 = {
- 	.eccbytes = 5,
- 	.eccpos = {6, 7, 8, 9, 10},
--	.oobfree = {{0, 6}, {12, 4}, }
-+	.oobfree = {{0, 6}, {12, 4}}
-+};
-+
 +#ifdef CONFIG_MTD_NAND_MXC_FLASH_BBT
 +static u8 bbt_pattern[] = {'B', 'b', 't', '0' };
 +static u8 mirror_pattern[] = {'1', 't', 'b', 'B' };
@@ -10815,6 +11121,10 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 +	.pattern = bbt_pattern,
  };
  
+-static struct nand_ecclayout nand_hw_eccoob_16 = {
+-	.eccbytes = 5,
+-	.eccpos = {6, 7, 8, 9, 10},
+-	.oobfree = {{0, 6}, {12, 4}, }
 +static struct nand_bbt_descr bbt_mirror_descr = {
 +	.options = (NAND_BBT_LASTBLOCK | NAND_BBT_WRITE |
 +		    NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP),
@@ -10830,29 +11140,22 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 + * OOB placement block for use with hardware ecc generation
 + */
 +static struct nand_ecclayout nand_hw_eccoob2k_8 = {
-+	.eccbytes = 9,
-+	.eccpos = {7, 8, 9, 10, 11, 12, 13, 14, 15},
++	.eccbytes = 36,
++	.eccpos = {
++		7, 8, 9, 10, 11, 12, 13, 14, 15,
++		23, 24, 25, 26, 27, 28, 29, 30, 31,
++		39, 40, 41, 42, 43, 44, 45, 46, 47,
++		55, 56, 57, 58, 59, 60, 61, 62, 63,
++	},
 +	.oobfree = {{2, 5}, {16, 7}, {32, 7}, {48, 7}},
 +};
 +
 +static struct nand_ecclayout nand_hw_eccoob_8 = {
 +	.eccbytes = 9,
-+	.eccpos = {7, 8, 9, 10, 11, 12, 13, 14, 15},
++	.eccpos = { 7, 8, 9, 10, 11, 12, 13, 14, 15, },
 +	.oobfree = {{0, 4}},
 +};
 +
-+static struct nand_ecclayout nand_hw_eccoob2k_16 = {
-+	.eccbytes = 9,
-+	.eccpos = {6, 7, 8, 9, 10, 11, 12, 13, 14},
-+	.oobfree = {{2, 4}, {17, 6}, {33, 6}, {47, 6}},
-+};
-+
-+static struct nand_ecclayout nand_hw_eccoob_16 = {
-+	.eccbytes = 9,
-+	.eccpos = {6, 7, 8, 9, 10, 11, 12, 13, 14},
-+	.oobfree = {{0, 3}}
-+};
-+
 +#ifdef CONFIG_MTD_NAND_MXC_FLASH_BBT
 +/* Generic flash bbt decriptors
 +*/
@@ -10867,8 +11170,8 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 +	.veroffs = 4,
 +	.maxblocks = 4,
 +	.pattern = bbt_pattern
-+};
-+
+ };
+ 
 +static struct nand_bbt_descr bbt_mirror_descr = {
 +	.options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE |
 +	NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
@@ -10923,7 +11226,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  
  	wake_up(&host->irq_waitq);
  
-@@ -166,35 +322,29 @@ static irqreturn_t mxc_nfc_irq(int irq, 
+@@ -166,35 +312,29 @@ static irqreturn_t mxc_nfc_irq(int irq, 
  static void wait_op_done(struct mxc_nand_host *host, int max_retries,
  				uint16_t param, int useirq)
  {
@@ -10977,7 +11280,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  	}
  }
  
-@@ -204,8 +354,9 @@ static void send_cmd(struct mxc_nand_hos
+@@ -204,8 +344,9 @@ static void send_cmd(struct mxc_nand_hos
  {
  	DEBUG(MTD_DEBUG_LEVEL3, "send_cmd(host, 0x%x, %d)\n", cmd, useirq);
  
@@ -10989,7 +11292,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  
  	/* Wait for operation to complete */
  	wait_op_done(host, TROP_US_DELAY, cmd, useirq);
-@@ -218,8 +369,9 @@ static void send_addr(struct mxc_nand_ho
+@@ -218,34 +359,72 @@ static void send_addr(struct mxc_nand_ho
  {
  	DEBUG(MTD_DEBUG_LEVEL3, "send_addr(host, 0x%x %d)\n", addr, islast);
  
@@ -11001,18 +11304,53 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  
  	/* Wait for operation to complete */
  	wait_op_done(host, TROP_US_DELAY, addr, islast);
-@@ -230,22 +382,28 @@ static void send_addr(struct mxc_nand_ho
+ }
+ 
++static inline void nfc_buf_read(const void __iomem *nfc, void *buf, int len)
++{
++	u32 *wp = buf;
++	int i;
++
++	BUG_ON((unsigned long)nfc & 3);
++	BUG_ON((unsigned long)buf & 3);
++
++	for (i = 0; i < len; i += sizeof(long)) {
++		wp[i >> 2] = readl(nfc + i);
++	}
++}
++
++static inline void nfc_buf_write(void __iomem *nfc, const void *buf, int len)
++{
++	const u32 *rp = buf;
++	int i;
++
++	BUG_ON((unsigned long)nfc & 3);
++	BUG_ON((unsigned long)buf & 3);
++
++	for (i = 0; i < len; i += sizeof(long)) {
++		writel(rp[i >> 2], nfc + i);
++	}
++}
++
+ /* This function requests the NANDFC to initate the transfer
+  * of data currently in the NANDFC RAM buffer to the NAND device. */
  static void send_prog_page(struct mxc_nand_host *host, uint8_t buf_id,
  			int spare_only)
  {
+-	DEBUG(MTD_DEBUG_LEVEL3, "send_prog_page (%d)\n", spare_only);
 +	int i;
- 	DEBUG(MTD_DEBUG_LEVEL3, "send_prog_page (%d)\n", spare_only);
- 
-+	for (i = 0; i < 4; i++) {
-+		void *src = host->nfc_buf + SPARE_AREA0 + i * 16;
-+		void *dst = host->nfc_buf + SPARE_AREA0 + i * 64;
-+		memcpy(dst, src, 16);
++
++	if (spare_only)
++		DEBUG(MTD_DEBUG_LEVEL1, "send_prog_page (%d)\n", spare_only);
++	if (cpu_is_mx25()) {
++		for (i = 0; i < 4; i++) {
++			void __iomem *src = host->nfc_buf + SPARE_AREA0 + i * 16;
++			void __iomem *dst = host->nfc_buf + SPARE_AREA0 + i * 64;
++
++			memcpy(dst, src, 16);
++		}
 +	}
+ 
  	/* NANDFC buffer 0 is used for page read/write */
 -	writew(buf_id, host->regs + NFC_BUF_ADDR);
 +	nfc_write_reg(buf_id, host->regs, NFC_BUF_ADDR);
@@ -11036,7 +11374,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  
  	/* Wait for operation to complete */
  	wait_op_done(host, TROP_US_DELAY, spare_only, true);
-@@ -256,25 +414,33 @@ static void send_prog_page(struct mxc_na
+@@ -256,25 +435,37 @@ static void send_prog_page(struct mxc_na
  static void send_read_page(struct mxc_nand_host *host, uint8_t buf_id,
  		int spare_only)
  {
@@ -11066,15 +11404,19 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  
  	/* Wait for operation to complete */
  	wait_op_done(host, TROP_US_DELAY, spare_only, true);
++	if (!cpu_is_mx25())
++		return;
++
 +	for (i = 0; i < 4; i++) {
-+		void *src = host->nfc_buf + SPARE_AREA0 + i * 64;
-+		void *dst = host->nfc_buf + SPARE_AREA0 + i * 16;
++		void __iomem *src = host->nfc_buf + SPARE_AREA0 + i * 64;
++		void __iomem *dst = host->nfc_buf + SPARE_AREA0 + i * 16;
++
 +		memcpy(dst, src, 16);
 +	}
  }
  
  /* Request the NANDFC to perform a read of the NAND device ID. */
-@@ -284,20 +450,23 @@ static void send_read_id(struct mxc_nand
+@@ -284,20 +475,23 @@ static void send_read_id(struct mxc_nand
  	uint16_t tmp;
  
  	/* NANDFC buffer 0 is used for device ID output */
@@ -11104,7 +11446,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  		/* compress the ID info */
  		writeb(readb(main_buf + 2), main_buf + 1);
  		writeb(readb(main_buf + 4), main_buf + 2);
-@@ -311,32 +480,35 @@ static void send_read_id(struct mxc_nand
+@@ -311,32 +505,35 @@ static void send_read_id(struct mxc_nand
   * NAND device status and returns the current status. */
  static uint16_t get_dev_status(struct mxc_nand_host *host)
  {
@@ -11112,7 +11454,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 +	void __iomem *main_buf = host->nfc_buf + MAIN_AREA1;
  	uint32_t store;
  	uint16_t ret, tmp;
- 	/* Issue status request to NAND device */
+-	/* Issue status request to NAND device */
  
 -	/* store the main area1 first word, later do recovery */
 +	/* store the main area first word, later do recovery */
@@ -11130,6 +11472,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 +	nfc_write_reg(tmp, host->regs, NFC_CONFIG1);
  
 -	writew(NFC_STATUS, host->regs + NFC_CONFIG2);
++	/* Issue status request to NAND device */
 +	WARN_ON(nfc_read_reg(host->regs, NFC_CONFIG2));
 +	nfc_write_reg(NFC_STATUS, host->regs, NFC_CONFIG2);
  
@@ -11142,21 +11485,363 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  	ret = readw(main_buf);
  	writel(store, main_buf);
  
-+	DBG(0, "%s: status=%02x\n", __FUNCTION__, ret);
++	DEBUG(MTD_DEBUG_LEVEL2, "%s: status=%02x\n", __FUNCTION__, ret);
 +
  	return ret;
  }
  
-@@ -369,7 +541,7 @@ static int mxc_nand_correct_data(struct 
+@@ -352,10 +549,290 @@ static int mxc_nand_dev_ready(struct mtd
+ 
+ static void mxc_nand_enable_hwecc(struct mtd_info *mtd, int mode)
+ {
+-	/*
+-	 * If HW ECC is enabled, we turn it on during init. There is
+-	 * no need to enable again here.
+-	 */
++	switch (mode) {
++	case NAND_ECC_WRITE:
++		DBG(0, "ECC_MODE=NAND_ECC_WRITE\n");
++		break;
++	case NAND_ECC_READSYN:
++		DBG(0, "ECC_MODE=NAND_ECC_READSYN\n");
++		break;
++	case NAND_ECC_READ:
++		DBG(0, "ECC_MODE=NAND_ECC_READ\n");
++		break;
++	default:
++		DBG(-1, "%s: Unknown ECC_MODE: %d\n", __FUNCTION__, mode);
++	}
++}
++
++static void _mxc_nand_enable_hwecc(struct mtd_info *mtd, int on)
++{
++	struct nand_chip *nand_chip = mtd->priv;
++	struct mxc_nand_host *host = nand_chip->priv;
++	uint16_t ecc = nfc_read_reg(host->regs, NFC_CONFIG1);
++
++	if (on) {
++		ecc |= NFC_ECC_EN;
++	} else {
++		ecc &= ~NFC_ECC_EN;
++	}
++	nfc_write_reg(ecc, host->regs, NFC_CONFIG1);
++}
++
++static int mxc_nand_read_oob_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
++				      int page, int sndcmd)
++{
++	struct mxc_nand_host *host = chip->priv;
++	uint8_t *buf = chip->oob_poi;
++	int length = mtd->oobsize;
++	int eccpitch = chip->ecc.bytes + chip->ecc.prepad + chip->ecc.postpad;
++	uint8_t *bufpoi = buf;
++	int i, toread;
++
++	DEBUG(MTD_DEBUG_LEVEL0, "%s: Reading OOB area of page %u to oob %p\n",
++	      __FUNCTION__, host->page_addr, buf);
++
++	chip->cmdfunc(mtd, NAND_CMD_READOOB, mtd->writesize, page);
++	for (i = 0; i < chip->ecc.steps; i++) {
++		toread = min_t(int, length, chip->ecc.prepad);
++		if (toread) {
++			chip->read_buf(mtd, bufpoi, toread);
++			bufpoi += toread;
++			length -= toread;
++		}
++		bufpoi += chip->ecc.bytes;
++		host->col_addr += chip->ecc.bytes;
++		length -= chip->ecc.bytes;
++
++		toread = min_t(int, length, chip->ecc.postpad);
++		if (toread) {
++			chip->read_buf(mtd, bufpoi, toread);
++			bufpoi += toread;
++			length -= toread;
++		}
++	}
++	if (length > 0)
++		chip->read_buf(mtd, bufpoi, length);
++
++	_mxc_nand_enable_hwecc(mtd, 0);
++	chip->cmdfunc(mtd, NAND_CMD_READOOB, mtd->writesize + chip->ecc.prepad, page);
++	bufpoi = buf + chip->ecc.prepad;
++	length = mtd->oobsize - chip->ecc.prepad;
++	for (i = 0; i < chip->ecc.steps; i++) {
++		toread = min_t(int, length, chip->ecc.bytes);
++		chip->read_buf(mtd, bufpoi, toread);
++		bufpoi += eccpitch;
++		length -= eccpitch;
++		host->col_addr += chip->ecc.postpad + chip->ecc.prepad;
++	}
++	_mxc_nand_enable_hwecc(mtd, 1);
++	return 1;
++}
++
++static int mxc_nand_read_page_raw_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
++					   uint8_t *buf)
++{
++	struct mxc_nand_host *host = chip->priv;
++	int eccsize = chip->ecc.size;
++	int eccbytes = chip->ecc.bytes;
++	int eccpitch = eccbytes + chip->ecc.prepad + chip->ecc.postpad;
++	uint8_t *oob = chip->oob_poi;
++	int steps, size;
++	int n;
++
++	_mxc_nand_enable_hwecc(mtd, 0);
++	chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, host->page_addr);
++
++	for (n = 0, steps = chip->ecc.steps; steps > 0; n++, steps--) {
++		host->col_addr = n * eccsize;
++		chip->read_buf(mtd, buf, eccsize);
++		buf += eccsize;
++
++		host->col_addr = mtd->writesize + n * eccpitch;
++		if (chip->ecc.prepad) {
++			chip->read_buf(mtd, oob, chip->ecc.prepad);
++			oob += chip->ecc.prepad;
++		}
++
++		chip->read_buf(mtd, oob, eccbytes);
++		oob += eccbytes;
++
++		if (chip->ecc.postpad) {
++			chip->read_buf(mtd, oob, chip->ecc.postpad);
++			oob += chip->ecc.postpad;
++		}
++	}
++
++	size = mtd->oobsize - (oob - chip->oob_poi);
++	if (size)
++		chip->read_buf(mtd, oob, size);
++	_mxc_nand_enable_hwecc(mtd, 0);
++
++	return 0;
++}
++
++static int mxc_nand_read_page_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
++				       uint8_t *buf)
++{
++	struct mxc_nand_host *host = chip->priv;
++	int n, eccsize = chip->ecc.size;
++	int eccbytes = chip->ecc.bytes;
++	int eccpitch = eccbytes + chip->ecc.prepad + chip->ecc.postpad;
++	int eccsteps = chip->ecc.steps;
++	uint8_t *p = buf;
++	uint8_t *oob = chip->oob_poi;
++
++	DEBUG(MTD_DEBUG_LEVEL1, "%s: Reading page %u to buf %p oob %p\n", __FUNCTION__,
++	      host->page_addr, buf, oob);
++
++	/* first read out the data area and the available portion of OOB */
++	for (n = 0; eccsteps; n++, eccsteps--, p += eccsize) {
++		int stat;
++
++		host->col_addr = n * eccsize;
++
++		chip->read_buf(mtd, p, eccsize);
++
++		host->col_addr = mtd->writesize + n * eccpitch;
++
++		if (chip->ecc.prepad) {
++			chip->read_buf(mtd, oob, chip->ecc.prepad);
++			oob += chip->ecc.prepad;
++		}
++
++		stat = chip->ecc.correct(mtd, p, oob, NULL);
++
++		if (stat < 0)
++			mtd->ecc_stats.failed++;
++		else
++			mtd->ecc_stats.corrected += stat;
++		oob += eccbytes;
++
++		if (chip->ecc.postpad) {
++			chip->read_buf(mtd, oob, chip->ecc.postpad);
++			oob += chip->ecc.postpad;
++		}
++	}
++
++	/* Calculate remaining oob bytes */
++	n = mtd->oobsize - (oob - chip->oob_poi);
++	if (n)
++		chip->read_buf(mtd, oob, n);
++
++	/* Then switch ECC off and read the OOB area to get the ECC code */
++	_mxc_nand_enable_hwecc(mtd, 0);
++	chip->cmdfunc(mtd, NAND_CMD_READOOB, mtd->writesize, host->page_addr);
++	eccsteps = chip->ecc.steps;
++	oob = chip->oob_poi + chip->ecc.prepad;
++	for (n = 0; eccsteps; n++, eccsteps--, p += eccsize) {
++		host->col_addr = mtd->writesize + n * eccpitch + chip->ecc.prepad;
++		chip->read_buf(mtd, oob, eccbytes);
++		oob += eccbytes + chip->ecc.postpad;
++	}
++	_mxc_nand_enable_hwecc(mtd, 1);
++	return 0;
++}
++
++static int mxc_nand_write_oob_syndrome(struct mtd_info *mtd,
++				       struct nand_chip *chip, int page)
++{
++	struct mxc_nand_host *host = chip->priv;
++	int eccpitch = chip->ecc.bytes + chip->ecc.prepad + chip->ecc.postpad;
++	int length = mtd->oobsize;
++	int i, len, status, steps = chip->ecc.steps;
++	const uint8_t *bufpoi = chip->oob_poi;
++
++	chip->cmdfunc(mtd, NAND_CMD_SEQIN, mtd->writesize, page);
++	for (i = 0; i < steps; i++) {
++		len = min_t(int, length, eccpitch);
++
++		chip->write_buf(mtd, bufpoi, len);
++		bufpoi += len;
++		length -= len;
++		host->col_addr += chip->ecc.prepad + chip->ecc.postpad;
++	}
++	if (length > 0)
++		chip->write_buf(mtd, bufpoi, length);
++
++	chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);
++	status = chip->waitfunc(mtd, chip);
++	return status & NAND_STATUS_FAIL ? -EIO : 0;
++}
++
++static void mxc_nand_write_page_raw_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
++					     const uint8_t *buf)
++{
++	struct mxc_nand_host *host = chip->priv;
++	int eccsize = chip->ecc.size;
++	int eccbytes = chip->ecc.bytes;
++	int eccpitch = eccbytes + chip->ecc.prepad + chip->ecc.postpad;
++	uint8_t *oob = chip->oob_poi;
++	int steps, size;
++	int n;
++
++	for (n = 0, steps = chip->ecc.steps; steps > 0; n++, steps--) {
++		host->col_addr = n * eccsize;
++		chip->write_buf(mtd, buf, eccsize);
++		buf += eccsize;
++
++		host->col_addr = mtd->writesize + n * eccpitch;
++
++		if (chip->ecc.prepad) {
++			chip->write_buf(mtd, oob, chip->ecc.prepad);
++			oob += chip->ecc.prepad;
++		}
++
++		host->col_addr += eccbytes;
++		oob += eccbytes;
++
++		if (chip->ecc.postpad) {
++			chip->write_buf(mtd, oob, chip->ecc.postpad);
++			oob += chip->ecc.postpad;
++		}
++	}
++
++	size = mtd->oobsize - (oob - chip->oob_poi);
++	if (size)
++		chip->write_buf(mtd, oob, size);
++}
++
++static void mxc_nand_write_page_syndrome(struct mtd_info *mtd,
++					 struct nand_chip *chip, const uint8_t *buf)
++{
++	struct mxc_nand_host *host = chip->priv;
++	int i, n, eccsize = chip->ecc.size;
++	int eccbytes = chip->ecc.bytes;
++	int eccpitch = eccbytes + chip->ecc.prepad + chip->ecc.postpad;
++	int eccsteps = chip->ecc.steps;
++	const uint8_t *p = buf;
++	uint8_t *oob = chip->oob_poi;
++
++	chip->ecc.hwctl(mtd, NAND_ECC_WRITE);
++
++	for (i = n = 0; eccsteps; n++, eccsteps--, i += eccbytes, p += eccsize) {
++		host->col_addr = n * eccsize;
++
++		chip->write_buf(mtd, p, eccsize);
++
++		host->col_addr = mtd->writesize + n * eccpitch;
++
++		if (chip->ecc.prepad) {
++			chip->write_buf(mtd, oob, chip->ecc.prepad);
++			oob += chip->ecc.prepad;
++		}
++
++		chip->write_buf(mtd, oob, eccbytes);
++		oob += eccbytes;
++
++		if (chip->ecc.postpad) {
++			chip->write_buf(mtd, oob, chip->ecc.postpad);
++			oob += chip->ecc.postpad;
++		}
++	}
++
++	/* Calculate remaining oob bytes */
++	i = mtd->oobsize - (oob - chip->oob_poi);
++	if (i)
++		chip->write_buf(mtd, oob, i);
+ }
+ 
+ static int mxc_nand_correct_data(struct mtd_info *mtd, u_char *dat,
+@@ -363,18 +840,41 @@ static int mxc_nand_correct_data(struct 
+ {
+ 	struct nand_chip *nand_chip = mtd->priv;
+ 	struct mxc_nand_host *host = nand_chip->priv;
++	uint16_t ecc_status = nfc_read_reg(host->regs, NFC_ECC_STATUS_RESULT);
+ 
+ 	/*
+ 	 * 1-Bit errors are automatically corrected in HW.  No need for
  	 * additional correction.  2-Bit errors cannot be corrected by
  	 * HW ECC, so we need to return failure
  	 */
 -	uint16_t ecc_status = readw(host->regs + NFC_ECC_STATUS_RESULT);
-+	uint16_t ecc_status = nfc_read_reg(host->regs, NFC_ECC_STATUS_RESULT);
+-
+-	if (((ecc_status & 0x3) == 2) || ((ecc_status >> 2) == 2)) {
+-		DEBUG(MTD_DEBUG_LEVEL0,
+-		      "MXC_NAND: HWECC uncorrectable 2-bit ECC error\n");
+-		return -1;
++	if (!(nfc_read_reg(host->regs, NFC_CONFIG1) & NFC_ECC_EN)) {
++		DEBUG(MTD_DEBUG_LEVEL1, "%s: ECC turned off\n", __FUNCTION__);
++		return 0;
++	}
++
++	if (ecc_status)
++		DBG(ecc_status ? -1 : 0, "%s: ECC_STATUS=%04x\n", __FUNCTION__, ecc_status);
++
++	if (cpu_is_mx25()) {
++		int subpages = mtd->writesize / nand_chip->subpagesize;
++
++		do {
++			if ((ecc_status & 0xf) > 4) {
++				printk(KERN_ERR
++				       "MXC_NAND: HWECC uncorrectable ECC error in page %u subpage %d\n",
++				       host->page_addr,
++				       mtd->writesize / nand_chip->subpagesize - subpages);
++				return -1;
++			}
++			ecc_status >>= 4;
++			subpages--;
++		} while (subpages > 0);
++	} else {
++		if (((ecc_status & 0x3) == 2) || ((ecc_status >> 2) == 2)) {
++			DEBUG(MTD_DEBUG_LEVEL0,
++			      "MXC_NAND: HWECC uncorrectable 2-bit ECC error\n");
++			return -1;
++		}
+ 	}
  
- 	if (((ecc_status & 0x3) == 2) || ((ecc_status >> 2) == 2)) {
- 		DEBUG(MTD_DEBUG_LEVEL0,
-@@ -392,8 +564,10 @@ static u_char mxc_nand_read_byte(struct 
+ 	return 0;
+@@ -383,6 +883,7 @@ static int mxc_nand_correct_data(struct 
+ static int mxc_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
+ 				  u_char *ecc_code)
+ {
++	/* HW ECC calculation is done transparently by the controller */
+ 	return 0;
+ }
+ 
+@@ -392,8 +893,13 @@ static u_char mxc_nand_read_byte(struct 
  	struct mxc_nand_host *host = nand_chip->priv;
  	uint8_t ret = 0;
  	uint16_t col, rd_word;
@@ -11165,19 +11850,32 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 +	uint16_t __iomem *main_buf = host->nfc_buf + MAIN_AREA0;
 +	uint16_t __iomem *spare_buf = host->nfc_buf + SPARE_AREA0;
 +
-+	WARN_ON(host->spare_only && host->col_addr >= 16);
++	DEBUG(MTD_DEBUG_LEVEL3,
++	      "%s(col = %d)\n", __FUNCTION__, host->col_addr);
++
++	BUG_ON(host->spare_only && host->col_addr >= 16);
  
  	/* Check for status request */
  	if (host->status_request)
-@@ -431,14 +605,16 @@ static uint16_t mxc_nand_read_word(struc
- 	      "mxc_nand_read_word(col = %d)\n", host->col_addr);
+@@ -424,28 +930,27 @@ static uint16_t mxc_nand_read_word(struc
+ {
+ 	struct nand_chip *nand_chip = mtd->priv;
+ 	struct mxc_nand_host *host = nand_chip->priv;
+-	uint16_t col, rd_word, ret;
++	uint16_t col, ret;
+ 	uint16_t __iomem *p;
+ 
+-	DEBUG(MTD_DEBUG_LEVEL3,
+-	      "mxc_nand_read_word(col = %d)\n", host->col_addr);
++	DEBUG(MTD_DEBUG_LEVEL1,
++	      "%s(col = %d)\n", __FUNCTION__, host->col_addr);
  
  	col = host->col_addr;
 +
  	/* Adjust saved column address */
  	if (col < mtd->writesize && host->spare_only)
  		col += mtd->writesize;
-+	WARN_ON(col >= mtd->writesize + 16);
++	BUG_ON(col >= mtd->writesize + 16);
  
  	if (col < mtd->writesize)
 -		p = (host->regs + MAIN_AREA0) + (col >> 1);
@@ -11187,24 +11885,43 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 +		p = (host->nfc_buf + SPARE_AREA0) + ((col - mtd->writesize) >> 1);
  
  	if (col & 1) {
- 		rd_word = readw(p);
-@@ -474,10 +650,13 @@ static void mxc_nand_write_buf(struct mt
+-		rd_word = readw(p);
+-		ret = (rd_word >> 8) & 0xff;
+-		rd_word = readw(&p[1]);
+-		ret |= (rd_word << 8) & 0xff00;
+-
++		ret = readw(p++) >> 8;
++		ret |= readw(p) << 8;
+ 	} else
+ 		ret = readw(p);
+ 
+@@ -466,31 +971,32 @@ static void mxc_nand_write_buf(struct mt
+ 	int n, col, i = 0;
+ 
+ 	DEBUG(MTD_DEBUG_LEVEL3,
+-	      "mxc_nand_write_buf(col = %d, len = %d)\n", host->col_addr,
+-	      len);
+-
++	      "%s(buf=%p col=%03x, len=%03x)\n", __FUNCTION__,
++	      buf, host->col_addr, len);
+ 	col = host->col_addr;
+ 
  	/* Adjust saved column address */
  	if (col < mtd->writesize && host->spare_only)
  		col += mtd->writesize;
--
-+#if 0
- 	n = mtd->writesize + mtd->oobsize - col;
- 	n = min(len, n);
--
-+#else
+ 
+-	n = mtd->writesize + mtd->oobsize - col;
+-	n = min(len, n);
++	/* If more data is requested to be written than free space in
++	 * the flash buffer this is clearly a BUG! */
 +	BUG_ON(len > mtd->writesize + mtd->oobsize - col);
 +	n = len;
-+#endif
+ 
  	DEBUG(MTD_DEBUG_LEVEL3,
- 	      "%s:%d: col = %d, n = %d\n", __func__, __LINE__, col, n);
+-	      "%s:%d: col = %d, n = %d\n", __func__, __LINE__, col, n);
++	      "%s:%d: col=%03x, n=%03x\n", __func__, __LINE__, col, n);
  
-@@ -485,10 +664,10 @@ static void mxc_nand_write_buf(struct mt
+ 	while (n) {
  		void __iomem *p;
  
  		if (col < mtd->writesize)
@@ -11216,33 +11933,49 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 +			p = host->nfc_buf + SPARE_AREA0 +
 +				(col & ~3) - mtd->writesize;
  
- 		DEBUG(MTD_DEBUG_LEVEL3, "%s:%d: p = %p\n", __func__,
+-		DEBUG(MTD_DEBUG_LEVEL3, "%s:%d: p = %p\n", __func__,
++		DEBUG(MTD_DEBUG_LEVEL3, "%s:%d: p=%p\n", __func__,
  		      __LINE__, p);
-@@ -542,6 +721,7 @@ static void mxc_nand_write_buf(struct mt
- 			DEBUG(MTD_DEBUG_LEVEL3,
- 			      "%s:%d: n = %d, m = %d, i = %d, col = %d\n",
- 			      __func__,  __LINE__, n, m, i, col);
-+			BUG_ON(m == 0);
  
+ 		if (((col | (int)&buf[i]) & 3) || n < 16) {
+@@ -538,11 +1044,6 @@ static void mxc_nand_write_buf(struct mt
+ 				m += mtd->oobsize;
+ 
+ 			m = min(n, m) & ~3;
+-
+-			DEBUG(MTD_DEBUG_LEVEL3,
+-			      "%s:%d: n = %d, m = %d, i = %d, col = %d\n",
+-			      __func__,  __LINE__, n, m, i, col);
+-
  			memcpy(p, &buf[i], m);
  			col += m;
-@@ -571,18 +751,28 @@ static void mxc_nand_read_buf(struct mtd
+ 			i += m;
+@@ -563,26 +1064,28 @@ static void mxc_nand_read_buf(struct mtd
+ 	struct mxc_nand_host *host = nand_chip->priv;
+ 	int n, col, i = 0;
+ 
+-	DEBUG(MTD_DEBUG_LEVEL3,
+-	      "mxc_nand_read_buf(col = %d, len = %d)\n", host->col_addr, len);
+-
+ 	col = host->col_addr;
+ 
++	DEBUG(MTD_DEBUG_LEVEL1,
++	      "%s(col=%03x len=%03x)\n", __FUNCTION__, col, len);
++
  	/* Adjust saved column address */
  	if (col < mtd->writesize && host->spare_only)
  		col += mtd->writesize;
--
-+#if 0
- 	n = mtd->writesize + mtd->oobsize - col;
- 	n = min(len, n);
--
-+#else
+ 
+-	n = mtd->writesize + mtd->oobsize - col;
+-	n = min(len, n);
 +	/* If more data is requested to be read than is available in
 +	 * the flash buffer this is clearly a BUG! */
 +	BUG_ON(len > mtd->writesize + mtd->oobsize - col);
 +	n = len;
-+#endif
+ 
  	while (n) {
- 		void __iomem *p;
+-		void __iomem *p;
++		const void __iomem *p;
  
  		if (col < mtd->writesize)
 -			p = host->regs + MAIN_AREA0 + (col & ~3);
@@ -11252,37 +11985,18 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 -					mtd->writesize + (col & ~3);
 +			p = host->nfc_buf + SPARE_AREA0 +
 +				(col & ~3) - mtd->writesize;
-+
-+		if (dbg_lvl(3)) {
-+			print_hex_dump(KERN_DEBUG, "spare: ", DUMP_PREFIX_ADDRESS,
-+				       16, 2, p, 64, 0);
-+		}
  
  		if (((col | (int)&buf[i]) & 3) || n < 16) {
  			uint32_t data;
-@@ -621,15 +811,20 @@ static void mxc_nand_read_buf(struct mtd
- 				m += mtd->oobsize;
- 
- 			m = min(n, m) & ~3;
-+			DBG(1, "Copying %u byte from offset %03x[%p]\n",
-+			    m + (col & 3), col, p);
-+			BUG_ON(m == 0);
- 			memcpy(&buf[i], p, m);
- 			col += m;
- 			i += m;
- 			n -= m;
- 		}
+@@ -629,7 +1132,6 @@ static void mxc_nand_read_buf(struct mtd
  	}
-+	if (dbg_lvl(1)) {
-+		print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, buf, len);
-+	}
  	/* Update saved column address */
  	host->col_addr = col;
 -
  }
  
  /* Used by the upper layer to verify the data in NAND Flash
-@@ -637,7 +832,22 @@ static void mxc_nand_read_buf(struct mtd
+@@ -637,7 +1139,38 @@ static void mxc_nand_read_buf(struct mtd
  static int mxc_nand_verify_buf(struct mtd_info *mtd,
  				const u_char *buf, int len)
  {
@@ -11291,14 +12005,30 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 +	struct mxc_nand_host *host = nand_chip->priv;
 +	int i;
 +	u16 *wp = host->nfc_buf + MAIN_AREA0;
++	const u_char *b = buf;
 +
 +	for (i = 0; i < len >> 1; i++) {
 +		u16 w = *wp++;
-+		u8 c1 = *buf++;
-+		u8 c2 = *buf++;
-+		if ((w & 0xff) != c1 || (w >> 8) != c2) {
-+			DBG(0, "%s: verify error @ %03x: read: %02x %02x expected: %02x %02x\n",
-+			    __FUNCTION__, i, w & 0xff, w >> 8, c1, c2);
++		u16 data = *buf++;
++
++		if (len - i > 1)
++			data |= (*buf++) << 8;
++		else
++			data |= 0xff << 8;
++
++		/* This is crappy! The upper layer always sends us a
++		 * whole page buffer to verify, even if only a partial page
++		 * was written. So, ignore all 0xff bytes in the reference buffer.
++		 */
++		if ((data & w) != w) {
++			printk(KERN_ERR
++			       "%s: verify error @ %03x: read: %02x %02x expected: %02x %02x\n",
++			       __FUNCTION__, i, w & 0xff, w >> 8, data & 0xff, data >> 8);
++			print_hex_dump(KERN_DEBUG, "ver: ", DUMP_PREFIX_ADDRESS,
++				       16, 2, b + ((i << 1) & ~0xf), min(len - i, 64), 0);
++			print_hex_dump(KERN_DEBUG, "ref: ", DUMP_PREFIX_ADDRESS,
++				       16, 2, host->nfc_buf + MAIN_AREA0 + ((i << 1) & ~0xf),
++				       min(len - i, 64), 0);
 +			return -EFAULT;
 +		}
 +	}
@@ -11306,27 +12036,25 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  }
  
  /* This function is used by upper layer for select and
-@@ -655,13 +865,15 @@ static void mxc_nand_select_chip(struct 
+@@ -655,13 +1188,13 @@ static void mxc_nand_select_chip(struct 
  	}
  
  	if (chip == -1) {
 -		writew(readw(host->regs + NFC_CONFIG1) & ~NFC_CE,
 -				host->regs + NFC_CONFIG1);
-+		nfc_write_reg(host->regs,
-+			nfc_read_reg(host->regs, NFC_CONFIG1) & ~NFC_CE,
-+			NFC_CONFIG1);
++		nfc_write_reg(nfc_read_reg(host->regs, NFC_CONFIG1) & ~NFC_CE,
++			      host->regs, NFC_CONFIG1);
  		return;
  	}
  
 -	writew(readw(host->regs + NFC_CONFIG1) | NFC_CE,
 -			host->regs + NFC_CONFIG1);
-+	nfc_write_reg(host->regs,
-+			nfc_read_reg(host->regs, NFC_CONFIG1) | NFC_CE,
-+			NFC_CONFIG1);
++	nfc_write_reg(nfc_read_reg(host->regs, NFC_CONFIG1) | NFC_CE,
++		      host->regs, NFC_CONFIG1);
  #endif
  
  	switch (chip) {
-@@ -679,9 +891,6 @@ static void mxc_nand_select_chip(struct 
+@@ -679,9 +1212,6 @@ static void mxc_nand_select_chip(struct 
  			host->clk_act = 1;
  		}
  		break;
@@ -11336,7 +12064,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  	}
  }
  
-@@ -692,7 +901,7 @@ static void mxc_nand_command(struct mtd_
+@@ -692,10 +1222,10 @@ static void mxc_nand_command(struct mtd_
  {
  	struct nand_chip *nand_chip = mtd->priv;
  	struct mxc_nand_host *host = nand_chip->priv;
@@ -11344,9 +12072,16 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 +	int useirq = false;
  
  	DEBUG(MTD_DEBUG_LEVEL3,
- 	      "mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n",
-@@ -712,13 +921,11 @@ static void mxc_nand_command(struct mtd_
+-	      "mxc_nand_command (cmd = 0x%x, col = 0x%x, page = 0x%x)\n",
++	      "%s: cmd 0x%08x, col 0x%03x, page 0x%04x\n", __FUNCTION__,
+ 	      command, column, page_addr);
+ 
+ 	/* Reset command state information */
+@@ -710,15 +1240,14 @@ static void mxc_nand_command(struct mtd_
+ 		break;
+ 
  	case NAND_CMD_READ0:
++		host->page_addr = page_addr;
  		host->col_addr = column;
  		host->spare_only = false;
 -		useirq = false;
@@ -11359,7 +12094,20 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  		if (host->pagesize_2k)
  			command = NAND_CMD_READ0; /* only READ0 is valid */
  		break;
-@@ -751,23 +958,25 @@ static void mxc_nand_command(struct mtd_
+@@ -726,9 +1255,9 @@ static void mxc_nand_command(struct mtd_
+ 	case NAND_CMD_SEQIN:
+ 		if (column >= mtd->writesize) {
+ 			/*
+-			 * FIXME: before send SEQIN command for write OOB,
+-			 * We must read one page out.
+-			 * For K9F1GXX has no READ1 command to set current HW
++			 * Before sending the SEQIN command for writing OOB
++			 * we must read one page out.
++			 * Because K9F1GXX has no READ1 command to set current HW
+ 			 * pointer to spare area, we must write the whole page
+ 			 * including OOB together.
+ 			 */
+@@ -751,23 +1280,23 @@ static void mxc_nand_command(struct mtd_
  			if (!host->pagesize_2k)
  				send_cmd(host, NAND_CMD_READ0, false);
  		}
@@ -11369,15 +12117,14 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  	case NAND_CMD_PAGEPROG:
  		send_prog_page(host, 0, host->spare_only);
 -
-+#ifndef CONFIG_ARCH_MXC_HAS_NFC_V1_1
- 		if (host->pagesize_2k) {
+-		if (host->pagesize_2k) {
++		if (host->pagesize_2k && !cpu_is_mx25()) {
  			/* data in 4 areas datas */
  			send_prog_page(host, 1, host->spare_only);
  			send_prog_page(host, 2, host->spare_only);
  			send_prog_page(host, 3, host->spare_only);
  		}
 -
-+#endif
 +		useirq = true;
  		break;
  
@@ -11389,7 +12136,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  		break;
  	}
  
-@@ -791,23 +1000,13 @@ static void mxc_nand_command(struct mtd_
+@@ -791,23 +1320,13 @@ static void mxc_nand_command(struct mtd_
  
  	/* Write out page address, if necessary */
  	if (page_addr != -1) {
@@ -11419,15 +12166,18 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  	}
  
  	/* Command post-processing step */
-@@ -823,14 +1022,17 @@ static void mxc_nand_command(struct mtd_
+@@ -823,14 +1342,17 @@ static void mxc_nand_command(struct mtd_
  			send_cmd(host, NAND_CMD_READSTART, true);
  			/* read for each AREA */
  			send_read_page(host, 0, host->spare_only);
-+#ifndef CONFIG_ARCH_MXC_HAS_NFC_V1_1
- 			send_read_page(host, 1, host->spare_only);
- 			send_read_page(host, 2, host->spare_only);
- 			send_read_page(host, 3, host->spare_only);
-+#endif
+-			send_read_page(host, 1, host->spare_only);
+-			send_read_page(host, 2, host->spare_only);
+-			send_read_page(host, 3, host->spare_only);
++			if (!cpu_is_mx25()) {
++				send_read_page(host, 1, host->spare_only);
++				send_read_page(host, 2, host->spare_only);
++				send_read_page(host, 3, host->spare_only);
++			}
  		} else
  			send_read_page(host, 0, host->spare_only);
  		break;
@@ -11437,7 +12187,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  		send_read_id(host);
  		break;
  
-@@ -851,9 +1053,12 @@ static int __init mxcnd_probe(struct pla
+@@ -851,9 +1373,9 @@ static int __init mxcnd_probe(struct pla
  	struct mtd_info *mtd;
  	struct mxc_nand_platform_data *pdata = pdev->dev.platform_data;
  	struct mxc_nand_host *host;
@@ -11446,13 +12196,10 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  	uint16_t tmp;
 -	int err = 0, nr_parts = 0;
 +	int err, nr_parts;
-+
-+	DBG(0, "%s: pdata=%p hw_ecc=%d width=%d\n", __FUNCTION__,
-+	    pdata, pdata->hw_ecc, pdata->width);
  
  	/* Allocate memory for MTD device structure and private data */
  	host = kzalloc(sizeof(struct mxc_nand_host), GFP_KERNEL);
-@@ -868,9 +1073,6 @@ static int __init mxcnd_probe(struct pla
+@@ -868,9 +1390,6 @@ static int __init mxcnd_probe(struct pla
  	mtd->owner = THIS_MODULE;
  	mtd->dev.parent = &pdev->dev;
  
@@ -11462,7 +12209,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  	this->priv = host;
  	this->dev_ready = mxc_nand_dev_ready;
  	this->cmdfunc = mxc_nand_command;
-@@ -880,29 +1082,54 @@ static int __init mxcnd_probe(struct pla
+@@ -880,29 +1399,54 @@ static int __init mxcnd_probe(struct pla
  	this->write_buf = mxc_nand_write_buf;
  	this->read_buf = mxc_nand_read_buf;
  	this->verify_buf = mxc_nand_verify_buf;
@@ -11526,7 +12273,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  
  	init_waitqueue_head(&host->irq_waitq);
  
-@@ -912,57 +1139,84 @@ static int __init mxcnd_probe(struct pla
+@@ -912,57 +1456,89 @@ static int __init mxcnd_probe(struct pla
  	if (err)
  		goto eirq;
  
@@ -11584,46 +12331,47 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  		DEBUG(MTD_DEBUG_LEVEL0,
  		      "MXC_ND: Unable to find any NAND device.\n");
 -		err = -ENXIO;
-+		goto escan;
-+	}
+ 		goto escan;
+ 	}
+ 
 +	/* this is required before completing the scan */
 +	host->pagesize_2k = (mtd->writesize == 2048);
 +	tmp = nfc_read_reg(host->regs, NFC_CONFIG1);
-+	tmp |= NFC_ONE_CYCLE;
-+	tmp &= ~(3 << 9); /* clear PPB mask */
-+	DBG(0, "%s: ppb=%d (%02x)\n", __FUNCTION__,
-+	    mtd->erasesize / mtd->writesize,
-+	    ffs(mtd->erasesize / mtd->writesize) - 6);
++	if (cpu_is_mx25())
++		tmp |= NFC_ONE_CYCLE;
 +
-+	/* set PPB (pages per block */
++	tmp &= ~(3 << 9); /* clear PPB mask */
++	/* set PPB (pages per block) */
 +	tmp |= (ffs(mtd->erasesize / mtd->writesize) - 6) << 9;
 +	nfc_write_reg(tmp, host->regs, NFC_CONFIG1);
-+	if (pdata->width == 2) {
-+		if (host->pagesize_2k) {
-+			this->ecc.layout = &nand_hw_eccoob2k_16;
++
++	if (pdata->hw_ecc) {
++		this->ecc.calculate = mxc_nand_calculate_ecc;
++		this->ecc.hwctl = mxc_nand_enable_hwecc;
++		this->ecc.correct = mxc_nand_correct_data;
++		if (cpu_is_mx25()) {
++			this->ecc.mode = NAND_ECC_HW_SYNDROME;
++			this->ecc.read_page = mxc_nand_read_page_syndrome;
++			this->ecc.read_page_raw = mxc_nand_read_page_raw_syndrome;
++			this->ecc.read_oob = mxc_nand_read_oob_syndrome;
++			this->ecc.write_page = mxc_nand_write_page_syndrome;
++			this->ecc.write_page_raw = mxc_nand_write_page_raw_syndrome;
++			this->ecc.write_oob = mxc_nand_write_oob_syndrome;
++			this->ecc.bytes = 9;
++			this->ecc.prepad = 7;
 +		} else {
-+			this->ecc.layout = &nand_hw_eccoob_16;
++			this->ecc.mode = NAND_ECC_HW;
 +		}
-+	} else {
 +		if (host->pagesize_2k) {
 +			this->ecc.layout = &nand_hw_eccoob2k_8;
 +		} else {
 +			this->ecc.layout = &nand_hw_eccoob_8;
 +		}
-+	}
-+	if (pdata->hw_ecc) {
-+		this->ecc.calculate = mxc_nand_calculate_ecc;
-+		this->ecc.hwctl = mxc_nand_enable_hwecc;
-+		this->ecc.correct = mxc_nand_correct_data;
-+		this->ecc.mode = NAND_ECC_HW;
 +		this->ecc.size = 512;
-+		this->ecc.bytes = 3;
 +		tmp = nfc_read_reg(host->regs, NFC_CONFIG1);
 +		tmp |= NFC_ECC_EN;
 +		nfc_write_reg(tmp, host->regs, NFC_CONFIG1);
 +	} else {
-+		this->ecc.size = 512;
-+		this->ecc.bytes = 3;
 +		this->ecc.mode = NAND_ECC_SOFT;
 +		tmp = nfc_read_reg(host->regs, NFC_CONFIG1);
 +		tmp &= ~NFC_ECC_EN;
@@ -11632,16 +12380,20 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
 +
 +	err = nand_scan_tail(mtd);
 +	if (err) {
- 		goto escan;
- 	}
- 
++		goto escan;
++	}
++	if (cpu_is_mx25()) {
++		mtd->flags &= ~MTD_OOB_WRITEABLE;
++	}
++
 +	pr_info("MXC MTD nand Driver IRQ %d bus width: %u bit %s ECC IO: %08lx\n",
 +		host->irq, pdata->width * 8, pdata->hw_ecc ? "HW" : "SW",
 +		(unsigned long)res1->start);
++
  	/* Register the partitions */
  #ifdef CONFIG_MTD_PARTITIONS
  	nr_parts =
-@@ -981,10 +1235,19 @@ static int __init mxcnd_probe(struct pla
+@@ -981,10 +1557,19 @@ static int __init mxcnd_probe(struct pla
  	return 0;
  
  escan:
@@ -11662,7 +12414,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  	clk_put(host->clk);
  eclk:
  	kfree(host);
-@@ -995,46 +1258,63 @@ eclk:
+@@ -995,46 +1580,63 @@ eclk:
  static int __devexit mxcnd_remove(struct platform_device *pdev)
  {
  	struct mxc_nand_host *host = platform_get_drvdata(pdev);
@@ -11739,7 +12491,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  
  	return ret;
  }
-@@ -1047,7 +1327,7 @@ static int mxcnd_resume(struct platform_
+@@ -1047,7 +1649,7 @@ static int mxcnd_resume(struct platform_
  static struct platform_driver mxcnd_driver = {
  	.driver = {
  		   .name = DRIVER_NAME,
@@ -11748,7 +12500,7 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  	.remove = __exit_p(mxcnd_remove),
  	.suspend = mxcnd_suspend,
  	.resume = mxcnd_resume,
-@@ -1055,13 +1335,14 @@ static struct platform_driver mxcnd_driv
+@@ -1055,13 +1657,14 @@ static struct platform_driver mxcnd_driv
  
  static int __init mxc_nd_init(void)
  {
@@ -11767,9 +12519,9 @@ diff -urNp linux-2.6.30-rc4/drivers/mtd/nand/mxc_nand.c linux-2.6.30-rc4-karo/dr
  }
  
  static void __exit mxc_nd_cleanup(void)
-diff -urNp linux-2.6.30-rc4/drivers/net/Kconfig linux-2.6.30-rc4-karo/drivers/net/Kconfig
---- linux-2.6.30-rc4/drivers/net/Kconfig	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/drivers/net/Kconfig	2009-06-02 18:42:32.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/drivers/net/Kconfig linux-2.6.30-rc4-karo3/drivers/net/Kconfig
+--- linux-2.6.30-rc4-git/drivers/net/Kconfig	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/net/Kconfig	2009-06-02 18:42:32.000000000 +0200
 @@ -1859,7 +1859,7 @@ config 68360_ENET
  
  config FEC
@@ -11779,9 +12531,2053 @@ diff -urNp linux-2.6.30-rc4/drivers/net/Kconfig linux-2.6.30-rc4-karo/drivers/ne
  	help
  	  Say Y here if you want to use the built-in 10/100 Fast ethernet
  	  controller on some Motorola ColdFire and Freescale i.MX processors.
-diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/fec.c
---- linux-2.6.30-rc4/drivers/net/fec.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/drivers/net/fec.c	2009-06-02 18:43:03.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/drivers/net/can/Kconfig linux-2.6.30-rc4-karo3/drivers/net/can/Kconfig
+--- linux-2.6.30-rc4-git/drivers/net/can/Kconfig	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/net/can/Kconfig	2009-07-01 11:28:55.000000000 +0200
+@@ -22,4 +22,21 @@ config CAN_DEBUG_DEVICES
+ 	  a problem with CAN support and want to see more of what is going
+ 	  on.
+ 
++config CAN_FLEXCAN
++        tristate "Freescale FlexCAN"
++        depends on CAN && (MACH_MX25 || ARCH_MX35)
++        default m
++        ---help---
++          This select the support of Freescale CAN(FlexCAN).
++          This driver can also be built as a module.
++          If unsure, say N.
++
++config CAN_FLEXCAN_CAN1
++	bool "Enable CAN1 interface on i.MX25/i.MX35"
++	depends on CAN_FLEXCAN && (MACH_MX25 && !ARCH_MXC_EHCI_USBOTG)
++
++config CAN_FLEXCAN_CAN2
++	bool "Enable CAN2 interface on i.MX25/i.MX35"
++	depends on CAN_FLEXCAN
++
+ endmenu
+diff -purN linux-2.6.30-rc4-git/drivers/net/can/Makefile linux-2.6.30-rc4-karo3/drivers/net/can/Makefile
+--- linux-2.6.30-rc4-git/drivers/net/can/Makefile	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/net/can/Makefile	2009-07-01 11:29:31.000000000 +0200
+@@ -1,5 +1,9 @@
+ #
+ #  Makefile for the Linux Controller Area Network drivers.
+ #
++ifneq ($(CONFIG_CAN_DEBUG_DEVICES),)
++	EXTRA_CFLAGS += -DDEBUG
++endif
+ 
+ obj-$(CONFIG_CAN_VCAN)		+= vcan.o
++obj-$(CONFIG_CAN_FLEXCAN)	+= flexcan.o
+diff -purN linux-2.6.30-rc4-git/drivers/net/can/flexcan.c linux-2.6.30-rc4-karo3/drivers/net/can/flexcan.c
+--- linux-2.6.30-rc4-git/drivers/net/can/flexcan.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/drivers/net/can/flexcan.c	2009-07-06 15:17:41.000000000 +0200
+@@ -0,0 +1,1784 @@
++/*
++ * drivers/net/can/flexcan.c
++ *
++ * Copyright (C) 2009  Lothar Wassmann <LW@KARO-electronics.de>
++ *
++ * based on: drivers/net/can/flexcan/
++ *   Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
++ *
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * version 2 as published by the Free Software Foundation
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the:
++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
++ */
++
++/*
++ * Driver for Freescale CAN Controller FlexCAN.
++ */
++
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/netdevice.h>
++#include <linux/if_arp.h>
++#include <linux/if_ether.h>
++#include <linux/platform_device.h>
++#include <linux/regulator/consumer.h>
++#include <linux/clk.h>
++
++#include <asm/io.h>
++#include <asm/irq.h>
++#include <mach/hardware.h>
++#include <mach/mxc_can.h>
++
++#include "flexcan.h"
++
++#ifdef DEBUG
++static int debug = 0;
++#define dbg_lvl(n)	((n) < debug)
++module_param(debug, int, S_IRUGO | S_IWUSR);
++
++#define DBG(lvl, fmt...)	do { if (dbg_lvl(lvl)) printk(KERN_DEBUG fmt); } while (0)
++#else
++static int debug;
++#define dbg_lvl(n)	0
++module_param(debug, int, 0);
++
++#define DBG(lvl, fmt...)	do { } while (0)
++#endif
++
++#define ndev_dbg(d, l, fmt...)		do { if (dbg_lvl(l)) dev_dbg(&(d)->dev, fmt); } while (0)
++#define pdev_dbg(p, l, fmt...)		do { if (dbg_lvl(l)) dev_dbg(&(p)->dev, fmt); } while (0)
++#define flexcan_dbg(f, l, fmt...)	do { if (dbg_lvl(l)) dev_dbg(&(f)->dev->dev, fmt); } while (0)
++
++#define ndev_err(d, fmt...)	dev_err(&(d)->dev, fmt)
++#define pdev_err(p, fmt...)	dev_err(&(p)->dev, fmt)
++
++enum {
++	FLEXCAN_ATTR_STATE = 0,
++	FLEXCAN_ATTR_BITRATE,
++	FLEXCAN_ATTR_BR_PRESDIV,
++	FLEXCAN_ATTR_BR_RJW,
++	FLEXCAN_ATTR_BR_PROPSEG,
++	FLEXCAN_ATTR_BR_PSEG1,
++	FLEXCAN_ATTR_BR_PSEG2,
++	FLEXCAN_ATTR_BR_CLKSRC,
++	FLEXCAN_ATTR_MAXMB,
++	FLEXCAN_ATTR_XMIT_MAXMB,
++	FLEXCAN_ATTR_FIFO,
++	FLEXCAN_ATTR_WAKEUP,
++	FLEXCAN_ATTR_SRX_DIS,
++	FLEXCAN_ATTR_WAK_SRC,
++	FLEXCAN_ATTR_BCC,
++	FLEXCAN_ATTR_LOCAL_PRIORITY,
++	FLEXCAN_ATTR_ABORT,
++	FLEXCAN_ATTR_LOOPBACK,
++	FLEXCAN_ATTR_SMP,
++	FLEXCAN_ATTR_BOFF_REC,
++	FLEXCAN_ATTR_TSYN,
++	FLEXCAN_ATTR_LISTEN,
++	FLEXCAN_ATTR_EXTEND_MSG,
++	FLEXCAN_ATTR_STANDARD_MSG,
++#ifdef CONFIG_CAN_DEBUG_DEVICES
++	FLEXCAN_ATTR_DUMP_REG,
++	FLEXCAN_ATTR_DUMP_XMIT_MB,
++	FLEXCAN_ATTR_DUMP_RX_MB,
++#endif
++	FLEXCAN_ATTR_MAX
++};
++
++#ifdef DEBUG
++#define flexcan_reg_read(f,r)	_flexcan_reg_read(f, r, #r, __FUNCTION__)
++static inline unsigned long _flexcan_reg_read(struct flexcan_device *flexcan, int reg,
++					      const char *name, const char *fn)
++{
++	unsigned long val;
++	val = __raw_readl(flexcan->io_base + reg);
++	DBG(2, "%s: Read %08lx from %s[%p]\n", fn, val, name,
++	    flexcan->io_base + reg);
++	return val;
++}
++
++#define flexcan_reg_write(f,r,v)	_flexcan_reg_write(f, r, v, #r, __FUNCTION__)
++static inline void _flexcan_reg_write(struct flexcan_device *flexcan, int reg, unsigned long val,
++				      const char *name, const char *fn)
++{
++	DBG(2, "%s: Writing %08lx to %s[%p]\n", fn, val, name, flexcan->io_base + reg);
++	__raw_writel(val, flexcan->io_base + reg);
++}
++#else
++static inline unsigned long flexcan_reg_read(struct flexcan_device *flexcan, int reg)
++{
++	return __raw_readl(flexcan->io_base + reg);
++}
++
++static inline void flexcan_reg_write(struct flexcan_device *flexcan, int reg, unsigned long val)
++{
++	__raw_writel(val, flexcan->io_base + reg);
++}
++#endif
++
++static ssize_t flexcan_show_attr(struct device *dev,
++				 struct device_attribute *attr, char *buf);
++static ssize_t flexcan_set_attr(struct device *dev,
++				struct device_attribute *attr, const char *buf,
++				size_t count);
++
++static struct device_attribute flexcan_dev_attr[FLEXCAN_ATTR_MAX] = {
++	[FLEXCAN_ATTR_STATE] = __ATTR(state, 0444, flexcan_show_attr, NULL),
++	[FLEXCAN_ATTR_BITRATE] =
++	    __ATTR(bitrate, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_BR_PRESDIV] =
++	    __ATTR(br_presdiv, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_BR_RJW] =
++	    __ATTR(br_rjw, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_BR_PROPSEG] =
++	    __ATTR(br_propseg, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_BR_PSEG1] =
++	    __ATTR(br_pseg1, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_BR_PSEG2] =
++	    __ATTR(br_pseg2, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_BR_CLKSRC] =
++	    __ATTR(br_clksrc, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_MAXMB] =
++	    __ATTR(maxmb, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_XMIT_MAXMB] =
++	    __ATTR(xmit_maxmb, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_FIFO] =
++	    __ATTR(fifo, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_WAKEUP] =
++	    __ATTR(wakeup, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_SRX_DIS] =
++	    __ATTR(srx_dis, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_WAK_SRC] =
++	    __ATTR(wak_src, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_BCC] =
++	    __ATTR(bcc, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_LOCAL_PRIORITY] =
++	    __ATTR(local_priority, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_ABORT] =
++	    __ATTR(abort, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_LOOPBACK] =
++	    __ATTR(loopback, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_SMP] =
++	    __ATTR(smp, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_BOFF_REC] =
++	    __ATTR(boff_rec, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_TSYN] =
++	    __ATTR(tsyn, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_LISTEN] =
++	    __ATTR(listen, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_EXTEND_MSG] =
++	    __ATTR(ext_msg, 0644, flexcan_show_attr, flexcan_set_attr),
++	[FLEXCAN_ATTR_STANDARD_MSG] =
++	    __ATTR(std_msg, 0644, flexcan_show_attr, flexcan_set_attr),
++#ifdef CONFIG_CAN_DEBUG_DEVICES
++	[FLEXCAN_ATTR_DUMP_REG] =
++	    __ATTR(dump_reg, 0444, flexcan_show_attr, NULL),
++	[FLEXCAN_ATTR_DUMP_XMIT_MB] =
++	    __ATTR(dump_xmit_mb, 0444, flexcan_show_attr, NULL),
++	[FLEXCAN_ATTR_DUMP_RX_MB] =
++	    __ATTR(dump_rx_mb, 0444, flexcan_show_attr, NULL),
++#endif
++};
++
++static void flexcan_set_bitrate(struct flexcan_device *flexcan, int bitrate)
++{
++	/* TODO:: implement in future
++	 * based on the bitrate to get the timing of
++	 * presdiv, pseg1, pseg2, propseg
++	 */
++}
++
++static void flexcan_update_bitrate(struct flexcan_device *flexcan)
++{
++	int rate, div;
++
++	if (flexcan->br_clksrc)
++		rate = clk_get_rate(flexcan->clk);
++	else {
++		struct clk *clk;
++		clk = clk_get_sys(NULL, "ckih");
++		if (IS_ERR(clk))
++			return;
++		rate = clk_get_rate(clk);
++		clk_put(clk);
++	}
++	if (!rate)
++		return;
++
++	flexcan_dbg(flexcan, 0, "%s: master clock rate %u from %s\n",
++		    __FUNCTION__, rate, flexcan->br_clksrc ? "osc" : "pll");
++
++	div = flexcan->br_presdiv + 1;
++	div *= flexcan->br_propseg + flexcan->br_pseg1 + flexcan->br_pseg2 + 4;
++	flexcan->bitrate = (rate + div - 1) / div;
++
++	flexcan_dbg(flexcan, 0, "%s: flexcan bitrate %u time quantum %uns\n",
++		    __FUNCTION__, flexcan->bitrate,
++		    1000000000 / (flexcan->bitrate *
++				  (flexcan->br_propseg + flexcan->br_pseg1 +
++				   flexcan->br_pseg2 + 4)));
++}
++
++static inline void flexcan_read_hw_mb(struct flexcan_device *flexcan, struct can_hw_mb *mb,
++				      int buf_no)
++{
++	__raw_readsl(mb, flexcan->hwmb + buf_no * sizeof(*mb), sizeof(*mb));
++}
++
++static inline void flexcan_write_hw_mb(struct flexcan_device *flexcan, struct can_hw_mb *mb,
++				       int buf_no)
++{
++	__raw_writesl(flexcan->hwmb + buf_no * sizeof(*mb), mb, sizeof(*mb));
++}
++
++#ifdef CONFIG_CAN_DEBUG_DEVICES
++static int flexcan_dump_reg(struct flexcan_device *flexcan, char *buf)
++{
++	int ret = 0;
++	unsigned int reg;
++
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
++	ret += sprintf(buf + ret, "MCR::0x%08x\n", reg);
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_CTRL);
++	ret += sprintf(buf + ret, "CTRL::0x%08x\n", reg);
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_RXGMASK);
++	ret += sprintf(buf + ret, "RXGMASK::0x%08x\n", reg);
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_RX14MASK);
++	ret += sprintf(buf + ret, "RX14MASK::0x%08x\n", reg);
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_RX15MASK);
++	ret += sprintf(buf + ret, "RX15MASK::0x%08x\n", reg);
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_ECR);
++	ret += sprintf(buf + ret, "ECR::0x%08x\n", reg);
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_ESR);
++	ret += sprintf(buf + ret, "ESR::0x%08x\n", reg);
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_IMASK2);
++	ret += sprintf(buf + ret, "IMASK2::0x%08x\n", reg);
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_IMASK1);
++	ret += sprintf(buf + ret, "IMASK1::0x%08x\n", reg);
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_IFLAG2);
++	ret += sprintf(buf + ret, "IFLAG2::0x%08x\n", reg);
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_IFLAG1);
++	ret += sprintf(buf + ret, "IFLAG1::0x%08x\n", reg);
++	return ret;
++}
++
++static int flexcan_dump_xmit_mb(struct flexcan_device *flexcan, char *buf)
++{
++	int ret = 0, i;
++
++	clk_enable(flexcan->clk);
++	for (i = flexcan->xmit_maxmb + 1; i <= flexcan->maxmb; i++) {
++		int j;
++
++		ret += sprintf(buf + ret,
++			       "mb[%d]::CS:0x%08x ID:0x%08x DATA",
++			       i, flexcan->hwmb[i].mb_cs.data,
++			       flexcan->hwmb[i].mb_id);
++		for (j = 0; j < sizeof(flexcan->hwmb[i].mb_data); j++) {
++			ret += sprintf(buf + ret, ":%02x",
++				       flexcan->hwmb[i].mb_data[j]);
++		}
++		ret += sprintf(buf + ret, "\n");
++	}
++	clk_disable(flexcan->clk);
++	return ret;
++}
++
++static int flexcan_dump_rx_mb(struct flexcan_device *flexcan, char *buf)
++{
++	int ret = 0, i;
++
++	clk_enable(flexcan->clk);
++	for (i = 0; i <= flexcan->xmit_maxmb; i++) {
++		int j;
++
++		ret += sprintf(buf + ret,
++			       "mb[%d]::CS:0x%08x ID:0x%08x DATA",
++			       i, flexcan->hwmb[i].mb_cs.data,
++			       flexcan->hwmb[i].mb_id);
++		for (j = 0; j < sizeof(flexcan->hwmb[i].mb_data); j++) {
++			ret += sprintf(buf + ret, ":%02x",
++				       flexcan->hwmb[i].mb_data[j]);
++		}
++		ret += sprintf(buf + ret, "\n");
++	}
++	clk_disable(flexcan->clk);
++	return ret;
++}
++#endif
++
++static ssize_t flexcan_show_state(struct net_device *net, char *buf)
++{
++	int ret, esr;
++	struct flexcan_device *flexcan = netdev_priv(net);
++
++	ret = sprintf(buf, "%s::", netif_running(net) ? "Start" : "Stop");
++	if (netif_carrier_ok(net)) {
++		esr = flexcan_reg_read(flexcan, CAN_HW_REG_ESR);
++		switch ((esr & __ESR_FLT_CONF_MASK) >> __ESR_FLT_CONF_OFF) {
++		case 0:
++			ret += sprintf(buf + ret, "normal\n");
++			break;
++		case 1:
++			ret += sprintf(buf + ret, "error passive\n");
++			break;
++		default:
++			ret += sprintf(buf + ret, "bus off\n");
++		}
++	} else
++		ret += sprintf(buf + ret, "bus off\n");
++	return ret;
++}
++
++static ssize_t flexcan_show_attr(struct device *dev,
++				 struct device_attribute *attr, char *buf)
++{
++	int attr_id;
++	struct net_device *net = dev_get_drvdata(dev);
++	struct flexcan_device *flexcan = netdev_priv(net);
++
++	attr_id = attr - flexcan_dev_attr;
++	switch (attr_id) {
++	case FLEXCAN_ATTR_STATE:
++		return flexcan_show_state(net, buf);
++	case FLEXCAN_ATTR_BITRATE:
++		return sprintf(buf, "%d\n", flexcan->bitrate);
++	case FLEXCAN_ATTR_BR_PRESDIV:
++		return sprintf(buf, "%d\n", flexcan->br_presdiv + 1);
++	case FLEXCAN_ATTR_BR_RJW:
++		return sprintf(buf, "%d\n", flexcan->br_rjw);
++	case FLEXCAN_ATTR_BR_PROPSEG:
++		return sprintf(buf, "%d\n", flexcan->br_propseg + 1);
++	case FLEXCAN_ATTR_BR_PSEG1:
++		return sprintf(buf, "%d\n", flexcan->br_pseg1 + 1);
++	case FLEXCAN_ATTR_BR_PSEG2:
++		return sprintf(buf, "%d\n", flexcan->br_pseg2 + 1);
++	case FLEXCAN_ATTR_BR_CLKSRC:
++		return sprintf(buf, "%s\n", flexcan->br_clksrc ? "bus" : "osc");
++	case FLEXCAN_ATTR_MAXMB:
++		return sprintf(buf, "%d\n", flexcan->maxmb + 1);
++	case FLEXCAN_ATTR_XMIT_MAXMB:
++		return sprintf(buf, "%d\n", flexcan->xmit_maxmb + 1);
++	case FLEXCAN_ATTR_FIFO:
++		return sprintf(buf, "%d\n", flexcan->fifo);
++	case FLEXCAN_ATTR_WAKEUP:
++		return sprintf(buf, "%d\n", flexcan->wakeup);
++	case FLEXCAN_ATTR_SRX_DIS:
++		return sprintf(buf, "%d\n", flexcan->srx_dis);
++	case FLEXCAN_ATTR_WAK_SRC:
++		return sprintf(buf, "%d\n", flexcan->wak_src);
++	case FLEXCAN_ATTR_BCC:
++		return sprintf(buf, "%d\n", flexcan->bcc);
++	case FLEXCAN_ATTR_LOCAL_PRIORITY:
++		return sprintf(buf, "%d\n", flexcan->lprio);
++	case FLEXCAN_ATTR_ABORT:
++		return sprintf(buf, "%d\n", flexcan->abort);
++	case FLEXCAN_ATTR_LOOPBACK:
++		return sprintf(buf, "%d\n", flexcan->loopback);
++	case FLEXCAN_ATTR_SMP:
++		return sprintf(buf, "%d\n", flexcan->smp);
++	case FLEXCAN_ATTR_BOFF_REC:
++		return sprintf(buf, "%d\n", flexcan->boff_rec);
++	case FLEXCAN_ATTR_TSYN:
++		return sprintf(buf, "%d\n", flexcan->tsyn);
++	case FLEXCAN_ATTR_LISTEN:
++		return sprintf(buf, "%d\n", flexcan->listen);
++	case FLEXCAN_ATTR_EXTEND_MSG:
++		return sprintf(buf, "%d\n", flexcan->ext_msg);
++	case FLEXCAN_ATTR_STANDARD_MSG:
++		return sprintf(buf, "%d\n", flexcan->std_msg);
++#ifdef CONFIG_CAN_DEBUG_DEVICES
++	case FLEXCAN_ATTR_DUMP_REG:
++		return flexcan_dump_reg(flexcan, buf);
++	case FLEXCAN_ATTR_DUMP_XMIT_MB:
++		return flexcan_dump_xmit_mb(flexcan, buf);
++	case FLEXCAN_ATTR_DUMP_RX_MB:
++		return flexcan_dump_rx_mb(flexcan, buf);
++#endif
++	default:
++		return sprintf(buf, "%s:%p->%p\n", __func__, flexcan_dev_attr,
++			       attr);
++	}
++}
++
++static ssize_t flexcan_set_attr(struct device *dev,
++				struct device_attribute *attr, const char *buf,
++				size_t count)
++{
++	int attr_id, tmp;
++	struct net_device *net = dev_get_drvdata(dev);
++	struct flexcan_device *flexcan = netdev_priv(net);
++
++	attr_id = attr - flexcan_dev_attr;
++
++	mutex_lock(&flexcan->mutex);
++
++	if (netif_running(net))
++		goto set_finish;
++
++	if (attr_id == FLEXCAN_ATTR_BR_CLKSRC) {
++		if (!strcasecmp(buf, "bus"))
++			flexcan->br_clksrc = 1;
++		else if (!strcasecmp(buf, "osc"))
++			flexcan->br_clksrc = 0;
++		goto set_finish;
++	}
++
++	tmp = simple_strtoul(buf, NULL, 0);
++	switch (attr_id) {
++	case FLEXCAN_ATTR_BITRATE:
++		flexcan_set_bitrate(flexcan, tmp);
++		break;
++	case FLEXCAN_ATTR_BR_PRESDIV:
++		if ((tmp > 0) && (tmp <= FLEXCAN_MAX_PRESDIV)) {
++			flexcan->br_presdiv = tmp - 1;
++			flexcan_update_bitrate(flexcan);
++		}
++		break;
++	case FLEXCAN_ATTR_BR_RJW:
++		if ((tmp > 0) && (tmp <= FLEXCAN_MAX_RJW))
++			flexcan->br_rjw = tmp - 1;
++		break;
++	case FLEXCAN_ATTR_BR_PROPSEG:
++		if ((tmp > 0) && (tmp <= FLEXCAN_MAX_PROPSEG)) {
++			flexcan->br_propseg = tmp - 1;
++			flexcan_update_bitrate(flexcan);
++		}
++		break;
++	case FLEXCAN_ATTR_BR_PSEG1:
++		if ((tmp > 0) && (tmp <= FLEXCAN_MAX_PSEG1)) {
++			flexcan->br_pseg1 = tmp - 1;
++			flexcan_update_bitrate(flexcan);
++		}
++		break;
++	case FLEXCAN_ATTR_BR_PSEG2:
++		if ((tmp > 0) && (tmp <= FLEXCAN_MAX_PSEG2)) {
++			flexcan->br_pseg2 = tmp - 1;
++			flexcan_update_bitrate(flexcan);
++		}
++		break;
++	case FLEXCAN_ATTR_MAXMB:
++		if ((tmp > 0) && (tmp <= FLEXCAN_MAX_MB)) {
++			if (flexcan->maxmb != (tmp - 1)) {
++				flexcan->maxmb = tmp - 1;
++				if (flexcan->xmit_maxmb < flexcan->maxmb)
++					flexcan->xmit_maxmb = flexcan->maxmb;
++			}
++		}
++		break;
++	case FLEXCAN_ATTR_XMIT_MAXMB:
++		if ((tmp > 0) && (tmp <= (flexcan->maxmb + 1))) {
++			if (flexcan->xmit_maxmb != (tmp - 1))
++				flexcan->xmit_maxmb = tmp - 1;
++		}
++		break;
++	case FLEXCAN_ATTR_FIFO:
++		flexcan->fifo = !!tmp;
++		break;
++	case FLEXCAN_ATTR_WAKEUP:
++		flexcan->wakeup = !!tmp;
++		break;
++	case FLEXCAN_ATTR_SRX_DIS:
++		flexcan->srx_dis = !!tmp;
++		break;
++	case FLEXCAN_ATTR_WAK_SRC:
++		flexcan->wak_src = !!tmp;
++		break;
++	case FLEXCAN_ATTR_BCC:
++		flexcan->bcc = !!tmp;
++		break;
++	case FLEXCAN_ATTR_LOCAL_PRIORITY:
++		flexcan->lprio = !!tmp;
++		break;
++	case FLEXCAN_ATTR_ABORT:
++		flexcan->abort = !!tmp;
++		break;
++	case FLEXCAN_ATTR_LOOPBACK:
++		flexcan->loopback = !!tmp;
++		break;
++	case FLEXCAN_ATTR_SMP:
++		flexcan->smp = !!tmp;
++		break;
++	case FLEXCAN_ATTR_BOFF_REC:
++		flexcan->boff_rec = !!tmp;
++		break;
++	case FLEXCAN_ATTR_TSYN:
++		flexcan->tsyn = !!tmp;
++		break;
++	case FLEXCAN_ATTR_LISTEN:
++		flexcan->listen = !!tmp;
++		break;
++	case FLEXCAN_ATTR_EXTEND_MSG:
++		flexcan->ext_msg = !!tmp;
++		break;
++	case FLEXCAN_ATTR_STANDARD_MSG:
++		flexcan->std_msg = !!tmp;
++		break;
++	}
++ set_finish:
++	mutex_unlock(&flexcan->mutex);
++	return count;
++}
++
++static void flexcan_device_default(struct flexcan_device *dev)
++{
++	dev->br_clksrc = 1;
++	dev->br_rjw = 2;
++	dev->br_presdiv = 6;
++	dev->br_propseg = 4;
++	dev->br_pseg1 = 4;
++	dev->br_pseg2 = 7;
++
++	dev->bcc = 1;
++	dev->srx_dis = 1;
++	dev->smp = 1;
++	dev->abort = 1;
++
++	dev->maxmb = FLEXCAN_MAX_MB - 1;
++	dev->xmit_maxmb = (FLEXCAN_MAX_MB >> 1) - 1;
++	dev->xmit_mb = dev->maxmb - dev->xmit_maxmb;
++
++	dev->ext_msg = 1;
++	dev->std_msg = 1;
++}
++
++static int flexcan_device_attach(struct flexcan_device *flexcan)
++{
++	int ret;
++	struct resource *res;
++	struct platform_device *pdev = flexcan->dev;
++	struct flexcan_platform_data *plat_data = pdev->dev.platform_data;
++	int irq;
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!res)
++		return -ENODEV;
++
++	irq = platform_get_irq(pdev, 0);
++	if (irq < 0)
++		return -ENODEV;
++
++	if (!request_mem_region(res->start, resource_size(res), "flexcan")) {
++		return -EBUSY;
++	}
++
++	flexcan->irq = irq;
++	flexcan->io_base = ioremap_nocache(res->start, resource_size(res));
++	if (!flexcan->io_base) {
++		ret = -ENOMEM;
++		goto release;
++	}
++	pdev_dbg(pdev, 0, "controller registers %08lx remapped to %p\n",
++		 (unsigned long)res->start, flexcan->io_base);
++
++	flexcan->hwmb = flexcan->io_base + CAN_MB_BASE;
++	flexcan->rx_mask = flexcan->io_base + CAN_RXMASK_BASE;
++
++	flexcan->clk = clk_get(&pdev->dev, "can_clk");
++	if (IS_ERR(flexcan->clk)) {
++		ret = PTR_ERR(flexcan->clk);
++		dev_err(&pdev->dev, "Failed to get clock: %d\n", ret);
++		goto unmap;
++	}
++
++	if (plat_data) {
++		if (plat_data->active) {
++			ret = plat_data->active(pdev);
++			if (ret)
++				goto put_clk;
++		}
++		if (plat_data->core_reg) {
++			flexcan->core_reg = regulator_get(&pdev->dev,
++							  plat_data->core_reg);
++			if (IS_ERR(flexcan->core_reg)) {
++				ret = PTR_ERR(flexcan->core_reg);
++				goto deactivate;
++			}
++		}
++
++		if (plat_data->io_reg) {
++			flexcan->io_reg = regulator_get(&pdev->dev,
++							plat_data->io_reg);
++			if (IS_ERR(flexcan->core_reg)) {
++				ret = PTR_ERR(flexcan->io_reg);
++				goto put_reg;
++			}
++		}
++	}
++	return 0;
++
++ put_reg:
++	regulator_put(flexcan->core_reg);
++ deactivate:
++	if (plat_data->inactive)
++		plat_data->inactive(pdev);
++ put_clk:
++	clk_put(flexcan->clk);
++ unmap:
++	iounmap(flexcan->io_base);
++ release:
++	release_mem_region(res->start, resource_size(res));
++	return ret;
++}
++
++static void flexcan_device_detach(struct flexcan_device *flexcan)
++{
++	struct platform_device *pdev = flexcan->dev;
++	struct flexcan_platform_data *plat_data = pdev->dev.platform_data;
++	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++
++	BUG_ON(!res);
++
++	clk_put(flexcan->clk);
++
++	if (flexcan->io_reg) {
++		regulator_put(flexcan->io_reg);
++	}
++
++	if (flexcan->core_reg) {
++		regulator_put(flexcan->core_reg);
++	}
++
++	if (plat_data && plat_data->inactive)
++		plat_data->inactive(pdev);
++
++	iounmap(flexcan->io_base);
++	release_mem_region(res->start, resource_size(res));
++}
++
++static void flexcan_mbm_isr(struct work_struct *work);
++static void flexcan_err_handler(struct work_struct *work);
++
++static struct net_device *flexcan_device_alloc(struct platform_device *pdev,
++					       void (*setup)(struct net_device *dev))
++{
++	struct flexcan_device *flexcan;
++	struct net_device *net;
++	int i, num;
++	int ret;
++
++	net = alloc_netdev(sizeof(*flexcan), "can%d", setup);
++	if (net == NULL) {
++		pdev_err(pdev, "Failed to allocate netdevice\n");
++		return ERR_PTR(-ENOMEM);
++	}
++	flexcan = netdev_priv(net);
++
++	init_timer(&flexcan->timer);
++	mutex_init(&flexcan->mutex);
++	INIT_WORK(&flexcan->mb_work, flexcan_mbm_isr);
++	INIT_WORK(&flexcan->err_work, flexcan_err_handler);
++
++	flexcan->dev = pdev;
++	ret = flexcan_device_attach(flexcan);
++	if (ret) {
++		free_netdev(net);
++		return ERR_PTR(ret);
++	}
++	flexcan_device_default(flexcan);
++	flexcan_update_bitrate(flexcan);
++
++	num = ARRAY_SIZE(flexcan_dev_attr);
++
++	for (i = 0; i < num; i++) {
++		ret = device_create_file(&pdev->dev, flexcan_dev_attr + i);
++		if (ret) {
++			pdev_err(pdev, "Failed to create attribute file %s: %d\n",
++				(flexcan_dev_attr + i)->attr.name, ret);
++			for (i--; i >= 0; i--)
++				device_remove_file(&pdev->dev, flexcan_dev_attr + i);
++			flexcan_device_detach(flexcan);
++			free_netdev(net);
++			return ERR_PTR(ret);
++		}
++	}
++	platform_set_drvdata(pdev, net);
++	return net;
++}
++
++static void flexcan_device_free(struct net_device *dev)
++{
++	struct flexcan_device *flexcan = netdev_priv(dev);
++	struct platform_device *pdev = flexcan->dev;
++	int i;
++
++	ndev_dbg(dev, 0, "%s: Deleting timer\n", __FUNCTION__);
++	del_timer_sync(&flexcan->timer);
++
++	ndev_dbg(dev, 0, "%s: Removing sysfs files\n", __FUNCTION__);
++	for (i = 0; i < ARRAY_SIZE(flexcan_dev_attr); i++)
++		device_remove_file(&pdev->dev, flexcan_dev_attr + i);
++
++	ndev_dbg(dev, 0, "%s: Detaching can device\n", __FUNCTION__);
++	flexcan_device_detach(flexcan);
++	ndev_dbg(dev, 0, "%s: Freeing net_device\n", __FUNCTION__);
++	free_netdev(dev);
++}
++
++#define flexcan_swab32(x)				\
++	(((x) << 24) | ((x) >> 24) |			\
++		(((x) & (__u32)0x0000ff00UL) << 8) |	\
++		(((x) & (__u32)0x00ff0000UL) >> 8))
++
++static inline void flexcan_mb_write(struct can_frame *frame, struct can_hw_mb __iomem *hwmb,
++				    int code)
++{
++	int i;
++	unsigned long __iomem *s = (unsigned long *)&frame->data[0];
++	unsigned long __iomem *d = (unsigned long *)&hwmb->mb_data[0];
++	struct can_hw_mb mb;
++	unsigned int can_id;
++	int n_words = (frame->can_dlc + 3) / sizeof(unsigned int);
++
++	mb.mb_cs.data = 0;
++	mb.mb_cs.cs.code = code;
++	mb.mb_cs.cs.length = frame->can_dlc;
++
++	mb.mb_cs.cs.rtr = !!(frame->can_id & CAN_RTR_FLAG);
++
++	if (frame->can_id & CAN_EFF_FLAG) {
++		mb.mb_cs.cs.ide = 1;
++		mb.mb_cs.cs.srr = 1;
++		can_id = frame->can_id & CAN_EFF_MASK;
++	} else {
++		mb.mb_cs.cs.ide = 0;
++		can_id = (frame->can_id & CAN_SFF_MASK) << 18;
++	}
++
++	DBG(0, "%s: writing can_id %08x to mb_id %p\n", __FUNCTION__, can_id, &hwmb->mb_id);
++	__raw_writel(can_id, &hwmb->mb_id);
++	for (i = 0; i < n_words; i++, s++, d++) {
++		DBG(0, "%s: writing data %08lx to mb_data %p\n", __FUNCTION__,
++		    flexcan_swab32(*s), d);
++		__raw_writel(flexcan_swab32(*s), d);
++	}
++	DBG(0, "%s: Writing CS %08x to mb_cs %p\n", __FUNCTION__, mb.mb_cs.data, &hwmb->mb_cs);
++	__raw_writel(mb.mb_cs.data, &hwmb->mb_cs.data);
++}
++
++static inline void flexcan_mb_read(struct can_frame *frame, struct can_hw_mb __iomem *hwmb)
++{
++	int i;
++	unsigned long __iomem *s = (unsigned long *)&hwmb->mb_data[0];
++	unsigned long __iomem *d = (unsigned long *)&frame->data[0];
++	struct can_hw_mb mb;
++	unsigned int can_id;
++	int n_words;
++
++	mb.mb_cs.data = __raw_readl(&hwmb->mb_cs);
++	BUG_ON(mb.mb_cs.cs.code & CAN_MB_RX_BUSY);
++
++	can_id = __raw_readl(&hwmb->mb_id);
++
++	if (mb.mb_cs.cs.ide)
++		frame->can_id = (can_id & CAN_EFF_MASK) | CAN_EFF_FLAG;
++	else
++		frame->can_id = (can_id >> 18) & CAN_SFF_MASK;
++	if (mb.mb_cs.cs.rtr)
++		frame->can_id |= CAN_RTR_FLAG;
++
++	frame->can_dlc = mb.mb_cs.cs.length;
++	if (frame->can_dlc == 0 || frame->can_dlc > 8)
++		return;
++
++	n_words = (frame->can_dlc + 3) / sizeof(unsigned int);
++	for (i = 0; i < n_words; i++, s++, d++)
++		*d = flexcan_swab32(__raw_readl(s));
++}
++
++static inline void flexcan_memcpy(void *dst, void *src, int len)
++{
++	int i;
++	unsigned int __iomem *d = dst, *s = src;
++
++	DBG(2, "%s: Copying %u byte from %p to %p\n", __FUNCTION__, len, s, d);
++	WARN_ON(len & 3);
++	len = (len + 3) >> 2;
++	for (i = 0; i < len; i++, s++, d++)
++		__raw_writel(flexcan_swab32(*s), d);
++	if (dbg_lvl(1)) {
++		print_hex_dump(KERN_DEBUG, "swdat: ", DUMP_PREFIX_OFFSET, 16, 4,
++			       src, len << 2, 0);
++		print_hex_dump(KERN_DEBUG, "hwdat: ", DUMP_PREFIX_OFFSET, 16, 4,
++			       dst, len << 2, 0);
++	}
++}
++
++static inline struct can_frame *flexcan_skb_put(struct sk_buff *skb, unsigned int len)
++{
++	return (struct can_frame *)skb_put(skb, len);
++}
++
++static inline struct can_frame *flexcan_skb_data(struct sk_buff *skb)
++{
++	BUG_ON(skb == NULL);
++	return (struct can_frame *)skb->data;
++}
++
++static struct net_device_stats *flexcan_get_stats(struct net_device *dev)
++{
++	ndev_dbg(dev, 3, "%s@%d: \n", __FUNCTION__, __LINE__);
++	if (!netif_running(dev))
++		return &dev->stats;
++	ndev_dbg(dev, 3, "%s@%d: \n", __FUNCTION__, __LINE__);
++	return &dev->stats;
++}
++
++static void flexcan_mb_bottom(struct net_device *dev, int index)
++{
++	struct flexcan_device *flexcan = netdev_priv(dev);
++	struct net_device_stats *stats = flexcan_get_stats(dev);
++	struct can_hw_mb __iomem *hwmb;
++	struct can_frame *frame;
++	struct sk_buff *skb;
++	struct can_hw_mb mb;
++
++	ndev_dbg(dev, 1, "%s: index: %d\n", __FUNCTION__, index);
++
++	hwmb = flexcan->hwmb + index;
++	mb.mb_cs.data = __raw_readl(&hwmb->mb_cs.data);
++	if (flexcan->fifo ||
++	    index >= flexcan->maxmb - flexcan->xmit_maxmb) {
++		/* handle transmit MBs */
++
++		if (mb.mb_cs.cs.code == CAN_MB_TX_ABORT) {
++			mb.mb_cs.cs.code = CAN_MB_TX_INACTIVE;
++			__raw_writel(mb.mb_cs.data, &hwmb->mb_cs.data);
++		}
++		if (mb.mb_cs.cs.code & CAN_MB_TX_INACTIVE) {
++			if (flexcan->xmit_buffers++ == 0) {
++				ndev_dbg(dev, 1, "%s: Starting netif queue\n", __FUNCTION__);
++				netif_start_queue(dev);
++			}
++			BUG_ON(flexcan->xmit_buffers > flexcan->maxmb - flexcan->xmit_maxmb);
++			return;
++		}
++		/* if fifo is enabled all RX MBs should be handled in the fifo_isr */
++		BUG();
++	}
++	if (dbg_lvl(1))
++		print_hex_dump(KERN_DEBUG, "rx_mb: ", DUMP_PREFIX_OFFSET, 16, 4,
++			       hwmb, sizeof(*hwmb), 0);
++	/* handle RX MB in case fifo is not used */
++	BUG_ON(flexcan->fifo);
++	if (mb.mb_cs.cs.code & CAN_MB_RX_BUSY) {
++		ndev_dbg(dev, -1, "%s: MB[%02x] is busy: %x\n", __FUNCTION__,
++			 index, mb.mb_cs.cs.code);
++		/* unlock buffer */
++		(void)flexcan_reg_read(flexcan, CAN_HW_REG_TIMER);
++		return;
++	}
++
++	skb = dev_alloc_skb(sizeof(struct can_frame));
++	if (skb) {
++		frame = flexcan_skb_put(skb, sizeof(*frame));
++		flexcan_mb_read(frame, hwmb);
++		/* unlock buffer */
++		(void)flexcan_reg_read(flexcan, CAN_HW_REG_TIMER);
++
++		dev->last_rx = jiffies;
++		stats->rx_packets++;
++		stats->rx_bytes += frame->can_dlc;
++
++		skb->dev = dev;
++		skb->protocol = __constant_htons(ETH_P_CAN);
++		skb->ip_summed = CHECKSUM_UNNECESSARY;
++		netif_receive_skb(skb);
++	} else {
++		flexcan_dbg(flexcan, 0, "%s: Could not allocate SKB; dropping packet\n",
++			    __FUNCTION__);
++
++		stats->rx_dropped++;
++	}
++}
++
++static void flexcan_fifo_isr(struct net_device *dev, unsigned int iflag1)
++{
++	struct flexcan_device *flexcan = netdev_priv(dev);
++	struct net_device_stats *stats = flexcan_get_stats(dev);
++	struct sk_buff *skb;
++	struct can_hw_mb __iomem *hwmb = flexcan->hwmb;
++	struct can_frame *frame;
++
++	ndev_dbg(dev, 2, "%s: \n", __FUNCTION__);
++	if (dbg_lvl(1))
++		print_hex_dump(KERN_DEBUG, "rx_mb: ", DUMP_PREFIX_OFFSET, 16, 4,
++			       hwmb, sizeof(*hwmb), 0);
++	if (iflag1 & __FIFO_RDY_INT) {
++		skb = dev_alloc_skb(sizeof(struct can_frame));
++		if (skb) {
++			frame = flexcan_skb_put(skb, sizeof(*frame));
++			flexcan_mb_read(frame, hwmb);
++			/* unlock mb */
++			(void) flexcan_reg_read(flexcan, CAN_HW_REG_TIMER);
++
++			dev->last_rx = jiffies;
++
++			stats->rx_packets++;
++			stats->rx_bytes += frame->can_dlc;
++
++			skb->dev = dev;
++			skb->protocol = __constant_htons(ETH_P_CAN);
++			skb->ip_summed = CHECKSUM_UNNECESSARY;
++			netif_receive_skb(skb);
++		} else {
++			(void)__raw_readl(&hwmb->mb_cs.data);
++			/* unlock mb */
++			(void) flexcan_reg_read(flexcan, CAN_HW_REG_TIMER);
++		}
++	}
++
++	if (iflag1 & (__FIFO_OV_INT | __FIFO_WARN_INT)) {
++		skb = dev_alloc_skb(sizeof(struct can_frame));
++		if (skb) {
++			frame = flexcan_skb_put(skb, sizeof(*frame));
++			frame->can_id = CAN_ERR_FLAG | CAN_ERR_CRTL;
++			frame->can_dlc = CAN_ERR_DLC;
++			if (iflag1 & __FIFO_WARN_INT)
++				frame->data[1] |=
++				    CAN_ERR_CRTL_TX_WARNING |
++				    CAN_ERR_CRTL_RX_WARNING;
++			if (iflag1 & __FIFO_OV_INT)
++				frame->data[1] |= CAN_ERR_CRTL_RX_OVERFLOW;
++			if (dbg_lvl(1))
++				print_hex_dump(KERN_DEBUG, "err_mb: ", DUMP_PREFIX_OFFSET, 16, 4,
++					       frame, sizeof(*frame), 0);
++
++			skb->dev = dev;
++			skb->protocol = __constant_htons(ETH_P_CAN);
++			skb->ip_summed = CHECKSUM_UNNECESSARY;
++			netif_receive_skb(skb);
++		}
++	}
++}
++
++/*
++ * called by CAN ISR to handle mb events.
++ */
++static void flexcan_mbm_isr(struct work_struct *work)
++{
++	struct flexcan_device *flexcan = container_of(work, struct flexcan_device, mb_work);
++	struct net_device *dev = platform_get_drvdata(flexcan->dev);
++	int i, iflag1, iflag2, maxmb;
++
++	i = 0;
++
++	ndev_dbg(dev, 2, "%s: \n", __FUNCTION__);
++
++	iflag1 = flexcan_reg_read(flexcan, CAN_HW_REG_IFLAG1) &
++		flexcan_reg_read(flexcan, CAN_HW_REG_IMASK1);
++	if (flexcan->maxmb > 31) {
++		maxmb = flexcan->maxmb + 1 - 32;
++		iflag2 = flexcan_reg_read(flexcan, CAN_HW_REG_IFLAG2) &
++		    flexcan_reg_read(flexcan, CAN_HW_REG_IMASK2);
++		iflag2 &= (1 << maxmb) - 1;
++		maxmb = 32;
++	} else {
++		maxmb = flexcan->maxmb + 1;
++		iflag1 &= (1 << maxmb) - 1;
++		iflag2 = 0;
++	}
++
++	ndev_dbg(dev, 2, "%s: loop=%d iflag1=%08x\n", __FUNCTION__, i, iflag1);
++
++	flexcan_reg_write(flexcan, CAN_HW_REG_IFLAG1, iflag1);
++	flexcan_reg_write(flexcan, CAN_HW_REG_IFLAG2, iflag2);
++
++	if (flexcan->fifo) {
++		flexcan_fifo_isr(dev, iflag1);
++		iflag1 &= ~0xFF;
++	}
++	for (i = 0; iflag1 && (i < maxmb); i++) {
++		if (iflag1 & (1 << i)) {
++			iflag1 &= ~(1 << i);
++			flexcan_mb_bottom(dev, i);
++		}
++	}
++
++	for (i = maxmb; iflag2 && (i <= flexcan->maxmb); i++) {
++		if (iflag2 & (1 << (i - 32))) {
++			iflag2 &= ~(1 << (i - 32));
++			flexcan_mb_bottom(dev, i);
++		}
++	}
++	enable_irq(flexcan->irq);
++}
++
++static int flexcan_mbm_xmit(struct flexcan_device *flexcan, struct can_frame *frame)
++{
++	int i = flexcan->xmit_mb;
++	struct can_hw_mb __iomem *hwmb = flexcan->hwmb;
++	static int last;
++
++	if (flexcan->xmit_buffers != last) {
++		flexcan_dbg(flexcan, 1, "%s: %d free buffers\n", __FUNCTION__,
++			    flexcan->xmit_buffers);
++		last = flexcan->xmit_buffers;
++	}
++	do {
++		struct can_hw_mb mb;
++
++		mb.mb_cs.data = __raw_readl(&hwmb[i].mb_cs);
++
++		if (mb.mb_cs.cs.code == CAN_MB_TX_INACTIVE)
++			break;
++		if (++i > flexcan->maxmb) {
++			if (flexcan->fifo)
++				i = FLEXCAN_MAX_FIFO_MB;
++			else
++				i = flexcan->xmit_maxmb + 1;
++		}
++		if (i == flexcan->xmit_mb) {
++			flexcan_dbg(flexcan, 0, "%s: no free xmit buffer\n", __FUNCTION__);
++			return 0;
++		}
++	} while (1);
++
++	flexcan->xmit_mb = i + 1;
++	if (flexcan->xmit_mb > flexcan->maxmb) {
++		if (flexcan->fifo)
++			flexcan->xmit_mb = FLEXCAN_MAX_FIFO_MB;
++		else
++			flexcan->xmit_mb = flexcan->xmit_maxmb + 1;
++	}
++
++	flexcan_dbg(flexcan, 1, "%s: Enabling transmission of buffer %d\n", __FUNCTION__, i);
++	flexcan_mb_write(frame, &hwmb[i], CAN_MB_TX_ONCE);
++
++	if (dbg_lvl(1))
++		print_hex_dump(KERN_DEBUG, "tx_mb: ", DUMP_PREFIX_OFFSET, 16, 4,
++			       &hwmb[i], sizeof(*hwmb), 0);
++	return 1;
++}
++
++static void flexcan_mbm_init(struct flexcan_device *flexcan)
++{
++	struct can_hw_mb __iomem *hwmb;
++	int rx_mb, i;
++
++	flexcan_dbg(flexcan, 0, "%s@%d: \n", __FUNCTION__, __LINE__);
++
++	/* Set global mask to receive all messages */
++	flexcan_reg_write(flexcan, CAN_HW_REG_RXGMASK, 0);
++	flexcan_reg_write(flexcan, CAN_HW_REG_RX14MASK, 0);
++	flexcan_reg_write(flexcan, CAN_HW_REG_RX15MASK, 0);
++
++	for (i = 0; i < FLEXCAN_MAX_MB; i++) {
++		int j;
++		void __iomem *mb = &flexcan->hwmb[i];
++		void __iomem *rxm = &flexcan->rx_mask[i];
++
++		__raw_writel(0, rxm);
++		for (j = 0; j < sizeof(*flexcan->hwmb); j += 4) {
++			__raw_writel(0, mb + j);
++		}
++	}
++
++	if (flexcan->fifo)
++		rx_mb = FLEXCAN_MAX_FIFO_MB;
++	else
++		rx_mb = flexcan->maxmb - flexcan->xmit_maxmb;
++
++	hwmb = flexcan->hwmb;
++	if (flexcan->fifo) {
++		unsigned long *id_table = flexcan->io_base + CAN_FIFO_BASE;
++		for (i = 0; i < rx_mb; i++)
++			__raw_writel(0, &id_table[i]);
++	} else {
++		for (i = 0; i < rx_mb; i++) {
++			struct can_hw_mb mb;
++
++			mb.mb_cs.data = 0;
++			mb.mb_cs.cs.code = CAN_MB_RX_EMPTY;
++			if (flexcan->ext_msg && flexcan->std_msg)
++				mb.mb_cs.cs.ide = i & 1;
++			else if (flexcan->ext_msg)
++				mb.mb_cs.cs.ide = 1;
++
++			__raw_writel(mb.mb_cs.data, &hwmb[i]);
++		}
++	}
++
++	for (; i <= flexcan->maxmb; i++) {
++		struct can_hw_mb mb;
++
++		mb.mb_cs.data = 0;
++		mb.mb_cs.cs.code = CAN_MB_TX_INACTIVE;
++		__raw_writel(mb.mb_cs.data, &hwmb[i]);
++	}
++
++	flexcan->xmit_mb = rx_mb;
++	flexcan->xmit_buffers = flexcan->maxmb - flexcan->xmit_maxmb;
++}
++
++static void flexcan_hw_start(struct flexcan_device *flexcan)
++{
++	unsigned int reg;
++
++	flexcan_dbg(flexcan, 0, "%s: \n", __FUNCTION__);
++
++	if ((flexcan->maxmb + 1) > 32) {
++		flexcan_reg_write(flexcan, CAN_HW_REG_IMASK1, ~0);
++		reg = (1 << (flexcan->maxmb - 31)) - 1;
++		flexcan_reg_write(flexcan, CAN_HW_REG_IMASK2, reg);
++	} else {
++		reg = (1 << (flexcan->maxmb + 1)) - 1;
++		flexcan_reg_write(flexcan, CAN_HW_REG_IMASK1, reg);
++		flexcan_reg_write(flexcan, CAN_HW_REG_IMASK2, 0);
++	}
++
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
++	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg & ~__MCR_HALT);
++}
++
++static void flexcan_hw_stop(struct flexcan_device *flexcan)
++{
++	unsigned int reg;
++
++	flexcan_dbg(flexcan, 0, "%s: \n", __FUNCTION__);
++
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
++	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg | __MCR_HALT);
++}
++
++static int flexcan_hw_reset(struct flexcan_device *flexcan)
++{
++	struct platform_device *pdev __attribute__((unused)) = flexcan->dev;
++	unsigned int reg;
++	int timeout = 100000;
++
++	flexcan_dbg(flexcan, 0, "%s: \n", __FUNCTION__);
++
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
++	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg | __MCR_MDIS);
++
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_CTRL);
++	if (flexcan->br_clksrc)
++		reg |= __CTRL_CLK_SRC;
++	else
++		reg &= ~__CTRL_CLK_SRC;
++	flexcan_reg_write(flexcan, CAN_HW_REG_CTRL, reg);
++
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR) & ~__MCR_MDIS;
++	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg);
++	reg |= __MCR_SOFT_RST;
++	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg);
++
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
++	while (reg & __MCR_SOFT_RST) {
++		if (--timeout <= 0) {
++			dev_err(&pdev->dev, "Flexcan software Reset Timeout\n");
++			return -ETIME;
++		}
++		udelay(10);
++		reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
++	}
++	return 0;
++}
++
++static void flexcan_mcr_setup(struct flexcan_device *flexcan)
++{
++	unsigned int reg;
++
++	flexcan_dbg(flexcan, 0, "%s: \n", __FUNCTION__);
++
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
++	reg &= ~(__MCR_MAX_MB_MASK | __MCR_WAK_MSK | __MCR_MAX_IDAM_MASK);
++
++	if (flexcan->fifo)
++		reg |= __MCR_FEN;
++	else
++		reg &= ~__MCR_FEN;
++
++	if (flexcan->wakeup)
++		reg |= __MCR_SLF_WAK | __MCR_WAK_MSK;
++	else
++		reg &= ~(__MCR_SLF_WAK | __MCR_WAK_MSK);
++
++	if (flexcan->wak_src)
++		reg |= __MCR_WAK_SRC;
++	else
++		reg &= ~__MCR_WAK_SRC;
++
++	if (flexcan->srx_dis)
++		reg |= __MCR_SRX_DIS;
++	else
++		reg &= ~__MCR_SRX_DIS;
++
++	if (flexcan->bcc)
++		reg |= __MCR_BCC;
++	else
++		reg &= ~__MCR_BCC;
++
++	if (flexcan->lprio)
++		reg |= __MCR_LPRIO_EN;
++	else
++		reg &= ~__MCR_LPRIO_EN;
++
++	if (flexcan->abort)
++		reg |= __MCR_AEN;
++	else
++		reg &= ~__MCR_AEN;
++
++	reg |= (flexcan->maxmb << __MCR_MAX_MB_OFFSET);
++	reg |= __MCR_DOZE | __MCR_MAX_IDAM_C;
++	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg);
++}
++
++static void flexcan_ctrl_setup(struct flexcan_device *flexcan)
++{
++	unsigned int reg;
++
++	flexcan_dbg(flexcan, 0, "%s: \n", __FUNCTION__);
++
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_CTRL);
++	reg &= ~(__CTRL_PRESDIV_MASK | __CTRL_RJW_MASK | __CTRL_PSEG1_MASK |
++		 __CTRL_PSEG2_MASK | __CTRL_PROPSEG_MASK);
++
++	if (flexcan->loopback)
++		reg |= __CTRL_LPB;
++	else
++		reg &= ~__CTRL_LPB;
++
++	if (flexcan->smp)
++		reg |= __CTRL_SMP;
++	else
++		reg &= ~__CTRL_SMP;
++
++	if (flexcan->boff_rec)
++		reg |= __CTRL_BOFF_REC;
++	else
++		reg &= ~__CTRL_BOFF_REC;
++
++	if (flexcan->tsyn)
++		reg |= __CTRL_TSYN;
++	else
++		reg &= ~__CTRL_TSYN;
++
++	if (flexcan->listen)
++		reg |= __CTRL_LOM;
++	else
++		reg &= ~__CTRL_LOM;
++
++	reg |= (flexcan->br_presdiv << __CTRL_PRESDIV_OFFSET) |
++	    (flexcan->br_rjw << __CTRL_RJW_OFFSET) |
++	    (flexcan->br_pseg1 << __CTRL_PSEG1_OFFSET) |
++	    (flexcan->br_pseg2 << __CTRL_PSEG2_OFFSET) |
++	    (flexcan->br_propseg << __CTRL_PROPSEG_OFFSET);
++
++	reg &= ~__CTRL_LBUF;
++
++	reg |= __CTRL_TWRN_MSK | __CTRL_RWRN_MSK | __CTRL_BOFF_MSK |
++	    __CTRL_ERR_MSK;
++
++	flexcan_reg_write(flexcan, CAN_HW_REG_CTRL, reg);
++}
++
++static int flexcan_hw_restart(struct net_device *dev)
++{
++	unsigned int reg;
++	struct flexcan_device *flexcan = netdev_priv(dev);
++
++	ndev_dbg(dev, 0, "%s: \n", __FUNCTION__);
++
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
++	if (reg & __MCR_SOFT_RST)
++		return 1;
++
++	flexcan_mcr_setup(flexcan);
++
++	flexcan_reg_write(flexcan, CAN_HW_REG_IMASK2, 0);
++	flexcan_reg_write(flexcan, CAN_HW_REG_IMASK1, 0);
++
++	flexcan_reg_write(flexcan, CAN_HW_REG_IFLAG2, 0xFFFFFFFF);
++	flexcan_reg_write(flexcan, CAN_HW_REG_IFLAG1, 0xFFFFFFFF);
++
++	flexcan_reg_write(flexcan, CAN_HW_REG_ECR, 0);
++
++	flexcan_mbm_init(flexcan);
++	netif_carrier_on(dev);
++	flexcan_hw_start(flexcan);
++
++	if (netif_queue_stopped(dev)) {
++		ndev_dbg(dev, 1, "%s@%d: Starting netif queue\n",
++			 __FUNCTION__, __LINE__);
++		netif_start_queue(dev);
++	}
++	return 0;
++}
++
++static void flexcan_hw_watch(unsigned long data)
++{
++	unsigned int reg, ecr;
++	struct net_device *dev = (struct net_device *)data;
++	struct flexcan_device *flexcan = netdev_priv(dev);
++
++	ndev_dbg(dev, 1, "%s: \n", __FUNCTION__);
++
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
++	if (reg & __MCR_MDIS) {
++		if (flexcan_hw_restart(dev))
++			mod_timer(&flexcan->timer, HZ / 20);
++		return;
++	}
++	ecr = flexcan_reg_read(flexcan, CAN_HW_REG_ECR);
++	if (flexcan->boff_rec) {
++		if (((reg & __ESR_FLT_CONF_MASK) >> __ESR_FLT_CONF_OFF) > 1) {
++			reg |= __MCR_SOFT_RST;
++			ndev_dbg(dev, 1, "%s: Initiating soft reset\n", __FUNCTION__);
++			flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg);
++			mod_timer(&flexcan->timer, HZ / 20);
++			return;
++		}
++		netif_carrier_on(dev);
++	}
++	ndev_dbg(dev, 1, "%s: Done\n", __FUNCTION__);
++}
++
++static void flexcan_hw_busoff(struct net_device *dev)
++{
++	struct flexcan_device *flexcan = netdev_priv(dev);
++	unsigned int reg;
++
++	netif_carrier_off(dev);
++
++	flexcan->timer.function = flexcan_hw_watch;
++	flexcan->timer.data = (unsigned long)dev;
++
++	if (flexcan->boff_rec) {
++		mod_timer(&flexcan->timer, HZ / 10);
++		return;
++	}
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
++	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg | __MCR_SOFT_RST);
++	mod_timer(&flexcan->timer, HZ / 20);
++}
++
++static int flexcan_hw_open(struct flexcan_device *flexcan)
++{
++	int ret;
++
++	if ((ret = flexcan_hw_reset(flexcan)) != 0)
++		return ret;
++
++	flexcan_mcr_setup(flexcan);
++	flexcan_ctrl_setup(flexcan);
++
++	flexcan_reg_write(flexcan, CAN_HW_REG_IMASK2, 0);
++	flexcan_reg_write(flexcan, CAN_HW_REG_IMASK1, 0);
++
++	flexcan_reg_write(flexcan, CAN_HW_REG_IFLAG2, 0xFFFFFFFF);
++	flexcan_reg_write(flexcan, CAN_HW_REG_IFLAG1, 0xFFFFFFFF);
++
++	flexcan_reg_write(flexcan, CAN_HW_REG_ECR, 0);
++	return 0;
++}
++
++static void flexcan_err_handler(struct work_struct *work)
++{
++	struct flexcan_device *flexcan = container_of(work, struct flexcan_device, err_work);
++	struct net_device *dev = platform_get_drvdata(flexcan->dev);
++	struct sk_buff *skb;
++	struct can_frame *frame;
++	unsigned int esr, ecr;
++
++	ndev_dbg(dev, 1, "%s@%d: \n", __FUNCTION__, __LINE__);
++
++	esr = flexcan_reg_read(flexcan, CAN_HW_REG_ESR);
++	flexcan_reg_write(flexcan, CAN_HW_REG_ESR, esr & __ESR_INTERRUPTS);
++	enable_irq(flexcan->irq);
++
++	if (esr & __ESR_WAK_INT) {
++		ndev_dbg(dev, 0, "%s@%d: \n", __FUNCTION__, __LINE__);
++		return;
++	}
++
++	skb = dev_alloc_skb(sizeof(struct can_frame));
++	if (!skb) {
++		ndev_err(dev, "%s: Failed to allocate skb\n", __func__);
++		return;
++	}
++	frame = flexcan_skb_put(skb, sizeof(*frame));
++	frame->can_id = CAN_ERR_FLAG | CAN_ERR_CRTL;
++	frame->can_dlc = CAN_ERR_DLC;
++
++	if (esr & __ESR_TWRN_INT) {
++		ndev_err(dev, "%s: TX_WARNING\n", __FUNCTION__);
++		frame->data[1] |= CAN_ERR_CRTL_TX_WARNING;
++	}
++	if (esr & __ESR_RWRN_INT) {
++		ndev_err(dev, "%s: RX_WARNING\n", __FUNCTION__);
++		frame->data[1] |= CAN_ERR_CRTL_RX_WARNING;
++	}
++	if (esr & __ESR_BOFF_INT) {
++		ndev_err(dev, "%s: BUS_OFF\n", __FUNCTION__);
++		frame->can_id |= CAN_ERR_BUSOFF;
++	}
++	if (esr & __ESR_ERR_INT) {
++		ndev_dbg(dev, 1, "%s@%d: \n", __FUNCTION__, __LINE__);
++		if (esr & __ESR_BIT1_ERR) {
++			ndev_err(dev, "%s: BIT1_ERR\n", __FUNCTION__);
++			frame->data[2] |= CAN_ERR_PROT_BIT1;
++		}
++
++		if (esr & __ESR_BIT0_ERR) {
++			ndev_err(dev, "%s: BIT0_ERR\n", __FUNCTION__);
++			frame->data[2] |= CAN_ERR_PROT_BIT0;
++		}
++
++		if (esr & __ESR_ACK_ERR) {
++			ndev_err(dev, "%s: ACK_ERR\n", __FUNCTION__);
++			frame->can_id |= CAN_ERR_ACK;
++		}
++
++		/*TODO:// if (esr & __ESR_CRC_ERR) */
++
++		if (esr & __ESR_FRM_ERR) {
++			ndev_err(dev, "%s: FRM_ERR\n", __FUNCTION__);
++			frame->data[2] |= CAN_ERR_PROT_FORM;
++		}
++
++		if (esr & __ESR_STF_ERR) {
++			ndev_err(dev, "%s: STF_ERR\n", __FUNCTION__);
++			frame->data[2] |= CAN_ERR_PROT_STUFF;
++		}
++
++		ecr = flexcan_reg_read(flexcan, CAN_HW_REG_ECR);
++		switch ((esr & __ESR_FLT_CONF_MASK) >> __ESR_FLT_CONF_OFF) {
++		case 0:
++			ndev_dbg(dev, 0, "%s@%d: \n", __FUNCTION__, __LINE__);
++			if (__ECR_TX_ERR_COUNTER(ecr) >= __ECR_ACTIVE_THRESHOLD)
++				frame->data[1] |= CAN_ERR_CRTL_TX_WARNING;
++			if (__ECR_RX_ERR_COUNTER(ecr) >= __ECR_ACTIVE_THRESHOLD)
++				frame->data[1] |= CAN_ERR_CRTL_RX_WARNING;
++			break;
++		case 1:
++			ndev_dbg(dev, 0, "%s@%d: \n", __FUNCTION__, __LINE__);
++			if (__ECR_TX_ERR_COUNTER(ecr) >=
++			    __ECR_PASSIVE_THRESHOLD)
++				frame->data[1] |= CAN_ERR_CRTL_TX_PASSIVE;
++
++			if (__ECR_RX_ERR_COUNTER(ecr) >=
++			    __ECR_PASSIVE_THRESHOLD)
++				frame->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;
++			break;
++		default:
++			ndev_dbg(dev, 0, "%s@%d: \n", __FUNCTION__, __LINE__);
++			frame->can_id |= CAN_ERR_BUSOFF;
++		}
++	}
++
++	if (frame->can_id & CAN_ERR_BUSOFF) {
++		ndev_dbg(dev, 0, "%s: switchung bus off\n", __FUNCTION__);
++		flexcan_hw_busoff(dev);
++	}
++	skb->dev = dev;
++	skb->ip_summed = CHECKSUM_UNNECESSARY;
++	netif_receive_skb(skb);
++}
++
++static irqreturn_t flexcan_irq_handler(int irq, void *data)
++{
++	struct net_device *dev = data;
++	struct flexcan_device *flexcan = netdev_priv(dev);
++	unsigned int reg;
++
++	ndev_dbg(dev, 1, "%s: \n", __FUNCTION__);
++	disable_irq_nosync(irq);
++
++	reg = flexcan_reg_read(flexcan, CAN_HW_REG_ESR);
++	if (reg & __ESR_INTERRUPTS) {
++		ndev_dbg(dev, 1, "%s: Scheduling err handler\n", __FUNCTION__);
++		schedule_work(&flexcan->err_work);
++		return IRQ_HANDLED;
++	}
++
++	ndev_dbg(dev, 1, "%s: Scheduling mbm handler\n", __FUNCTION__);
++	schedule_work(&flexcan->mb_work);
++	return IRQ_HANDLED;
++}
++
++static int flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)
++{
++	struct can_frame *frame = flexcan_skb_data(skb);
++	struct flexcan_device *flexcan = netdev_priv(dev);
++	struct net_device_stats *stats = flexcan_get_stats(dev);
++
++	ndev_dbg(dev, 1, "%s: \n", __FUNCTION__);
++
++	if (frame->can_dlc > 8)
++		return -EINVAL;
++
++	if (flexcan_mbm_xmit(flexcan, frame)) {
++		dev_kfree_skb(skb);
++		stats->tx_bytes += frame->can_dlc;
++		stats->tx_packets++;
++		dev->trans_start = jiffies;
++		if (--flexcan->xmit_buffers == 0) {
++			ndev_dbg(dev, 1, "%s: Stopping netif queue\n", __FUNCTION__);
++			netif_stop_queue(dev);
++		}
++		BUG_ON(flexcan->xmit_buffers < 0);
++		return NETDEV_TX_OK;
++	}
++	ndev_dbg(dev, 1, "%s: could not transmit message\n", __FUNCTION__);
++	return NETDEV_TX_BUSY;
++}
++
++static int flexcan_open(struct net_device *dev)
++{
++	int ret;
++	struct flexcan_device *flexcan = netdev_priv(dev);
++	struct platform_device *pdev = flexcan->dev;
++	struct flexcan_platform_data *plat_data = pdev->dev.platform_data;
++
++	ndev_dbg(dev, 0, "%s: \n", __FUNCTION__);
++
++	ret = clk_enable(flexcan->clk);
++	if (ret)
++		goto clk_err;
++
++	if (flexcan->core_reg) {
++		ret = regulator_enable(flexcan->core_reg);
++		if (ret)
++			goto core_reg_err;
++	}
++
++	if (flexcan->io_reg) {
++		ret = regulator_enable(flexcan->io_reg);
++		if (ret)
++			goto io_reg_err;
++	}
++
++	if (plat_data && plat_data->xcvr_enable) {
++		ret = plat_data->xcvr_enable(pdev, 1);
++		if (ret)
++			goto enable_err;
++	}
++
++	ret = request_irq(flexcan->irq, flexcan_irq_handler, IRQF_SAMPLE_RANDOM,
++			  dev->name, dev);
++	if (ret)
++		goto irq_err;
++
++	ret = flexcan_hw_open(flexcan);
++	if (ret)
++		goto open_err;
++
++	flexcan_mbm_init(flexcan);
++	netif_carrier_on(dev);
++	flexcan_hw_start(flexcan);
++	return 0;
++
++ open_err:
++	free_irq(flexcan->irq, dev);
++ irq_err:
++	if (plat_data && plat_data->xcvr_enable)
++		plat_data->xcvr_enable(pdev, 0);
++ enable_err:
++	if (flexcan->io_reg)
++		regulator_disable(flexcan->io_reg);
++ io_reg_err:
++	if (flexcan->core_reg)
++		regulator_disable(flexcan->core_reg);
++ core_reg_err:
++	if (flexcan->clk)
++		clk_disable(flexcan->clk);
++ clk_err:
++	return ret;
++}
++
++static int flexcan_stop(struct net_device *dev)
++{
++	struct flexcan_device *flexcan = netdev_priv(dev);
++	struct platform_device *pdev = flexcan->dev;
++	struct flexcan_platform_data *plat_data = pdev->dev.platform_data;
++
++	flexcan_hw_stop(flexcan);
++
++	free_irq(flexcan->irq, dev);
++
++	if (plat_data && plat_data->xcvr_enable)
++		plat_data->xcvr_enable(pdev, 0);
++
++	if (flexcan->io_reg)
++		regulator_disable(flexcan->io_reg);
++	if (flexcan->core_reg)
++		regulator_disable(flexcan->core_reg);
++	clk_disable(flexcan->clk);
++	return 0;
++}
++
++static const struct net_device_ops flexcan_netdev_ops = {
++	.ndo_open	= flexcan_open,
++	.ndo_stop	= flexcan_stop,
++	.ndo_start_xmit = flexcan_start_xmit,
++	.ndo_get_stats	= flexcan_get_stats,
++};
++
++static void flexcan_setup(struct net_device *dev)
++{
++	dev->type = ARPHRD_CAN;
++	dev->mtu = sizeof(struct can_frame);
++	dev->hard_header_len = 0;
++	dev->addr_len = 0;
++	dev->tx_queue_len = FLEXCAN_MAX_MB;
++	dev->flags = IFF_NOARP;
++	dev->features = NETIF_F_NO_CSUM;
++
++	dev->netdev_ops = &flexcan_netdev_ops;
++	dev->destructor = flexcan_device_free;
++}
++
++static int flexcan_probe(struct platform_device *pdev)
++{
++	int ret;
++	struct net_device *net;
++
++	net = flexcan_device_alloc(pdev, flexcan_setup);
++	if (IS_ERR(net))
++		return PTR_ERR(net);
++
++	ret = register_netdev(net);
++	if (ret) {
++		flexcan_device_free(net);
++	}
++	return ret;
++}
++
++static int flexcan_remove(struct platform_device *pdev)
++{
++	struct net_device *net = platform_get_drvdata(pdev);
++
++	unregister_netdev(net);
++	return 0;
++}
++
++#ifdef CONFIG_PM
++static int flexcan_suspend(struct platform_device *pdev, pm_message_t state)
++{
++	struct net_device *net = platform_get_drvdata(pdev);
++	struct flexcan_device *flexcan = netdev_priv(net);
++	struct flexcan_platform_data *plat_data;
++
++	if (!(net->flags & IFF_UP))
++		return 0;
++
++	if (flexcan->wakeup)
++		set_irq_wake(flexcan->irq, 1);
++	else {
++		int ret;
++
++		plat_data = pdev->dev.platform_data;
++
++		if (plat_data && plat_data->xcvr_enable) {
++			ret = plat_data->xcvr_enable(pdev, 0);
++			if (ret)
++				return ret;
++		}
++		if (flexcan->io_reg) {
++			ret = regulator_disable(flexcan->io_reg);
++			if (ret)
++				return ret;
++		}
++		if (flexcan->core_reg) {
++			ret = regulator_disable(flexcan->core_reg);
++			if (ret)
++				return ret;
++		}
++		clk_disable(flexcan->clk);
++		if (plat_data && plat_data->inactive) {
++			plat_data->inactive(pdev);
++		}
++	}
++	return 0;
++}
++
++static int flexcan_resume(struct platform_device *pdev)
++{
++	int ret;
++	struct net_device *net = platform_get_drvdata(pdev);
++	struct flexcan_device *flexcan = netdev_priv(net);
++	struct flexcan_platform_data *plat_data;
++
++	if (!(net->flags & IFF_UP))
++		return 0;
++
++	if (flexcan->wakeup)
++		set_irq_wake(flexcan->irq, 0);
++	else {
++		plat_data = pdev->dev.platform_data;
++		if (plat_data && plat_data->active) {
++			ret = plat_data->active(pdev);
++			if (ret)
++				printk(KERN_ERR "%s: Failed activate hardware: %d\n",
++				       __func__, ret);
++		}
++		ret = clk_enable(flexcan->clk);
++		if (ret)
++			printk(KERN_ERR "%s: Failed to enable clock: %d\n",
++			       __func__, ret);
++
++		if (flexcan->core_reg) {
++			ret = regulator_enable(flexcan->core_reg);
++			if (ret)
++				printk(KERN_ERR "%s: Failed to enable core voltage: %d\n",
++				       __func__, ret);
++		}
++		if (flexcan->io_reg) {
++			ret = regulator_enable(flexcan->io_reg);
++			if (ret)
++				printk(KERN_ERR "%s: Failed to enable io voltage: %d\n",
++				       __func__, ret);
++		}
++
++		if (plat_data && plat_data->xcvr_enable) {
++			ret = plat_data->xcvr_enable(pdev, 1);
++			if (ret)
++				printk(KERN_ERR "%s: Failed to enable transceiver: %d\n",
++				       __func__, ret);
++		}
++	}
++	return 0;
++}
++#else
++#define flexcan_suspend		NULL
++#define flexcan_resume		NULL
++#endif
++
++static struct platform_driver flexcan_driver = {
++	.driver = {
++		.name = "mxc-flexcan",
++	},
++	.probe = flexcan_probe,
++	.remove = flexcan_remove,
++	.suspend = flexcan_suspend,
++	.resume = flexcan_resume,
++};
++
++static __init int flexcan_init(void)
++{
++	pr_info("Freescale FlexCAN Driver \n");
++	return platform_driver_register(&flexcan_driver);
++}
++
++static __exit void flexcan_exit(void)
++{
++	return platform_driver_unregister(&flexcan_driver);
++}
++
++module_init(flexcan_init);
++module_exit(flexcan_exit);
++
++MODULE_LICENSE("GPL");
+diff -purN linux-2.6.30-rc4-git/drivers/net/can/flexcan.h linux-2.6.30-rc4-karo3/drivers/net/can/flexcan.h
+--- linux-2.6.30-rc4-git/drivers/net/can/flexcan.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/drivers/net/can/flexcan.h	2009-07-06 15:17:55.000000000 +0200
+@@ -0,0 +1,214 @@
++/*
++ * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
++ */
++
++/*
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++/*!
++ * @file flexcan.h
++ *
++ * @brief FlexCan definitions.
++ *
++ * @ingroup can
++ */
++
++#ifndef __CAN_FLEXCAN_H__
++#define __CAN_FLEXCAN_H__
++
++#include <linux/list.h>
++#include <linux/platform_device.h>
++#include <linux/regulator/consumer.h>
++#include <linux/clk.h>
++#include <linux/can.h>
++#include <linux/can/core.h>
++#include <linux/can/error.h>
++
++struct can_mb_cs {
++	unsigned int time_stamp:16;
++	unsigned int length:4;
++	unsigned int rtr:1;
++	unsigned int ide:1;
++	unsigned int srr:1;
++	unsigned int nouse1:1;
++	unsigned int code:4;
++	unsigned int nouse2:4;
++};
++
++#define CAN_MB_RX_INACTIVE	0x0
++#define CAN_MB_RX_EMPTY		0x4
++#define CAN_MB_RX_FULL		0x2
++#define CAN_MB_RX_OVERRUN	0x6
++#define CAN_MB_RX_BUSY		0x1
++
++#define CAN_MB_TX_INACTIVE	0x8
++#define CAN_MB_TX_ABORT		0x9
++#define CAN_MB_TX_ONCE		0xC
++#define CAN_MB_TX_REMOTE	0xA
++
++struct can_hw_mb {
++	union {
++		struct can_mb_cs cs;
++		unsigned int data;
++	} mb_cs;
++	unsigned int mb_id;
++	unsigned char mb_data[8];
++};
++
++#define CAN_HW_REG_MCR		0x00
++#define CAN_HW_REG_CTRL		0x04
++#define CAN_HW_REG_TIMER	0x08
++#define CAN_HW_REG_RXGMASK	0x10
++#define CAN_HW_REG_RX14MASK	0x14
++#define CAN_HW_REG_RX15MASK	0x18
++#define CAN_HW_REG_ECR		0x1C
++#define CAN_HW_REG_ESR		0x20
++#define CAN_HW_REG_IMASK2	0x24
++#define CAN_HW_REG_IMASK1	0x28
++#define CAN_HW_REG_IFLAG2	0x2C
++#define CAN_HW_REG_IFLAG1	0x30
++
++#define CAN_MB_BASE	0x0080
++#define CAN_RXMASK_BASE	0x0880
++#define CAN_FIFO_BASE	0xE0
++
++#define __MCR_MDIS		(1 << 31)
++#define __MCR_FRZ		(1 << 30)
++#define __MCR_FEN		(1 << 29)
++#define __MCR_HALT		(1 << 28)
++#define __MCR_NOTRDY		(1 << 27)
++#define __MCR_WAK_MSK		(1 << 26)
++#define __MCR_SOFT_RST		(1 << 25)
++#define __MCR_FRZ_ACK		(1 << 24)
++#define __MCR_SLF_WAK		(1 << 22)
++#define __MCR_WRN_EN		(1 << 21)
++#define __MCR_LPM_ACK		(1 << 20)
++#define __MCR_WAK_SRC		(1 << 19)
++#define __MCR_DOZE		(1 << 18)
++#define __MCR_SRX_DIS		(1 << 17)
++#define __MCR_BCC		(1 << 16)
++#define __MCR_LPRIO_EN		(1 << 13)
++#define __MCR_AEN		(1 << 12)
++#define __MCR_MAX_IDAM_OFFSET 	8
++#define __MCR_MAX_IDAM_MASK 	(0x3 << __MCR_MAX_IDAM_OFFSET)
++#define __MCR_MAX_IDAM_A	(0x0 << __MCR_MAX_IDAM_OFFSET)
++#define __MCR_MAX_IDAM_B	(0x1 << __MCR_MAX_IDAM_OFFSET)
++#define __MCR_MAX_IDAM_C	(0x2 << __MCR_MAX_IDAM_OFFSET)
++#define __MCR_MAX_IDAM_D	(0x3 << __MCR_MAX_IDAM_OFFSET)
++#define __MCR_MAX_MB_OFFSET 	0
++#define __MCR_MAX_MB_MASK 	(0x3F)
++
++#define __CTRL_PRESDIV_OFFSET	24
++#define __CTRL_PRESDIV_MASK	(0xFF << __CTRL_PRESDIV_OFFSET)
++#define __CTRL_RJW_OFFSET	22
++#define __CTRL_RJW_MASK		(0x3 << __CTRL_RJW_OFFSET)
++#define __CTRL_PSEG1_OFFSET	19
++#define __CTRL_PSEG1_MASK	(0x7 << __CTRL_PSEG1_OFFSET)
++#define __CTRL_PSEG2_OFFSET	16
++#define __CTRL_PSEG2_MASK	(0x7 << __CTRL_PSEG2_OFFSET)
++#define __CTRL_BOFF_MSK		(0x1 << 15)
++#define __CTRL_ERR_MSK		(0x1 << 14)
++#define __CTRL_CLK_SRC		(0x1 << 13)
++#define __CTRL_LPB		(0x1 << 12)
++#define __CTRL_TWRN_MSK		(0x1 << 11)
++#define __CTRL_RWRN_MSK		(0x1 << 10)
++#define __CTRL_SMP		(0x1 << 7)
++#define __CTRL_BOFF_REC		(0x1 << 6)
++#define __CTRL_TSYN		(0x1 << 5)
++#define __CTRL_LBUF		(0x1 << 4)
++#define __CTRL_LOM		(0x1 << 3)
++#define __CTRL_PROPSEG_OFFSET	0
++#define __CTRL_PROPSEG_MASK	(0x7)
++
++#define __ECR_TX_ERR_COUNTER(x) ((x) & 0xFF)
++#define __ECR_RX_ERR_COUNTER(x) (((x) >> 8) & 0xFF)
++#define __ECR_PASSIVE_THRESHOLD	128
++#define __ECR_ACTIVE_THRESHOLD	96
++
++#define __ESR_TWRN_INT		(0x1 << 17)
++#define __ESR_RWRN_INT		(0x1 << 16)
++#define __ESR_BIT1_ERR		(0x1 << 15)
++#define __ESR_BIT0_ERR		(0x1 << 14)
++#define __ESR_ACK_ERR		(0x1 << 13)
++#define __ESR_CRC_ERR		(0x1 << 12)
++#define __ESR_FRM_ERR		(0x1 << 11)
++#define __ESR_STF_ERR		(0x1 << 10)
++#define __ESR_TX_WRN		(0x1 << 9)
++#define __ESR_RX_WRN		(0x1 << 8)
++#define __ESR_IDLE		(0x1 << 7)
++#define __ESR_TXRX		(0x1 << 6)
++#define __ESR_FLT_CONF_OFF	4
++#define __ESR_FLT_CONF_MASK	(0x3 << __ESR_FLT_CONF_OFF)
++#define __ESR_BOFF_INT		(0x1 << 2)
++#define __ESR_ERR_INT		(0x1 << 1)
++#define __ESR_WAK_INT		(0x1)
++
++#define __ESR_INTERRUPTS	(__ESR_WAK_INT | __ESR_ERR_INT | \
++				__ESR_BOFF_INT | __ESR_TWRN_INT | \
++				__ESR_RWRN_INT)
++
++#define __FIFO_OV_INT		(1 << 7)
++#define __FIFO_WARN_INT		(1 << 6)
++#define __FIFO_RDY_INT		(1 << 5)
++
++#define FLEXCAN_MAX_FIFO_MB	8
++#define FLEXCAN_MAX_MB		64
++#define FLEXCAN_MAX_PRESDIV	256
++#define FLEXCAN_MAX_RJW		4
++#define FLEXCAN_MAX_PSEG1	8
++#define FLEXCAN_MAX_PSEG2	8
++#define FLEXCAN_MAX_PROPSEG	8
++#define FLEXCAN_MAX_BITRATE	1000000
++
++struct flexcan_device {
++	struct mutex mutex;
++	struct work_struct err_work;
++	struct work_struct mb_work;
++	void __iomem *io_base;
++	struct can_hw_mb __iomem *hwmb;
++	unsigned int __iomem *rx_mask;
++	int xmit_buffers;
++	unsigned int xmit_mb;
++	unsigned int bitrate;
++	/* word 1 */
++	unsigned int br_presdiv:8;
++	unsigned int br_rjw:2;
++	unsigned int br_propseg:3;
++	unsigned int br_pseg1:3;
++	unsigned int br_pseg2:3;
++	unsigned int maxmb:6;
++	unsigned int xmit_maxmb:6;
++	unsigned int rsrvd:1;
++
++	/* word 2 */
++	unsigned int fifo:1;
++	unsigned int wakeup:1;
++	unsigned int srx_dis:1;
++	unsigned int wak_src:1;
++	unsigned int bcc:1;
++	unsigned int lprio:1;
++	unsigned int abort:1;
++	unsigned int br_clksrc:1;
++	unsigned int loopback:1;
++	unsigned int smp:1;
++	unsigned int boff_rec:1;
++	unsigned int tsyn:1;
++	unsigned int listen:1;
++
++	unsigned int ext_msg:1;
++	unsigned int std_msg:1;
++
++	struct timer_list timer;
++	struct platform_device *dev;
++	struct regulator *core_reg;
++	struct regulator *io_reg;
++	struct clk *clk;
++	int irq;
++};
++#endif /* __CAN_FLEXCAN_H__ */
+diff -purN linux-2.6.30-rc4-git/drivers/net/fec.c linux-2.6.30-rc4-karo3/drivers/net/fec.c
+--- linux-2.6.30-rc4-git/drivers/net/fec.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/net/fec.c	2009-07-01 12:59:40.000000000 +0200
 @@ -2,6 +2,12 @@
   * Fast Ethernet Controller (FEC) driver for Motorola MPC8xx.
   * Copyright (c) 1997 Dan Malek (dmalek@jlc.net)
@@ -12128,7 +14924,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  
  /* Make MII read/write commands for the FEC.
  */
-@@ -284,87 +378,233 @@ static int	mii_queue(struct net_device *
+@@ -284,47 +378,160 @@ static int	mii_queue(struct net_device *
  #define PHY_STAT_100HDX	0x4000  /* 100 Mbit half duplex selected */
  #define PHY_STAT_100FDX	0x8000  /* 100 Mbit full duplex selected */
  
@@ -12246,45 +15042,6 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +	dma_sync_single_for_device(fep->dma_dev, bdp->cbd_bufaddr,
 +				   len, DMA_TO_DEVICE);
 +}
-+
-+static void dump_packet(const char *prefix, const unsigned char *data, int len)
-+{
-+	if (dbg_lvl(3)) {
-+		print_hex_dump_bytes(prefix, DUMP_PREFIX_OFFSET, data, len);
-+	}
-+}
-+
-+static void dump_tx_buffers(struct fec_enet_private *fep)
-+{
-+	cbd_t *bdp = fep->tx_bd_base;
-+	int i;
-+
-+	printk(KERN_DEBUG "tx buffers: %u buffers\n", TX_RING_SIZE);
-+	for (i = 0; i < TX_RING_SIZE; i++, bdp++) {
-+		printk(KERN_DEBUG "  %p: %04x %04x %08x\n",
-+		       bdp,
-+		       bdp->cbd_sc,
-+		       bdp->cbd_datlen,
-+		       bdp->cbd_bufaddr);
-+		print_hex_dump_bytes("tx buffers:", DUMP_PREFIX_ADDRESS, bdp, sizeof(cbd_t));
-+	}
-+}
-+
-+static void dump_rx_buffers(struct fec_enet_private *fep)
-+{
-+	cbd_t *bdp = fep->rx_bd_base;
-+	int i;
-+
-+	printk(KERN_DEBUG "rx buffers: %lu buffers\n", RX_RING_SIZE);
-+	for (i = 0; i < RX_RING_SIZE; i++, bdp++) {
-+		printk(KERN_DEBUG "  %p: %04x %04x %08x\n",
-+		       bdp,
-+		       bdp->cbd_sc,
-+		       bdp->cbd_datlen,
-+		       bdp->cbd_bufaddr);
-+		print_hex_dump_bytes("rx buffers:", DUMP_PREFIX_ADDRESS, bdp, sizeof(cbd_t));
-+	}
-+}
  
  static int
  fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -12305,13 +15062,13 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +	if (!fep->linkstatus) {
 +		DBG(0, "%s: Cannot send packet; link is down\n", __FUNCTION__);
  		/* Link is down or autonegotiation is in progress. */
- 		return 1;
+-		return 1;
++		return NETDEV_TX_BUSY;
  	}
  
 -	spin_lock_irqsave(&fep->hw_lock, flags);
 +	spin_lock_irqsave(&fep->lock, flags);
 +
-+	//WARN_ON(fec_reg_read(fep, FEC_TDAR) & TDAR_BUSY);
 +	fec_enet_cbd_get(fep);
 +
  	/* Fill in a Tx ring entry */
@@ -12326,9 +15083,10 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  		 */
  		printk("%s: tx queue full!.\n", dev->name);
 -		spin_unlock_irqrestore(&fep->hw_lock, flags);
+-		return 1;
 +		fec_enet_cbd_put(fep);
 +		spin_unlock_irqrestore(&fep->lock, flags);
- 		return 1;
++		return NETDEV_TX_BUSY;
  	}
  #endif
 -
@@ -12341,9 +15099,8 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 -	bdp->cbd_bufaddr = __pa(skb->data);
  	bdp->cbd_datlen = skb->len;
  
-+	dump_packet("sending packet:", skb->data, skb->len);
  	/*
- 	 *	On some FEC implementations data must be aligned on
+@@ -332,39 +539,31 @@ fec_enet_start_xmit(struct sk_buff *skb,
  	 *	4-byte boundaries. Use bounce buffers to copy data
  	 *	and get it aligned. Ugh.
  	 */
@@ -12390,7 +15147,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  	/* If this was the last BD in the ring, start at the beginning again.
  	*/
  	if (status & BD_ENET_TX_WRAP) {
-@@ -375,12 +615,22 @@ fec_enet_start_xmit(struct sk_buff *skb,
+@@ -375,14 +574,19 @@ fec_enet_start_xmit(struct sk_buff *skb,
  
  	if (bdp == fep->dirty_tx) {
  		fep->tx_full = 1;
@@ -12401,21 +15158,19 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 -	fep->cur_tx = (cbd_t *)bdp;
 +	fep->cur_tx = bdp;
 +	fec_enet_cbd_put(fep);
-+#if 0
-+	if (dbg_lvl(3)) {
-+		dump_tx_buffers(fep);
-+		dump_rx_buffers(fep);
-+	}
-+#endif
++
 +	/* Trigger transmission start */
 +	fec_reg_write(fep, FEC_TDAR, DONT_CARE);
  
 -	spin_unlock_irqrestore(&fep->hw_lock, flags);
 +	spin_unlock_irqrestore(&fep->lock, flags);
  
- 	return 0;
+-	return 0;
++	return NETDEV_TX_OK;
  }
-@@ -390,101 +640,126 @@ fec_timeout(struct net_device *dev)
+ 
+ static void
+@@ -390,101 +594,125 @@ fec_timeout(struct net_device *dev)
  {
  	struct fec_enet_private *fep = netdev_priv(dev);
  
@@ -12592,12 +15347,11 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 -	spin_lock_irq(&fep->hw_lock);
 +	spin_lock(&fep->lock);
 +
-+	//WARN_ON(fec_reg_read(fep, FEC_TDAR) & TDAR_BUSY);
 +	fec_enet_cbd_get(fep);
  	bdp = fep->dirty_tx;
  
  	while (((status = bdp->cbd_sc) & BD_ENET_TX_READY) == 0) {
-@@ -495,22 +770,22 @@ fec_enet_tx(struct net_device *dev)
+@@ -495,22 +723,22 @@ fec_enet_tx(struct net_device *dev)
  		if (status & (BD_ENET_TX_HB | BD_ENET_TX_LC |
  				   BD_ENET_TX_RL | BD_ENET_TX_UN |
  				   BD_ENET_TX_CSL)) {
@@ -12628,15 +15382,13 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  		if (status & BD_ENET_TX_READY)
  			printk("HEY! Enet xmit interrupt and TX_READY.\n");
  #endif
-@@ -518,12 +793,13 @@ fec_enet_tx(struct net_device *dev)
+@@ -518,12 +746,11 @@ fec_enet_tx(struct net_device *dev)
  		 * but we eventually sent the packet OK.
  		 */
  		if (status & BD_ENET_TX_DEF)
 -			dev->stats.collisions++;
 +			fep->stats.collisions++;
  
-+		dump_packet("sent packet:", fep->tx_skbuff[fep->skb_dirty]->data,
-+			    fep->tx_skbuff[fep->skb_dirty]->len);
  		/* Free the sk buffer associated with this last transmit.
  		 */
 -		dev_kfree_skb_any(skb);
@@ -12645,7 +15397,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  		fep->skb_dirty = (fep->skb_dirty + 1) & TX_RING_MOD_MASK;
  
  		/* Update pointer to next buffer descriptor to be transmitted.
-@@ -538,12 +814,15 @@ fec_enet_tx(struct net_device *dev)
+@@ -538,12 +765,15 @@ fec_enet_tx(struct net_device *dev)
  		 */
  		if (fep->tx_full) {
  			fep->tx_full = 0;
@@ -12664,7 +15416,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  }
  
  
-@@ -555,22 +834,22 @@ fec_enet_tx(struct net_device *dev)
+@@ -555,22 +785,22 @@ fec_enet_tx(struct net_device *dev)
  static void
  fec_enet_rx(struct net_device *dev)
  {
@@ -12698,7 +15450,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  
  	/* First, grab all of the stats for the incoming packet.
  	 * These get messed up if we get called due to a busy condition.
-@@ -578,32 +857,34 @@ fec_enet_rx(struct net_device *dev)
+@@ -578,32 +808,34 @@ fec_enet_rx(struct net_device *dev)
  	bdp = fep->cur_rx;
  
  while (!((status = bdp->cbd_sc) & BD_ENET_RX_EMPTY)) {
@@ -12744,7 +15496,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  	}
  
  	/* Report late collisions as a frame error.
-@@ -611,39 +892,91 @@ while (!((status = bdp->cbd_sc) & BD_ENE
+@@ -611,39 +843,67 @@ while (!((status = bdp->cbd_sc) & BD_ENE
  	 * have in the buffer.  So, just drop this frame on the floor.
  	 */
  	if (status & BD_ENET_RX_CL) {
@@ -12753,33 +15505,14 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +		fep->stats.rx_errors++;
 +		fep->stats.rx_frame_errors++;
 +		DBG(0, "%s: Collision detected; dropping packet\n", __FUNCTION__);
-+		if (bdp->cbd_datlen > PKT_MAXBUF_SIZE) {
-+			printk(KERN_ERR "invalid packet size %u; max %u\n", bdp->cbd_datlen,
-+			       PKT_MAXBUF_SIZE);
-+		} else {
-+			fec_enet_rxbuf_get(fep, bdp, bdp->cbd_datlen);
-+			dump_packet("received packet:",
-+				    fep->rx_skbuff[rx_index]->data, bdp->cbd_datlen);
-+			fec_enet_rxbuf_put(fep, bdp, bdp->cbd_datlen);
-+		}
- 		goto rx_processing_done;
- 	}
--
-+#if 1
-+	if (!fep->opened) {
-+		DBG(0, "%s: Driver not opened; ignoring packet\n", __FUNCTION__);
-+		if (bdp->cbd_datlen > PKT_MAXBUF_SIZE) {
-+			printk(KERN_ERR "invalid packet size %u; max %u\n", bdp->cbd_datlen,
-+			       PKT_MAXBUF_SIZE);
-+		} else {
-+			fec_enet_rxbuf_get(fep, bdp, bdp->cbd_datlen);
-+			dump_packet("received packet:",
-+				    fep->rx_skbuff[rx_index]->data, bdp->cbd_datlen);
-+			fec_enet_rxbuf_put(fep, bdp, bdp->cbd_datlen);
-+		}
 +		goto rx_processing_done;
 +	}
-+#endif
++
++	if (!fep->opened) {
++		DBG(0, "%s: Driver not opened; ignoring packet\n", __FUNCTION__);
+ 		goto rx_processing_done;
+ 	}
+ 
  	/* Process the incoming frame.
  	 */
 -	dev->stats.rx_packets++;
@@ -12842,16 +15575,10 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  	}
    rx_processing_done:
 -
-+#if 0
-+	if (dbg_lvl(3)) {
-+		dump_rx_buffers(fep);
-+		dump_tx_buffers(fep);
-+	}
-+#endif
  	/* Clear the status flags for this buffer.
  	*/
  	status &= ~BD_ENET_RX_STATS;
-@@ -653,6 +986,9 @@ while (!((status = bdp->cbd_sc) & BD_ENE
+@@ -653,6 +913,9 @@ while (!((status = bdp->cbd_sc) & BD_ENE
  	status |= BD_ENET_RX_EMPTY;
  	bdp->cbd_sc = status;
  
@@ -12861,7 +15588,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  	/* Update BD pointer to next entry.
  	*/
  	if (status & BD_ENET_RX_WRAP)
-@@ -665,10 +1001,10 @@ while (!((status = bdp->cbd_sc) & BD_ENE
+@@ -665,10 +928,10 @@ while (!((status = bdp->cbd_sc) & BD_ENE
  	 * incoming frames.  On a heavily loaded network, we should be
  	 * able to keep up at the expense of system resources.
  	 */
@@ -12874,7 +15601,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  
  #if 0
  	/* Doing this here will allow us to process all frames in the
-@@ -678,27 +1014,28 @@ while (!((status = bdp->cbd_sc) & BD_ENE
+@@ -678,27 +941,28 @@ while (!((status = bdp->cbd_sc) & BD_ENE
  	 * our way back to the interrupt return only to come right back
  	 * here.
  	 */
@@ -12913,7 +15640,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  
  	if ((mip = mii_head) == NULL) {
  		printk("MII and no head!\n");
-@@ -713,27 +1050,27 @@ fec_enet_mii(struct net_device *dev)
+@@ -713,27 +977,27 @@ fec_enet_mii(struct net_device *dev)
  	mii_free = mip;
  
  	if ((mip = mii_head) != NULL)
@@ -12948,7 +15675,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  
  	if ((mip = mii_free) != NULL) {
  		mii_free = mip->mii_next;
-@@ -745,32 +1082,32 @@ mii_queue(struct net_device *dev, int re
+@@ -745,32 +1009,32 @@ mii_queue(struct net_device *dev, int re
  			mii_tail = mip;
  		} else {
  			mii_head = mii_tail = mip;
@@ -12990,7 +15717,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  
  	if (mii_reg & 0x0004)
  		status |= PHY_STAT_LINK;
-@@ -778,31 +1115,30 @@ static void mii_parse_sr(uint mii_reg, s
+@@ -778,31 +1042,30 @@ static void mii_parse_sr(uint mii_reg, s
  		status |= PHY_STAT_FAULT;
  	if (mii_reg & 0x0020)
  		status |= PHY_STAT_ANC;
@@ -13027,7 +15754,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  
  	if (mii_reg & 0x0020)
  		status |= PHY_CONF_10HDX;
-@@ -812,7 +1148,7 @@ static void mii_parse_anar(uint mii_reg,
+@@ -812,7 +1075,7 @@ static void mii_parse_anar(uint mii_reg,
  		status |= PHY_CONF_100HDX;
  	if (mii_reg & 0x00100)
  		status |= PHY_CONF_100FDX;
@@ -13036,7 +15763,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  }
  
  /* ------------------------------------------------------------------------- */
-@@ -827,10 +1163,9 @@ static void mii_parse_anar(uint mii_reg,
+@@ -827,10 +1090,9 @@ static void mii_parse_anar(uint mii_reg,
  static void mii_parse_lxt970_csr(uint mii_reg, struct net_device *dev)
  {
  	struct fec_enet_private *fep = netdev_priv(dev);
@@ -13048,7 +15775,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  	if (mii_reg & 0x0800) {
  		if (mii_reg & 0x1000)
  			status |= PHY_STAT_100FDX;
-@@ -842,7 +1177,7 @@ static void mii_parse_lxt970_csr(uint mi
+@@ -842,7 +1104,7 @@ static void mii_parse_lxt970_csr(uint mi
  		else
  			status |= PHY_STAT_10HDX;
  	}
@@ -13057,7 +15784,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  }
  
  static phy_cmd_t const phy_cmd_lxt970_config[] = {
-@@ -898,16 +1233,15 @@ static phy_info_t const phy_info_lxt970 
+@@ -898,16 +1160,15 @@ static phy_info_t const phy_info_lxt970 
  static void mii_parse_lxt971_sr2(uint mii_reg, struct net_device *dev)
  {
  	struct fec_enet_private *fep = netdev_priv(dev);
@@ -13077,7 +15804,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  	}
  	if (mii_reg & 0x0080)
  		status |= PHY_STAT_ANC;
-@@ -925,7 +1259,7 @@ static void mii_parse_lxt971_sr2(uint mi
+@@ -925,7 +1186,7 @@ static void mii_parse_lxt971_sr2(uint mi
  	if (mii_reg & 0x0008)
  		status |= PHY_STAT_FAULT;
  
@@ -13086,7 +15813,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  }
  
  static phy_cmd_t const phy_cmd_lxt971_config[] = {
-@@ -982,10 +1316,9 @@ static phy_info_t const phy_info_lxt971 
+@@ -982,10 +1243,9 @@ static phy_info_t const phy_info_lxt971 
  static void mii_parse_qs6612_pcr(uint mii_reg, struct net_device *dev)
  {
  	struct fec_enet_private *fep = netdev_priv(dev);
@@ -13098,7 +15825,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  
  	switch((mii_reg >> 2) & 7) {
  	case 1: status |= PHY_STAT_10HDX; break;
-@@ -994,7 +1327,7 @@ static void mii_parse_qs6612_pcr(uint mi
+@@ -994,7 +1254,7 @@ static void mii_parse_qs6612_pcr(uint mi
  	case 6: status |= PHY_STAT_100FDX; break;
  }
  
@@ -13107,7 +15834,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  }
  
  static phy_cmd_t const phy_cmd_qs6612_config[] = {
-@@ -1052,10 +1385,9 @@ static phy_info_t const phy_info_qs6612 
+@@ -1052,10 +1312,9 @@ static phy_info_t const phy_info_qs6612 
  static void mii_parse_am79c874_dr(uint mii_reg, struct net_device *dev)
  {
  	struct fec_enet_private *fep = netdev_priv(dev);
@@ -13119,7 +15846,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  
  	if (mii_reg & 0x0080)
  		status |= PHY_STAT_ANC;
-@@ -1064,7 +1396,7 @@ static void mii_parse_am79c874_dr(uint m
+@@ -1064,7 +1323,7 @@ static void mii_parse_am79c874_dr(uint m
  	else
  		status |= ((mii_reg & 0x0800) ? PHY_STAT_10FDX : PHY_STAT_10HDX);
  
@@ -13128,7 +15855,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  }
  
  static phy_cmd_t const phy_cmd_am79c874_config[] = {
-@@ -1107,7 +1439,7 @@ static phy_info_t const phy_info_am79c87
+@@ -1107,7 +1366,7 @@ static phy_info_t const phy_info_am79c87
  /* register definitions for the 8721 */
  
  #define MII_KS8721BL_RXERCR	21
@@ -13137,7 +15864,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  #define	MII_KS8721BL_PHYCR	31
  
  static phy_cmd_t const phy_cmd_ks8721bl_config[] = {
-@@ -1149,32 +1481,31 @@ static phy_info_t const phy_info_ks8721b
+@@ -1149,32 +1408,31 @@ static phy_info_t const phy_info_ks8721b
  static void mii_parse_dp8384x_sr2(uint mii_reg, struct net_device *dev)
  {
  	struct fec_enet_private *fep = netdev_priv(dev);
@@ -13180,7 +15907,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  }
  
  static phy_info_t phy_info_dp83848= {
-@@ -1211,92 +1542,362 @@ static phy_info_t const * const phy_info
+@@ -1211,122 +1469,391 @@ static phy_info_t const * const phy_info
  	&phy_info_dp83848,
  	NULL
  };
@@ -13197,37 +15924,22 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +MOVED to platform_data hooks!
   */
 -static void __inline__ fec_request_mii_intr(struct net_device *dev)
--{
--	if (request_irq(66, mii_link_interrupt, IRQF_DISABLED, "fec(MII)", dev) != 0)
--		printk("FEC: Could not allocate fec(MII) IRQ(66)!\n");
--}
- 
--static void __inline__ fec_disable_phy_intr(void)
--{
--	volatile unsigned long *icrp;
--	icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
--	*icrp = 0x08000000;
--}
++
 +#define PHY_POLL_LINK_ON	(1 * HZ)
 +#define PHY_POLL_LINK_OFF	(HZ / 5)
- 
--static void __inline__ fec_phy_ack_intr(void)
++
 +static int fec_mii_read(struct mii_bus *bus, int phy_id, int regnum);
 +
 +#ifdef CONFIG_PHYLIB
 +static void fec_link_change(struct net_device *dev)
  {
--	volatile unsigned long *icrp;
--	/* Acknowledge the interrupt */
--	icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
--	*icrp = 0x0d000000;
+-	if (request_irq(66, mii_link_interrupt, IRQF_DISABLED, "fec(MII)", dev) != 0)
+-		printk("FEC: Could not allocate fec(MII) IRQ(66)!\n");
 -}
--#endif
 +	struct fec_enet_private *fep = netdev_priv(dev);
 +	struct phy_device *phydev = fep->phy;
  
--#ifdef CONFIG_M5272
--static void __inline__ fec_get_mac(struct net_device *dev)
+-static void __inline__ fec_disable_phy_intr(void)
 +	if (phydev->link != fep->linkstatus ||
 +	    phydev->duplex != fep->full_duplex) {
 +		DBG(0, "%s: link status changed from %d to %d %s -> %s duplex\n", __FUNCTION__,
@@ -13254,28 +15966,16 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +#else
 +static void fec_link_change(struct net_device *dev)
  {
- 	struct fec_enet_private *fep = netdev_priv(dev);
--	volatile fec_t *fecp;
--	unsigned char *iap, tmpaddr[ETH_ALEN];
- 
--	fecp = fep->hwp;
+-	volatile unsigned long *icrp;
+-	icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
+-	*icrp = 0x08000000;
++	struct fec_enet_private *fep = netdev_priv(dev);
++
 +	DBG(0, "%s: link status changed from %d to %d\n", __FUNCTION__,
 +	    fep->old_linkstatus, fep->linkstatus);
 +	if (fep->linkstatus) {
 +		int duplex;
- 
--	if (FEC_FLASHMAC) {
--		/*
--		 * Get MAC address from FLASH.
--		 * If it is all 1's or 0's, use the default.
--		 */
--		iap = (unsigned char *)FEC_FLASHMAC;
--		if ((iap[0] == 0) && (iap[1] == 0) && (iap[2] == 0) &&
--		    (iap[3] == 0) && (iap[4] == 0) && (iap[5] == 0))
--			iap = fec_mac_default;
--		if ((iap[0] == 0xff) && (iap[1] == 0xff) && (iap[2] == 0xff) &&
--		    (iap[3] == 0xff) && (iap[4] == 0xff) && (iap[5] == 0xff))
--			iap = fec_mac_default;
++
 +		duplex = 0;
 +		if (fep->phy_status & (PHY_STAT_100FDX | PHY_STAT_10FDX)) {
 +			duplex = 1;
@@ -13284,55 +15984,51 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +		if (fep->phy_timer) {
 +			mod_timer(fep->phy_timer, jiffies + PHY_POLL_LINK_ON);
 +		}
- 	} else {
--		*((unsigned long *) &tmpaddr[0]) = fecp->fec_addr_low;
--		*((unsigned short *) &tmpaddr[4]) = (fecp->fec_addr_high >> 16);
--		iap = &tmpaddr[0];
++	} else {
 +		fec_stop(dev);
 +		if (fep->phy_timer) {
 +			mod_timer(fep->phy_timer, jiffies + PHY_POLL_LINK_OFF);
 +		}
- 	}
- 
--	memcpy(dev->dev_addr, iap, ETH_ALEN);
--
--	/* Adjust MAC if using default MAC address */
--	if (iap == fec_mac_default)
--		 dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index;
++	}
++
 +	fep->old_linkstatus = fep->linkstatus;
  }
--#endif
  
--/* ------------------------------------------------------------------------- */
--
--static void mii_display_status(struct net_device *dev)
+-static void __inline__ fec_phy_ack_intr(void)
 +static void fec_phy_timer(unsigned long data)
  {
+-	volatile unsigned long *icrp;
+-	/* Acknowledge the interrupt */
+-	icrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_ICR1);
+-	*icrp = 0x0d000000;
 +	struct net_device *dev = (struct net_device *)data;
- 	struct fec_enet_private *fep = netdev_priv(dev);
--	volatile uint *s = &(fep->phy_status);
++	struct fec_enet_private *fep = netdev_priv(dev);
 +	int link_poll_interval = fep->linkstatus ? PHY_POLL_LINK_ON : PHY_POLL_LINK_OFF;
- 
--	if (!fep->link && !fep->old_link) {
--		/* Link is still down - don't print anything */
++
 +	if (fep->old_linkstatus != fep->linkstatus) {
 +		fec_link_change(dev);
 +	}
 +	mod_timer(fep->phy_timer, link_poll_interval);
-+}
-+#endif
-+
+ }
+ #endif
+ 
+-#ifdef CONFIG_M5272
+-static void __inline__ fec_get_mac(struct net_device *dev)
 +/*
 + * Code specific to Freescale i.MXC
 + */
 +static int fec_request_intrs(struct platform_device *pdev, struct net_device *dev)
-+{
+ {
 +	int ret;
-+	struct fec_enet_private *fep = netdev_priv(dev);
-+
+ 	struct fec_enet_private *fep = netdev_priv(dev);
+-	volatile fec_t *fecp;
+-	unsigned char *iap, tmpaddr[ETH_ALEN];
+ 
+-	fecp = fep->hwp;
 +	fep->etn_irq = platform_get_irq(pdev, 0);
 +	fep->mii_irq = platform_get_irq(pdev, 1);
-+
+ 
+-	if (FEC_FLASHMAC) {
 +	/* Setup interrupt handlers. */
 +	ret = request_irq(fep->etn_irq, fec_enet_interrupt, 0, "fec", dev);
 +	if (ret != 0) {
@@ -13349,13 +16045,25 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +			free_irq(fep->etn_irq, dev);
 +			return ret;
 +		}
-+		/*
+ 		/*
+-		 * Get MAC address from FLASH.
+-		 * If it is all 1's or 0's, use the default.
 +		 * board specific workaround should be done in board specific code
 +		 * This is unsafe anyway. An interrupt might have been asserted
 +		 * already. Use IRQ_NOAUTOEN with request_irq() to have irq initially disabled.
-+		 */
+ 		 */
+-		iap = (unsigned char *)FEC_FLASHMAC;
+-		if ((iap[0] == 0) && (iap[1] == 0) && (iap[2] == 0) &&
+-		    (iap[3] == 0) && (iap[4] == 0) && (iap[5] == 0))
+-			iap = fec_mac_default;
+-		if ((iap[0] == 0xff) && (iap[1] == 0xff) && (iap[2] == 0xff) &&
+-		    (iap[3] == 0xff) && (iap[4] == 0xff) && (iap[5] == 0xff))
+-			iap = fec_mac_default;
 +		fep->phy_int_enabled = 1;
-+	} else {
+ 	} else {
+-		*((unsigned long *) &tmpaddr[0]) = fecp->fec_addr_low;
+-		*((unsigned short *) &tmpaddr[4]) = (fecp->fec_addr_high >> 16);
+-		iap = &tmpaddr[0];
 +		fep->phy_timer = kzalloc(sizeof(struct timer_list), GFP_KERNEL);
 +		if (fep->phy_timer == NULL) {
 +			free_irq(fep->etn_irq, dev);
@@ -13365,49 +16073,87 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +		fep->phy_timer->function = fec_phy_timer;
 +		fep->phy_timer->data = (unsigned long)dev;
 +		fec_link_change(dev);
-+	}
-+#endif
-+
+ 	}
+-
+-	memcpy(dev->dev_addr, iap, ETH_ALEN);
+-
+-	/* Adjust MAC if using default MAC address */
+-	if (iap == fec_mac_default)
+-		 dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index;
+-}
+ #endif
+ 
+-/* ------------------------------------------------------------------------- */
 +	return 0;
 +}
-+
+ 
+-static void mii_display_status(struct net_device *dev)
 +static void fec_release_intrs(struct net_device *dev)
-+{
-+	struct fec_enet_private *fep = netdev_priv(dev);
-+
+ {
+ 	struct fec_enet_private *fep = netdev_priv(dev);
+-	volatile uint *s = &(fep->phy_status);
+ 
+-	if (!fep->link && !fep->old_link) {
+-		/* Link is still down - don't print anything */
+-		return;
 +	free_irq(fep->etn_irq, dev);
 +#ifndef CONFIG_PHYLIB
 +	if (fep->mii_irq >= 0) {
 +		free_irq(fep->mii_irq, dev);
-+	}
+ 	}
 +#endif
 +}
-+
+ 
+-	printk("%s: status: ", dev->name);
+-
+-	if (!fep->link) {
+-		printk("link down");
+-	} else {
+-		printk("link up");
+-
+-		switch(*s & PHY_STAT_SPMASK) {
+-		case PHY_STAT_100FDX: printk(", 100MBit Full Duplex"); break;
+-		case PHY_STAT_100HDX: printk(", 100MBit Half Duplex"); break;
+-		case PHY_STAT_10FDX: printk(", 10MBit Full Duplex"); break;
+-		case PHY_STAT_10HDX: printk(", 10MBit Half Duplex"); break;
+-		default:
+-			printk(", Unknown speed/duplex");
+-		}
 +#ifdef CONFIG_MACH_MX25
 +/*
 + * i.MX25 allows RMII mode to be configured via a gasket
 + */
 +#define FEC_MIIGSK_CFGR			0x300
 +#define FEC_MIIGSK_ENR			0x308
-+
+ 
+-		if (*s & PHY_STAT_ANC)
+-			printk(", auto-negotiation complete");
+-	}
 +#define FEC_MIIGSK_CFGR_FRCONT		(1 << 6)
 +#define FEC_MIIGSK_CFGR_LBMODE		(1 << 4)
 +#define FEC_MIIGSK_CFGR_EMODE		(1 << 3)
 +#define FEC_MIIGSK_CFGR_IF_MODE_MASK	(3 << 0)
 +#define FEC_MIIGSK_CFGR_IF_MODE_MII	(0 << 0)
 +#define FEC_MIIGSK_CFGR_IF_MODE_RMII	(1 << 0)
-+
+ 
+-	if (*s & PHY_STAT_FAULT)
+-		printk(", remote fault");
 +#define FEC_MIIGSK_ENR_READY		(1 << 2)
 +#define FEC_MIIGSK_ENR_EN		(1 << 1)
-+
+ 
+-	printk(".\n");
 +#ifndef DEBUG
 +static inline unsigned long fec_reg_read16(struct fec_enet_private *fep, unsigned int reg)
 +{
 +	return readw(fep->reg_base + reg);
-+}
-+
+ }
+ 
+-static void mii_display_config(struct work_struct *work)
 +static inline void fec_reg_write(struct fec_enet_private *fep, unsigned int reg, unsigned long val)
-+{
+ {
+-	struct fec_enet_private *fep = container_of(work, struct fec_enet_private, phy_task);
+-	struct net_device *dev = fep->netdev;
+-	uint status = fep->phy_status;
 +	writew(val, fep->reg_base + reg);
 +}
 +#else
@@ -13585,48 +16331,42 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +
 +	if (!fep->linkstatus && !fep->old_linkstatus) {
 +		/* Link is still down - don't print anything */
- 		return;
- 	}
- 
- 	printk("%s: status: ", dev->name);
- 
--	if (!fep->link) {
++		return;
++	}
++
++	printk("%s: status: ", dev->name);
++
 +	if (!fep->linkstatus) {
- 		printk("link down");
- 	} else {
- 		printk("link up");
- 
--		switch(*s & PHY_STAT_SPMASK) {
++		printk("link down");
++	} else {
++		printk("link up");
++
 +		switch(fep->phy_status & PHY_STAT_SPMASK) {
- 		case PHY_STAT_100FDX: printk(", 100MBit Full Duplex"); break;
- 		case PHY_STAT_100HDX: printk(", 100MBit Half Duplex"); break;
- 		case PHY_STAT_10FDX: printk(", 10MBit Full Duplex"); break;
-@@ -1305,20 +1906,19 @@ static void mii_display_status(struct ne
- 			printk(", Unknown speed/duplex");
- 		}
- 
--		if (*s & PHY_STAT_ANC)
++		case PHY_STAT_100FDX: printk(", 100MBit Full Duplex"); break;
++		case PHY_STAT_100HDX: printk(", 100MBit Half Duplex"); break;
++		case PHY_STAT_10FDX: printk(", 10MBit Full Duplex"); break;
++		case PHY_STAT_10HDX: printk(", 10MBit Half Duplex"); break;
++		default:
++			printk(", Unknown speed/duplex");
++		}
++
 +		if (fep->phy_status & PHY_STAT_ANC)
- 			printk(", auto-negotiation complete");
- 	}
- 
--	if (*s & PHY_STAT_FAULT)
++			printk(", auto-negotiation complete");
++	}
++
 +	if (fep->phy_status & PHY_STAT_FAULT)
- 		printk(", remote fault");
- 
- 	printk(".\n");
- }
- 
--static void mii_display_config(struct work_struct *work)
++		printk(", remote fault");
++
++	printk(".\n");
++}
++
 +static void mii_display_config(struct work_struct *w)
- {
--	struct fec_enet_private *fep = container_of(work, struct fec_enet_private, phy_task);
--	struct net_device *dev = fep->netdev;
++{
 +	struct fec_enet_private *fep = container_of(w, struct fec_enet_private, phy_task);
- 	uint status = fep->phy_status;
++	uint status = fep->phy_status;
  
  	/*
-@@ -1326,7 +1926,7 @@ static void mii_display_config(struct wo
+ 	** When we get here, phy_task is already removed from
  	** the workqueue.  It is thus safe to allow to reuse it.
  	*/
  	fep->mii_phy_task_queued = 0;
@@ -13635,7 +16375,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  
  	if (status & PHY_CONF_ANE)
  		printk("on");
-@@ -1351,11 +1951,21 @@ static void mii_display_config(struct wo
+@@ -1351,11 +1878,21 @@ static void mii_display_config(struct wo
  
  	fep->sequence_done = 1;
  }
@@ -13660,7 +16400,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  	int duplex;
  
  	/*
-@@ -1363,23 +1973,19 @@ static void mii_relink(struct work_struc
+@@ -1363,23 +1900,19 @@ static void mii_relink(struct work_struc
  	** the workqueue.  It is thus safe to allow to reuse it.
  	*/
  	fep->mii_phy_task_queued = 0;
@@ -13691,7 +16431,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  }
  
  /* mii_queue_relink is called in interrupt context from mii_link_interrupt */
-@@ -1429,15 +2035,14 @@ phy_cmd_t const phy_cmd_config[] = {
+@@ -1429,15 +1962,14 @@ phy_cmd_t const phy_cmd_config[] = {
  static void
  mii_discover_phy3(uint mii_reg, struct net_device *dev)
  {
@@ -13710,7 +16450,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  			break;
  	}
  
-@@ -1456,13 +2061,9 @@ mii_discover_phy3(uint mii_reg, struct n
+@@ -1456,13 +1988,9 @@ mii_discover_phy3(uint mii_reg, struct n
  static void
  mii_discover_phy(uint mii_reg, struct net_device *dev)
  {
@@ -13725,7 +16465,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  	if (fep->phy_addr < 32) {
  		if ((phytype = (mii_reg & 0xffff)) != 0xffff && phytype != 0) {
  
-@@ -1470,39 +2071,40 @@ mii_discover_phy(uint mii_reg, struct ne
+@@ -1470,39 +1998,40 @@ mii_discover_phy(uint mii_reg, struct ne
  			*/
  			fep->phy_id = phytype << 16;
  			mii_queue(dev, mk_mii_read(MII_REG_PHYIR2),
@@ -13783,7 +16523,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  
  	return IRQ_HANDLED;
  }
-@@ -1511,16 +2113,31 @@ mii_link_interrupt(int irq, void * dev_i
+@@ -1511,16 +2040,31 @@ mii_link_interrupt(int irq, void * dev_i
  static int
  fec_enet_open(struct net_device *dev)
  {
@@ -13818,7 +16558,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  	if (fep->phy) {
  		mii_do_cmd(dev, fep->phy->ack_int);
  		mii_do_cmd(dev, fep->phy->config);
-@@ -1542,16 +2159,20 @@ fec_enet_open(struct net_device *dev)
+@@ -1542,16 +2086,20 @@ fec_enet_open(struct net_device *dev)
  		 * based on this device does not implement a PHY interrupt,
  		 * so we are never notified of link change.
  		 */
@@ -13844,7 +16584,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  }
  
  static int
-@@ -1559,15 +2180,46 @@ fec_enet_close(struct net_device *dev)
+@@ -1559,15 +2107,46 @@ fec_enet_close(struct net_device *dev)
  {
  	struct fec_enet_private *fep = netdev_priv(dev);
  
@@ -13895,7 +16635,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  /* Set or clear the multicast filter for this adaptor.
   * Skeleton taken from sunlance driver.
   * The CPM Ethernet implementation allows Multicast as well as individual
-@@ -1583,37 +2235,32 @@ fec_enet_close(struct net_device *dev)
+@@ -1583,37 +2162,32 @@ fec_enet_close(struct net_device *dev)
  
  static void set_multicast_list(struct net_device *dev)
  {
@@ -13942,7 +16682,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  				/* Only support group multicast for now.
  				*/
  				if (!(dmi->dmi_addr[0] & 1))
-@@ -1621,13 +2268,11 @@ static void set_multicast_list(struct ne
+@@ -1621,13 +2195,11 @@ static void set_multicast_list(struct ne
  
  				/* calculate crc32 value of mac address
  				*/
@@ -13959,7 +16699,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  						crc = (crc >> 1) ^
  						(((crc ^ data) & 1) ? CRC32_POLY : 0);
  					}
-@@ -1639,9 +2284,13 @@ static void set_multicast_list(struct ne
+@@ -1639,9 +2211,13 @@ static void set_multicast_list(struct ne
  				hash = (crc >> (32 - HASH_BITS)) & 0x3f;
  
  				if (hash > 31)
@@ -13975,7 +16715,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  			}
  		}
  	}
-@@ -1650,106 +2299,272 @@ static void set_multicast_list(struct ne
+@@ -1650,106 +2226,272 @@ static void set_multicast_list(struct ne
  /* Set a MAC change in hardware.
   */
  static void
@@ -13997,7 +16737,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +	fec_reg_write(fep, FEC_PAUR, (dev->dev_addr[5] << 16) |
 +		(dev->dev_addr[4] << 24));
 +}
-+
+ 
 +static int
 +fec_set_mac_address(struct net_device *dev, void *_addr)
 +{
@@ -14014,7 +16754,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +	       addr->sa_data[4], addr->sa_data[5]);
 +
 +	memcpy(&dev->dev_addr, &addr->sa_data, ETH_ALEN);
- 
++
 +	_fec_set_mac_address(dev);
 +
 +	return 0;
@@ -14244,8 +16984,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 + /*
 +  * XXX:  We need to clean up on failure exits here.
 +  */
- 
--	/* Set receive and transmit descriptor base.
++
 +int __devinit fec_enet_init(struct platform_device *pdev, struct net_device *dev)
 +{
 +	int ret;
@@ -14254,7 +16993,8 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +	struct sk_buff *pskb;
 +	int i;
 +	void *mem;
-+
+ 
+-	/* Set receive and transmit descriptor base.
 +	spin_lock_init(&fep->lock);
 +
 +	/* Whack a reset.  We should wait for this.
@@ -14316,7 +17056,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  	}
  
  	/* Set the last buffer to wrap.
-@@ -1757,87 +2572,88 @@ int __init fec_enet_init(struct net_devi
+@@ -1757,87 +2499,88 @@ int __init fec_enet_init(struct net_devi
  	bdp--;
  	bdp->cbd_sc |= BD_SC_WRAP;
  
@@ -14463,7 +17203,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  }
  
  /* This function is called to start or restart the FEC during a link
-@@ -1847,60 +2663,67 @@ int __init fec_enet_init(struct net_devi
+@@ -1847,60 +2590,67 @@ int __init fec_enet_init(struct net_devi
  static void
  fec_restart(struct net_device *dev, int duplex)
  {
@@ -14559,7 +17299,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
  		/* Initialize the BD for every fragment in the page.
  		*/
  		bdp->cbd_sc = BD_ENET_RX_EMPTY;
-@@ -1908,246 +2731,366 @@ fec_restart(struct net_device *dev, int 
+@@ -1908,246 +2658,365 @@ fec_restart(struct net_device *dev, int 
  	}
  
  	/* Set the last buffer to wrap.
@@ -14890,8 +17630,6 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +	struct fec_enet_private *fep = netdev_priv(dev);
 +
 +	unregister_netdev(dev);
-+	free_netdev(dev);
-+
 +#ifdef CONFIG_PHYLIB
 +	if (fep->mii != NULL) {
 +		kfree(fep->mii->irq);
@@ -14923,6 +17661,7 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +	if (fep->res_mem2 != NULL) {
 +		release_resource(fep->res_mem2);
 +	}
++	free_netdev(dev);
  	return 0;
  }
  
@@ -15078,9 +17817,9 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.c linux-2.6.30-rc4-karo/drivers/net/
 +module_exit(fec_enet_module_cleanup);
  
  MODULE_LICENSE("GPL");
-diff -urNp linux-2.6.30-rc4/drivers/net/fec.h linux-2.6.30-rc4-karo/drivers/net/fec.h
---- linux-2.6.30-rc4/drivers/net/fec.h	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/drivers/net/fec.h	2009-06-02 18:43:03.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/drivers/net/fec.h linux-2.6.30-rc4-karo3/drivers/net/fec.h
+--- linux-2.6.30-rc4-git/drivers/net/fec.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/net/fec.h	2009-06-02 18:43:03.000000000 +0200
 @@ -13,6 +13,15 @@
  #define	FEC_H
  /****************************************************************************/
@@ -15211,9 +17950,414 @@ diff -urNp linux-2.6.30-rc4/drivers/net/fec.h linux-2.6.30-rc4-karo/drivers/net/
 +
  /****************************************************************************/
  #endif /* FEC_H */
-diff -urNp linux-2.6.30-rc4/drivers/video/imxfb.c linux-2.6.30-rc4-karo/drivers/video/imxfb.c
---- linux-2.6.30-rc4/drivers/video/imxfb.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/drivers/video/imxfb.c	2009-06-02 18:58:52.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/drivers/usb/Kconfig linux-2.6.30-rc4-karo3/drivers/usb/Kconfig
+--- linux-2.6.30-rc4-git/drivers/usb/Kconfig	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/usb/Kconfig	2009-06-29 10:49:52.000000000 +0200
+@@ -57,6 +57,7 @@ config USB_ARCH_HAS_EHCI
+ 	default y if PPC_83xx
+ 	default y if SOC_AU1200
+ 	default y if ARCH_IXP4XX
++	default y if ARCH_MXC
+ 	default PCI
+ 
+ # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
+diff -purN linux-2.6.30-rc4-git/drivers/usb/host/Kconfig linux-2.6.30-rc4-karo3/drivers/usb/host/Kconfig
+--- linux-2.6.30-rc4-git/drivers/usb/host/Kconfig	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/usb/host/Kconfig	2009-07-06 15:37:48.000000000 +0200
+@@ -106,6 +106,37 @@ config USB_OXU210HP_HCD
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called oxu210hp-hcd.
+ 
++config USB_EHCI_MXC
++	bool "Support for Freescale on-chip EHCI USB controller"
++	depends on USB_EHCI_HCD && ARCH_MXC
++	select USB_EHCI_ROOT_HUB_TT
++	---help---
++	  Variation of ARC USB block used in some Freescale chips.
++
++config ARCH_MXC_EHCI_USBH1
++	bool "Enable USB on USBH1 port"
++	depends on USB_EHCI_MXC && ARCH_MXC_HAS_USBH1
++
++config ARCH_MXC_EHCI_USBH2
++	bool "Enable USB on USBH2 port"
++	depends on USB_EHCI_MXC && ARCH_MXC_HAS_USBH2
++
++config ARCH_MXC_EHCI_USBOTG
++	bool "Enable USB on USBOTG port"
++	depends on USB_EHCI_MXC && ARCH_MXC_HAS_USBOTG
++
++config ARCH_MXC_HAS_USBH1
++	bool
++	depends on USB_EHCI_MXC
++
++config ARCH_MXC_HAS_USBH2
++	bool
++	depends on USB_EHCI_MXC
++
++config ARCH_MXC_HAS_USBOTG
++	bool
++	depends on USB_EHCI_MXC
++
+ config USB_ISP116X_HCD
+ 	tristate "ISP116X HCD support"
+ 	depends on USB
+diff -purN linux-2.6.30-rc4-git/drivers/usb/host/ehci-hcd.c linux-2.6.30-rc4-karo3/drivers/usb/host/ehci-hcd.c
+--- linux-2.6.30-rc4-git/drivers/usb/host/ehci-hcd.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/usb/host/ehci-hcd.c	2009-07-01 11:30:25.000000000 +0200
+@@ -1047,6 +1047,11 @@ MODULE_LICENSE ("GPL");
+ #define	PLATFORM_DRIVER		ehci_fsl_driver
+ #endif
+ 
++#ifdef CONFIG_USB_EHCI_MXC
++#include "ehci-mxc.c"
++#define PLATFORM_DRIVER		ehci_mxc_driver
++#endif
++
+ #ifdef CONFIG_SOC_AU1200
+ #include "ehci-au1xxx.c"
+ #define	PLATFORM_DRIVER		ehci_hcd_au1xxx_driver
+diff -purN linux-2.6.30-rc4-git/drivers/usb/host/ehci-mxc.c linux-2.6.30-rc4-karo3/drivers/usb/host/ehci-mxc.c
+--- linux-2.6.30-rc4-git/drivers/usb/host/ehci-mxc.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/drivers/usb/host/ehci-mxc.c	2009-07-01 11:31:58.000000000 +0200
+@@ -0,0 +1,247 @@
++/*
++ * Copyright (c) 2008 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software Foundation,
++ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++
++#include <linux/platform_device.h>
++#include <linux/clk.h>
++#include <mach/mxc_ehci.h>
++
++/* called during probe() after chip reset completes */
++static int ehci_mxc_setup(struct usb_hcd *hcd)
++{
++	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
++	int retval;
++
++	/* EHCI registers start at offset 0x100 */
++	ehci->caps = hcd->regs + 0x100;
++	ehci->regs = hcd->regs + 0x100 +
++	    HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
++	dbg_hcs_params(ehci, "reset");
++	dbg_hcc_params(ehci, "reset");
++
++	/* cache this readonly data; minimize chip reads */
++	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
++
++	retval = ehci_halt(ehci);
++	if (retval)
++		return retval;
++
++	/* data structure init */
++	retval = ehci_init(hcd);
++	if (retval)
++		return retval;
++
++	hcd->has_tt = 1;
++
++	ehci->sbrn = 0x20;
++
++	ehci_reset(ehci);
++
++	ehci_port_power(ehci, 0);
++	return 0;
++}
++
++static const struct hc_driver ehci_mxc_hc_driver = {
++	.description = hcd_name,
++	.product_desc = "Freescale On-Chip EHCI Host Controller",
++	.hcd_priv_size = sizeof(struct ehci_hcd),
++
++	/*
++	 * generic hardware linkage
++	 */
++	.irq = ehci_irq,
++	.flags = HCD_USB2 | HCD_MEMORY,
++
++	/*
++	 * basic lifecycle operations
++	 */
++	.reset = ehci_mxc_setup,
++	.start = ehci_run,
++	.stop = ehci_stop,
++	.shutdown = ehci_shutdown,
++
++	/*
++	 * managing i/o requests and associated device resources
++	 */
++	.urb_enqueue = ehci_urb_enqueue,
++	.urb_dequeue = ehci_urb_dequeue,
++	.endpoint_disable = ehci_endpoint_disable,
++
++	/*
++	 * scheduling support
++	 */
++	.get_frame_number = ehci_get_frame,
++
++	/*
++	 * root hub support
++	 */
++	.hub_status_data = ehci_hub_status_data,
++	.hub_control = ehci_hub_control,
++	.bus_suspend = ehci_bus_suspend,
++	.bus_resume = ehci_bus_resume,
++	.relinquish_port = ehci_relinquish_port,
++	.port_handed_over = ehci_port_handed_over,
++};
++
++static int ehci_mxc_drv_probe(struct platform_device *pdev)
++{
++	struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
++	struct usb_hcd *hcd;
++	struct resource *res;
++	int irq, ret, temp;
++	struct clk *usbclk, *ahbclk;
++
++	dev_info(&pdev->dev, "initializing i.MX USB Controller\n");
++
++	/* Need platform data for setup */
++	if (!pdata) {
++		dev_err(&pdev->dev,
++			"No platform data for %s.\n", dev_name(&pdev->dev));
++		return -ENODEV;
++	}
++
++	irq = platform_get_irq(pdev, 0);
++
++	hcd = usb_create_hcd(&ehci_mxc_hc_driver, &pdev->dev, dev_name(&pdev->dev));
++	if (!hcd) {
++		ret = -ENOMEM;
++		goto err1;
++	}
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!res) {
++		dev_err(&pdev->dev,
++			"Found HC with no register addr. Check %s setup!\n",
++			dev_name(&pdev->dev));
++		ret = -ENODEV;
++		goto err1;
++	}
++
++	hcd->rsrc_start = res->start;
++	hcd->rsrc_len = resource_size(res);
++
++	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
++		dev_dbg(&pdev->dev, "controller already in use\n");
++		ret = -EBUSY;
++		goto err1;
++	}
++
++	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
++	if (!hcd->regs) {
++		dev_err(&pdev->dev, "error mapping memory\n");
++		ret = -EFAULT;
++		goto err2;
++	}
++
++#if 0
++	ahbclk = clk_get(NULL, "usb_ahb_clk");
++	if (IS_ERR(ahbclk)) {
++		ret = PTR_ERR(ahbclk);
++		printk(KERN_ERR "Failed to get usb_ahb_clk: %d\n", ret);
++		goto err3;
++	}
++	clk_enable(ahbclk);
++#endif
++	usbclk = clk_get(&pdev->dev, "usb");
++	if (IS_ERR(usbclk)) {
++		ret = PTR_ERR(usbclk);
++		printk(KERN_ERR "Failed to get usb_clk: %d\n", ret);
++		goto err4;
++	}
++	clk_enable(usbclk);
++
++	if (pdata->init) {
++		ret = pdata->init(pdev);
++		if (ret) {
++			dev_err(&pdev->dev, "platform init failed\n");
++			goto err5;
++		}
++	}
++
++	/* Set to Host mode */
++	temp = readl(hcd->regs + 0x1a8);
++	writel(temp | 0x3, hcd->regs + 0x1a8);
++
++	ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
++	if (ret)
++		goto err6;
++
++	platform_set_drvdata(pdev, hcd);
++	clk_put(usbclk);
++
++	return 0;
++err6:
++	if (pdata->exit)
++		pdata->exit(pdev);
++err5:
++	clk_disable(usbclk);
++	clk_put(usbclk);
++err4:
++#if 0
++	clk_disable(ahbclk);
++	clk_put(ahbclk);
++#endif
++err3:
++	iounmap(hcd->regs);
++err2:
++	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
++err1:
++	usb_put_hcd(hcd);
++	return ret;
++}
++
++static int ehci_mxc_drv_remove(struct platform_device *pdev)
++{
++	struct usb_hcd *hcd = platform_get_drvdata(pdev);
++	struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
++	struct clk *usbclk;
++
++	usb_remove_hcd(hcd);
++	iounmap(hcd->regs);
++	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
++	usb_put_hcd(hcd);
++	platform_set_drvdata(pdev, NULL);
++
++	if (pdata->exit)
++		pdata->exit(pdev);
++
++	usbclk = clk_get(&pdev->dev, "usb");
++	if (!IS_ERR(usbclk)) {
++		clk_disable(usbclk);
++		clk_put(usbclk);
++	}
++#if 0
++	ahbclk = clk_get(NULL, "usb_ahb_clk");
++	if (!IS_ERR(ahbclk)) {
++		clk_disable(ahbclk);
++		clk_put(ahbclk);
++	}
++#endif
++	return 0;
++}
++
++MODULE_ALIAS("platform:mxc-ehci");
++
++static struct platform_driver ehci_mxc_driver = {
++	.probe = ehci_mxc_drv_probe,
++	.remove = ehci_mxc_drv_remove,
++	.shutdown = usb_hcd_platform_shutdown,
++	.driver = {
++		   .name = "mxc-ehci",
++	},
++};
+diff -purN linux-2.6.30-rc4-git/drivers/video/imxfb.c linux-2.6.30-rc4-karo3/drivers/video/imxfb.c
+--- linux-2.6.30-rc4-git/drivers/video/imxfb.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/drivers/video/imxfb.c	2009-07-02 16:21:35.000000000 +0200
+@@ -56,9 +56,9 @@
+ #define VPW_VPW(x)	((x) & 0x3ff)
+ 
+ #define LCDC_CPOS	0x0C
+-#define CPOS_CC1	(1<<31)
+-#define CPOS_CC0	(1<<30)
+-#define CPOS_OP		(1<<28)
++#define CPOS_CC1	(1 << 31)
++#define CPOS_CC0	(1 << 30)
++#define CPOS_OP		(1 << 28)
+ #define CPOS_CXP(x)	(((x) & 3ff) << 16)
+ 
+ #ifdef CONFIG_ARCH_MX1
+@@ -68,7 +68,7 @@
+ #endif
+ 
+ #define LCDC_LCWHB	0x10
+-#define LCWHB_BK_EN	(1<<31)
++#define LCWHB_BK_EN	(1 << 31)
+ #define LCWHB_CW(w)	(((w) & 0x1f) << 24)
+ #define LCWHB_CH(h)	(((h) & 0x1f) << 16)
+ #define LCWHB_BD(x)	((x) & 0xff)
+@@ -112,22 +112,22 @@
+ #define LCDC_RMCR	0x34
+ 
+ #ifdef CONFIG_ARCH_MX1
+-#define RMCR_LCDC_EN	(1<<1)
++#define RMCR_LCDC_EN	(1 << 1)
+ #else
+ #define RMCR_LCDC_EN	0
+ #endif
+ 
+-#define RMCR_SELF_REF	(1<<0)
++#define RMCR_SELF_REF	(1 << 0)
+ 
+ #define LCDC_LCDICR	0x38
+-#define LCDICR_INT_SYN	(1<<2)
+-#define LCDICR_INT_CON	(1)
++#define LCDICR_INT_SYN	(1 << 2)
++#define LCDICR_INT_CON	1
+ 
+ #define LCDC_LCDISR	0x40
+-#define LCDISR_UDR_ERR	(1<<3)
+-#define LCDISR_ERR_RES	(1<<2)
+-#define LCDISR_EOF	(1<<1)
+-#define LCDISR_BOF	(1<<0)
++#define LCDISR_UDR_ERR	(1 << 3)
++#define LCDISR_ERR_RES	(1 << 2)
++#define LCDISR_EOF	(1 << 1)
++#define LCDISR_BOF	(1 << 0)
+ 
+ /*
+  * These are the bitfields for each
+@@ -232,11 +232,11 @@ static int imxfb_setpalettereg(u_int reg
+ 	struct imxfb_info *fbi = info->par;
+ 	u_int val, ret = 1;
+ 
+-#define CNVT_TOHW(val,width) ((((val)<<(width))+0x7FFF-(val))>>16)
++#define CNVT_TOHW(val,width) ((((val) << (width)) + 0x7FFF - (val)) >> 16)
+ 	if (regno < fbi->palette_size) {
+-		val = (CNVT_TOHW(red, 4) << 8) |
+-		      (CNVT_TOHW(green,4) << 4) |
+-		      CNVT_TOHW(blue,  4);
++		val = (CNVT_TOHW(red, 6) << 12) |
++			(CNVT_TOHW(green, 6) << 6) |
++			CNVT_TOHW(blue,  6);
+ 
+ 		writel(val, fbi->regs + 0x800 + (regno << 2));
+ 		ret = 0;
+@@ -265,7 +265,7 @@ static int imxfb_setcolreg(u_int regno, 
+ 
+ 	/*
+ 	 * If greyscale is true, then we convert the RGB value
+-	 * to greyscale no mater what visual we are using.
++	 * to greyscale no matter what visual we are using.
+ 	 */
+ 	if (info->var.grayscale)
+ 		red = green = blue = (19595 * red + 38470 * green +
+@@ -527,7 +527,7 @@ static int imxfb_activate_var(struct fb_
+ 	if (--pcr > 0x3F) {
+ 		pcr = 0x3F;
+ 		printk(KERN_WARNING "Must limit pixel clock to %uHz\n",
+-				lcd_clk / pcr);
++				lcd_clk / pcr + 1);
+ 	}
+ 
+ 	/* add sync polarities */
 @@ -570,7 +570,7 @@ static int imxfb_resume(struct platform_
  #define imxfb_resume	NULL
  #endif
@@ -15278,9 +18422,55 @@ diff -urNp linux-2.6.30-rc4/drivers/video/imxfb.c linux-2.6.30-rc4-karo/drivers/
  	.shutdown	= imxfb_shutdown,
  	.driver		= {
  		.name	= DRIVER_NAME,
-diff -urNp linux-2.6.30-rc4/include/linux/fec_enet.h linux-2.6.30-rc4-karo/include/linux/fec_enet.h
---- linux-2.6.30-rc4/include/linux/fec_enet.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo/include/linux/fec_enet.h	2009-03-16 12:49:03.000000000 +0100
+diff -purN linux-2.6.30-rc4-git/fs/jffs2/erase.c linux-2.6.30-rc4-karo3/fs/jffs2/erase.c
+--- linux-2.6.30-rc4-git/fs/jffs2/erase.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/fs/jffs2/erase.c	2009-07-14 14:12:12.000000000 +0200
+@@ -422,6 +422,7 @@ static void jffs2_mark_erased_block(stru
+ 	/* Cleanmarker in oob area or no cleanmarker at all ? */
+ 	if (jffs2_cleanmarker_oob(c) || c->cleanmarker_size == 0) {
+ 
++		/* We only write cleanmarker in case of SLC NAND */
+ 		if (jffs2_cleanmarker_oob(c)) {
+ 			if (jffs2_write_nand_cleanmarker(c, jeb))
+ 				goto filebad;
+diff -purN linux-2.6.30-rc4-git/fs/jffs2/fs.c linux-2.6.30-rc4-karo3/fs/jffs2/fs.c
+--- linux-2.6.30-rc4-git/fs/jffs2/fs.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/fs/jffs2/fs.c	2009-07-14 14:12:28.000000000 +0200
+@@ -680,7 +680,9 @@ void jffs2_gc_release_page(struct jffs2_
+ static int jffs2_flash_setup(struct jffs2_sb_info *c) {
+ 	int ret = 0;
+ 
+-	if (jffs2_cleanmarker_oob(c)) {
++	if (c->mtd->type == MTD_NANDFLASH) {
++		if (!(c->mtd->flags & MTD_OOB_WRITEABLE))
++			printk(KERN_DEBUG "JFFS2 doesn't use OOB.\n");
+ 		/* NAND flash... do setup accordingly */
+ 		ret = jffs2_nand_flash_setup(c);
+ 		if (ret)
+@@ -713,7 +715,7 @@ static int jffs2_flash_setup(struct jffs
+ 
+ void jffs2_flash_cleanup(struct jffs2_sb_info *c) {
+ 
+-	if (jffs2_cleanmarker_oob(c)) {
++	if (c->mtd->type == MTD_NANDFLASH) {
+ 		jffs2_nand_flash_cleanup(c);
+ 	}
+ 
+diff -purN linux-2.6.30-rc4-git/fs/jffs2/os-linux.h linux-2.6.30-rc4-karo3/fs/jffs2/os-linux.h
+--- linux-2.6.30-rc4-git/fs/jffs2/os-linux.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/fs/jffs2/os-linux.h	2009-07-14 14:12:32.000000000 +0200
+@@ -110,7 +110,7 @@ static inline void jffs2_init_inode_info
+ #define jffs2_can_mark_obsolete(c) (c->mtd->flags & (MTD_BIT_WRITEABLE))
+ #endif
+ 
+-#define jffs2_cleanmarker_oob(c) (c->mtd->type == MTD_NANDFLASH)
++#define jffs2_cleanmarker_oob(c) (c->mtd->type == MTD_NANDFLASH && (c->mtd->flags & MTD_OOB_WRITEABLE))
+ 
+ #define jffs2_flash_write_oob(c, ofs, len, retlen, buf) ((c)->mtd->write_oob((c)->mtd, ofs, len, retlen, buf))
+ #define jffs2_flash_read_oob(c, ofs, len, retlen, buf) ((c)->mtd->read_oob((c)->mtd, ofs, len, retlen, buf))
+diff -purN linux-2.6.30-rc4-git/include/linux/fec_enet.h linux-2.6.30-rc4-karo3/include/linux/fec_enet.h
+--- linux-2.6.30-rc4-git/include/linux/fec_enet.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/include/linux/fec_enet.h	2009-03-16 12:49:03.000000000 +0100
 @@ -0,0 +1,26 @@
 +/*
 + * Copyright (C) 2007  Lothar Wassmann <LW@KARO-electronics.de>
@@ -15308,9 +18498,103 @@ diff -urNp linux-2.6.30-rc4/include/linux/fec_enet.h linux-2.6.30-rc4-karo/inclu
 +	int (*suspend)(struct platform_device *dev);
 +	int (*resume)(struct platform_device *dev);
 +};
-diff -urNp linux-2.6.30-rc4/kernel/printk.c linux-2.6.30-rc4-karo/kernel/printk.c
---- linux-2.6.30-rc4/kernel/printk.c	2009-05-13 09:46:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo/kernel/printk.c	2009-06-02 19:21:25.000000000 +0200
+diff -purN linux-2.6.30-rc4-git/include/linux/usb/xcvr.h linux-2.6.30-rc4-karo3/include/linux/usb/xcvr.h
+--- linux-2.6.30-rc4-git/include/linux/usb/xcvr.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.30-rc4-karo3/include/linux/usb/xcvr.h	2009-07-01 11:32:10.000000000 +0200
+@@ -0,0 +1,71 @@
++#ifndef __LINUX_USB_XCVR_H
++#define __LINUX_USB_XCVR_H
++
++struct usb_xcvr;
++
++struct usb_xcvr_access_ops {
++	int (*read)(struct usb_xcvr *xcvr, u32 reg);
++	int (*write)(struct usb_xcvr *xcvr, u32 val, u32 reg);
++};
++
++struct usb_xcvr_driver {
++	int  (*init)(struct usb_xcvr *xcvr);
++	void (*shutdown)(struct usb_xcvr *xcvr);
++	int  (*set_vbus)(struct usb_xcvr *xcvr, bool en);
++};
++
++struct usb_xcvr {
++	struct usb_xcvr_access_ops 	*access;
++	struct usb_xcvr_driver		*driver;
++	void __iomem			*access_priv;
++
++	/* only set this if you don't want the lowlevel driver to
++	 * handle this */
++	int (*set_vbus)(struct usb_xcvr *xcvr, bool en);
++};
++
++static inline int usb_xcvr_init(struct usb_xcvr *xcvr)
++{
++	if (xcvr->driver && xcvr->driver->init)
++		return xcvr->driver->init(xcvr);
++
++	return -EINVAL;
++}
++
++static inline void usb_xcvr_shutdown(struct usb_xcvr *xcvr)
++{
++	if (xcvr->driver && xcvr->driver->shutdown)
++		xcvr->driver->shutdown(xcvr);
++}
++
++static inline int usb_xcvr_set_vbus(struct usb_xcvr *xcvr, bool en)
++{
++	if (xcvr->set_vbus)
++		return xcvr->set_vbus(xcvr, en);
++
++	if (xcvr->driver && xcvr->driver->set_vbus)
++		return xcvr->driver->set_vbus(xcvr, en);
++
++	return -EINVAL;
++}
++
++/* lowlowel access helpers */
++
++static inline int usb_xcvr_read(struct usb_xcvr *xcvr, u32 reg)
++{
++	if (xcvr->access->read)
++		return xcvr->access->read(xcvr, reg);
++
++	return -EINVAL;
++}
++
++static inline int usb_xcvr_write(struct usb_xcvr *xcvr, u32 val, u32 reg)
++{
++	if (xcvr->access->write)
++		return xcvr->access->write(xcvr, val, reg);
++
++	return -EINVAL;
++}
++
++#endif /* __LINUX_USB_XCVR_H */
++
+diff -purN linux-2.6.30-rc4-git/include/mtd/mtd-abi.h linux-2.6.30-rc4-karo3/include/mtd/mtd-abi.h
+--- linux-2.6.30-rc4-git/include/mtd/mtd-abi.h	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/include/mtd/mtd-abi.h	2009-07-14 14:12:38.000000000 +0200
+@@ -30,12 +30,14 @@ struct mtd_oob_buf {
+ #define MTD_BIT_WRITEABLE	0x800	/* Single bits can be flipped */
+ #define MTD_NO_ERASE		0x1000	/* No erase necessary */
+ #define MTD_POWERUP_LOCK	0x2000	/* Always locked after reset */
++#define MTD_OOB_WRITEABLE	0x4000	/* Use Out-Of-Band area */
+ 
+ // Some common devices / combinations of capabilities
+ #define MTD_CAP_ROM		0
+ #define MTD_CAP_RAM		(MTD_WRITEABLE | MTD_BIT_WRITEABLE | MTD_NO_ERASE)
+ #define MTD_CAP_NORFLASH	(MTD_WRITEABLE | MTD_BIT_WRITEABLE)
+-#define MTD_CAP_NANDFLASH	(MTD_WRITEABLE)
++#define MTD_CAP_NANDFLASH	(MTD_WRITEABLE | MTD_OOB_WRITEABLE)
++#define MTD_CAP_MLC_NANDFLASH	(MTD_WRITEABLE)
+ 
+ /* ECC byte placement */
+ #define MTD_NANDECC_OFF		0	// Switch off ECC (Not recommended)
+diff -purN linux-2.6.30-rc4-git/kernel/printk.c linux-2.6.30-rc4-karo3/kernel/printk.c
+--- linux-2.6.30-rc4-git/kernel/printk.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/kernel/printk.c	2009-06-02 19:21:25.000000000 +0200
 @@ -637,9 +637,12 @@ static int acquire_console_semaphore_for
  static const char recursion_bug_msg [] =
  		KERN_CRIT "BUG: recent printk recursion!\n";
@@ -15335,3 +18619,45 @@ diff -urNp linux-2.6.30-rc4/kernel/printk.c linux-2.6.30-rc4-karo/kernel/printk.
  	/*
  	 * Copy the output into log_buf.  If the caller didn't provide
  	 * appropriate log level tags, we insert them here
+diff -purN linux-2.6.30-rc4-git/net/can/bcm.c linux-2.6.30-rc4-karo3/net/can/bcm.c
+--- linux-2.6.30-rc4-git/net/can/bcm.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/net/can/bcm.c	2009-07-14 14:13:01.000000000 +0200
+@@ -75,6 +75,7 @@ static __initdata const char banner[] = 
+ MODULE_DESCRIPTION("PF_CAN broadcast manager protocol");
+ MODULE_LICENSE("Dual BSD/GPL");
+ MODULE_AUTHOR("Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");
++MODULE_ALIAS("can-proto-2");
+ 
+ /* easy access to can_frame payload */
+ static inline u64 GET_U64(const struct can_frame *cp)
+@@ -1469,6 +1470,9 @@ static int bcm_release(struct socket *so
+ 		bo->ifindex = 0;
+ 	}
+ 
++	sock_orphan(sk);
++	sock->sk = NULL;
++
+ 	release_sock(sk);
+ 	sock_put(sk);
+ 
+diff -purN linux-2.6.30-rc4-git/net/can/raw.c linux-2.6.30-rc4-karo3/net/can/raw.c
+--- linux-2.6.30-rc4-git/net/can/raw.c	2009-05-13 09:46:19.000000000 +0200
++++ linux-2.6.30-rc4-karo3/net/can/raw.c	2009-07-14 14:13:07.000000000 +0200
+@@ -62,6 +62,7 @@ static __initdata const char banner[] =
+ MODULE_DESCRIPTION("PF_CAN raw protocol");
+ MODULE_LICENSE("Dual BSD/GPL");
+ MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>");
++MODULE_ALIAS("can-proto-1");
+ 
+ #define MASK_ALL 0
+ 
+@@ -306,6 +307,9 @@ static int raw_release(struct socket *so
+ 	ro->bound   = 0;
+ 	ro->count   = 0;
+ 
++	sock_orphan(sk);
++	sock->sk = NULL;
++
+ 	release_sock(sk);
+ 	sock_put(sk);
+ 
diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/tx25-can.patch b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/tx25-can.patch
deleted file mode 100644
index dd857d5846..0000000000
--- a/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/tx25-can.patch
+++ /dev/null
@@ -1,5914 +0,0 @@
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/mach-mx2/Kconfig linux-2.6.30-rc4-karo2/arch/arm/mach-mx2/Kconfig
---- linux-2.6.30-rc4-karo/arch/arm/mach-mx2/Kconfig	2009-06-08 11:15:16.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/arch/arm/mach-mx2/Kconfig	2009-07-01 11:09:09.000000000 +0200
-@@ -15,6 +15,9 @@ config MACH_MX27
- 	bool "i.MX27 support"
- 	select ARCH_MXC_IOMUX_V2
- 	select ARCH_MXC_HAS_NFC_V1
-+	select USB_ARCH_HAS_EHCI
-+	select ARCH_MXC_HAS_USBH2
-+	select ARCH_MXC_HAS_USBOTG
- 	help
- 	  This enables support for Freescale's MX2 based i.MX27 processor.
- 
-@@ -22,6 +25,9 @@ config MACH_MX25
- 	bool "i.MX25 support"
- 	select ARCH_MXC_IOMUX_V3
- 	select ARCH_MXC_HAS_NFC_V1_1
-+	select USB_ARCH_HAS_EHCI
-+	select ARCH_MXC_HAS_USBH2
-+	select ARCH_MXC_HAS_USBOTG
- 	select PHYLIB if FEC
- 	help
- 	  This enables support for Freescale's MX2 based i.MX25 processor.
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/mach-mx2/clock_imx25.c linux-2.6.30-rc4-karo2/arch/arm/mach-mx2/clock_imx25.c
---- linux-2.6.30-rc4-karo/arch/arm/mach-mx2/clock_imx25.c	2009-07-06 17:32:59.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/arch/arm/mach-mx2/clock_imx25.c	2009-07-06 15:40:57.000000000 +0200
-@@ -274,37 +274,42 @@ static void _perclk_disable(struct clk *
- static int _clk_pll_set_rate(struct clk *clk, unsigned long rate)
- {
- 	unsigned long reg;
--	signed long pd = 1;	/* Pre-divider */
--	signed long mfi;	/* Multiplication Factor (Integer part) */
-+	unsigned int pd = 1;	/* Pre-divider */
-+	unsigned long mfi;	/* Multiplication Factor (Integer part) */
- 	signed long mfn;	/* Multiplication Factor (Integer part) */
--	signed long mfd;	/* Multiplication Factor (Denominator Part) */
-+	unsigned long mfd;	/* Multiplication Factor (Denominator Part) */
- 	signed long tmp;
- 	unsigned long ref_freq = clk_get_rate(clk->parent);
-+	unsigned long err = ~0;
-+	int best_mfn = -1;
-+	int best_mfd = -1;
- 
- 	while (((ref_freq / pd) * 10) > rate)
- 		pd++;
- 
--	/* the ref_freq/2 in the following is to round up */
--	mfi = (((rate / 2) * pd) + (ref_freq / 2)) / ref_freq;
-+	mfi = ((rate / 2) * pd) / ref_freq;
- 	if (mfi < 5 || mfi > 15)
- 		return -EINVAL;
- 
--	/* pick a mfd value that will work
--	 * then solve for mfn */
--	mfd = ref_freq / 50000;
--
--	/*
--	 *          pll_freq * pd * mfd
--	 *   mfn = --------------------  -  (mfi * mfd)
--	 *           2 * ref_freq
--	 */
--	/* the tmp/2 is for rounding */
- 	tmp = ref_freq / 10000;
--	mfn = ((((((rate / 2) + (tmp / 2)) / tmp) * pd) * mfd) / 10000) -
--		(mfi * mfd);
-+	for (mfd = 1; mfd <= 1024; mfd++) {
-+		unsigned long act_freq;
- 
--	printk(KERN_DEBUG "pll freq: %lu PD=%ld MFI=%ld MFD=%ld MFN=%ld (0x%03lx)\n",
--	       rate, pd, mfi, mfd, mfn, (mfn + ((mfn < 0) ? 1024 : 0)) & 0x3ff);
-+		mfn = ((((((rate / 2) + (tmp - 1)) / tmp) * pd) * mfd) / 10000) -
-+			(mfi * mfd);
-+
-+		act_freq = (2 * ref_freq * mfi + (2 * ref_freq * mfn / mfd)) / pd;
-+		act_freq -= rate;
-+		if (abs(act_freq) < err) {
-+			best_mfn = mfn;
-+			best_mfd = mfd;
-+			err = abs(act_freq);
-+			if (err == 0)
-+				break;
-+		}
-+	}
-+	mfn = best_mfn;
-+	mfd = best_mfd;
- 
- 	mfn = (mfn + ((mfn < 0) ? 1024 : 0)) & 0x3ff;
- 	pd--;
-@@ -333,7 +338,8 @@ static int _clk_pll_set_rate(struct clk 
- static unsigned long _clk_pll_getrate(struct clk *clk)
- {
- 	unsigned long rate;
--	signed long mfi, mfn, mfd, pdf;
-+	unsigned int mfi, mfd, pdf;
-+	int mfn;
- 	unsigned long ref_clk;
- 	unsigned long reg;
- 
-@@ -355,6 +361,9 @@ static unsigned long _clk_pll_getrate(st
- 		BUG();		/* oops */
- 	}
- 
-+	if (mfn >= 512)
-+		mfn = 1024 - mfn;
-+
- 	mfi = (mfi < 5) ? 5 : mfi;
- 	rate = 2LL * ref_clk * mfn;
- 	do_div(rate, mfd + 1);
-@@ -436,8 +445,8 @@ static unsigned long _clk_perclkx_getrat
- 
- 	pcdr = __raw_readl(pcdr_a[clk->id >> 2]);
- 
--	perclk_pdf =
--	    (pcdr >> ((clk->id & 3) << 3)) & MXC_CCM_PCDR1_PERDIV1_MASK;
-+	perclk_pdf = (pcdr >> ((clk->id & 3) << 3)) &
-+		MXC_CCM_PCDR1_PERDIV1_MASK;
- 
- 	return clk_get_rate(clk->parent) / (perclk_pdf + 1);
- }
-@@ -466,8 +475,6 @@ static int _clk_perclkx_set_rate(struct 
- 		return -EINVAL;
- 
- 	div = clk_get_rate(clk->parent) / rate;
--	printk(KERN_DEBUG "%s: perclk[%d] parent_rate=%lu rate=%lu div=%lu\n",
--	       __FUNCTION__, clk->id, clk_get_rate(clk->parent), rate, div);
- 	if (div > 64 || div < 1 || ((clk_get_rate(clk->parent) / div) != rate))
- 		return -EINVAL;
- 	div--;
-@@ -542,7 +549,8 @@ static int _clk_perclkx_set_parent3(stru
- 
- static unsigned long _clk_ipg_getrate(struct clk *clk)
- {
--	return clk_get_rate(clk->parent) / 2;	/* Always AHB / 2 */
-+	unsigned long rate = clk_get_rate(clk->parent) / 2;	/* Always AHB / 2 */
-+	return rate;
- }
- 
- /* Top-level clocks */
-@@ -714,7 +722,7 @@ static struct clk per_clk[] = {
- 	},
- 	{
- 		.id = 5,
--		.parent = &upll_clk,	/* can be AHB or UPLL */
-+		.parent = &ahb_clk,	/* can be AHB or UPLL */
- 		.round_rate = _clk_perclkx_round_rate,
- 		.set_rate = _clk_perclkx_set_rate,
- 		.set_parent = _clk_perclkx_set_parent,
-@@ -1121,7 +1129,7 @@ static struct clk gpt2_clk[] = {
- 	{
- 		.id = 1,
- 		.parent = &per_clk[5],
--		.secondary = &gpt1_clk[1],
-+		.secondary = &gpt2_clk[1],
- 	},
- 	{
- 		.id = 1,
-@@ -1137,7 +1145,7 @@ static struct clk gpt3_clk[] = {
- 	{
- 		.id = 2,
- 		.parent = &per_clk[5],
--		.secondary = &gpt1_clk[1],
-+		.secondary = &gpt3_clk[1],
- 	},
- 	{
- 		.id = 2,
-@@ -1153,7 +1161,7 @@ static struct clk gpt4_clk[] = {
- 	{
- 		.id = 3,
- 		.parent = &per_clk[5],
--		.secondary = &gpt1_clk[1],
-+		.secondary = &gpt4_clk[1],
- 	},
- 	{
- 		.id = 3,
-@@ -1576,9 +1584,9 @@ static int _clk_usb_set_rate(struct clk 
- 
- static unsigned long _clk_usb_getrate(struct clk *clk)
- {
--	unsigned long div =
--		__raw_readl(MXC_CCM_MCR) & MXC_CCM_CCTL_USB_DIV_MASK;
-+	unsigned long div;
- 
-+	div = __raw_readl(MXC_CCM_MCR) & MXC_CCM_CCTL_USB_DIV_MASK;
- 	div >>= MXC_CCM_CCTL_USB_DIV_OFFSET;
- 
- 	return clk_get_rate(clk->parent) / (div + 1);
-@@ -1726,8 +1734,8 @@ static struct clk_lookup lookups[] = {
- 	_REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk)
- 	_REGISTER_CLOCK(NULL, "audmux", audmux_clk)
- 	_REGISTER_CLOCK(NULL, "ata", ata_clk[0])
--	_REGISTER_CLOCK("mxc-can.0", NULL, can_clk[0])
--	_REGISTER_CLOCK("mxc-can.1", NULL, can_clk[1])
-+	_REGISTER_CLOCK("mxc-flexcan.0", NULL, can_clk[0])
-+	_REGISTER_CLOCK("mxc-flexcan.1", NULL, can_clk[1])
- 	_REGISTER_CLOCK(NULL, "csi", csi_clk[0])
- 	_REGISTER_CLOCK(NULL, "cspi.0", cspi_clk[0])
- 	_REGISTER_CLOCK(NULL, "cspi.1", cspi_clk[1])
-@@ -1784,12 +1792,8 @@ int __init mx25_clocks_init(unsigned lon
- {
- 	int i;
- 
--	for (i = 0; i < ARRAY_SIZE(lookups); i++) {
--		printk(KERN_DEBUG "Registering clock '%s' '%s'\n",
--		       lookups[i].dev_id ? lookups[i].dev_id : "",
--		       lookups[i].con_id ? lookups[i].con_id : "");
-+	for (i = 0; i < ARRAY_SIZE(lookups); i++)
- 		clkdev_add(&lookups[i]);
--	}
- 
- 	ckih_rate = fref;
- #ifndef CONFIG_DEBUG_LL
-@@ -1825,23 +1829,19 @@ int __init mx25_clocks_init(unsigned lon
- 			}
- 		}
- 	}
--#endif
-+
- 	/* the NFC clock must be derived from AHB clock */
- 	clk_set_parent(&per_clk[8], &ahb_clk);
-+#endif
- 	clk_set_rate(&per_clk[8], clk_get_rate(&ahb_clk) / 6);
-+	clk_set_rate(&per_clk[7], clk_get_rate(per_clk[7].parent));
- 
- 	/* This will propagate to all children and init all the clock rates */
- #ifdef CONFIG_DEBUG_LL
- 	clk_enable(&uart1_clk[0]);
- #endif
- 	clk_enable(&emi_clk);
--	clk_enable(&gpio_clk[0]);
--	clk_enable(&gpio_clk[1]);
--	clk_enable(&gpio_clk[2]);
- 	clk_enable(&iim_clk);
--	clk_enable(&gpt1_clk[0]);
--	clk_enable(&iomuxc_clk);
--	clk_enable(&scc_clk);
- 
- 	pr_info("Clock input source is %ld\n", clk_get_rate(&osc24m_clk));
- 
-@@ -1856,6 +1856,6 @@ int __init mx25_clocks_init(unsigned lon
- 	clk_set_rate(&mpll_clk, clk_get_rate(&mpll_clk));
- 	clk_set_rate(&upll_clk, clk_get_rate(&upll_clk));
- 
--	mxc_timer_init(&gpt1_clk[0]);
-+	mxc_timer_init(&gpt1_clk[1]);
- 	return 0;
- }
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/mach-mx2/devices.h linux-2.6.30-rc4-karo2/arch/arm/mach-mx2/devices.h
---- linux-2.6.30-rc4-karo/arch/arm/mach-mx2/devices.h	2009-06-02 17:59:16.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/arch/arm/mach-mx2/devices.h	2009-07-01 11:10:15.000000000 +0200
-@@ -20,6 +20,9 @@ extern struct platform_device mxc_i2c_de
- extern struct platform_device mxc_i2c_device1;
- extern struct platform_device mxc_sdhc_device0;
- extern struct platform_device mxc_sdhc_device1;
-+extern struct platform_device mxc_usbh1_device;
-+extern struct platform_device mxc_usbh2_device;
-+extern struct platform_device mxc_usbotg_device;
- #ifdef CONFIG_MACH_MX25
- extern struct platform_device mx25_i2c_device0;
- extern struct platform_device mx25_i2c_device1;
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/mach-mx2/devices_mx25.c linux-2.6.30-rc4-karo2/arch/arm/mach-mx2/devices_mx25.c
---- linux-2.6.30-rc4-karo/arch/arm/mach-mx2/devices_mx25.c	2009-06-02 17:59:17.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/arch/arm/mach-mx2/devices_mx25.c	2009-06-29 10:48:40.000000000 +0200
-@@ -142,12 +142,12 @@ struct platform_device mxc_fb_device = {
-  * Resource definition for the CSPI1
-  */
- static struct resource mx25_spi1_resources[] = {
--	[0] = {
-+	{
- 	       .start = CSPI1_BASE_ADDR,
- 	       .end = CSPI1_BASE_ADDR + SZ_4K - 1,
- 	       .flags = IORESOURCE_MEM,
- 	},
--	[1] = {
-+	{
- 	       .start = MXC_INT_CSPI1,
- 	       .end = MXC_INT_CSPI1,
- 	       .flags = IORESOURCE_IRQ,
-@@ -178,12 +178,12 @@ static struct platform_device mx25_spi1_
-  * Resource definition for the CSPI2
-  */
- static struct resource mx25_spi2_resources[] = {
--	[0] = {
-+	{
- 	       .start = CSPI2_BASE_ADDR,
- 	       .end = CSPI2_BASE_ADDR + SZ_4K - 1,
- 	       .flags = IORESOURCE_MEM,
- 	},
--	[1] = {
-+	{
- 	       .start = MXC_INT_CSPI2,
- 	       .end = MXC_INT_CSPI2,
- 	       .flags = IORESOURCE_IRQ,
-@@ -213,12 +213,12 @@ static struct platform_device mx25_spi2_
-  * Resource definition for the CSPI3
-  */
- static struct resource mx25_spi3_resources[] = {
--	[0] = {
-+	{
- 	       .start = CSPI3_BASE_ADDR,
- 	       .end = CSPI3_BASE_ADDR + SZ_4K - 1,
- 	       .flags = IORESOURCE_MEM,
- 	},
--	[1] = {
-+	{
- 	       .start = MXC_INT_CSPI3,
- 	       .end = MXC_INT_CSPI3,
- 	       .flags = IORESOURCE_IRQ,
-@@ -267,6 +267,56 @@ static inline void mx25_init_spi(void)
- }
- #endif
- 
-+#if defined(CONFIG_USB_EHCI_MXC) || defined(CONFIG_USB_EHCI_MXC_MODULE)
-+static struct resource mxc_usbotg_resources[] = {
-+	{
-+		.start = OTG_BASE_ADDR,
-+		.end   = OTG_BASE_ADDR + 0x1ff,
-+		.flags = IORESOURCE_MEM,
-+	}, {
-+		.start = MXC_INT_USB_OTG,
-+		.flags = IORESOURCE_IRQ,
-+	},
-+};
-+
-+static u64 usbotg_dmamask = (u32)~0;
-+
-+struct platform_device mxc_usbotg_device = {
-+	.name = "mxc-ehci",
-+	.id = 0,
-+	.dev = {
-+		.coherent_dma_mask = 0xffffffff,
-+		.dma_mask = &usbotg_dmamask,
-+	},
-+	.num_resources = ARRAY_SIZE(mxc_usbotg_resources),
-+	.resource = mxc_usbotg_resources,
-+};
-+
-+static struct resource mxc_usbh2_resources[] = {
-+	{
-+		.start = USBH2_BASE_ADDR,
-+		.end   = USBH2_BASE_ADDR + 0x1ff,
-+		.flags = IORESOURCE_MEM,
-+	}, {
-+		.start = MXC_INT_USB_H2,
-+		.flags = IORESOURCE_IRQ,
-+	},
-+};
-+
-+static u64 usbh2_dmamask = (u32)~0;
-+
-+struct platform_device mxc_usbh2_device = {
-+	.name = "mxc-ehci",
-+	.id = 1,
-+	.dev = {
-+		.coherent_dma_mask = 0xffffffff,
-+		.dma_mask = &usbh2_dmamask,
-+	},
-+	.num_resources = ARRAY_SIZE(mxc_usbh2_resources),
-+	.resource = mxc_usbh2_resources,
-+};
-+#endif
-+
- /* I2C controller and device data */
- #if defined(CONFIG_I2C_IMX) || defined(CONFIG_I2C_IMX_MODULE)
- 
-@@ -274,12 +324,12 @@ static inline void mx25_init_spi(void)
-  * Resource definition for the I2C1
-  */
- static struct resource mx25_i2c1_resources[] = {
--	[0] = {
-+	{
- 		.start = I2C_BASE_ADDR,
- 		.end = I2C_BASE_ADDR + SZ_4K - 1,
- 		.flags = IORESOURCE_MEM,
- 	},
--	[1] = {
-+	{
- 		.start = MXC_INT_I2C,
- 		.end = MXC_INT_I2C,
- 		.flags = IORESOURCE_IRQ,
-@@ -290,12 +340,12 @@ static struct resource mx25_i2c1_resourc
-  * Resource definition for the I2C2
-  */
- static struct resource mx25_i2c2_resources[] = {
--	[0] = {
-+	{
- 		.start = I2C2_BASE_ADDR,
- 		.end = I2C2_BASE_ADDR + SZ_4K - 1,
- 		.flags = IORESOURCE_MEM,
- 	},
--	[1] = {
-+	{
- 		.start = MXC_INT_I2C2,
- 		.end = MXC_INT_I2C2,
- 		.flags = IORESOURCE_IRQ,
-@@ -306,12 +356,12 @@ static struct resource mx25_i2c2_resourc
-  * Resource definition for the I2C3
-  */
- static struct resource mx25_i2c3_resources[] = {
--	[0] = {
-+	{
- 		.start = I2C3_BASE_ADDR,
- 		.end = I2C3_BASE_ADDR + SZ_4K - 1,
- 		.flags = IORESOURCE_MEM,
- 	},
--	[1] = {
-+	{
- 		.start = MXC_INT_I2C3,
- 		.end = MXC_INT_I2C3,
- 		.flags = IORESOURCE_IRQ,
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/mach-mx2/karo-tx25.c linux-2.6.30-rc4-karo2/arch/arm/mach-mx2/karo-tx25.c
---- linux-2.6.30-rc4-karo/arch/arm/mach-mx2/karo-tx25.c	2009-07-06 17:32:59.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/arch/arm/mach-mx2/karo-tx25.c	2009-07-06 16:02:49.000000000 +0200
-@@ -31,8 +31,6 @@
- #include <linux/clk.h>
- #include <linux/delay.h>
- #include <linux/fb.h>
--//#include <linux/i2c.h>
--//#include <linux/i2c/at24.h>
- #include <linux/spi/spi.h>
- #include <linux/serial_8250.h>
- #include <linux/fec_enet.h>
-@@ -61,15 +59,12 @@
- #include <mach/irqs.h>
- #include <mach/clock.h>
- #include <mach/imxfb.h>
--//#include <mach/imx_spi.h>
--//#include <mach/i2c.h>
- #include <mach/mmc.h>
- #include <mach/imx-uart.h>
- #include <mach/mxc_nand.h>
--//#include <mach/ulpi.h>
--//#include <mach/mxc_ehci.h>
--//#include <mach/board-tx25.h>
-+#include <mach/mxc_ehci.h>
- #include <mach/mxc_tsadcc.h>
-+#include <mach/mxc_can.h>
- 
- #include "crm_regs.h"
- #include "devices.h"
-@@ -83,161 +78,172 @@ static int tx25_debug;
- module_param(tx25_debug, int, 0);
- #endif
- 
--//#include "karo.h"
--
- int karo_board_type = 0;
- int karo_mod_type = -1;
- 
- 
--#ifdef CONFIG_USB_EHCI_MXC
--
--#define SMSC_VENDOR_ID		0x0424
--#define USB3317_PROD_ID		0x0006
--#define ULPI_FCTL		7
--
--static inline const char *ulpi_name(void __iomem *view)
--{
--	if ((unsigned long)view & 0x400) {
--		return "USBH2";
--	} else {
--		return "USBOTG";
--	}
--}
--
--static int usb3317_init(void __iomem *view)
-+static int karo_tx25_gpio_config(struct pad_desc *pd, int num)
- {
--	int vid, pid, ret;
--#if 1
--	/* This is a kludge until we know why we sometimes read a wrong
--	 * vendor or product ID!
--	 */
--	int retries = 3;
--
-- retry:
--#endif
--	ret = ulpi_read(ISP1504_VID_HIGH, view);
--	if (ret < 0) {
--		goto err;
--	}
--	vid = ret << 8;
-+	int ret;
-+	int i;
-+	int count = 0;
- 
--	ret = ulpi_read(ISP1504_VID_LOW, view);
--	if (ret < 0) {
--		goto err;
-+	for (i = 0; i < num; i++) {
-+		ret = mxc_iomux_v3_setup_pad(&pd[i]);
-+		if (ret == 0) {
-+			DBG(0, "%s: PAD[%d] %s set up as GPIO\n", __FUNCTION__, i,
-+			    MXC_PAD_NAME(&pd[i]));
-+			count++;
-+			mxc_iomux_v3_release_pad(&pd[i]);
-+		} else {
-+			DBG(0, "%s: PAD[%d] %s skipped\n", __FUNCTION__, i,
-+			    MXC_PAD_NAME(&pd[i]));
-+		}
- 	}
--	vid |= ret;
-+	return count;
-+}
- 
--	ret = ulpi_read(ISP1504_PID_HIGH, view);
--	if (ret < 0) {
--		goto err;
--	}
--	pid = ret << 8;
-+#ifdef CONFIG_USB_EHCI_MXC
- 
--	ret = ulpi_read(ISP1504_PID_LOW, view);
--	if (ret < 0) {
--		goto err;
--	}
--	pid |= ret;
-+/* USB register offsets */
-+#define REG_USBCTRL		0x600
-+#define REG_PHY_CTRL		0x608
-+
-+#define PHY_CTRL_USBEN		(1 << 24)
-+
-+/* USB Host/OTG register offsets referenced to ULPI view port */
-+#define REG_USBCMD		0x140
-+#define REG_USBSTS		0x144
-+#define REG_PORTSC1		0x184
-+#define REG_USBMODE		0x1a8
-+
-+#define USBCMD_RST		(1 << 1)
-+#define USBCMD_RUN		(1 << 0)
-+
-+#define USBSTS_HCH		(1 << 12)
-+
-+/* USB_CTRL register bits */
-+#define USBCTRL_OCPOL_HST	(1 << 2)
-+#define USBCTRL_OCPOL_OTG	(1 << 3)
-+#define USBCTRL_USBTE		(1 << 4)
-+#define USBCTRL_HSDT		(1 << 5)
-+#define USBCTRL_XCSH		(1 << 9)
-+#define USBCTRL_XCSO		(1 << 10)
-+#define USBCTRL_PP_OTG		(1 << 11)
-+#define USBCTRL_HLKEN		(1 << 12)
-+#define USBCTRL_OLKEN		(1 << 13)
-+#define USBCTRL_HPM		(1 << 16)
-+#define USBCTRL_PP_HST		(1 << 18)
-+#define USBCTRL_HWIE		(1 << 19)
-+#define USBCTRL_HUIE		(1 << 20)
-+#define USBCTRL_OPM		(1 << 24)
-+#define USBCTRL_OEXTEN		(1 << 25)
-+#define USBCTRL_HEXTEN		(1 << 26)
-+#define USBCTRL_OWIE		(1 << 27)
-+#define USBCTRL_OUIE		(1 << 28)
- 
--	pr_info("ULPI on %s port Vendor ID 0x%x Product ID 0x%x\n",
--		ulpi_name(view), vid, pid);
--	if (vid != SMSC_VENDOR_ID || pid != USB3317_PROD_ID) {
--		if (retries-- < 0) {
--			pr_err("No USB3317 found\n");
--			return -ENODEV;
-+static int tx25_usb_init(struct platform_device *pdev, void __iomem *base, int host_mode)
-+{
-+	u32 val;
-+	unsigned long flags;
-+	const char __maybe_unused *name = pdev->id ? "USBH2" : "USBOTG";
-+	unsigned int loops = 0;
-+	void __iomem *otg_base = IO_ADDRESS(OTG_BASE_ADDR);
-+
-+	if (!(__raw_readl(base + REG_USBSTS) & USBSTS_HCH)) {
-+		DBG(0, "%s: %s[%p] is busy: %08x\n", __FUNCTION__, name,
-+		    base + REG_USBSTS, __raw_readl(base + REG_USBSTS));
-+		__raw_writel(__raw_readl(base + REG_USBCTRL) & ~USBCMD_RUN,
-+			 base + REG_USBCTRL);
-+		while (__raw_readl(base + REG_USBCTRL) & USBCMD_RUN) {
-+			cpu_relax();
- 		}
--		goto retry;
- 	}
-- err:
--	if (ret < 0) {
--		printk(KERN_ERR "ULPI read on %s port failed with error %d\n",
--		       ulpi_name(view), ret);
--		return ret;
-+	DBG(0, "%s: PHY_CTRL[%p]=%08x\n", __FUNCTION__, otg_base + REG_PHY_CTRL,
-+	    __raw_readl(otg_base + REG_PHY_CTRL));
-+	DBG(0, "%s: USBCMD[%p]=%08x\n", __FUNCTION__, base + REG_USBCMD,
-+	    __raw_readl(base + REG_USBCMD));
-+	DBG(0, "%s: USBSTS[%p]=%08x\n", __FUNCTION__, base + REG_USBSTS,
-+	    __raw_readl(base + REG_USBSTS));
-+
-+	/* reset USB Host controller */
-+	__raw_writel(USBCMD_RST, base + REG_USBCMD);
-+	while (__raw_readl(base + REG_USBCMD) & USBCMD_RST) {
-+		cpu_relax();
-+		loops++;
- 	}
--	return 0;
--}
--
--static int usb3317_set_vbus_power(void __iomem *view, int on)
--{
--	int ret;
--
--	DBG(0, "%s: Switching %s port VBUS power %s\n", __FUNCTION__,
--	    ulpi_name(view), on ? "on" : "off");
-+	DBG(0, "USB controller reset finished after %u loops\n", loops);
-+	local_irq_save(flags);
-+	val = __raw_readl(otg_base + REG_USBCTRL);
-+	if (pdev->id == 1) {
-+		val &= ~(USBCTRL_OCPOL_HST | USBCTRL_HPM |
-+			 USBCTRL_HEXTEN | USBCTRL_HWIE);
-+		val |= USBCTRL_PP_HST | USBCTRL_HSDT | USBCTRL_USBTE |
-+			USBCTRL_XCSH;
-+	} else {
-+		val &= ~(USBCTRL_OCPOL_OTG | USBCTRL_OPM |
-+			 USBCTRL_OEXTEN | USBCTRL_OWIE);
-+		val |= USBCTRL_PP_OTG | USBCTRL_XCSO;
-+	}
-+	DBG(0, "%s: Changing %s_USBCTRL from %08x to %08x\n", __FUNCTION__, name,
-+	    __raw_readl(otg_base + REG_USBCTRL), val);
-+	__raw_writel(val, otg_base + REG_USBCTRL);
-+	local_irq_restore(flags);
- 
--	if (on) {
--		ret = ulpi_set(DRV_VBUS_EXT |		/* enable external Vbus */
--			       DRV_VBUS |		/* enable internal Vbus */
--			       CHRG_VBUS,		/* charge Vbus */
--			       ISP1504_OTGCTL, view);
-+	val = __raw_readl(base + REG_PORTSC1);
-+	if (pdev->id == 1) {
-+		/* select serial transceiver */
-+		val = (val & ~(3 << 30)) | (3 << 30) | (1 << 28);
- 	} else {
--		ret = ulpi_clear(DRV_VBUS_EXT |		/* disable external Vbus */
--				 DRV_VBUS,		/* disable internal Vbus */
--				 ISP1504_OTGCTL, view);
--		if (ret == 0) {
--			ret = ulpi_set(DISCHRG_VBUS,	   /* discharge Vbus */
--				       ISP1504_OTGCTL, view);
--		}
--	}
--	if (ret < 0) {
--		printk(KERN_ERR "ULPI read on %s port failed with error %d\n",
--		       ulpi_name(view), ret);
--		return ret;
-+		/* select UTMI transceiver */
-+		val = (val & ~(3 << 30)) | (0 << 30) | (1 << 28);
- 	}
-+	DBG(0, "%s: Changing %s_PORTSC1 from %08x to %08x\n", __FUNCTION__, name,
-+	    __raw_readl(base + REG_PORTSC1), val);
-+	__raw_writel(val, base + REG_PORTSC1);
-+
-+	val = __raw_readl(otg_base + REG_PHY_CTRL);
-+	__raw_writel(val & ~PHY_CTRL_USBEN, otg_base + REG_PHY_CTRL);
-+	//__raw_writel(val | PHY_CTRL_USBEN, otg_base + REG_PHY_CTRL);
-+	DBG(0, "%s: PHY_CTRL[%p]=%08x\n", __FUNCTION__, otg_base + REG_PHY_CTRL,
-+	    __raw_readl(otg_base + REG_PHY_CTRL));
-+
-+	/* Switch to Host mode */
-+	val = __raw_readl(base + REG_USBMODE);
-+	DBG(0, "%s: Changing %s_USBMODE from %08x to %08x\n", __FUNCTION__, name,
-+	    val, val | (host_mode ? 0x3 : 0x02));
-+	__raw_writel(val | (host_mode ? 0x3 : 0x02), base + REG_USBMODE);
-+
- 	return 0;
- }
- 
-+#ifdef CONFIG_ARCH_MXC_EHCI_USBH2
-+static struct pad_desc karo_tx25_usbh2_pads[] = {
-+	MX25_PAD_D9__USBH2_PWR,
-+	MX25_PAD_D8__USBH2_OC,
-+};
-+
- static int tx25_usbh2_init(struct platform_device *pdev)
- {
- 	int ret;
--	u32 temp;
--	unsigned long flags;
--	void __iomem *view = IO_ADDRESS(OTG_BASE_ADDR + 0x570);
-+	void __iomem *base = IO_ADDRESS(OTG_BASE_ADDR + 0x400);
- 
--	local_irq_save(flags);
--	temp = readl(IO_ADDRESS(OTG_BASE_ADDR) + 0x600);
--	temp &= ~((3 << 21) | (1 << 0));
--	temp |= (1 << 5) | (1 << 16) | (1 << 19) | (1 << 20);
--	writel(temp, IO_ADDRESS(OTG_BASE_ADDR) + 0x600);
--	local_irq_restore(flags);
--
--	/* select ULPI transceiver */
--	/* this must be done _before_ setting up the GPIOs! */
--	temp = readl(view + 0x14);
--	DBG(0, "%s: Changing USBH2_PORTSC1 from %08x to %08x\n", __FUNCTION__,
--	    temp, (temp & ~(3 << 30)) | (2 << 30));
--	temp &= ~(3 << 30);
--	temp |= 2 << 30;
--	writel(temp, view + 0x14);
--
--	/* Set to Host mode */
--	temp = readl(view + 0x38);
--	DBG(0, "%s: Changing USBH2_USBMODE from %08x to %08x\n", __FUNCTION__,
--	    temp, temp | 3);
--	writel(temp | 0x3, view + 0x38);
-+	DBG(0, "%s: \n", __FUNCTION__);
- 
--	ret = gpio_usbh2_active();
-+	ret = tx25_usb_init(pdev, base, 1);
- 	if (ret != 0) {
- 		return ret;
- 	}
- 
--	ret = usb3317_init(view);
--	if (ret != 0) {
--		goto err;
--	}
--	ret = usb3317_set_vbus_power(view, 1);
--	if (ret != 0) {
--		goto err;
--	}
--	return 0;
--
-- err:
--	gpio_usbh2_inactive();
-+	ret = mxc_iomux_v3_setup_multiple_pads(karo_tx25_usbh2_pads,
-+					       ARRAY_SIZE(karo_tx25_usbh2_pads));
- 	return ret;
- }
- 
- static int tx25_usbh2_exit(struct platform_device *pdev)
- {
--	gpio_usbh2_inactive();
-+	mxc_iomux_v3_release_multiple_pads(karo_tx25_usbh2_pads,
-+					   ARRAY_SIZE(karo_tx25_usbh2_pads));
- 	return 0;
- }
- 
-@@ -250,10 +256,55 @@ int tx25_usbh2_register(void)
- {
- 	int ret;
- 
--	ret = mxc_register_device(&mxc_ehci2, &tx25_usbh2_data);
-+	ret = mxc_register_device(&mxc_usbh2_device, &tx25_usbh2_data);
- 	return ret;
- }
- device_initcall(tx25_usbh2_register);
-+#endif // CONFIG_ARCH_MXC_EHCI_USBH2
-+
-+#ifdef CONFIG_ARCH_MXC_EHCI_USBOTG
-+static struct pad_desc karo_tx25_usbotg_pads[] = {
-+	MX25_PAD_GPIO_A__USBOTG_PWR,
-+	MX25_PAD_GPIO_B__USBOTG_OC,
-+};
-+
-+static int tx25_usbotg_init(struct platform_device *pdev)
-+{
-+	int ret;
-+	void __iomem *base = IO_ADDRESS(OTG_BASE_ADDR + 0x000);
-+
-+	DBG(0, "%s: \n", __FUNCTION__);
-+
-+	ret = tx25_usb_init(pdev, base, 1);
-+	if (ret != 0) {
-+		return ret;
-+	}
-+	ret = mxc_iomux_v3_setup_multiple_pads(karo_tx25_usbotg_pads,
-+					       ARRAY_SIZE(karo_tx25_usbotg_pads));
-+	return 0;
-+}
-+
-+static int tx25_usbotg_exit(struct platform_device *pdev)
-+{
-+	mxc_iomux_v3_release_multiple_pads(karo_tx25_usbotg_pads,
-+					   ARRAY_SIZE(karo_tx25_usbotg_pads));
-+	return 0;
-+}
-+
-+static struct mxc_usbh_platform_data tx25_usbotg_data = {
-+	.init = tx25_usbotg_init,
-+	.exit = tx25_usbotg_exit,
-+};
-+
-+int tx25_usbotg_register(void)
-+{
-+	int ret;
-+
-+	ret = mxc_register_device(&mxc_usbotg_device, &tx25_usbotg_data);
-+	return ret;
-+}
-+device_initcall(tx25_usbotg_register);
-+#endif // CONFIG_ARCH_MXC_EHCI_USBOTG
- #endif // CONFIG_USB_EHCI_MXC
- 
- //#define FEC_MII_IRQ		IRQ_GPIOD(8)
-@@ -382,17 +433,7 @@ static int gpio_fec_active(void)
- 			return ret;
- 		}
- 		DBG(0, "%s: Switching FEC PHY power on\n", __FUNCTION__);
--		//gpio_set_value(TX25_FEC_PWR_GPIO, 1);
--#if 0
--		while (1) {
--			gpio_set_value(TX25_FEC_PWR_GPIO, 1);
--			mdelay(1000);
--			gpio_set_value(TX25_FEC_PWR_GPIO, 0);
--			mdelay(1000);
--		}
--#endif
- 		DBG(0, "%s: Asserting FEC PHY reset\n", __FUNCTION__);
--//		gpio_set_value(TX25_FEC_RST_GPIO, 0);
- 		for (i = 0; i < ARRAY_SIZE(karo_tx25_fec_strap_gpios); i++) {
- 			struct gpio_desc *pd = &karo_tx25_fec_strap_gpios[i];
- 
-@@ -462,13 +503,6 @@ static int gpio_fec_active(void)
-  rel_gpio:
- 	while (--i >= 0) {
- 		struct gpio_desc *pd = &karo_tx25_fec_strap_gpios[i];
--#ifdef DEBUG
--		int grp = pd->gpio / 32 + 1;
--		int ofs = pd->gpio % 32;
--
--		DBG(0, "%s: Freeing GPIO%d_%d\n", __FUNCTION__,
--		    grp, ofs);
--#endif
- 		gpio_free(pd->gpio);
- 	}
- 	mxc_iomux_v3_release_multiple_pads(karo_tx25_fec_pwr_gpios,
-@@ -499,13 +533,6 @@ static void gpio_fec_inactive(void)
- 					   ARRAY_SIZE(karo_tx25_fec_pwr_gpios));
- 	for (i = 0; i < ARRAY_SIZE(karo_tx25_fec_strap_gpios); i++) {
- 		struct gpio_desc *pd = &karo_tx25_fec_strap_gpios[i];
--#ifdef DEBUG
--		int grp = pd->gpio / 32 + 1;
--		int ofs = pd->gpio % 32;
--
--		DBG(0, "%s: Freeing GPIO%d_%d\n", __FUNCTION__,
--		    grp, ofs);
--#endif
- 		gpio_free(pd->gpio);
- 	}
- }
-@@ -530,45 +557,6 @@ static int tx25_fec_resume(struct platfo
- 	return 0;
- }
- 
--#if 0
--/*
-- * i.MX25 allows RMII mode to be configured via a gasket
-- */
--#define FEC_MIIGSK_CFGR_FRCONT (1 << 6)
--#define FEC_MIIGSK_CFGR_LBMODE (1 << 4)
--#define FEC_MIIGSK_CFGR_EMODE (1 << 3)
--#define FEC_MIIGSK_CFGR_IF_MODE_MASK (3 << 0)
--#define FEC_MIIGSK_CFGR_IF_MODE_MII (0 << 0)
--#define FEC_MIIGSK_CFGR_IF_MODE_RMII (1 << 0)
--
--#define FEC_MIIGSK_ENR_READY (1 << 2)
--#define FEC_MIIGSK_ENR_EN (1 << 1)
--
--#include "../arch/arm/mach-mx25/crm_regs.h"
--static void __inline__ fec_localhw_setup(struct net_device *dev)
--{
--	struct fec_enet_private *fep = netdev_priv(dev);
--
--	/*
--	 * Set up the MII gasket for RMII mode
--	 */
--	printk("%s: enable RMII gasket\n", dev->name);
--
--	/* disable the gasket and wait */
--	fec_reg_write16(fep, FEC_MIIGSK_ENR, 0);
--	while (fec_reg_read16(fep, FEC_MIIGSK_ENR) & FEC_MIIGSK_ENR_READY)
--		udelay(1);
--
--	/* configure the gasket for RMII, 50 MHz, no loopback, no echo */
--	fec_reg_write16(fep, FEC_MIIGSK_CFGR, FEC_MIIGSK_CFGR_IF_MODE_RMII);
--
--	/* re-enable the gasket */
--	fec_reg_write16(fep, FEC_MIIGSK_ENR, FEC_MIIGSK_ENR_EN);
--	fec_reg_read16(fep, FEC_MIIGSK_CFGR);
--	fec_reg_read16(fep, FEC_MIIGSK_ENR);
--}
--#endif
--
- static int fec_arch_init(struct platform_device *pdev)
- {
- 	int ret;
-@@ -648,62 +636,6 @@ static struct pad_desc karo_tx25_nand_pa
- 	MX25_PAD_D0__D0,
- };
- 
--#ifdef CONFIG_ARCH_MXC_HAS_NFC_V2
--static struct mtd_partition tx25_nand_partitions[] = {
--	{
--		.name = "RedBoot",
--		.offset = 0,
--		.size = 0x00040000,
--	}, {
--		.name = "kernel",
--		.offset = MTDPART_OFS_APPEND,
--		.size = 0x001A0000,
--	}, {
--		.name = "rootfs",
--		.offset = MTDPART_OFS_APPEND,
--		.size = 0x07E000000,
--	}, {
--		.name = "FIS directory",
--		.offset = MTDPART_OFS_APPEND,
--		.size = 0x00003000,
--		.mask_flags = MTD_WRITEABLE,
--	}, {
--		.name = "RedBoot config",
--		.offset = MTDPART_OFS_APPEND,
--		.size = 0x00001000,
--		.mask_flags = MTD_WRITEABLE,
--	},
--};
--
--static int tx25_nand_init(void)
--{
--	int ret;
--
--	DBG(0, "%s: Configuring NAND pins\n", __FUNCTION__);
--	ret = mxc_iomux_v3_setup_multiple_pads(karo_tx25_nand_pads,
--					       ARRAY_SIZE(karo_tx25_nand_pads));
--	if (ret) {
--		return ret;
--	}
--	return 0;
--}
--
--static void tx25_nand_exit(void)
--{
--	mxc_iomux_v3_release_multiple_pads(karo_tx25_nand_pads,
--					   ARRAY_SIZE(karo_tx25_nand_pads));
--}
--
--static struct flash_platform_data tx25_nand_data = {
--	.map_name = "nand_probe",
--	.name = "tx25-nand",
--	.parts = tx25_nand_partitions,
--	.nr_parts = ARRAY_SIZE(tx25_nand_partitions),
--	.width = 1,
--	.init = tx25_nand_init,
--	.exit = tx25_nand_exit,
--};
--#else
- static struct mxc_nand_platform_data tx25_nand_data = {
- 	.hw_ecc = 1,
- 	.width = 1,
-@@ -722,7 +654,6 @@ static int tx25_nand_init(void)
- 	return 0;
- }
- arch_initcall(tx25_nand_init);
--#endif
- 
- static struct resource tx25_nand_resources[] = {
- 	{
-@@ -767,10 +698,6 @@ static struct platform_device tx25_v4l2o
- #if 0
- #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
- static struct pad_desc mxc_i2c0_pins[] = {
--	/*
--	 * it seems the data line misses a pullup, so we must enable
--	 * the internal pullup as a local workaround
--	 */
- 	MX25_PAD_I2C1_CLK__I2C1_CLK,
- 	MX25_PAD_I2C1_DAT__I2C1_DAT,
- };
-@@ -847,7 +774,7 @@ static struct resource mxc_tsadcc_resour
- static struct mxc_tsadcc_pdata mxc_tsadcc_pdata = {
- 	.pen_debounce_time = 32,
- 	.intref = 1,
--	.adc_clk = 1666667,
-+	.adc_clk = 1750000,
- 	.tsc_mode = MXC_TSC_4WIRE,
- 	.hsyncen = 0,
- };
-@@ -863,6 +790,113 @@ static struct platform_device mxc_tsadcc
- };
- #endif
- 
-+#if defined(CONFIG_CAN_FLEXCAN) || defined(CONFIG_CAN_FLEXCAN_MODULE)
-+
-+#ifdef CONFIG_CAN_FLEXCAN_CAN1
-+static struct pad_desc tx25_flexcan1_pads[] = {
-+	MX25_PAD_GPIO_A__CAN1_TX,
-+	MX25_PAD_GPIO_B__CAN1_RX,
-+};
-+
-+static struct resource tx25_flexcan1_resources[] = {
-+	{
-+		.start = CAN1_BASE_ADDR,
-+		.end = CAN1_BASE_ADDR + 0x97f,
-+		.flags = IORESOURCE_MEM,
-+	},
-+	{
-+		.start = MXC_INT_CAN1,
-+		.end = MXC_INT_CAN1,
-+		.flags = IORESOURCE_IRQ,
-+	},
-+};
-+
-+static int tx25_flexcan1_active(struct platform_device *pdev)
-+{
-+	return mxc_iomux_v3_setup_multiple_pads(tx25_flexcan1_pads,
-+					       ARRAY_SIZE(tx25_flexcan1_pads));
-+}
-+
-+static void tx25_flexcan1_inactive(struct platform_device *pdev)
-+{
-+	mxc_iomux_v3_release_multiple_pads(tx25_flexcan1_pads,
-+					   ARRAY_SIZE(tx25_flexcan1_pads));
-+	karo_tx25_gpio_config(tx25_flexcan1_pads,
-+			      ARRAY_SIZE(tx25_flexcan1_pads));
-+}
-+
-+static struct flexcan_platform_data tx25_flexcan1_pdata = {
-+	//.core_reg = NULL;
-+	//.io_reg = NULL;
-+	//.xcvr_enable = NULL,
-+	.active = tx25_flexcan1_active,
-+	.inactive = tx25_flexcan1_inactive,
-+};
-+
-+static struct platform_device tx25_flexcan1_device = {
-+	.id = 0,
-+	.name = "mxc-flexcan",
-+	.num_resources = ARRAY_SIZE(tx25_flexcan1_resources),
-+	.resource = tx25_flexcan1_resources,
-+	.dev = {
-+		.platform_data = &tx25_flexcan1_pdata,
-+	},
-+};
-+#endif // CONFIG_CAN_FLEXCAN_CAN1
-+
-+#ifdef CONFIG_CAN_FLEXCAN_CAN2
-+static struct pad_desc tx25_flexcan2_pads[] = {
-+	MX25_PAD_GPIO_C__CAN2_TX,
-+	MX25_PAD_GPIO_D__CAN2_RX,
-+};
-+
-+static struct resource tx25_flexcan2_resources[] = {
-+	{
-+		.start = CAN2_BASE_ADDR,
-+		.end = CAN2_BASE_ADDR + 0x97f,
-+		.flags = IORESOURCE_MEM,
-+	},
-+	{
-+		.start = MXC_INT_CAN2,
-+		.end = MXC_INT_CAN2,
-+		.flags = IORESOURCE_IRQ,
-+	},
-+};
-+
-+static int tx25_flexcan2_active(struct platform_device *pdev)
-+{
-+	return mxc_iomux_v3_setup_multiple_pads(tx25_flexcan2_pads,
-+					       ARRAY_SIZE(tx25_flexcan2_pads));
-+}
-+
-+static void tx25_flexcan2_inactive(struct platform_device *pdev)
-+{
-+	mxc_iomux_v3_release_multiple_pads(tx25_flexcan2_pads,
-+					   ARRAY_SIZE(tx25_flexcan2_pads));
-+	karo_tx25_gpio_config(tx25_flexcan2_pads,
-+			      ARRAY_SIZE(tx25_flexcan2_pads));
-+}
-+
-+static struct flexcan_platform_data tx25_flexcan2_pdata = {
-+	//.core_reg = NULL;
-+	//.io_reg = NULL;
-+	//.xcvr_enable = NULL,
-+	.active = tx25_flexcan2_active,
-+	.inactive = tx25_flexcan2_inactive,
-+};
-+
-+static struct platform_device tx25_flexcan2_device = {
-+	.id = 1,
-+	.name = "mxc-flexcan",
-+	.num_resources = ARRAY_SIZE(tx25_flexcan2_resources),
-+	.resource = tx25_flexcan2_resources,
-+	.dev = {
-+		.platform_data = &tx25_flexcan2_pdata,
-+	},
-+};
-+#endif // CONFIG_CAN_FLEXCAN_CAN2
-+#endif // CONFIG_CAN_FLEXCAN || CONFIG_CAN_FLEXCAN_MODULE
-+
- struct platform_dev_list {
- 	struct platform_device *pdev;
- 	int flag;
-@@ -871,22 +905,28 @@ struct platform_dev_list {
- 	{ .pdev = &mxc_rtc_device, .flag = -1, },
- #endif
- #if defined(CONFIG_MTD_NAND_MXC) || defined(CONFIG_MTD_NAND_MXC_MODULE)
--	{ .pdev = &tx25_nand_mtd_device, .flag = 1, },
-+	{ .pdev = &tx25_nand_mtd_device, .flag = -1, },
- #endif
- #if defined(CONFIG_FEC) || defined(CONFIG_FEC_MODULE)
--	{ .pdev = &fec_device, .flag = 1, },
-+	{ .pdev = &fec_device, .flag = -1, },
- #endif
- #if defined(CONFIG_SPI_MXC) || defined(CONFIG_SPI_MXC_MODULE)
--	{ .pdev = &mxcspi1_device, .flag = 1, },
-+	{ .pdev = &mxcspi1_device, .flag = -1, },
- #endif
- #if defined(CONFIG_VIDEO_MXC_EMMA_OUTPUT) || defined(CONFIG_VIDEO_MXC_EMMA_OUTPUT_MODULE)
--	{ .pdev = &tx25_v4l2out_device, .flag = 1, },
-+	{ .pdev = &tx25_v4l2out_device, .flag = -1, },
- #endif
- #if defined(CONFIG_MXC_VPU) || defined(CONFIG_MXC_VPU_MODULE)
--	{ .pdev = &mxc_vpu_device, .flag = 1, },
-+	{ .pdev = &mxc_vpu_device, .flag = -1, },
- #endif
- #if defined(CONFIG_TOUCHSCREEN_MXC_TSADCC) || defined(CONFIG_TOUCHSCREEN_MXC_TSADCC_MODULE)
--	{ .pdev = &mxc_tsadcc_device, .flag = 1, },
-+	{ .pdev = &mxc_tsadcc_device, .flag = -1, },
-+#endif
-+#ifdef CONFIG_CAN_FLEXCAN_CAN1
-+	{ .pdev = &tx25_flexcan1_device, .flag = -1, },
-+#endif
-+#ifdef CONFIG_CAN_FLEXCAN_CAN2
-+	{ .pdev = &tx25_flexcan2_device, .flag = -1, },
- #endif
- };
- #define TX25_NUM_DEVICES		ARRAY_SIZE(tx25_devices)
-@@ -1057,17 +1097,20 @@ static struct pad_desc karo_tx25_gpios[]
- 
- static int __init karo_tx25_setup_gpios(void)
- {
-+#if 1
-+	int count;
-+
-+	count = karo_tx25_gpio_config(karo_tx25_gpios, ARRAY_SIZE(karo_tx25_gpios));
-+	DBG(0, "%s: %d out of %d pins set up as GPIO\n", __FUNCTION__,
-+	    count, ARRAY_SIZE(karo_tx25_gpios));
-+#else
- 	int i;
- 	int ret;
- 	int count = 0;
- 
- 	for (i = 0; i < ARRAY_SIZE(karo_tx25_gpios); i++) {
- 		struct pad_desc *pd = &karo_tx25_gpios[i];
--#if 0
--		if (i - 64 >= 16 && i - 64 < 32) {
--			continue;
--		}
--#endif
-+
- 		ret = mxc_iomux_v3_setup_pad(pd);
- 		if (ret == 0) {
- #ifdef IOMUX_DEBUG
-@@ -1086,23 +1129,6 @@ static int __init karo_tx25_setup_gpios(
- 		}
- 	}
- 	DBG(0, "%s: %d out of %d pins set up as GPIO\n", __FUNCTION__, count, i);
--#if 0
--	if (gpio_request(42, "TEST") == 0) {
--		gpio_direction_output(42, 1);
--		while (1) {
--			gpio_set_value(42, 0);
--			if (gpio_get_value(42)) {
--				DBG(0, "%s: GPIO 42 is HIGH instead of LOW\n", __FUNCTION__);
--			}
--			msleep(1000);
--			gpio_set_value(42, 1);
--			if (!gpio_get_value(42)) {
--				DBG(0, "%s: GPIO 42 is LOW instead of HIGH\n", __FUNCTION__);
--			}
--			msleep(1000);
--		}
--	}
--	gpio_free(42);
- #endif
- 	return 0;
- }
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/mach-mx2/stk5-baseboard.c linux-2.6.30-rc4-karo2/arch/arm/mach-mx2/stk5-baseboard.c
---- linux-2.6.30-rc4-karo/arch/arm/mach-mx2/stk5-baseboard.c	2009-06-02 17:59:18.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/arch/arm/mach-mx2/stk5-baseboard.c	2009-07-06 15:40:58.000000000 +0200
-@@ -34,7 +34,6 @@
- #include <linux/i2c.h>
- #include <linux/i2c/at24.h>
- #include <linux/spi/spi.h>
--//#include <linux/serial_8250.h>
- 
- #include <linux/serial.h>
- #include <linux/fsl_devices.h>
-@@ -59,8 +58,6 @@
- #include <mach/i2c.h>
- #include <mach/mmc.h>
- #include <mach/imx-uart.h>
--//#include <mach/ulpi.h>
--//#include <mach/mxc_ehci.h>
- #include <mach/board-stk5.h>
- 
- #include "crm_regs.h"
-@@ -184,167 +181,6 @@ static void __init karo_stk5_serial_init
- }
- #endif
- 
--#ifdef CONFIG_USB_EHCI_MXC
--
--#define SMSC_VENDOR_ID		0x0424
--#define USB3317_PROD_ID		0x0006
--#define ULPI_FCTL		7
--
--static inline const char *ulpi_name(void __iomem *view)
--{
--	if ((unsigned long)view & 0x400) {
--		return "USBH2";
--	} else {
--		return "USBOTG";
--	}
--}
--
--static int usb3317_init(void __iomem *view)
--{
--	int vid, pid, ret;
--
--	ret = ulpi_read(ISP1504_VID_HIGH, view);
--	if (ret < 0) {
--		goto err;
--	}
--	vid = ret << 8;
--
--	ret = ulpi_read(ISP1504_VID_LOW, view);
--	if (ret < 0) {
--		goto err;
--	}
--	vid |= ret;
--
--	ret = ulpi_read(ISP1504_PID_HIGH, view);
--	if (ret < 0) {
--		goto err;
--	}
--	pid = ret << 8;
--
--	ret = ulpi_read(ISP1504_PID_LOW, view);
--	if (ret < 0) {
--		goto err;
--	}
--	pid |= ret;
--
--	pr_info("ULPI on %s port Vendor ID 0x%x Product ID 0x%x\n",
--		ulpi_name(view), vid, pid);
--	if (vid != SMSC_VENDOR_ID || pid != USB3317_PROD_ID) {
--		pr_err("No USB3317 found\n");
--		return -ENODEV;
--	}
-- err:
--	if (ret < 0) {
--		printk(KERN_ERR "ULPI read on %s port failed with error %d\n",
--		       ulpi_name(view), ret);
--		return ret;
--	}
--	return 0;
--}
--
--static int usb3317_set_vbus_power(void __iomem *view, int on)
--{
--	int ret;
--
--	DBG(0, "%s: Switching %s port VBUS power %s\n", __FUNCTION__,
--	    ulpi_name(view), on ? "on" : "off");
--
--	if (on) {
--		ret = ulpi_set(DRV_VBUS_EXT |		/* enable external Vbus */
--			       DRV_VBUS |		/* enable internal Vbus */
--			       CHRG_VBUS,		/* charge Vbus */
--			       ISP1504_OTGCTL, view);
--	} else {
--		ret = ulpi_clear(DRV_VBUS_EXT |		/* disable external Vbus */
--				 DRV_VBUS,		/* disable internal Vbus */
--				 ISP1504_OTGCTL, view);
--		if (ret == 0) {
--			ret = ulpi_set(DISCHRG_VBUS,	   /* discharge Vbus */
--				       ISP1504_OTGCTL, view);
--		}
--	}
--	if (ret < 0) {
--		printk(KERN_ERR "ULPI read on %s port failed with error %d\n",
--		       ulpi_name(view), ret);
--		return ret;
--	}
--	return 0;
--}
--
--static int stk5_usbh2_init(struct platform_device *pdev)
--{
--	int ret;
--	u32 temp;
--	unsigned long flags;
--	void __iomem *view = IO_ADDRESS(OTG_BASE_ADDR + 0x570);
--
--	local_irq_save(flags);
--	temp = readl(IO_ADDRESS(OTG_BASE_ADDR) + 0x600);
--	temp &= ~((3 << 21) | (1 << 0));
--	temp |= (1 << 5) | (1 << 16) | (1 << 19) | (1 << 20);
--	writel(temp, IO_ADDRESS(OTG_BASE_ADDR) + 0x600);
--	local_irq_restore(flags);
--
--	/* select ULPI transceiver */
--	/* this must be done _before_ setting up the GPIOs! */
--	temp = readl(view + 0x14);
--	DBG(0, "%s: Changing USBH2_PORTSC1 from %08x to %08x\n", __FUNCTION__,
--	    temp, (temp & ~(3 << 30)) | (2 << 30));
--	temp &= ~(3 << 30);
--	temp |= 2 << 30;
--	writel(temp, view + 0x14);
--
--	/* Set to Host mode */
--	temp = readl(view + 0x38);
--	DBG(0, "%s: Changing USBH2_USBMODE from %08x to %08x\n", __FUNCTION__,
--	    temp, temp | 3);
--	writel(temp | 0x3, view + 0x38);
--
--	ret = gpio_usbh2_active();
--	if (ret != 0) {
--		return ret;
--	}
--
--	ret = usb3317_init(view);
--	if (ret != 0) {
--		goto err;
--	}
--	ret = usb3317_set_vbus_power(view, 1);
--	if (ret != 0) {
--		goto err;
--	}
--	return 0;
--
-- err:
--	gpio_usbh2_inactive();
--	return ret;
--}
--
--static int stk5_usbh2_exit(struct platform_device *pdev)
--{
--	gpio_usbh2_inactive();
--	return 0;
--}
--
--static struct mxc_usbh_platform_data stk5_usbh2_data = {
--	.init = stk5_usbh2_init,
--	.exit = stk5_usbh2_exit,
--};
--
--static int __init karo_stk5_usbh2_register(void)
--{
--	int ret;
--
--	ret = mxc_register_device(&mxc_ehci2, &stk5_usbh2_data);
--	return ret;
--}
--#else
--static inline int karo_stk5_usbh2_register(void)
--{
--	return 0;
--}
--#endif // CONFIG_USB_EHCI_MXC
--
- #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
- static struct gpio_led stk5_leds[] = {
- 	{
-@@ -470,25 +306,71 @@ static void stk5_gpio_lcdc_inactive(stru
- 
- static struct imx_fb_platform_data stk5_fb_data[] __initdata = {
- 	{
-+#if 1
- 		//.fb_mode = "Xenarc_700_Y-18",
- 		.init = stk5_gpio_lcdc_active,
- 		.exit = stk5_gpio_lcdc_inactive,
- 		.lcd_power = NULL,
- 		.backlight_power = NULL,
- 
-+		.pixclock	= 45833,
-+
-+		.xres		= 640,
-+		.yres		= 480,
-+
-+		.bpp		= 8,
-+
-+		.hsync_len	= 64,
-+		.right_margin	= 28 + 1,
-+		.left_margin	= 20 + 3,
-+
-+		.vsync_len	= 1,
-+		.lower_margin	= 0,
-+		.upper_margin	= 16,
-+
-+		.pcr		= PCR_TFT | PCR_COLOR | PCR_END_BYTE_SWAP |
-+		PCR_BPIX_8 | PCR_FLMPOL | PCR_LPPOL | PCR_SCLK_SEL,
-+		.dmacr		= 0x80040060,
-+
-+		.cmap_greyscale	= 0,
-+		.cmap_inverse	= 0,
-+		.cmap_static	= 0,
-+
-+		.fixed_screen_cpu = NULL,
-+	}, {
-+#endif
-+		//.fb_mode = "Xenarc_700_Y-18",
-+		.init = stk5_gpio_lcdc_active,
-+		.exit = stk5_gpio_lcdc_inactive,
-+		.lcd_power = NULL,
-+		.backlight_power = NULL,
-+#if 1
- 		.pixclock	= 34576,
-+#else
-+		.pixclock	= 38033,
-+#endif
- 		.xres		= 640,
- 		.yres		= 480,
- 
- 		.bpp		= 32,
--
-+#if 1
- 		.hsync_len	= 64,
- 		.right_margin	= 60 + 1,
- 		.left_margin	= 80 + 3,
--
-+#else
-+		.hsync_len	= 64,
-+		.right_margin	= 79 + 1,
-+		.left_margin	= 57 + 3,
-+#endif
-+#if 1
- 		.vsync_len	= 2,
-+		.lower_margin	= 54,
- 		.upper_margin	= 54,
-+#else
-+		.vsync_len	= 4,
- 		.lower_margin	= 54,
-+		.upper_margin	= 54,
-+#endif
- #if 0
- 		/* currently not used by driver! */
- 		.sync		= ((0*FB_SYNC_HOR_HIGH_ACT) |
-@@ -497,7 +379,7 @@ static struct imx_fb_platform_data stk5_
- #else
- 		.pcr		= PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 |
- 		PCR_BPIX_18 | PCR_END_SEL | PCR_FLMPOL | PCR_LPPOL | PCR_SCLK_SEL,
--		.dmacr		= 0x800a0078,
-+		.dmacr		= 0x80040060,
- #endif
- 		.cmap_greyscale	= 0,
- 		.cmap_inverse	= 0,
-@@ -522,8 +404,8 @@ static struct imx_fb_platform_data stk5_
- 		.left_margin	= 118 + 3,
- 
- 		.vsync_len	= 7,
--		.upper_margin	= 44,
- 		.lower_margin	= 44,
-+		.upper_margin	= 44,
- #if 0
- 		/* currently not used by driver! */
- 		.sync		= ((0*FB_SYNC_HOR_HIGH_ACT) |
-@@ -560,8 +442,8 @@ static struct imx_fb_platform_data stk5_
- 		.left_margin	= 118 + 3,
- 
- 		.vsync_len	= 7,
--		.upper_margin	= 28,
- 		.lower_margin	= 60,
-+		.upper_margin	= 28,
- #if 0
- 		/* currently not used by driver! */
- 		.sync		= ((0*FB_SYNC_HOR_HIGH_ACT) |
-@@ -602,8 +484,8 @@ static struct imx_fb_platform_data stk5_
- 		.left_margin	= 0 + 3,
- 
- 		.vsync_len	= 35,
--		.upper_margin	= 0,
- 		.lower_margin	= 0,
-+		.upper_margin	= 0,
- #if 0
- 		/* currently not used by driver! */
- 		.sync		= ((0*FB_SYNC_HOR_HIGH_ACT) |
-@@ -974,11 +856,6 @@ static __init int karo_stk5_board_init(v
- 		printk(KERN_WARNING "%s: karo_stk5_fb_register() failed: %d\n",
- 		       __FUNCTION__, ret);
- 	}
--	ret = karo_stk5_usbh2_register();
--	if (ret) {
--		printk(KERN_WARNING "%s: karo_stk5_usbh2_register() failed: %d\n",
--		       __FUNCTION__, ret);
--	}
- 
- 	for (i = 0; i < STK5_NUM_DEVICES; i++) {
- 		if (stk5_devices[i].pdev == NULL) continue;
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/iomux-mx25.h linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/include/mach/iomux-mx25.h
---- linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/iomux-mx25.h	2009-07-06 17:00:57.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/include/mach/iomux-mx25.h	2009-07-06 15:41:30.000000000 +0200
-@@ -34,475 +34,345 @@
-  * IOMUX/PAD Bit field definitions
-  */
- 
--#define MX25_PAD_A10__A10			IOMUX_PAD(A10, A10, 0x000, 0x008, 0x00, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_A10__GPIO_4_0			IOMUX_PAD(A10, GPIO_4_0, 0x000, 0x008, 0x05, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_A13__A13			IOMUX_PAD(A13, A13, 0x22C, 0x00c, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A13__GPIO_4_1			IOMUX_PAD(A13, GPIO_4_1, 0x22C, 0x00c, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A14__A14			IOMUX_PAD(A14, A14, 0x230, 0x010, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A14__GPIO_2_0			IOMUX_PAD(A14, GPIO_2_0, 0x230, 0x010, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A15__A15			IOMUX_PAD(A15, A15, 0x234, 0x014, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A15__GPIO_2_1			IOMUX_PAD(A15, GPIO_2_1, 0x234, 0x014, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A16__A16			IOMUX_PAD(A16, A16, 0x000, 0x018, 0x10, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_A16__GPIO_2_2			IOMUX_PAD(A16, GPIO_2_2, 0x000, 0x018, 0x15, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_A17__A17			IOMUX_PAD(A17, A17, 0x238, 0x01c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A17__GPIO_2_3			IOMUX_PAD(A17, GPIO_2_3, 0x238, 0x01c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A18__A18			IOMUX_PAD(A18, A18, 0x23c, 0x020, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A18__GPIO_2_4			IOMUX_PAD(A18, GPIO_2_4, 0x23c, 0x020, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A18__FEC_COL			IOMUX_PAD(A18, FEC_COL, 0x23c, 0x020, 0x17, 0x504, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_A19__A19			IOMUX_PAD(A19, A19, 0x240, 0x024, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A19__FEC_RX_ER			IOMUX_PAD(A19, FEC_RX_ER, 0x240, 0x024, 0x17, 0x518, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_A19__GPIO_2_5			IOMUX_PAD(A19, GPIO_2_5, 0x240, 0x024, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A20__A20			IOMUX_PAD(A20, A20, 0x244, 0x028, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A20__GPIO_2_6			IOMUX_PAD(A20, GPIO_2_6, 0x244, 0x028, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A20__FEC_RDATA2		IOMUX_PAD(A20, FEC_RDATA2, 0x244, 0x028, 0x17, 0x50c, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_A21__A21			IOMUX_PAD(A21, A21, 0x248, 0x02c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A21__GPIO_2_7			IOMUX_PAD(A21, GPIO_2_7, 0x248, 0x02c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A21__FEC_RDATA3		IOMUX_PAD(A21, FEC_RDATA3, 0x248, 0x02c, 0x17, 0x510, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_A22__A22			IOMUX_PAD(A22, A22, 0x000, 0x030, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A22__GPIO_2_8			IOMUX_PAD(A22, GPIO_2_8, 0x000, 0x030, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A23__A23			IOMUX_PAD(A23, A23, 0x24c, 0x034, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A23__GPIO_2_9			IOMUX_PAD(A23, GPIO_2_9, 0x24c, 0x034, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A24__A24			IOMUX_PAD(A24, A24, 0x250, 0x038, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A24__GPIO_2_10			IOMUX_PAD(A24, GPIO_2_10, 0x250, 0x038, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A24__FEC_RX_CLK		IOMUX_PAD(A24, FEC_RX_CLK, 0x250, 0x038, 0x17, 0x514, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_A25__A25			IOMUX_PAD(A25, A25, 0x254, 0x03c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A25__GPIO_2_11			IOMUX_PAD(A25, GPIO_2_11, 0x254, 0x03c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_A25__FEC_CRS			IOMUX_PAD(A25, FEC_CRS, 0x254, 0x03c, 0x17, 0x508, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_EB0__EB0			IOMUX_PAD(EB0, EB0, 0x258, 0x040, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_EB0__AUD4_TXD			IOMUX_PAD(EB0, AUD4_TXD, 0x258, 0x040, 0x14, 0x464, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_EB0__GPIO_2_12			IOMUX_PAD(EB0, GPIO_2_12, 0x258, 0x040, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_EB1__EB1			IOMUX_PAD(EB1, EB1, 0x25c, 0x044, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_EB1__AUD4_RXD			IOMUX_PAD(EB1, AUD4_RXD, 0x25c, 0x044, 0x14, 0x460, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_EB1__GPIO_2_13			IOMUX_PAD(EB1, GPIO_2_13, 0x25c, 0x044, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_OE__OE				IOMUX_PAD(OE, OE, 0x260, 0x048, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_OE__AUD4_TXC			IOMUX_PAD(OE, AUD4_TXC, 0x260, 0x048, 0x14, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_OE__GPIO_2_14			IOMUX_PAD(OE, GPIO_2_14, 0x260, 0x048, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CS0__CS0			IOMUX_PAD(CS0, CS0, 0x000, 0x04c, 0x00, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CS0__GPIO_4_2			IOMUX_PAD(CS0, GPIO_4_2, 0x000, 0x04c, 0x05, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CS1__CS1			IOMUX_PAD(CS1, CS1, 0x000, 0x050, 0x00, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CS1__GPIO_4_3			IOMUX_PAD(CS1, GPIO_4_3, 0x000, 0x050, 0x05, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CS4__CS4			IOMUX_PAD(CS4, CS4, 0x264, 0x054, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CS4__UART5_CTS			IOMUX_PAD(CS4, UART5_CTS, 0x264, 0x054, 0x13, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CS4__GPIO_3_20			IOMUX_PAD(CS4, GPIO_3_20, 0x264, 0x054, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CS5__CS5			IOMUX_PAD(CS5, CS5, 0x268, 0x058, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CS5__UART5_RTS			IOMUX_PAD(CS5, UART5_RTS, 0x268, 0x058, 0x13, 0x574, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CS5__GPIO_3_21			IOMUX_PAD(CS5, GPIO_3_21, 0x268, 0x058, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_NF_CE0__NF_CE0			IOMUX_PAD(NF_CE0, NF_CE0, 0x26c, 0x05c, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_NF_CE0__GPIO_3_22		IOMUX_PAD(NF_CE0, GPIO_3_22, 0x26c, 0x05c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_ECB__ECB			IOMUX_PAD(ECB, ECB, 0x270, 0x060, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_ECB__UART5_TXD_MUX		IOMUX_PAD(ECB, UART5_TXD_MUX, 0x270, 0x060, 0x13, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_ECB__GPIO_3_23			IOMUX_PAD(ECB, GPIO_3_23, 0x270, 0x060, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LBA__LBA			IOMUX_PAD(LBA, LBA, 0x274, 0x064, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LBA__UART5_RXD_MUX		IOMUX_PAD(LBA, UART5_RXD_MUX, 0x274, 0x064, 0x13, 0x578, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LBA__GPIO_3_24			IOMUX_PAD(LBA, GPIO_3_24, 0x274, 0x064, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_BCLK__BCLK			IOMUX_PAD(BCLK, BCLK, 0x000, 0x068, 0x00, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_BCLK__GPIO_4_4			IOMUX_PAD(BCLK, GPIO_4_4, 0x000, 0x068, 0x05, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_RW__RW				IOMUX_PAD(RW, RW, 0x278, 0x06c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_RW__AUD4_TXFS			IOMUX_PAD(RW, AUD4_TXFS, 0x278, 0x06c, 0x14, 0x474, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_RW__GPIO_3_25			IOMUX_PAD(RW, GPIO_3_25, 0x278, 0x06c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_NFWE_B__NFWE_B			IOMUX_PAD(NFWE_B, NFWE_B, 0x000, 0x070, 0x10, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_NFWE_B__GPIO_3_26		IOMUX_PAD(NFWE_B, GPIO_3_26, 0x000, 0x070, 0x15, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_NFRE_B__NFRE_B			IOMUX_PAD(NFRE_B, NFRE_B, 0x000, 0x074, 0x10, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_NFRE_B__GPIO_3_27		IOMUX_PAD(NFRE_B, GPIO_3_27, 0x000, 0x074, 0x15, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_NFALE__NFALE			IOMUX_PAD(NFALE, NFALE, 0x000, 0x078, 0x10, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_NFALE__GPIO_3_28		IOMUX_PAD(NFALE, GPIO_3_28, 0x000, 0x078, 0x15, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_NFCLE__NFCLE			IOMUX_PAD(NFCLE, NFCLE, 0x000, 0x07c, 0x10, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_NFCLE__GPIO_3_29		IOMUX_PAD(NFCLE, GPIO_3_29, 0x000, 0x07c, 0x15, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_NFWP_B__NFWP_B			IOMUX_PAD(NFWP_B, NFWP_B, 0x000, 0x080, 0x10, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_NFWP_B__GPIO_3_30		IOMUX_PAD(NFWP_B, GPIO_3_30, 0x000, 0x080, 0x15, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_NFRB__NFRB			IOMUX_PAD(NFRB, NFRB, 0x27c, 0x084, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
--#define MX25_PAD_NFRB__GPIO_3_31		IOMUX_PAD(NFRB, GPIO_3_31, 0x27c, 0x084, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D15__D15			IOMUX_PAD(D15, D15, 0x280, 0x088, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D15__LD16			IOMUX_PAD(D15, LD16, 0x280, 0x088, 0x01, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D15__GPIO_4_5			IOMUX_PAD(D15, GPIO_4_5, 0x280, 0x088, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D14__D14			IOMUX_PAD(D14, D14, 0x284, 0x08c, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D14__LD17			IOMUX_PAD(D14, LD17, 0x284, 0x08c, 0x01, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D14__GPIO_4_6			IOMUX_PAD(D14, GPIO_4_6, 0x284, 0x08c, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D13__D13			IOMUX_PAD(D13, D13, 0x288, 0x090, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D13__LD18			IOMUX_PAD(D13, LD18, 0x288, 0x090, 0x01, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D13__GPIO_4_7			IOMUX_PAD(D13, GPIO_4_7, 0x288, 0x090, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D12__D12			IOMUX_PAD(D12, D12, 0x28c, 0x094, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D12__GPIO_4_8			IOMUX_PAD(D12, GPIO_4_8, 0x28c, 0x094, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D11__D11			IOMUX_PAD(D11, D11, 0x290, 0x098, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D11__GPIO_4_9			IOMUX_PAD(D11, GPIO_4_9, 0x290, 0x098, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D10__D10			IOMUX_PAD(D10, D10, 0x294, 0x09c, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D10__GPIO_4_10			IOMUX_PAD(D10, GPIO_4_10, 0x294, 0x09c, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D10__USBOTG_OC			IOMUX_PAD(D10, USBOTG_OC, 0x294, 0x09c, 0x06, 0x57c, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D9__D9				IOMUX_PAD(D9, D9, 0x298, 0x0a0, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D9__GPIO_4_11			IOMUX_PAD(D9, GPIO_4_11, 0x298, 0x0a0, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D9__USBH2_PWR			IOMUX_PAD(D9, USBH2_PWR, 0x298, 0x0a0, 0x06, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D8__D8				IOMUX_PAD(D8, D8, 0x29c, 0x0a4, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D8__GPIO_4_12			IOMUX_PAD(D8, GPIO_4_12, 0x29c, 0x0a4, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D8__USBH2_OC			IOMUX_PAD(D8, USBH2_OC, 0x29c, 0x0a4, 0x06, 0x580, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D7__D7				IOMUX_PAD(D7, D7, 0x2a0, 0x0a8, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D7__GPIO_4_13			IOMUX_PAD(D7, GPIO_4_13, 0x2a0, 0x0a8, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D6__D6				IOMUX_PAD(D6, D6, 0x2a4, 0x0ac, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D6__GPIO_4_14			IOMUX_PAD(D6, GPIO_4_14, 0x2a4, 0x0ac, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D5__D5				IOMUX_PAD(D5, D5, 0x2a8, 0x0b0, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D5__GPIO_4_15			IOMUX_PAD(D5, GPIO_4_15, 0x2a8, 0x0b0, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D4__D4				IOMUX_PAD(D4, D4, 0x2ac, 0x0b4, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D4__GPIO_4_16			IOMUX_PAD(D4, GPIO_4_16, 0x2ac, 0x0b4, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D3__D3				IOMUX_PAD(D3, D3, 0x2b0, 0x0b8, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D3__GPIO_4_17			IOMUX_PAD(D3, GPIO_4_17, 0x2b0, 0x0b8, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D2__D2				IOMUX_PAD(D2, D2, 0x2b4, 0x0bc, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D2__GPIO_4_18			IOMUX_PAD(D2, GPIO_4_18, 0x2b4, 0x0bc, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D1__D1				IOMUX_PAD(D1, D1, 0x2b8, 0x0c0, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D1__GPIO_4_19			IOMUX_PAD(D1, GPIO_4_19, 0x2b8, 0x0c0, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D0__D0				IOMUX_PAD(D0, D0, 0x2bc, 0x0c4, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_D0__GPIO_4_20			IOMUX_PAD(D0, GPIO_4_20, 0x2bc, 0x0c4, 0x05, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD0__LD0			IOMUX_PAD(LD0, LD0, 0x2c0, 0x0c8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD0__CSI_D0			IOMUX_PAD(LD0, CSI_D0, 0x2c0, 0x0c8, 0x12, 0x488, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD0__GPIO_2_15			IOMUX_PAD(LD0, GPIO_2_15, 0x2c0, 0x0c8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD1__LD1			IOMUX_PAD(LD1, LD1, 0x2c4, 0x0cc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD1__CSI_D1			IOMUX_PAD(LD1, CSI_D1, 0x2c4, 0x0cc, 0x12, 0x48c, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD1__GPIO_2_16			IOMUX_PAD(LD1, GPIO_2_16, 0x2c4, 0x0cc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD2__LD2			IOMUX_PAD(LD2, LD2, 0x2c8, 0x0d0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD2__GPIO_2_17			IOMUX_PAD(LD2, GPIO_2_17, 0x2c8, 0x0d0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD3__LD3			IOMUX_PAD(LD3, LD3, 0x2cc, 0x0d4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD3__GPIO_2_18			IOMUX_PAD(LD3, GPIO_2_18, 0x2cc, 0x0d4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD4__LD4			IOMUX_PAD(LD4, LD4, 0x2d0, 0x0d8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD4__GPIO_2_19			IOMUX_PAD(LD4, GPIO_2_19, 0x2d0, 0x0d8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD5__LD5			IOMUX_PAD(LD5, LD5, 0x2d4, 0x0dc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD5__GPIO_1_19			IOMUX_PAD(LD5, GPIO_1_19, 0x2d4, 0x0dc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD6__LD6			IOMUX_PAD(LD6, LD6, 0x2d8, 0x0e0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD6__GPIO_1_20			IOMUX_PAD(LD6, GPIO_1_20, 0x2d8, 0x0e0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD7__LD7			IOMUX_PAD(LD7, LD7, 0x2dc, 0x0e4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD7__GPIO_1_21			IOMUX_PAD(LD7, GPIO_1_21, 0x2dc, 0x0e4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD8__LD8			IOMUX_PAD(LD8, LD8, 0x2e0, 0x0e8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD8__FEC_TX_ERR		IOMUX_PAD(LD8, FEC_TX_ERR, 0x2e0, 0x0e8, 0x15, 0, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_LD9__LD9			IOMUX_PAD(LD9, LD9, 0x2e4, 0x0ec, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD9__FEC_COL			IOMUX_PAD(LD9, FEC_COL, 0x2e4, 0x0ec, 0x15, 0x504, 1, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_LD10__LD10			IOMUX_PAD(LD10, LD10, 0x2e8, 0x0f0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD10__FEC_RX_ER		IOMUX_PAD(LD10, FEC_RX_ER, 0x2e8, 0x0f0, 0x15, 0x518, 1, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_LD11__LD11			IOMUX_PAD(LD11, LD11, 0x2ec, 0x0f4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD11__FEC_RDATA2		IOMUX_PAD(LD11, FEC_RDATA2, 0x2ec, 0x0f4, 0x15, 0x50c, 1, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_LD12__LD12			IOMUX_PAD(LD12, LD12, 0x2f0, 0x0f8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD12__FEC_RDATA3		IOMUX_PAD(LD12, FEC_RDATA3, 0x2f0, 0x0f8, 0x15, 0x510, 1, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_LD13__LD13			IOMUX_PAD(LD13, LD13, 0x2f4, 0x0fc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD13__FEC_TDATA2		IOMUX_PAD(LD13, FEC_TDATA2, 0x2f4, 0x0fc, 0x15, 0, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_LD14__LD14			IOMUX_PAD(LD14, LD14, 0x2f8, 0x100, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD14__FEC_TDATA3		IOMUX_PAD(LD14, FEC_TDATA3, 0x2f8, 0x100, 0x15, 0, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_LD15__LD15			IOMUX_PAD(LD15, LD15, 0x2fc, 0x104, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LD15__FEC_RX_CLK		IOMUX_PAD(LD15, FEC_RX_CLK, 0x2fc, 0x104, 0x15, 0x514, 1, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_HSYNC__HSYNC			IOMUX_PAD(HSYNC, HSYNC, 0x300, 0x108, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_HSYNC__GPIO_1_22		IOMUX_PAD(HSYNC, GPIO_1_22, 0x300, 0x108, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_VSYNC__VSYNC			IOMUX_PAD(VSYNC, VSYNC, 0x304, 0x10c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_VSYNC__GPIO_1_23		IOMUX_PAD(VSYNC, GPIO_1_23, 0x304, 0x10c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LSCLK__LSCLK			IOMUX_PAD(LSCLK, LSCLK, 0x308, 0x110, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_LSCLK__GPIO_1_24		IOMUX_PAD(LSCLK, GPIO_1_24, 0x308, 0x110, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_OE_ACD__OE_ACD			IOMUX_PAD(OE_ACD, OE_ACD, 0x30c, 0x114, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_OE_ACD__GPIO_1_25		IOMUX_PAD(OE_ACD, GPIO_1_25, 0x30c, 0x114, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CONTRAST__CONTRAST		IOMUX_PAD(CONTRAST, CONTRAST, 0x310, 0x118, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CONTRAST__FEC_CRS		IOMUX_PAD(CONTRAST, FEC_CRS, 0x310, 0x118, 0x15, 0x508, 1, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_PWM__PWM			IOMUX_PAD(PWM, PWM, 0x314, 0x11c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_PWM__GPIO_1_26			IOMUX_PAD(PWM, GPIO_1_26, 0x314, 0x11c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_PWM__USBH2_OC			IOMUX_PAD(PWM, USBH2_OC, 0x314, 0x11c, 0x16, 0x580, 1, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D2__CSI_D2			IOMUX_PAD(CSI_D2, CSI_D2, 0x318, 0x120, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D2__UART5_RXD_MUX		IOMUX_PAD(CSI_D2, UART5_RXD_MUX, 0x318, 0x120, 0x11, 0x578, 1, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D2__GPIO_1_27		IOMUX_PAD(CSI_D2, GPIO_1_27, 0x318, 0x120, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D3__CSI_D3			IOMUX_PAD(CSI_D3, CSI_D3, 0x31c, 0x124, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D3__GPIO_1_28		IOMUX_PAD(CSI_D3, GPIO_1_28, 0x31c, 0x124, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D4__CSI_D4			IOMUX_PAD(CSI_D4, CSI_D4, 0x320, 0x128, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D4__UART5_RTS		IOMUX_PAD(CSI_D4, UART5_RTS, 0x320, 0x128, 0x11, 0x574, 1, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D4__GPIO_1_29		IOMUX_PAD(CSI_D4, GPIO_1_29, 0x320, 0x128, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D5__CSI_D5			IOMUX_PAD(CSI_D5, CSI_D5, 0x324, 0x12c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D5__GPIO_1_30		IOMUX_PAD(CSI_D5, GPIO_1_30, 0x324, 0x12c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D6__CSI_D6			IOMUX_PAD(CSI_D6, CSI_D6, 0x328, 0x130, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D6__GPIO_1_31		IOMUX_PAD(CSI_D6, GPIO_1_31, 0x328, 0x130, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D7__CSI_D7			IOMUX_PAD(CSI_D7, CSI_D7, 0x32c, 0x134, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D7__GPIO_1_6		IOMUX_PAD(CSI_D7, GPIO_1_6, 0x32c, 0x134, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D8__CSI_D8			IOMUX_PAD(CSI_D8, CSI_D8, 0x330, 0x138, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D8__GPIO_1_7		IOMUX_PAD(CSI_D8, GPIO_1_7, 0x330, 0x138, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D9__CSI_D9			IOMUX_PAD(CSI_D9, CSI_D9, 0x334, 0x13c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_D9__GPIO_4_21		IOMUX_PAD(CSI_D9, GPIO_4_21, 0x334, 0x13c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_MCLK__CSI_MCLK		IOMUX_PAD(CSI_MCLK, CSI_MCLK, 0x338, 0x140, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_MCLK__GPIO_1_8		IOMUX_PAD(CSI_MCLK, GPIO_1_8, 0x338, 0x140, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_VSYNC__CSI_VSYNC		IOMUX_PAD(CSI_VSYNC, CSI_VSYNC, 0x33c, 0x144, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_VSYNC__GPIO_1_9		IOMUX_PAD(CSI_VSYNC, GPIO_1_9, 0x33c, 0x144, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_HSYNC__CSI_HSYNC		IOMUX_PAD(CSI_HSYNC, CSI_HSYNC, 0x340, 0x148, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_HSYNC__GPIO_1_10		IOMUX_PAD(CSI_HSYNC, GPIO_1_10, 0x340, 0x148, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_PIXCLK__CSI_PIXCLK		IOMUX_PAD(CSI_PIXCLK, CSI_PIXCLK, 0x344, 0x14c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSI_PIXCLK__GPIO_1_11		IOMUX_PAD(CSI_PIXCLK, GPIO_1_11, 0x344, 0x14c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_I2C1_CLK__I2C1_CLK		IOMUX_PAD(I2C1_CLK, I2C1_CLK, 0x348, 0x150, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_I2C1_CLK__GPIO_1_12		IOMUX_PAD(I2C1_CLK, GPIO_1_12, 0x348, 0x150, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_I2C1_DAT__I2C1_DAT		IOMUX_PAD(I2C1_DAT, I2C1_DAT, 0x34c, 0x154, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_I2C1_DAT__GPIO_1_13		IOMUX_PAD(I2C1_DAT, GPIO_1_13, 0x34c, 0x154, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSPI1_MOSI__CSPI1_MOSI		IOMUX_PAD(CSPI1_MOSI, CSPI1_MOSI, 0x350, 0x158, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSPI1_MOSI__GPIO_1_14		IOMUX_PAD(CSPI1_MOSI, GPIO_1_14, 0x350, 0x158, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSPI1_MISO__CSPI1_MISO		IOMUX_PAD(CSPI1_MISO, CSPI1_MISO, 0x354, 0x15c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSPI1_MISO__GPIO_1_15		IOMUX_PAD(CSPI1_MISO, GPIO_1_15, 0x354, 0x15c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSPI1_SS0__CSPI1_SS0		IOMUX_PAD(CSPI1_SS0, CSPI1_SS0, 0x358, 0x160, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSPI1_SS0__GPIO_1_16		IOMUX_PAD(CSPI1_SS0, GPIO_1_16, 0x358, 0x160, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSPI1_SS1__CSPI1_SS1		IOMUX_PAD(CSPI1_SS1, CSPI1_SS1, 0x35c, 0x164, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSPI1_SS1__GPIO_1_17		IOMUX_PAD(CSPI1_SS1, GPIO_1_17, 0x35c, 0x164, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSPI1_SCLK__CSPI1_SCLK		IOMUX_PAD(CSPI1_SCLK, CSPI1_SCLK, 0x360, 0x168, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSPI1_SCLK__GPIO_1_18		IOMUX_PAD(CSPI1_SCLK, GPIO_1_18, 0x360, 0x168, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CSPI1_RDY__CSPI1_RDY		IOMUX_PAD(CSPI1_RDY, CSPI1_RDY, 0x364, 0x16c, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
--#define MX25_PAD_CSPI1_RDY__GPIO_2_22		IOMUX_PAD(CSPI1_RDY, GPIO_2_22, 0x364, 0x16c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART1_RXD__UART1_RXD		IOMUX_PAD(UART1_RXD, UART1_RXD, 0x368, 0x170, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K)
--#define MX25_PAD_UART1_RXD__GPIO_4_22		IOMUX_PAD(UART1_RXD, GPIO_4_22, 0x368, 0x170, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART1_TXD__UART1_TXD		IOMUX_PAD(UART1_TXD, UART1_TXD, 0x36c, 0x174, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART1_TXD__GPIO_4_23		IOMUX_PAD(UART1_TXD, GPIO_4_23, 0x36c, 0x174, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART1_RTS__UART1_RTS		IOMUX_PAD(UART1_RTS, UART1_RTS, 0x370, 0x178, 0x10, 0, 0, PAD_CTL_PULL_UP_100K)
--#define MX25_PAD_UART1_RTS__CSI_D0		IOMUX_PAD(UART1_RTS, CSI_D0, 0x370, 0x178, 0x11, 0x488, 1, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART1_RTS__GPIO_4_24		IOMUX_PAD(UART1_RTS, GPIO_4_24, 0x370, 0x178, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART1_CTS__UART1_CTS		IOMUX_PAD(UART1_CTS, UART1_CTS, 0x374, 0x17c, 0x10, 0, 0, PAD_CTL_PULL_UP_100K)
--#define MX25_PAD_UART1_CTS__CSI_D1		IOMUX_PAD(UART1_CTS, CSI_D1, 0x374, 0x17c, 0x11, 0x48c, 1, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART1_CTS__GPIO_4_25		IOMUX_PAD(UART1_CTS, GPIO_4_25, 0x374, 0x17c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART2_RXD__UART2_RXD		IOMUX_PAD(UART2_RXD, UART2_RXD, 0x378, 0x180, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART2_RXD__GPIO_4_26		IOMUX_PAD(UART2_RXD, GPIO_4_26, 0x378, 0x180, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART2_TXD__UART2_TXD		IOMUX_PAD(UART2_TXD, UART2_TXD, 0x37c, 0x184, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART2_TXD__GPIO_4_27		IOMUX_PAD(UART2_TXD, GPIO_4_27, 0x37c, 0x184, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART2_RTS__UART2_RTS		IOMUX_PAD(UART2_RTS, UART2_RTS, 0x380, 0x188, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART2_RTS__FEC_COL		IOMUX_PAD(UART2_RTS, FEC_COL, 0x380, 0x188, 0x12, 0x504, 2, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_UART2_RTS__GPIO_4_28		IOMUX_PAD(UART2_RTS, GPIO_4_28, 0x380, 0x188, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART2_CTS__FEC_RX_ER		IOMUX_PAD(UART2_CTS, FEC_RX_ER, 0x384, 0x18c, 0x12, 0x518, 2, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_UART2_CTS__UART2_CTS		IOMUX_PAD(UART2_CTS, UART2_CTS, 0x384, 0x18c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_UART2_CTS__GPIO_4_29		IOMUX_PAD(UART2_CTS, GPIO_4_29, 0x384, 0x18c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_SD1_CMD__SD1_CMD		IOMUX_PAD(SD1_CMD, SD1_CMD, 0x388, 0x190, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_SD1_CMD__FEC_RDATA2		IOMUX_PAD(SD1_CMD, FEC_RDATA2, 0x388, 0x190, 0x12, 0x50c, 2, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_SD1_CMD__GPIO_2_23		IOMUX_PAD(SD1_CMD, GPIO_2_23, 0x388, 0x190, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_SD1_CLK__SD1_CLK		IOMUX_PAD(SD1_CLK, SD1_CLK, 0x38c, 0x194, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_SD1_CLK__FEC_RDATA3		IOMUX_PAD(SD1_CLK, FEC_RDATA3, 0x38c, 0x194, 0x12, 0x510, 2, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_SD1_CLK__GPIO_2_24		IOMUX_PAD(SD1_CLK, GPIO_2_24, 0x38c, 0x194, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_SD1_DATA0__SD1_DATA0		IOMUX_PAD(SD1_DATA0, SD1_DATA0, 0x390, 0x198, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_SD1_DATA0__GPIO_2_25		IOMUX_PAD(SD1_DATA0, GPIO_2_25, 0x390, 0x198, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_SD1_DATA1__SD1_DATA1		IOMUX_PAD(SD1_DATA1, SD1_DATA1, 0x394, 0x19c, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_SD1_DATA1__AUD7_RXD		IOMUX_PAD(SD1_DATA1, AUD7_RXD, 0x394, 0x19c, 0x13, 0x478, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_SD1_DATA1__GPIO_2_26		IOMUX_PAD(SD1_DATA1, GPIO_2_26, 0x394, 0x19c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_SD1_DATA2__SD1_DATA2		IOMUX_PAD(SD1_DATA2, SD1_DATA2, 0x398, 0x1a0, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_SD1_DATA2__FEC_RX_CLK		IOMUX_PAD(SD1_DATA2, FEC_RX_CLK, 0x398, 0x1a0, 0x15, 0x514, 2, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_SD1_DATA2__GPIO_2_27		IOMUX_PAD(SD1_DATA2, GPIO_2_27, 0x398, 0x1a0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_SD1_DATA3__SD1_DATA3		IOMUX_PAD(SD1_DATA3, SD1_DATA3, 0x39c, 0x1a4, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_SD1_DATA3__FEC_CRS		IOMUX_PAD(SD1_DATA3, FEC_CRS, 0x39c, 0x1a4, 0x10, 0x508, 2, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_SD1_DATA3__GPIO_2_28		IOMUX_PAD(SD1_DATA3, GPIO_2_28, 0x39c, 0x1a4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_KPP_ROW0__KPP_ROW0		IOMUX_PAD(KPP_ROW0, KPP_ROW0, 0x3a0, 0x1a8, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
--#define MX25_PAD_KPP_ROW0__GPIO_2_29		IOMUX_PAD(KPP_ROW0, GPIO_2_29, 0x3a0, 0x1a8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_KPP_ROW1__KPP_ROW1		IOMUX_PAD(KPP_ROW1, KPP_ROW1, 0x3a4, 0x1ac, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
--#define MX25_PAD_KPP_ROW1__GPIO_2_30		IOMUX_PAD(KPP_ROW1, GPIO_2_30, 0x3a4, 0x1ac, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_KPP_ROW2__KPP_ROW2		IOMUX_PAD(KPP_ROW2, KPP_ROW2, 0x3a8, 0x1b0, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
--#define MX25_PAD_KPP_ROW2__CSI_D0		IOMUX_PAD(KPP_ROW2, CSI_D0, 0x3a8, 0x1b0, 0x13, 0x488, 2, 0 | NO_PAD_CTRL)
--#define MX25_PAD_KPP_ROW2__GPIO_2_31		IOMUX_PAD(KPP_ROW2, GPIO_2_31, 0x3a8, 0x1b0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_KPP_ROW3__KPP_ROW3		IOMUX_PAD(KPP_ROW3, KPP_ROW3, 0x3ac, 0x1b4, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
--#define MX25_PAD_KPP_ROW3__CSI_LD1		IOMUX_PAD(KPP_ROW3, CSI_LD1, 0x3ac, 0x1b4, 0x13, 0x48c, 2, 0 | NO_PAD_CTRL)
--#define MX25_PAD_KPP_ROW3__GPIO_3_0		IOMUX_PAD(KPP_ROW3, GPIO_3_0, 0x3ac, 0x1b4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_KPP_COL0__KPP_COL0		IOMUX_PAD(KPP_COL0, KPP_COL0, 0x3b0, 0x1b8, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
--#define MX25_PAD_KPP_COL0__GPIO_3_1		IOMUX_PAD(KPP_COL0, GPIO_3_1, 0x3b0, 0x1b8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_KPP_COL1__KPP_COL1		IOMUX_PAD(KPP_COL1, KPP_COL1, 0x3b4, 0x1bc, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
--#define MX25_PAD_KPP_COL1__GPIO_3_2		IOMUX_PAD(KPP_COL1, GPIO_3_2, 0x3b4, 0x1bc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_KPP_COL2__KPP_COL2		IOMUX_PAD(KPP_COL2, KPP_COL2, 0x3b8, 0x1c0, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
--#define MX25_PAD_KPP_COL2__GPIO_3_3		IOMUX_PAD(KPP_COL2, GPIO_3_3, 0x3b8, 0x1c0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_KPP_COL3__KPP_COL3		IOMUX_PAD(KPP_COL3, KPP_COL3, 0x3bc, 0x1c4, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
--#define MX25_PAD_KPP_COL3__GPIO_3_4		IOMUX_PAD(KPP_COL3, GPIO_3_4, 0x3bc, 0x1c4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_FEC_MDC__FEC_MDC		IOMUX_PAD(FEC_MDC, FEC_MDC, 0x3c0, 0x1c8, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_FEC_MDC__AUD4_TXD		IOMUX_PAD(FEC_MDC, AUD4_TXD, 0x3c0, 0x1c8, 0x12, 0x464, 1, 0 | NO_PAD_CTRL)
--#define MX25_PAD_FEC_MDC__GPIO_3_5		IOMUX_PAD(FEC_MDC, GPIO_3_5, 0x3c0, 0x1c8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_FEC_MDIO__FEC_MDIO		IOMUX_PAD(FEC_MDIO, FEC_MDIO, 0x3c4, 0x1cc, 0x10, 0, 0, PAD_CTL_HYSTERESIS | PAD_CTL_PULL_UP_22K | PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_FEC_MDIO__AUD4_RXD		IOMUX_PAD(FEC_MDIO, AUD4_RXD, 0x3c4, 0x1cc, 0x12, 0x460, 1, 0 | NO_PAD_CTRL)
--#define MX25_PAD_FEC_MDIO__GPIO_3_6		IOMUX_PAD(FEC_MDIO, GPIO_3_6, 0x3c4, 0x1cc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_FEC_TDATA0__FEC_TDATA0		IOMUX_PAD(FEC_TDATA0, FEC_TDATA0, 0x3c8, 0x1d0, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_FEC_TDATA0__GPIO_3_7		IOMUX_PAD(FEC_TDATA0, GPIO_3_7, 0x3c8, 0x1d0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_FEC_TDATA1__FEC_TDATA1		IOMUX_PAD(FEC_TDATA1, FEC_TDATA1, 0x3cc, 0x1d4, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_FEC_TDATA1__AUD4_TXFS		IOMUX_PAD(FEC_TDATA1, AUD4_TXFS, 0x3cc, 0x1d4, 0x12, 0x474, 1, 0 | NO_PAD_CTRL)
--#define MX25_PAD_FEC_TDATA1__GPIO_3_8		IOMUX_PAD(FEC_TDATA1, GPIO_3_8, 0x3cc, 0x1d4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_FEC_TX_EN__FEC_TX_EN		IOMUX_PAD(FEC_TX_EN, FEC_TX_EN, 0x3d0, 0x1d8, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_FEC_TX_EN__GPIO_3_9   		IOMUX_PAD(FEC_TX_EN, GPIO_3_9   , 0x3d0, 0x1d8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_FEC_RDATA0__FEC_RDATA0		IOMUX_PAD(FEC_RDATA0, FEC_RDATA0, 0x3d4, 0x1dc, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_FEC_RDATA0__GPIO_3_10		IOMUX_PAD(FEC_RDATA0, GPIO_3_10, 0x3d4, 0x1dc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_FEC_RDATA1__FEC_RDATA1		IOMUX_PAD(FEC_RDATA1, FEC_RDATA1, 0x3d8, 0x1e0, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_FEC_RDATA1__GPIO_3_11		IOMUX_PAD(FEC_RDATA1, GPIO_3_11, 0x3d8, 0x1e0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_FEC_RX_DV__FEC_RX_DV		IOMUX_PAD(FEC_RX_DV, FEC_RX_DV, 0x3dc, 0x1e4, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_FEC_RX_DV__CAN2_RX		IOMUX_PAD(FEC_RX_DV, CAN2_RX, 0x3dc, 0x1e4, 0x14, 0x484, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_FEC_RX_DV__GPIO_3_12		IOMUX_PAD(FEC_RX_DV, GPIO_3_12, 0x3dc, 0x1e4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_FEC_TX_CLK__FEC_TX_CLK		IOMUX_PAD(FEC_TX_CLK, FEC_TX_CLK, 0x3e0, 0x1e8, 0x10, 0, 0, PAD_CTL_HYSTERESIS | PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
--#define MX25_PAD_FEC_TX_CLK__GPIO_3_13		IOMUX_PAD(FEC_TX_CLK, GPIO_3_13, 0x3e0, 0x1e8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_RTCK__RTCK			IOMUX_PAD(RTCK, RTCK, 0x3e4, 0x1ec, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_RTCK__OWIRE			IOMUX_PAD(RTCK, OWIRE, 0x3e4, 0x1ec, 0x11, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_RTCK__GPIO_3_14		IOMUX_PAD(RTCK, GPIO_3_14, 0x3e4, 0x1ec, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_DE_B__DE_B			IOMUX_PAD(DE_B, DE_B, 0x3ec, 0x1f0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_DE_B__GPIO_2_20		IOMUX_PAD(DE_B, GPIO_2_20, 0x3ec, 0x1f0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_TDO__TDO			IOMUX_PAD(TDO, TDO, 0x3e8, 0x000, 0x00, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_GPIO_A__GPIO_A			IOMUX_PAD(GPIO_A, GPIO_A, 0x3f0, 0x1f4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_GPIO_A__USBOTG_PWR		IOMUX_PAD(GPIO_A, USBOTG_PWR, 0x3f0, 0x1f4, 0x12, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_GPIO_B__GPIO_B			IOMUX_PAD(GPIO_B, GPIO_B, 0x3f4, 0x1f8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_GPIO_B__USBOTG_OC		IOMUX_PAD(GPIO_B, USBOTG_OC, 0x3f4, 0x1f8, 0x12, 0x57c, 1, 0 | NO_PAD_CTRL)
--#define MX25_PAD_GPIO_C__GPIO_C			IOMUX_PAD(GPIO_C, GPIO_C, 0x3f8, 0x1fc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_GPIO_C__CAN2_TX		IOMUX_PAD(GPIO_C, CAN2_TX, 0x3f8, 0x1fc, 0x16, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_GPIO_D__GPIO_D			IOMUX_PAD(GPIO_D, GPIO_D, 0x3fc, 0x200, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_GPIO_D__CAN2_RX		IOMUX_PAD(GPIO_D, CAN2_RX, 0x3fc, 0x200, 0x16, 0x484, 1, 0 | NO_PAD_CTRL)
--#define MX25_PAD_GPIO_E__GPIO_E			IOMUX_PAD(GPIO_E, GPIO_E, 0x400, 0x204, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_GPIO_E__AUD7_TXD		IOMUX_PAD(GPIO_E, AUD7_TXD, 0x400, 0x204, 0x14, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_GPIO_F__GPIO_F			IOMUX_PAD(GPIO_F, GPIO_F, 0x404, 0x208, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_GPIO_F__AUD7_TXC		IOMUX_PAD(GPIO_F, AUD7_TXC, 0x404, 0x208, 0x14, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_EXT_ARMCLK__EXT_ARMCLK		IOMUX_PAD(EXT_ARMCLK, EXT_ARMCLK, 0x000, 0x20c, 0x10, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_EXT_ARMCLK__GPIO_3_15		IOMUX_PAD(EXT_ARMCLK, GPIO_3_15, 0x000, 0x20c, 0x15, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_UPLL_BYPCLK__UPLL_BYPCLK	IOMUX_PAD(UPLL_BYPCLK, UPLL_BYPCLK, 0x000, 0x210, 0x10, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_UPLL_BYPCLK__GPIO_3_16		IOMUX_PAD(UPLL_BYPCLK, GPIO_3_16, 0x000, 0x210, 0x15, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_VSTBY_REQ__VSTBY_REQ		IOMUX_PAD(VSTBY_REQ, VSTBY_REQ, 0x408, 0x214, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_VSTBY_REQ__AUD7_TXFS		IOMUX_PAD(VSTBY_REQ, AUD7_TXFS, 0x408, 0x214, 0x14, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_VSTBY_REQ__GPIO_3_17		IOMUX_PAD(VSTBY_REQ, GPIO_3_17, 0x408, 0x214, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_VSTBY_ACK__VSTBY_ACK		IOMUX_PAD(VSTBY_ACK, VSTBY_ACK, 0x40c, 0x218, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_VSTBY_ACK__GPIO_3_18		IOMUX_PAD(VSTBY_ACK, GPIO_3_18, 0x40c, 0x218, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_POWER_FAIL__POWER_FAIL		IOMUX_PAD(POWER_FAIL, POWER_FAIL, 0x410, 0x21c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_POWER_FAIL__AUD7_RXD		IOMUX_PAD(POWER_FAIL, AUD7_RXD, 0x410, 0x21c, 0x14, 0x478, 1, 0 | NO_PAD_CTRL)
--#define MX25_PAD_POWER_FAIL__GPIO_3_19		IOMUX_PAD(POWER_FAIL, GPIO_3_19, 0x410, 0x21c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CLKO__CLKO			IOMUX_PAD(CLKO, CLKO, 0x414, 0x220, 0x10, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_CLKO__GPIO_2_21		IOMUX_PAD(CLKO, GPIO_2_21, 0x414, 0x220, 0x15, 0, 0, 0 | NO_PAD_CTRL)
--#define MX25_PAD_BOOT_MODE0__BOOT_MODE0		IOMUX_PAD(BOOT_MODE0, BOOT_MODE0, 0x000, 0x224, 0x00, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_BOOT_MODE0__GPIO_4_30		IOMUX_PAD(BOOT_MODE0, GPIO_4_30, 0x000, 0x224, 0x05, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_BOOT_MODE1__BOOT_MODE1		IOMUX_PAD(BOOT_MODE1, BOOT_MODE1, 0x000, 0x228, 0x00, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_BOOT_MODE1__GPIO_4_31		IOMUX_PAD(BOOT_MODE1, GPIO_4_31, 0x000, 0x228, 0x05, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_A10__A10		IOMUX_PAD(A10, A10, 0x000, 0x008, 0x00, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_A10__GPIO_4_0		IOMUX_PAD(A10, GPIO_4_0, 0x000, 0x008, 0x05, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_A13__A13		IOMUX_PAD(A13, A13, 0x22C, 0x00c, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A13__GPIO_4_1		IOMUX_PAD(A13, GPIO_4_1, 0x22C, 0x00c, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A14__A14		IOMUX_PAD(A14, A14, 0x230, 0x010, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A14__GPIO_2_0		IOMUX_PAD(A14, GPIO_2_0, 0x230, 0x010, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A15__A15		IOMUX_PAD(A15, A15, 0x234, 0x014, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A15__GPIO_2_1		IOMUX_PAD(A15, GPIO_2_1, 0x234, 0x014, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A16__A16		IOMUX_PAD(A16, A16, 0x000, 0x018, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_A16__GPIO_2_2		IOMUX_PAD(A16, GPIO_2_2, 0x000, 0x018, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_A17__A17		IOMUX_PAD(A17, A17, 0x238, 0x01c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A17__GPIO_2_3		IOMUX_PAD(A17, GPIO_2_3, 0x238, 0x01c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A18__A18		IOMUX_PAD(A18, A18, 0x23c, 0x020, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A18__GPIO_2_4		IOMUX_PAD(A18, GPIO_2_4, 0x23c, 0x020, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A18__FEC_COL		IOMUX_PAD(A18, FEC_COL, 0x23c, 0x020, 0x17, 0x504, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_A19__A19		IOMUX_PAD(A19, A19, 0x240, 0x024, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A19__FEC_RX_ER		IOMUX_PAD(A19, FEC_RX_ER, 0x240, 0x024, 0x17, 0x518, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_A19__GPIO_2_5		IOMUX_PAD(A19, GPIO_2_5, 0x240, 0x024, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A20__A20		IOMUX_PAD(A20, A20, 0x244, 0x028, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A20__GPIO_2_6		IOMUX_PAD(A20, GPIO_2_6, 0x244, 0x028, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A20__FEC_RDATA2	IOMUX_PAD(A20, FEC_RDATA2, 0x244, 0x028, 0x17, 0x50c, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_A21__A21		IOMUX_PAD(A21, A21, 0x248, 0x02c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A21__GPIO_2_7		IOMUX_PAD(A21, GPIO_2_7, 0x248, 0x02c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A21__FEC_RDATA3	IOMUX_PAD(A21, FEC_RDATA3, 0x248, 0x02c, 0x17, 0x510, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_A22__A22		IOMUX_PAD(A22, A22, 0x000, 0x030, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A22__GPIO_2_8		IOMUX_PAD(A22, GPIO_2_8, 0x000, 0x030, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A23__A23		IOMUX_PAD(A23, A23, 0x24c, 0x034, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A23__GPIO_2_9		IOMUX_PAD(A23, GPIO_2_9, 0x24c, 0x034, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A24__A24		IOMUX_PAD(A24, A24, 0x250, 0x038, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A24__GPIO_2_10		IOMUX_PAD(A24, GPIO_2_10, 0x250, 0x038, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A24__FEC_RX_CLK	IOMUX_PAD(A24, FEC_RX_CLK, 0x250, 0x038, 0x17, 0x514, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_A25__A25		IOMUX_PAD(A25, A25, 0x254, 0x03c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A25__GPIO_2_11		IOMUX_PAD(A25, GPIO_2_11, 0x254, 0x03c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_A25__FEC_CRS		IOMUX_PAD(A25, FEC_CRS, 0x254, 0x03c, 0x17, 0x508, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_EB0__EB0		IOMUX_PAD(EB0, EB0, 0x258, 0x040, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_EB0__AUD4_TXD		IOMUX_PAD(EB0, AUD4_TXD, 0x258, 0x040, 0x14, 0x464, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_EB0__GPIO_2_12		IOMUX_PAD(EB0, GPIO_2_12, 0x258, 0x040, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_EB1__EB1		IOMUX_PAD(EB1, EB1, 0x25c, 0x044, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_EB1__AUD4_RXD		IOMUX_PAD(EB1, AUD4_RXD, 0x25c, 0x044, 0x14, 0x460, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_EB1__GPIO_2_13		IOMUX_PAD(EB1, GPIO_2_13, 0x25c, 0x044, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_OE__OE			IOMUX_PAD(OE, OE, 0x260, 0x048, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_OE__AUD4_TXC		IOMUX_PAD(OE, AUD4_TXC, 0x260, 0x048, 0x14, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_OE__GPIO_2_14		IOMUX_PAD(OE, GPIO_2_14, 0x260, 0x048, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CS0__CS0		IOMUX_PAD(CS0, CS0, 0x000, 0x04c, 0x00, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CS0__GPIO_4_2		IOMUX_PAD(CS0, GPIO_4_2, 0x000, 0x04c, 0x05, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CS1__CS1		IOMUX_PAD(CS1, CS1, 0x000, 0x050, 0x00, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CS1__GPIO_4_3		IOMUX_PAD(CS1, GPIO_4_3, 0x000, 0x050, 0x05, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CS4__CS4		IOMUX_PAD(CS4, CS4, 0x264, 0x054, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CS4__UART5_CTS		IOMUX_PAD(CS4, UART5_CTS, 0x264, 0x054, 0x13, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CS4__GPIO_3_20		IOMUX_PAD(CS4, GPIO_3_20, 0x264, 0x054, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CS5__CS5		IOMUX_PAD(CS5, CS5, 0x268, 0x058, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CS5__UART5_RTS		IOMUX_PAD(CS5, UART5_RTS, 0x268, 0x058, 0x13, 0x574, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CS5__GPIO_3_21		IOMUX_PAD(CS5, GPIO_3_21, 0x268, 0x058, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_NF_CE0__NF_CE0		IOMUX_PAD(NF_CE0, NF_CE0, 0x26c, 0x05c, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_NF_CE0__GPIO_3_22	IOMUX_PAD(NF_CE0, GPIO_3_22, 0x26c, 0x05c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_ECB__ECB		IOMUX_PAD(ECB, ECB, 0x270, 0x060, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_ECB__UART5_TXD_MUX	IOMUX_PAD(ECB, UART5_TXD_MUX, 0x270, 0x060, 0x13, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_ECB__GPIO_3_23		IOMUX_PAD(ECB, GPIO_3_23, 0x270, 0x060, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LBA__LBA		IOMUX_PAD(LBA, LBA, 0x274, 0x064, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LBA__UART5_RXD_MUX	IOMUX_PAD(LBA, UART5_RXD_MUX, 0x274, 0x064, 0x13, 0x578, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LBA__GPIO_3_24		IOMUX_PAD(LBA, GPIO_3_24, 0x274, 0x064, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_BCLK__BCLK		IOMUX_PAD(BCLK, BCLK, 0x000, 0x068, 0x00, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_BCLK__GPIO_4_4		IOMUX_PAD(BCLK, GPIO_4_4, 0x000, 0x068, 0x05, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_RW__RW			IOMUX_PAD(RW, RW, 0x278, 0x06c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_RW__AUD4_TXFS		IOMUX_PAD(RW, AUD4_TXFS, 0x278, 0x06c, 0x14, 0x474, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_RW__GPIO_3_25		IOMUX_PAD(RW, GPIO_3_25, 0x278, 0x06c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_NFWE_B__NFWE_B		IOMUX_PAD(NFWE_B, NFWE_B, 0x000, 0x070, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFWE_B__GPIO_3_26	IOMUX_PAD(NFWE_B, GPIO_3_26, 0x000, 0x070, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFRE_B__NFRE_B		IOMUX_PAD(NFRE_B, NFRE_B, 0x000, 0x074, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFRE_B__GPIO_3_27	IOMUX_PAD(NFRE_B, GPIO_3_27, 0x000, 0x074, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFALE__NFALE		IOMUX_PAD(NFALE, NFALE, 0x000, 0x078, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFALE__GPIO_3_28	IOMUX_PAD(NFALE, GPIO_3_28, 0x000, 0x078, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFCLE__NFCLE		IOMUX_PAD(NFCLE, NFCLE, 0x000, 0x07c, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFCLE__GPIO_3_29	IOMUX_PAD(NFCLE, GPIO_3_29, 0x000, 0x07c, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFWP_B__NFWP_B		IOMUX_PAD(NFWP_B, NFWP_B, 0x000, 0x080, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFWP_B__GPIO_3_30	IOMUX_PAD(NFWP_B, GPIO_3_30, 0x000, 0x080, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_NFRB__NFRB		IOMUX_PAD(NFRB, NFRB, 0x27c, 0x084, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_NFRB__GPIO_3_31	IOMUX_PAD(NFRB, GPIO_3_31, 0x27c, 0x084, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D15__D15		IOMUX_PAD(D15, D15, 0x280, 0x088, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D15__LD16		IOMUX_PAD(D15, LD16, 0x280, 0x088, 0x01, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D15__GPIO_4_5		IOMUX_PAD(D15, GPIO_4_5, 0x280, 0x088, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D14__D14		IOMUX_PAD(D14, D14, 0x284, 0x08c, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D14__LD17		IOMUX_PAD(D14, LD17, 0x284, 0x08c, 0x01, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D14__GPIO_4_6		IOMUX_PAD(D14, GPIO_4_6, 0x284, 0x08c, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D13__D13		IOMUX_PAD(D13, D13, 0x288, 0x090, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D13__LD18		IOMUX_PAD(D13, LD18, 0x288, 0x090, 0x01, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D13__GPIO_4_7		IOMUX_PAD(D13, GPIO_4_7, 0x288, 0x090, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D12__D12		IOMUX_PAD(D12, D12, 0x28c, 0x094, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D12__GPIO_4_8		IOMUX_PAD(D12, GPIO_4_8, 0x28c, 0x094, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D11__D11		IOMUX_PAD(D11, D11, 0x290, 0x098, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D11__GPIO_4_9		IOMUX_PAD(D11, GPIO_4_9, 0x290, 0x098, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D10__D10		IOMUX_PAD(D10, D10, 0x294, 0x09c, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D10__GPIO_4_10		IOMUX_PAD(D10, GPIO_4_10, 0x294, 0x09c, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D10__USBOTG_OC		IOMUX_PAD(D10, USBOTG_OC, 0x294, 0x09c, 0x06, 0x57c, 0, PAD_CTL_PULL_UP_100K)
-+#define MX25_PAD_D9__D9			IOMUX_PAD(D9, D9, 0x298, 0x0a0, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D9__GPIO_4_11		IOMUX_PAD(D9, GPIO_4_11, 0x298, 0x0a0, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D9__USBH2_PWR		IOMUX_PAD(D9, USBH2_PWR, 0x298, 0x0a0, 0x06, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_D8__D8			IOMUX_PAD(D8, D8, 0x29c, 0x0a4, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D8__GPIO_4_12		IOMUX_PAD(D8, GPIO_4_12, 0x29c, 0x0a4, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D8__USBH2_OC		IOMUX_PAD(D8, USBH2_OC, 0x29c, 0x0a4, 0x06, 0x580, 0, PAD_CTL_PULL_UP_100K)
-+#define MX25_PAD_D7__D7			IOMUX_PAD(D7, D7, 0x2a0, 0x0a8, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D7__GPIO_4_13		IOMUX_PAD(D7, GPIO_4_13, 0x2a0, 0x0a8, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D6__D6			IOMUX_PAD(D6, D6, 0x2a4, 0x0ac, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D6__GPIO_4_14		IOMUX_PAD(D6, GPIO_4_14, 0x2a4, 0x0ac, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D5__D5			IOMUX_PAD(D5, D5, 0x2a8, 0x0b0, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D5__GPIO_4_15		IOMUX_PAD(D5, GPIO_4_15, 0x2a8, 0x0b0, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D4__D4			IOMUX_PAD(D4, D4, 0x2ac, 0x0b4, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D4__GPIO_4_16		IOMUX_PAD(D4, GPIO_4_16, 0x2ac, 0x0b4, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D3__D3			IOMUX_PAD(D3, D3, 0x2b0, 0x0b8, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D3__GPIO_4_17		IOMUX_PAD(D3, GPIO_4_17, 0x2b0, 0x0b8, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D2__D2			IOMUX_PAD(D2, D2, 0x2b4, 0x0bc, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D2__GPIO_4_18		IOMUX_PAD(D2, GPIO_4_18, 0x2b4, 0x0bc, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D1__D1			IOMUX_PAD(D1, D1, 0x2b8, 0x0c0, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D1__GPIO_4_19		IOMUX_PAD(D1, GPIO_4_19, 0x2b8, 0x0c0, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D0__D0			IOMUX_PAD(D0, D0, 0x2bc, 0x0c4, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_D0__GPIO_4_20		IOMUX_PAD(D0, GPIO_4_20, 0x2bc, 0x0c4, 0x05, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD0__LD0		IOMUX_PAD(LD0, LD0, 0x2c0, 0x0c8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD0__CSI_D0		IOMUX_PAD(LD0, CSI_D0, 0x2c0, 0x0c8, 0x12, 0x488, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD0__GPIO_2_15		IOMUX_PAD(LD0, GPIO_2_15, 0x2c0, 0x0c8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD1__LD1		IOMUX_PAD(LD1, LD1, 0x2c4, 0x0cc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD1__CSI_D1		IOMUX_PAD(LD1, CSI_D1, 0x2c4, 0x0cc, 0x12, 0x48c, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD1__GPIO_2_16		IOMUX_PAD(LD1, GPIO_2_16, 0x2c4, 0x0cc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD2__LD2		IOMUX_PAD(LD2, LD2, 0x2c8, 0x0d0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD2__GPIO_2_17		IOMUX_PAD(LD2, GPIO_2_17, 0x2c8, 0x0d0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD3__LD3		IOMUX_PAD(LD3, LD3, 0x2cc, 0x0d4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD3__GPIO_2_18		IOMUX_PAD(LD3, GPIO_2_18, 0x2cc, 0x0d4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD4__LD4		IOMUX_PAD(LD4, LD4, 0x2d0, 0x0d8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD4__GPIO_2_19		IOMUX_PAD(LD4, GPIO_2_19, 0x2d0, 0x0d8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD5__LD5		IOMUX_PAD(LD5, LD5, 0x2d4, 0x0dc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD5__GPIO_1_19		IOMUX_PAD(LD5, GPIO_1_19, 0x2d4, 0x0dc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD6__LD6		IOMUX_PAD(LD6, LD6, 0x2d8, 0x0e0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD6__GPIO_1_20		IOMUX_PAD(LD6, GPIO_1_20, 0x2d8, 0x0e0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD7__LD7		IOMUX_PAD(LD7, LD7, 0x2dc, 0x0e4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD7__GPIO_1_21		IOMUX_PAD(LD7, GPIO_1_21, 0x2dc, 0x0e4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD8__LD8		IOMUX_PAD(LD8, LD8, 0x2e0, 0x0e8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD8__FEC_TX_ERR	IOMUX_PAD(LD8, FEC_TX_ERR, 0x2e0, 0x0e8, 0x15, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD9__LD9		IOMUX_PAD(LD9, LD9, 0x2e4, 0x0ec, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD9__FEC_COL		IOMUX_PAD(LD9, FEC_COL, 0x2e4, 0x0ec, 0x15, 0x504, 1, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD10__LD10		IOMUX_PAD(LD10, LD10, 0x2e8, 0x0f0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD10__FEC_RX_ER	IOMUX_PAD(LD10, FEC_RX_ER, 0x2e8, 0x0f0, 0x15, 0x518, 1, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD11__LD11		IOMUX_PAD(LD11, LD11, 0x2ec, 0x0f4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD11__FEC_RDATA2	IOMUX_PAD(LD11, FEC_RDATA2, 0x2ec, 0x0f4, 0x15, 0x50c, 1, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD12__LD12		IOMUX_PAD(LD12, LD12, 0x2f0, 0x0f8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD12__FEC_RDATA3	IOMUX_PAD(LD12, FEC_RDATA3, 0x2f0, 0x0f8, 0x15, 0x510, 1, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD13__LD13		IOMUX_PAD(LD13, LD13, 0x2f4, 0x0fc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD13__FEC_TDATA2	IOMUX_PAD(LD13, FEC_TDATA2, 0x2f4, 0x0fc, 0x15, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD14__LD14		IOMUX_PAD(LD14, LD14, 0x2f8, 0x100, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD14__FEC_TDATA3	IOMUX_PAD(LD14, FEC_TDATA3, 0x2f8, 0x100, 0x15, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_LD15__LD15		IOMUX_PAD(LD15, LD15, 0x2fc, 0x104, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LD15__FEC_RX_CLK	IOMUX_PAD(LD15, FEC_RX_CLK, 0x2fc, 0x104, 0x15, 0x514, 1, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_HSYNC__HSYNC		IOMUX_PAD(HSYNC, HSYNC, 0x300, 0x108, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_HSYNC__GPIO_1_22	IOMUX_PAD(HSYNC, GPIO_1_22, 0x300, 0x108, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_VSYNC__VSYNC		IOMUX_PAD(VSYNC, VSYNC, 0x304, 0x10c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_VSYNC__GPIO_1_23	IOMUX_PAD(VSYNC, GPIO_1_23, 0x304, 0x10c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LSCLK__LSCLK		IOMUX_PAD(LSCLK, LSCLK, 0x308, 0x110, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_LSCLK__GPIO_1_24	IOMUX_PAD(LSCLK, GPIO_1_24, 0x308, 0x110, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_OE_ACD__OE_ACD		IOMUX_PAD(OE_ACD, OE_ACD, 0x30c, 0x114, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_OE_ACD__GPIO_1_25	IOMUX_PAD(OE_ACD, GPIO_1_25, 0x30c, 0x114, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CONTRAST__CONTRAST	IOMUX_PAD(CONTRAST, CONTRAST, 0x310, 0x118, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CONTRAST__FEC_CRS	IOMUX_PAD(CONTRAST, FEC_CRS, 0x310, 0x118, 0x15, 0x508, 1, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_PWM__PWM		IOMUX_PAD(PWM, PWM, 0x314, 0x11c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_PWM__GPIO_1_26		IOMUX_PAD(PWM, GPIO_1_26, 0x314, 0x11c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_PWM__USBH2_OC		IOMUX_PAD(PWM, USBH2_OC, 0x314, 0x11c, 0x16, 0x580, 1, PAD_CTL_PULL_UP_100K)
-+#define MX25_PAD_CSI_D2__CSI_D2		IOMUX_PAD(CSI_D2, CSI_D2, 0x318, 0x120, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D2__UART5_RXD_MUX	IOMUX_PAD(CSI_D2, UART5_RXD_MUX, 0x318, 0x120, 0x11, 0x578, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D2__GPIO_1_27	IOMUX_PAD(CSI_D2, GPIO_1_27, 0x318, 0x120, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D3__CSI_D3		IOMUX_PAD(CSI_D3, CSI_D3, 0x31c, 0x124, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D3__GPIO_1_28	IOMUX_PAD(CSI_D3, GPIO_1_28, 0x31c, 0x124, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D4__CSI_D4		IOMUX_PAD(CSI_D4, CSI_D4, 0x320, 0x128, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D4__UART5_RTS	IOMUX_PAD(CSI_D4, UART5_RTS, 0x320, 0x128, 0x11, 0x574, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D4__GPIO_1_29	IOMUX_PAD(CSI_D4, GPIO_1_29, 0x320, 0x128, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D5__CSI_D5		IOMUX_PAD(CSI_D5, CSI_D5, 0x324, 0x12c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D5__GPIO_1_30	IOMUX_PAD(CSI_D5, GPIO_1_30, 0x324, 0x12c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D6__CSI_D6		IOMUX_PAD(CSI_D6, CSI_D6, 0x328, 0x130, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D6__GPIO_1_31	IOMUX_PAD(CSI_D6, GPIO_1_31, 0x328, 0x130, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D7__CSI_D7		IOMUX_PAD(CSI_D7, CSI_D7, 0x32c, 0x134, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D7__GPIO_1_6	IOMUX_PAD(CSI_D7, GPIO_1_6, 0x32c, 0x134, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D8__CSI_D8		IOMUX_PAD(CSI_D8, CSI_D8, 0x330, 0x138, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D8__GPIO_1_7	IOMUX_PAD(CSI_D8, GPIO_1_7, 0x330, 0x138, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D9__CSI_D9		IOMUX_PAD(CSI_D9, CSI_D9, 0x334, 0x13c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_D9__GPIO_4_21	IOMUX_PAD(CSI_D9, GPIO_4_21, 0x334, 0x13c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_MCLK__CSI_MCLK	IOMUX_PAD(CSI_MCLK, CSI_MCLK, 0x338, 0x140, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_MCLK__GPIO_1_8	IOMUX_PAD(CSI_MCLK, GPIO_1_8, 0x338, 0x140, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_VSYNC__CSI_VSYNC	IOMUX_PAD(CSI_VSYNC, CSI_VSYNC, 0x33c, 0x144, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_VSYNC__GPIO_1_9	IOMUX_PAD(CSI_VSYNC, GPIO_1_9, 0x33c, 0x144, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_HSYNC__CSI_HSYNC	IOMUX_PAD(CSI_HSYNC, CSI_HSYNC, 0x340, 0x148, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_HSYNC__GPIO_1_10	IOMUX_PAD(CSI_HSYNC, GPIO_1_10, 0x340, 0x148, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_PIXCLK__CSI_PIXCLK	IOMUX_PAD(CSI_PIXCLK, CSI_PIXCLK, 0x344, 0x14c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSI_PIXCLK__GPIO_1_11	IOMUX_PAD(CSI_PIXCLK, GPIO_1_11, 0x344, 0x14c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_I2C1_CLK__I2C1_CLK	IOMUX_PAD(I2C1_CLK, I2C1_CLK, 0x348, 0x150, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_I2C1_CLK__GPIO_1_12	IOMUX_PAD(I2C1_CLK, GPIO_1_12, 0x348, 0x150, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_I2C1_DAT__I2C1_DAT	IOMUX_PAD(I2C1_DAT, I2C1_DAT, 0x34c, 0x154, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_I2C1_DAT__GPIO_1_13	IOMUX_PAD(I2C1_DAT, GPIO_1_13, 0x34c, 0x154, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_MOSI__CSPI1_MOSI	IOMUX_PAD(CSPI1_MOSI, CSPI1_MOSI, 0x350, 0x158, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_MOSI__GPIO_1_14	IOMUX_PAD(CSPI1_MOSI, GPIO_1_14, 0x350, 0x158, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_MISO__CSPI1_MISO	IOMUX_PAD(CSPI1_MISO, CSPI1_MISO, 0x354, 0x15c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_MISO__GPIO_1_15	IOMUX_PAD(CSPI1_MISO, GPIO_1_15, 0x354, 0x15c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_SS0__CSPI1_SS0	IOMUX_PAD(CSPI1_SS0, CSPI1_SS0, 0x358, 0x160, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_SS0__GPIO_1_16	IOMUX_PAD(CSPI1_SS0, GPIO_1_16, 0x358, 0x160, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_SS1__CSPI1_SS1	IOMUX_PAD(CSPI1_SS1, CSPI1_SS1, 0x35c, 0x164, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_SS1__GPIO_1_17	IOMUX_PAD(CSPI1_SS1, GPIO_1_17, 0x35c, 0x164, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_SCLK__CSPI1_SCLK	IOMUX_PAD(CSPI1_SCLK, CSPI1_SCLK, 0x360, 0x168, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_SCLK__GPIO_1_18	IOMUX_PAD(CSPI1_SCLK, GPIO_1_18, 0x360, 0x168, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CSPI1_RDY__CSPI1_RDY	IOMUX_PAD(CSPI1_RDY, CSPI1_RDY, 0x364, 0x16c, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_CSPI1_RDY__GPIO_2_22	IOMUX_PAD(CSPI1_RDY, GPIO_2_22, 0x364, 0x16c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_RXD__UART1_RXD	IOMUX_PAD(UART1_RXD, UART1_RXD, 0x368, 0x170, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K)
-+#define MX25_PAD_UART1_RXD__GPIO_4_22	IOMUX_PAD(UART1_RXD, GPIO_4_22, 0x368, 0x170, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_TXD__UART1_TXD	IOMUX_PAD(UART1_TXD, UART1_TXD, 0x36c, 0x174, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_TXD__GPIO_4_23	IOMUX_PAD(UART1_TXD, GPIO_4_23, 0x36c, 0x174, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_RTS__UART1_RTS	IOMUX_PAD(UART1_RTS, UART1_RTS, 0x370, 0x178, 0x10, 0, 0, PAD_CTL_PULL_UP_100K)
-+#define MX25_PAD_UART1_RTS__CSI_D0	IOMUX_PAD(UART1_RTS, CSI_D0, 0x370, 0x178, 0x11, 0x488, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_RTS__GPIO_4_24	IOMUX_PAD(UART1_RTS, GPIO_4_24, 0x370, 0x178, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_CTS__UART1_CTS	IOMUX_PAD(UART1_CTS, UART1_CTS, 0x374, 0x17c, 0x10, 0, 0, PAD_CTL_PULL_UP_100K)
-+#define MX25_PAD_UART1_CTS__CSI_D1	IOMUX_PAD(UART1_CTS, CSI_D1, 0x374, 0x17c, 0x11, 0x48c, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART1_CTS__GPIO_4_25	IOMUX_PAD(UART1_CTS, GPIO_4_25, 0x374, 0x17c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_RXD__UART2_RXD	IOMUX_PAD(UART2_RXD, UART2_RXD, 0x378, 0x180, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_RXD__GPIO_4_26	IOMUX_PAD(UART2_RXD, GPIO_4_26, 0x378, 0x180, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_TXD__UART2_TXD	IOMUX_PAD(UART2_TXD, UART2_TXD, 0x37c, 0x184, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_TXD__GPIO_4_27	IOMUX_PAD(UART2_TXD, GPIO_4_27, 0x37c, 0x184, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_RTS__UART2_RTS	IOMUX_PAD(UART2_RTS, UART2_RTS, 0x380, 0x188, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_RTS__FEC_COL	IOMUX_PAD(UART2_RTS, FEC_COL, 0x380, 0x188, 0x12, 0x504, 2, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_UART2_RTS__GPIO_4_28	IOMUX_PAD(UART2_RTS, GPIO_4_28, 0x380, 0x188, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_CTS__FEC_RX_ER	IOMUX_PAD(UART2_CTS, FEC_RX_ER, 0x384, 0x18c, 0x12, 0x518, 2, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_UART2_CTS__UART2_CTS	IOMUX_PAD(UART2_CTS, UART2_CTS, 0x384, 0x18c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_UART2_CTS__GPIO_4_29	IOMUX_PAD(UART2_CTS, GPIO_4_29, 0x384, 0x18c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_CMD__SD1_CMD	IOMUX_PAD(SD1_CMD, SD1_CMD, 0x388, 0x190, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_CMD__FEC_RDATA2	IOMUX_PAD(SD1_CMD, FEC_RDATA2, 0x388, 0x190, 0x12, 0x50c, 2, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_CMD__GPIO_2_23	IOMUX_PAD(SD1_CMD, GPIO_2_23, 0x388, 0x190, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_CLK__SD1_CLK	IOMUX_PAD(SD1_CLK, SD1_CLK, 0x38c, 0x194, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_CLK__FEC_RDATA3	IOMUX_PAD(SD1_CLK, FEC_RDATA3, 0x38c, 0x194, 0x12, 0x510, 2, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_CLK__GPIO_2_24	IOMUX_PAD(SD1_CLK, GPIO_2_24, 0x38c, 0x194, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_DATA0__SD1_DATA0	IOMUX_PAD(SD1_DATA0, SD1_DATA0, 0x390, 0x198, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_DATA0__GPIO_2_25	IOMUX_PAD(SD1_DATA0, GPIO_2_25, 0x390, 0x198, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_DATA1__SD1_DATA1	IOMUX_PAD(SD1_DATA1, SD1_DATA1, 0x394, 0x19c, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_DATA1__AUD7_RXD	IOMUX_PAD(SD1_DATA1, AUD7_RXD, 0x394, 0x19c, 0x13, 0x478, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_DATA1__GPIO_2_26	IOMUX_PAD(SD1_DATA1, GPIO_2_26, 0x394, 0x19c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_DATA2__SD1_DATA2	IOMUX_PAD(SD1_DATA2, SD1_DATA2, 0x398, 0x1a0, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_DATA2__FEC_RX_CLK	IOMUX_PAD(SD1_DATA2, FEC_RX_CLK, 0x398, 0x1a0, 0x15, 0x514, 2, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_DATA2__GPIO_2_27	IOMUX_PAD(SD1_DATA2, GPIO_2_27, 0x398, 0x1a0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_SD1_DATA3__SD1_DATA3	IOMUX_PAD(SD1_DATA3, SD1_DATA3, 0x39c, 0x1a4, 0x10, 0, 0, PAD_CTL_PULL_UP_47K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_DATA3__FEC_CRS	IOMUX_PAD(SD1_DATA3, FEC_CRS, 0x39c, 0x1a4, 0x10, 0x508, 2, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_SD1_DATA3__GPIO_2_28	IOMUX_PAD(SD1_DATA3, GPIO_2_28, 0x39c, 0x1a4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_ROW0__KPP_ROW0	IOMUX_PAD(KPP_ROW0, KPP_ROW0, 0x3a0, 0x1a8, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_KPP_ROW0__GPIO_2_29	IOMUX_PAD(KPP_ROW0, GPIO_2_29, 0x3a0, 0x1a8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_ROW1__KPP_ROW1	IOMUX_PAD(KPP_ROW1, KPP_ROW1, 0x3a4, 0x1ac, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_KPP_ROW1__GPIO_2_30	IOMUX_PAD(KPP_ROW1, GPIO_2_30, 0x3a4, 0x1ac, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_ROW2__KPP_ROW2	IOMUX_PAD(KPP_ROW2, KPP_ROW2, 0x3a8, 0x1b0, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_KPP_ROW2__CSI_D0	IOMUX_PAD(KPP_ROW2, CSI_D0, 0x3a8, 0x1b0, 0x13, 0x488, 2, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_ROW2__GPIO_2_31	IOMUX_PAD(KPP_ROW2, GPIO_2_31, 0x3a8, 0x1b0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_ROW3__KPP_ROW3	IOMUX_PAD(KPP_ROW3, KPP_ROW3, 0x3ac, 0x1b4, 0x10, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_KPP_ROW3__CSI_LD1	IOMUX_PAD(KPP_ROW3, CSI_LD1, 0x3ac, 0x1b4, 0x13, 0x48c, 2, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_ROW3__GPIO_3_0	IOMUX_PAD(KPP_ROW3, GPIO_3_0, 0x3ac, 0x1b4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_COL0__KPP_COL0	IOMUX_PAD(KPP_COL0, KPP_COL0, 0x3b0, 0x1b8, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
-+#define MX25_PAD_KPP_COL0__GPIO_3_1	IOMUX_PAD(KPP_COL0, GPIO_3_1, 0x3b0, 0x1b8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_COL1__KPP_COL1	IOMUX_PAD(KPP_COL1, KPP_COL1, 0x3b4, 0x1bc, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
-+#define MX25_PAD_KPP_COL1__GPIO_3_2	IOMUX_PAD(KPP_COL1, GPIO_3_2, 0x3b4, 0x1bc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_COL2__KPP_COL2	IOMUX_PAD(KPP_COL2, KPP_COL2, 0x3b8, 0x1c0, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
-+#define MX25_PAD_KPP_COL2__GPIO_3_3	IOMUX_PAD(KPP_COL2, GPIO_3_3, 0x3b8, 0x1c0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_KPP_COL3__KPP_COL3	IOMUX_PAD(KPP_COL3, KPP_COL3, 0x3bc, 0x1c4, 0x10, 0, 0, PAD_CTL_PULL_KEEPER | PAD_CTL_OUTPUT_OPEN_DRAIN)
-+#define MX25_PAD_KPP_COL3__GPIO_3_4	IOMUX_PAD(KPP_COL3, GPIO_3_4, 0x3bc, 0x1c4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_MDC__FEC_MDC	IOMUX_PAD(FEC_MDC, FEC_MDC, 0x3c0, 0x1c8, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_MDC__AUD4_TXD	IOMUX_PAD(FEC_MDC, AUD4_TXD, 0x3c0, 0x1c8, 0x12, 0x464, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_MDC__GPIO_3_5	IOMUX_PAD(FEC_MDC, GPIO_3_5, 0x3c0, 0x1c8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_MDIO__FEC_MDIO	IOMUX_PAD(FEC_MDIO, FEC_MDIO, 0x3c4, 0x1cc, 0x10, 0, 0, PAD_CTL_HYSTERESIS | PAD_CTL_PULL_UP_22K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_MDIO__AUD4_RXD	IOMUX_PAD(FEC_MDIO, AUD4_RXD, 0x3c4, 0x1cc, 0x12, 0x460, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_MDIO__GPIO_3_6	IOMUX_PAD(FEC_MDIO, GPIO_3_6, 0x3c4, 0x1cc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_TDATA0__FEC_TDATA0	IOMUX_PAD(FEC_TDATA0, FEC_TDATA0, 0x3c8, 0x1d0, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_TDATA0__GPIO_3_7	IOMUX_PAD(FEC_TDATA0, GPIO_3_7, 0x3c8, 0x1d0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_TDATA1__FEC_TDATA1	IOMUX_PAD(FEC_TDATA1, FEC_TDATA1, 0x3cc, 0x1d4, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_TDATA1__AUD4_TXFS	IOMUX_PAD(FEC_TDATA1, AUD4_TXFS, 0x3cc, 0x1d4, 0x12, 0x474, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_TDATA1__GPIO_3_8	IOMUX_PAD(FEC_TDATA1, GPIO_3_8, 0x3cc, 0x1d4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_TX_EN__FEC_TX_EN	IOMUX_PAD(FEC_TX_EN, FEC_TX_EN, 0x3d0, 0x1d8, 0x10, 0, 0, PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_TX_EN__GPIO_3_9   	IOMUX_PAD(FEC_TX_EN, GPIO_3_9   , 0x3d0, 0x1d8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_RDATA0__FEC_RDATA0	IOMUX_PAD(FEC_RDATA0, FEC_RDATA0, 0x3d4, 0x1dc, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_RDATA0__GPIO_3_10	IOMUX_PAD(FEC_RDATA0, GPIO_3_10, 0x3d4, 0x1dc, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_RDATA1__FEC_RDATA1	IOMUX_PAD(FEC_RDATA1, FEC_RDATA1, 0x3d8, 0x1e0, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_RDATA1__GPIO_3_11	IOMUX_PAD(FEC_RDATA1, GPIO_3_11, 0x3d8, 0x1e0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_RX_DV__FEC_RX_DV	IOMUX_PAD(FEC_RX_DV, FEC_RX_DV, 0x3dc, 0x1e4, 0x10, 0, 0, PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_RX_DV__CAN2_RX	IOMUX_PAD(FEC_RX_DV, CAN2_RX, 0x3dc, 0x1e4, 0x14, 0x484, 0, PAD_CTL_PULL_UP_22K)
-+#define MX25_PAD_FEC_RX_DV__GPIO_3_12	IOMUX_PAD(FEC_RX_DV, GPIO_3_12, 0x3dc, 0x1e4, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_FEC_TX_CLK__FEC_TX_CLK	IOMUX_PAD(FEC_TX_CLK, FEC_TX_CLK, 0x3e0, 0x1e8, 0x10, 0, 0, PAD_CTL_HYSTERESIS | PAD_CTL_PULL_DOWN_100K | PAD_CTL_SLEW_RATE_FAST)
-+#define MX25_PAD_FEC_TX_CLK__GPIO_3_13	IOMUX_PAD(FEC_TX_CLK, GPIO_3_13, 0x3e0, 0x1e8, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_RTCK__RTCK		IOMUX_PAD(RTCK, RTCK, 0x3e4, 0x1ec, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_RTCK__OWIRE		IOMUX_PAD(RTCK, OWIRE, 0x3e4, 0x1ec, 0x11, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_RTCK__GPIO_3_14	IOMUX_PAD(RTCK, GPIO_3_14, 0x3e4, 0x1ec, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_DE_B__DE_B		IOMUX_PAD(DE_B, DE_B, 0x3ec, 0x1f0, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_DE_B__GPIO_2_20	IOMUX_PAD(DE_B, GPIO_2_20, 0x3ec, 0x1f0, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_TDO__TDO		IOMUX_PAD(TDO, TDO, 0x3e8, 0x000, 0x00, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_A__GPIO_A		IOMUX_PAD(GPIO_A, GPIO_A, 0x3f0, 0x1f4, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_A__CAN1_TX	IOMUX_PAD(GPIO_A, CAN1_TX, 0x3f0, 0x1f4, 0x16, 0, 0, PAD_CTL_PULL_UP_22K | PAD_CTL_OUTPUT_OPEN_DRAIN | PAD_CTL_DRIVE_STRENGTH_MAX)
-+#define MX25_PAD_GPIO_A__USBOTG_PWR	IOMUX_PAD(GPIO_A, USBOTG_PWR, 0x3f0, 0x1f4, 0x12, 0, 0, PAD_CTL_PULL_KEEPER)
-+#define MX25_PAD_GPIO_B__GPIO_B		IOMUX_PAD(GPIO_B, GPIO_B, 0x3f4, 0x1f8, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_B__CAN1_RX	IOMUX_PAD(GPIO_B, CAN1_RX, 0x3f4, 0x1f8, 0x16, 0x480, 1, PAD_CTL_PULL_UP_22K | PAD_CTL_OUTPUT_OPEN_DRAIN)
-+#define MX25_PAD_GPIO_B__USBOTG_OC	IOMUX_PAD(GPIO_B, USBOTG_OC, 0x3f4, 0x1f8, 0x12, 0x57c, 1, PAD_CTL_PULL_UP_100K)
-+#define MX25_PAD_GPIO_C__GPIO_C		IOMUX_PAD(GPIO_C, GPIO_C, 0x3f8, 0x1fc, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_C__CAN2_TX	IOMUX_PAD(GPIO_C, CAN2_TX, 0x3f8, 0x1fc, 0x16, 0, 0, PAD_CTL_PULL_UP_22K | PAD_CTL_OUTPUT_OPEN_DRAIN | PAD_CTL_DRIVE_STRENGTH_MAX)
-+#define MX25_PAD_GPIO_D__GPIO_D		IOMUX_PAD(GPIO_D, GPIO_D, 0x3fc, 0x200, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_D__CAN2_RX	IOMUX_PAD(GPIO_D, CAN2_RX, 0x3fc, 0x200, 0x16, 0x484, 1, PAD_CTL_PULL_UP_22K)
-+#define MX25_PAD_GPIO_E__GPIO_E		IOMUX_PAD(GPIO_E, GPIO_E, 0x400, 0x204, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_E__AUD7_TXD	IOMUX_PAD(GPIO_E, AUD7_TXD, 0x400, 0x204, 0x14, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_F__GPIO_F		IOMUX_PAD(GPIO_F, GPIO_F, 0x404, 0x208, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_GPIO_F__AUD7_TXC	IOMUX_PAD(GPIO_F, AUD7_TXC, 0x404, 0x208, 0x14, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_EXT_ARMCLK__EXT_ARMCLK	IOMUX_PAD(EXT_ARMCLK, EXT_ARMCLK, 0x000, 0x20c, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_EXT_ARMCLK__GPIO_3_15	IOMUX_PAD(EXT_ARMCLK, GPIO_3_15, 0x000, 0x20c, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_UPLL_BYPCLK__UPLL_BYPCLK IOMUX_PAD(UPLL_BYPCLK, UPLL_BYPCLK, 0x000, 0x210, 0x10, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_UPLL_BYPCLK__GPIO_3_16	IOMUX_PAD(UPLL_BYPCLK, GPIO_3_16, 0x000, 0x210, 0x15, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_VSTBY_REQ__VSTBY_REQ	IOMUX_PAD(VSTBY_REQ, VSTBY_REQ, 0x408, 0x214, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_VSTBY_REQ__AUD7_TXFS	IOMUX_PAD(VSTBY_REQ, AUD7_TXFS, 0x408, 0x214, 0x14, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_VSTBY_REQ__GPIO_3_17	IOMUX_PAD(VSTBY_REQ, GPIO_3_17, 0x408, 0x214, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_VSTBY_ACK__VSTBY_ACK	IOMUX_PAD(VSTBY_ACK, VSTBY_ACK, 0x40c, 0x218, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_VSTBY_ACK__GPIO_3_18	IOMUX_PAD(VSTBY_ACK, GPIO_3_18, 0x40c, 0x218, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_POWER_FAIL__POWER_FAIL	IOMUX_PAD(POWER_FAIL, POWER_FAIL, 0x410, 0x21c, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_POWER_FAIL__AUD7_RXD	IOMUX_PAD(POWER_FAIL, AUD7_RXD, 0x410, 0x21c, 0x14, 0x478, 1, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_POWER_FAIL__GPIO_3_19	IOMUX_PAD(POWER_FAIL, GPIO_3_19, 0x410, 0x21c, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CLKO__CLKO		IOMUX_PAD(CLKO, CLKO, 0x414, 0x220, 0x10, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_CLKO__GPIO_2_21	IOMUX_PAD(CLKO, GPIO_2_21, 0x414, 0x220, 0x15, 0, 0, 0 | NO_PAD_CTRL)
-+#define MX25_PAD_BOOT_MODE0__BOOT_MODE0	IOMUX_PAD(BOOT_MODE0, BOOT_MODE0, 0x000, 0x224, 0x00, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_BOOT_MODE0__GPIO_4_30	IOMUX_PAD(BOOT_MODE0, GPIO_4_30, 0x000, 0x224, 0x05, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_BOOT_MODE1__BOOT_MODE1	IOMUX_PAD(BOOT_MODE1, BOOT_MODE1, 0x000, 0x228, 0x00, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_BOOT_MODE1__GPIO_4_31	IOMUX_PAD(BOOT_MODE1, GPIO_4_31, 0x000, 0x228, 0x05, 0, 0, NO_PAD_CTRL)
- 
--#define MX25_PAD_CTL_GRP_DVS_MISC		IOMUX_PAD(0x418, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DSE_FEC		IOMUX_PAD(0x41c, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DVS_JTAG		IOMUX_PAD(0x420, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DSE_NFC		IOMUX_PAD(0x424, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DSE_CSI		IOMUX_PAD(0x428, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DSE_WEIM		IOMUX_PAD(0x42c, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DSE_DDR		IOMUX_PAD(0x430, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DVS_CRM		IOMUX_PAD(0x434, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DSE_KPP		IOMUX_PAD(0x438, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DSE_SDHC1		IOMUX_PAD(0x43c, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DSE_LCD		IOMUX_PAD(0x440, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DSE_UART		IOMUX_PAD(0x444, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DVS_NFC		IOMUX_PAD(0x448, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DVS_CSI		IOMUX_PAD(0x44c, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DSE_CSPI1		IOMUX_PAD(0x450, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DDRTYPE		IOMUX_PAD(0x454, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DVS_SDHC1		IOMUX_PAD(0x458, 0x000, 0, 0, 0, NO_PAD_CTRL)
--#define MX25_PAD_CTL_GRP_DVS_LCD		IOMUX_PAD(0x45c, 0x000, 0, 0, 0, NO_PAD_CTRL)
--
--#if 0
--enum {
--	GPIO_A,
--	GPIO_B,
--	GPIO_C,
--	GPIO_D,
--	GPIO_E,
--	GPIO_F,
--	GPIO_1_6,
--	GPIO_1_7,
--	GPIO_1_8,
--	GPIO_1_9,
--	GPIO_1_10,
--	GPIO_1_11,
--	GPIO_1_12,
--	GPIO_1_13,
--	GPIO_1_14,
--	GPIO_1_15,
--	GPIO_1_16,
--	GPIO_1_17,
--	GPIO_1_18,
--	GPIO_1_19,
--	GPIO_1_20,
--	GPIO_1_21,
--	GPIO_1_22,
--	GPIO_1_23,
--	GPIO_1_24,
--	GPIO_1_25,
--	GPIO_1_26,
--	GPIO_1_27,
--	GPIO_1_28,
--	GPIO_1_29,
--	GPIO_1_30,
--	GPIO_1_31,
--	GPIO_2_0,
--	GPIO_2_1,
--	GPIO_2_2,
--	GPIO_2_3,
--	GPIO_2_4,
--	GPIO_2_5,
--	GPIO_2_6,
--	GPIO_2_7,
--	GPIO_2_8,
--	GPIO_2_9,
--	GPIO_2_10,
--	GPIO_2_11,
--	GPIO_2_12,
--	GPIO_2_13,
--	GPIO_2_14,
--	GPIO_2_15,
--	GPIO_2_16,
--	GPIO_2_17,
--	GPIO_2_18,
--	GPIO_2_19,
--	GPIO_2_20,
--	GPIO_2_21,
--	GPIO_2_22,
--	GPIO_2_23,
--	GPIO_2_24,
--	GPIO_2_25,
--	GPIO_2_26,
--	GPIO_2_27,
--	GPIO_2_28,
--	GPIO_2_29,
--	GPIO_2_30,
--	GPIO_2_31,
--	GPIO_3_0,
--	GPIO_3_1,
--	GPIO_3_2,
--	GPIO_3_3,
--	GPIO_3_4,
--	GPIO_3_5,
--	GPIO_3_6,
--	GPIO_3_7,
--	GPIO_3_8,
--	GPIO_3_9,
--	GPIO_3_10,
--	GPIO_3_11,
--	GPIO_3_12,
--	GPIO_3_13,
--	GPIO_3_14,
--	GPIO_3_15,
--	GPIO_3_16,
--	GPIO_3_17,
--	GPIO_3_18,
--	GPIO_3_19,
--	GPIO_3_20,
--	GPIO_3_21,
--	GPIO_3_22,
--	GPIO_3_23,
--	GPIO_3_24,
--	GPIO_3_25,
--	GPIO_3_26,
--	GPIO_3_27,
--	GPIO_3_28,
--	GPIO_3_29,
--	GPIO_3_30,
--	GPIO_3_31,
--	GPIO_4_0,
--	GPIO_4_1,
--	GPIO_4_2,
--	GPIO_4_3,
--	GPIO_4_4,
--	GPIO_4_5,
--	GPIO_4_6,
--	GPIO_4_7,
--	GPIO_4_8,
--	GPIO_4_9,
--	GPIO_4_10,
--	GPIO_4_11,
--	GPIO_4_12,
--	GPIO_4_13,
--	GPIO_4_14,
--	GPIO_4_15,
--	GPIO_4_16,
--	GPIO_4_17,
--	GPIO_4_18,
--	GPIO_4_19,
--	GPIO_4_20,
--	GPIO_4_21,
--	GPIO_4_22,
--	GPIO_4_23,
--	GPIO_4_24,
--	GPIO_4_25,
--	GPIO_4_26,
--	GPIO_4_27,
--	GPIO_4_28,
--	GPIO_4_29,
--	GPIO_4_30,
--	GPIO_4_31,
--};
-+#define MX25_PAD_CTL_GRP_DVS_MISC	IOMUX_PAD(0x418, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_FEC	IOMUX_PAD(0x41c, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DVS_JTAG	IOMUX_PAD(0x420, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_NFC	IOMUX_PAD(0x424, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_CSI	IOMUX_PAD(0x428, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_WEIM	IOMUX_PAD(0x42c, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_DDR	IOMUX_PAD(0x430, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DVS_CRM	IOMUX_PAD(0x434, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_KPP	IOMUX_PAD(0x438, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_SDHC1	IOMUX_PAD(0x43c, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_LCD	IOMUX_PAD(0x440, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_UART	IOMUX_PAD(0x444, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DVS_NFC	IOMUX_PAD(0x448, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DVS_CSI	IOMUX_PAD(0x44c, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DSE_CSPI1	IOMUX_PAD(0x450, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DDRTYPE	IOMUX_PAD(0x454, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DVS_SDHC1	IOMUX_PAD(0x458, 0x000, 0, 0, 0, NO_PAD_CTRL)
-+#define MX25_PAD_CTL_GRP_DVS_LCD	IOMUX_PAD(0x45c, 0x000, 0, 0, 0, NO_PAD_CTRL)
- 
- #define IOMUX_TO_GPIO(__pad_desc) ({		\
- 	int __gpio = -1;			\
-@@ -510,396 +380,395 @@ enum {
- 						\
- 	switch (__pd->mux_ctrl_ofs) {		\
- 	case MX25_PAD_GPIO_A__GPIO_A:		\
--		__gpio = GPIO_A;		\
--		break;				\
-+	__gpio = GPIO_A;			\
-+	break;					\
- 	case MX25_PAD_GPIO_B__GPIO_B:		\
--		__gpio = GPIO_B;		\
--		break;				\
-+	__gpio = GPIO_B;			\
-+	break;					\
- 	case MX25_PAD_GPIO_C__GPIO_C:		\
--		__gpio = GPIO_C;		\
--		break;				\
-+	__gpio = GPIO_C;			\
-+	break;					\
- 	case MX25_PAD_GPIO_D__GPIO_D:		\
--		__gpio = GPIO_D;		\
--		break;				\
-+	__gpio = GPIO_D;			\
-+	break;					\
- 	case MX25_PAD_GPIO_E__GPIO_E:		\
--		__gpio = GPIO_E;		\
--		break;				\
-+	__gpio = GPIO_E;			\
-+	break;					\
- 	case MX25_PAD_GPIO_F__GPIO_F:		\
--		__gpio = GPIO_F;		\
--		break;				\
-+	__gpio = GPIO_F;			\
-+	break;					\
- 	case MX25_PAD_CSI_D7__GPIO_1_6:		\
--		__gpio = GPIO_1_6;		\
--		break;				\
-+	__gpio = GPIO_1_6;			\
-+	break;					\
- 	case MX25_PAD_CSI_D8__GPIO_1_7:		\
--		__gpio = GPIO_1_7;		\
--		break;				\
-+	__gpio = GPIO_1_7;			\
-+	break;					\
- 	case MX25_PAD_CSI_MCLK__GPIO_1_8:	\
--		__gpio = GPIO_1_8;		\
--		break;				\
-+	__gpio = GPIO_1_8;			\
-+	break;					\
- 	case MX25_PAD_CSI_VSYNC__GPIO_1_9:	\
--		__gpio = GPIO_1_9;		\
--		break;				\
-+	__gpio = GPIO_1_9;			\
-+	break;					\
- 	case MX25_PAD_CSI_HSYNC__GPIO_1_10:	\
--		__gpio = GPIO_1_10;		\
--		break;				\
-+	__gpio = GPIO_1_10;			\
-+	break;					\
- 	case MX25_PAD_CSI_PIXCLK__GPIO_1_11:	\
--		__gpio = GPIO_1_11;		\
--		break;				\
-+	__gpio = GPIO_1_11;			\
-+	break;					\
- 	case MX25_PAD_I2C1_CLK__GPIO_1_12:	\
--		__gpio = GPIO_1_12;		\
--		break;				\
-+	__gpio = GPIO_1_12;			\
-+	break;					\
- 	case MX25_PAD_I2C1_DAT__GPIO_1_13:	\
--		__gpio = GPIO_1_13;		\
--		break;				\
-+	__gpio = GPIO_1_13;			\
-+	break;					\
- 	case MX25_PAD_CSPI1_MOSI__GPIO_1_14:	\
--		__gpio = GPIO_1_14;		\
--		break;				\
-+	__gpio = GPIO_1_14;			\
-+	break;					\
- 	case MX25_PAD_CSPI1_MISO__GPIO_1_15:	\
--		__gpio = GPIO_1_15;		\
--		break;				\
-+	__gpio = GPIO_1_15;			\
-+	break;					\
- 	case MX25_PAD_CSPI1_SS0__GPIO_1_16:	\
--		__gpio = GPIO_1_16;		\
--		break;				\
-+	__gpio = GPIO_1_16;			\
-+	break;					\
- 	case MX25_PAD_CSPI1_SS1__GPIO_1_17:	\
--		__gpio = GPIO_1_17;		\
--		break;				\
-+	__gpio = GPIO_1_17;			\
-+	break;					\
- 	case MX25_PAD_CSPI1_SCLK__GPIO_1_18:	\
--		__gpio = GPIO_1_18;		\
--		break;				\
-+	__gpio = GPIO_1_18;			\
-+	break;					\
- 	case MX25_PAD_LD5__GPIO_1_19:		\
--		__gpio = GPIO_1_19;		\
--		break;				\
-+	__gpio = GPIO_1_19;			\
-+	break;					\
- 	case MX25_PAD_LD6__GPIO_1_20:		\
--		__gpio = GPIO_1_20;		\
--		break;				\
-+	__gpio = GPIO_1_20;			\
-+	break;					\
- 	case MX25_PAD_LD7__GPIO_1_21:		\
--		__gpio = GPIO_1_21;		\
--		break;				\
-+	__gpio = GPIO_1_21;			\
-+	break;					\
- 	case MX25_PAD_HSYNC__GPIO_1_22:		\
--		__gpio = GPIO_1_22;		\
--		break;				\
-+	__gpio = GPIO_1_22;			\
-+	break;					\
- 	case MX25_PAD_VSYNC__GPIO_1_23:		\
--		__gpio = GPIO_1_23;		\
--		break;				\
-+	__gpio = GPIO_1_23;			\
-+	break;					\
- 	case MX25_PAD_LSCLK__GPIO_1_24:		\
--		__gpio = GPIO_1_24;		\
--		break;				\
-+	__gpio = GPIO_1_24;			\
-+	break;					\
- 	case MX25_PAD_OE_ACD__GPIO_1_25:	\
--		__gpio = GPIO_1_25;		\
--		break;				\
-+	__gpio = GPIO_1_25;			\
-+	break;					\
- 	case MX25_PAD_PWM__GPIO_1_26:		\
--		__gpio = GPIO_1_26;		\
--		break;				\
-+	__gpio = GPIO_1_26;			\
-+	break;					\
- 	case MX25_PAD_CSI_D2__GPIO_1_27:	\
--		__gpio = GPIO_1_27;		\
--		break;				\
-+	__gpio = GPIO_1_27;			\
-+	break;					\
- 	case MX25_PAD_CSI_D3__GPIO_1_28:	\
--		__gpio = GPIO_1_28;		\
--		break;				\
-+	__gpio = GPIO_1_28;			\
-+	break;					\
- 	case MX25_PAD_CSI_D4__GPIO_1_29:	\
--		__gpio = GPIO_1_29;		\
--		break;				\
-+	__gpio = GPIO_1_29;			\
-+	break;					\
- 	case MX25_PAD_CSI_D5__GPIO_1_30:	\
--		__gpio = GPIO_1_30;		\
--		break;				\
-+	__gpio = GPIO_1_30;			\
-+	break;					\
- 	case MX25_PAD_CSI_D6__GPIO_1_31:	\
--		__gpio = GPIO_1_31;		\
--		break;				\
-+	__gpio = GPIO_1_31;			\
-+	break;					\
- 						\
- 	case MX25_PAD_A14__GPIO_2_0:		\
--		__gpio = GPIO_2_0;		\
--		break;				\
-+	__gpio = GPIO_2_0;			\
-+	break;					\
- 	case MX25_PAD_A15__GPIO_2_1:		\
--		__gpio = GPIO_2_1;		\
--		break;				\
-+	__gpio = GPIO_2_1;			\
-+	break;					\
- 	case MX25_PAD_A16__GPIO_2_2:		\
--		__gpio = GPIO_2_2;		\
--		break;				\
-+	__gpio = GPIO_2_2;			\
-+	break;					\
- 	case MX25_PAD_A17__GPIO_2_3:		\
--		__gpio = GPIO_2_3;		\
--		break;				\
-+	__gpio = GPIO_2_3;			\
-+	break;					\
- 	case MX25_PAD_A18__GPIO_2_4:		\
--		__gpio = GPIO_2_4;		\
--		break;				\
-+	__gpio = GPIO_2_4;			\
-+	break;					\
- 	case MX25_PAD_A19__GPIO_2_5:		\
--		__gpio = GPIO_2_5;		\
--		break;				\
-+	__gpio = GPIO_2_5;			\
-+	break;					\
- 	case MX25_PAD_A20__GPIO_2_6:		\
--		__gpio = GPIO_2_6;		\
--		break;				\
-+	__gpio = GPIO_2_6;			\
-+	break;					\
- 	case MX25_PAD_A21__GPIO_2_7:		\
--		__gpio = GPIO_2_7;		\
--		break;				\
-+	__gpio = GPIO_2_7;			\
-+	break;					\
- 	case MX25_PAD_A22__GPIO_2_8:		\
--		__gpio = GPIO_2_8;		\
--		break;				\
-+	__gpio = GPIO_2_8;			\
-+	break;					\
- 	case MX25_PAD_A23__GPIO_2_9:		\
--		__gpio = GPIO_2_9;		\
--		break;				\
-+	__gpio = GPIO_2_9;			\
-+	break;					\
- 	case MX25_PAD_A24__GPIO_2_10:		\
--		__gpio = GPIO_2_10;		\
--		break;				\
-+	__gpio = GPIO_2_10;			\
-+	break;					\
- 	case MX25_PAD_A25__GPIO_2_11:		\
--		__gpio = GPIO_2_11;		\
--		break;				\
-+	__gpio = GPIO_2_11;			\
-+	break;					\
- 	case MX25_PAD_EB0__GPIO_2_12:		\
--		__gpio = GPIO_2_12;		\
--		break;				\
-+	__gpio = GPIO_2_12;			\
-+	break;					\
- 	case MX25_PAD_EB1__GPIO_2_13:		\
--		__gpio = GPIO_2_13;		\
--		break;				\
-+	__gpio = GPIO_2_13;			\
-+	break;					\
- 	case MX25_PAD_OE__GPIO_2_14:		\
--		__gpio = GPIO_2_14;		\
--		break;				\
-+	__gpio = GPIO_2_14;			\
-+	break;					\
- 	case MX25_PAD_LD0__GPIO_2_15:		\
--		__gpio = GPIO_2_15;		\
--		break;				\
-+	__gpio = GPIO_2_15;			\
-+	break;					\
- 	case MX25_PAD_LD1__GPIO_2_16:		\
--		__gpio = GPIO_2_16;		\
--		break;				\
-+	__gpio = GPIO_2_16;			\
-+	break;					\
- 	case MX25_PAD_LD2__GPIO_2_17:		\
--		__gpio = GPIO_2_17;		\
--		break;				\
-+	__gpio = GPIO_2_17;			\
-+	break;					\
- 	case MX25_PAD_LD3__GPIO_2_18:		\
--		__gpio = GPIO_2_18;		\
--		break;				\
-+	__gpio = GPIO_2_18;			\
-+	break;					\
- 	case MX25_PAD_LD4__GPIO_2_19:		\
--		__gpio = GPIO_2_19;		\
--		break;				\
-+	__gpio = GPIO_2_19;			\
-+	break;					\
- 	case MX25_PAD_DE_B__GPIO_2_20:		\
--		__gpio = GPIO_2_20;		\
--		break;				\
-+	__gpio = GPIO_2_20;			\
-+	break;					\
- 	case MX25_PAD_CLKO__GPIO_2_21:		\
--		__gpio = GPIO_2_21;		\
--		break;				\
-+	__gpio = GPIO_2_21;			\
-+	break;					\
- 	case MX25_PAD_CSPI1_RDY__GPIO_2_22:	\
--		__gpio = GPIO_2_22;		\
--		break;				\
-+	__gpio = GPIO_2_22;			\
-+	break;					\
- 	case MX25_PAD_SD1_CMD__GPIO_2_23:	\
--		__gpio = GPIO_2_23;		\
--		break;				\
-+	__gpio = GPIO_2_23;			\
-+	break;					\
- 	case MX25_PAD_SD1_CLK__GPIO_2_24:	\
--		__gpio = GPIO_2_24;		\
--		break;				\
-+	__gpio = GPIO_2_24;			\
-+	break;					\
- 	case MX25_PAD_SD1_DATA0__GPIO_2_25:	\
--		__gpio = GPIO_2_25;		\
--		break;				\
-+	__gpio = GPIO_2_25;			\
-+	break;					\
- 	case MX25_PAD_SD1_DATA1__GPIO_2_26:	\
--		__gpio = GPIO_2_26;		\
--		break;				\
-+	__gpio = GPIO_2_26;			\
-+	break;					\
- 	case MX25_PAD_SD1_DATA2__GPIO_2_27:	\
--		__gpio = GPIO_2_27;		\
--		break;				\
-+	__gpio = GPIO_2_27;			\
-+	break;					\
- 	case MX25_PAD_SD1_DATA3__GPIO_2_28:	\
--		__gpio = GPIO_2_28;		\
--		break;				\
-+	__gpio = GPIO_2_28;			\
-+	break;					\
- 	case MX25_PAD_KPP_ROW0__GPIO_2_29:	\
--		__gpio = GPIO_2_29;		\
--		break;				\
-+	__gpio = GPIO_2_29;			\
-+	break;					\
- 	case MX25_PAD_KPP_ROW1__GPIO_2_30:	\
--		__gpio = GPIO_2_30;		\
--		break;				\
-+	__gpio = GPIO_2_30;			\
-+	break;					\
- 	case MX25_PAD_KPP_ROW2__GPIO_2_31:	\
--		__gpio = GPIO_2_31;		\
--		break;				\
-+	__gpio = GPIO_2_31;			\
-+	break;					\
- 						\
- 	case MX25_PAD_KPP_ROW3__GPIO_3_0:	\
--		__gpio = GPIO_3_0;		\
--		break;				\
-+	__gpio = GPIO_3_0;			\
-+	break;					\
- 	case MX25_PAD_KPP_COL0__GPIO_3_1:	\
--		__gpio = GPIO_3_1;		\
--		break;				\
-+	__gpio = GPIO_3_1;			\
-+	break;					\
- 	case MX25_PAD_KPP_COL1__GPIO_3_2:	\
--		__gpio = GPIO_3_2;		\
--		break;				\
-+	__gpio = GPIO_3_2;			\
-+	break;					\
- 	case MX25_PAD_KPP_COL2__GPIO_3_3:	\
--		__gpio = GPIO_3_3;		\
--		break;				\
-+	__gpio = GPIO_3_3;			\
-+	break;					\
- 	case MX25_PAD_KPP_COL3__GPIO_3_4:	\
--		__gpio = GPIO_3_4;		\
--		break;				\
-+	__gpio = GPIO_3_4;			\
-+	break;					\
- 	case MX25_PAD_FEC_MDC__GPIO_3_5:	\
--		__gpio = GPIO_3_5;		\
--		break;				\
-+	__gpio = GPIO_3_5;			\
-+	break;					\
- 	case MX25_PAD_FEC_MDIO__GPIO_3_6:	\
--		__gpio = GPIO_3_6;		\
--		break;				\
-+	__gpio = GPIO_3_6;			\
-+	break;					\
- 	case MX25_PAD_FEC_TDATA0__GPIO_3_7:	\
--		__gpio = GPIO_3_7;		\
--		break;				\
-+	__gpio = GPIO_3_7;			\
-+	break;					\
- 	case MX25_PAD_FEC_TDATA1__GPIO_3_8:	\
--		__gpio = GPIO_3_8;		\
--		break;				\
-+	__gpio = GPIO_3_8;			\
-+	break;					\
- 	case MX25_PAD_FEC_TX_EN__GPIO_3_9:	\
--		__gpio = GPIO_3_9;		\
--		break;				\
-+	__gpio = GPIO_3_9;			\
-+	break;					\
- 	case MX25_PAD_FEC_RDATA0__GPIO_3_10:	\
--		__gpio = GPIO_3_10;		\
--		break;				\
-+	__gpio = GPIO_3_10;			\
-+	break;					\
- 	case MX25_PAD_FEC_RDATA1__GPIO_3_11:	\
--		__gpio = GPIO_3_11;		\
--		break;				\
-+	__gpio = GPIO_3_11;			\
-+	break;					\
- 	case MX25_PAD_FEC_RX_DV__GPIO_3_12:	\
--		__gpio = GPIO_3_12;		\
--		break;				\
-+	__gpio = GPIO_3_12;			\
-+	break;					\
- 	case MX25_PAD_FEC_TX_CLK__GPIO_3_13:	\
--		__gpio = GPIO_3_13;		\
--		break;				\
-+	__gpio = GPIO_3_13;			\
-+	break;					\
- 	case MX25_PAD_RTCK__GPIO_3_14:		\
--		__gpio = GPIO_3_14;		\
--		break;				\
-+	__gpio = GPIO_3_14;			\
-+	break;					\
- 	case MX25_PAD_EXT_ARMCLK__GPIO_3_15:	\
--		__gpio = GPIO_3_15;		\
--		break;				\
-+	__gpio = GPIO_3_15;			\
-+	break;					\
- 	case MX25_PAD_UPLL_BYPCLK__GPIO_3_16:	\
--		__gpio = GPIO_3_16;		\
--		break;				\
-+	__gpio = GPIO_3_16;			\
-+	break;					\
- 	case MX25_PAD_VSTBY_REQ__GPIO_3_17:	\
--		__gpio = GPIO_3_17;		\
--		break;				\
-+	__gpio = GPIO_3_17;			\
-+	break;					\
- 	case MX25_PAD_VSTBY_ACK__GPIO_3_18:	\
--		__gpio = GPIO_3_18;		\
--		break;				\
-+	__gpio = GPIO_3_18;			\
-+	break;					\
- 	case MX25_PAD_POWER_FAIL__GPIO_3_19:	\
--		__gpio = GPIO_3_19;		\
--		break;				\
-+	__gpio = GPIO_3_19;			\
-+	break;					\
- 	case MX25_PAD_CS4__GPIO_3_20:		\
--		__gpio = GPIO_3_20;		\
--		break;				\
-+	__gpio = GPIO_3_20;			\
-+	break;					\
- 	case MX25_PAD_CS5__GPIO_3_21:		\
--		__gpio = GPIO_3_21;		\
--		break;				\
-+	__gpio = GPIO_3_21;			\
-+	break;					\
- 	case MX25_PAD_NF_CE0__GPIO_3_22:	\
--		__gpio = GPIO_3_22;		\
--		break;				\
-+	__gpio = GPIO_3_22;			\
-+	break;					\
- 	case MX25_PAD_ECB__GPIO_3_23:		\
--		__gpio = GPIO_3_23;		\
--		break;				\
-+	__gpio = GPIO_3_23;			\
-+	break;					\
- 	case MX25_PAD_LBA__GPIO_3_24:		\
--		__gpio = GPIO_3_24;		\
--		break;				\
-+	__gpio = GPIO_3_24;			\
-+	break;					\
- 	case MX25_PAD_RW__GPIO_3_25:		\
--		__gpio = GPIO_3_25;		\
--		break;				\
-+	__gpio = GPIO_3_25;			\
-+	break;					\
- 	case MX25_PAD_NFWE_B__GPIO_3_26:	\
--		__gpio = GPIO_3_26;		\
--		break;				\
-+	__gpio = GPIO_3_26;			\
-+	break;					\
- 	case MX25_PAD_NFRE_B__GPIO_3_27:	\
--		__gpio = GPIO_3_27;		\
--		break;				\
-+	__gpio = GPIO_3_27;			\
-+	break;					\
- 	case MX25_PAD_NFALE__GPIO_3_28:		\
--		__gpio = GPIO_3_28;		\
--		break;				\
-+	__gpio = GPIO_3_28;			\
-+	break;					\
- 	case MX25_PAD_NFCLE__GPIO_3_29:		\
--		__gpio = GPIO_3_29;		\
--		break;				\
-+	__gpio = GPIO_3_29;			\
-+	break;					\
- 	case MX25_PAD_NFWP_B__GPIO_3_30:	\
--		__gpio = GPIO_3_30;		\
--		break;				\
-+	__gpio = GPIO_3_30;			\
-+	break;					\
- 	case MX25_PAD_NFRB__GPIO_3_31:		\
--		__gpio = GPIO_3_31;		\
--		break;				\
-+	__gpio = GPIO_3_31;			\
-+	break;					\
- 						\
- 	case MX25_PAD_A10__GPIO_4_0:		\
--		__gpio = GPIO_4_0;		\
--		break;				\
-+	__gpio = GPIO_4_0;			\
-+	break;					\
- 	case MX25_PAD_A13__GPIO_4_1:		\
--		__gpio = GPIO_4_1;		\
--		break;				\
-+	__gpio = GPIO_4_1;			\
-+	break;					\
- 	case MX25_PAD_CS0__GPIO_4_2:		\
--		__gpio = GPIO_4_2;		\
--		break;				\
-+	__gpio = GPIO_4_2;			\
-+	break;					\
- 	case MX25_PAD_CS1__GPIO_4_3:		\
--		__gpio = GPIO_4_3;		\
--		break;				\
-+	__gpio = GPIO_4_3;			\
-+	break;					\
- 	case MX25_PAD_BCLK__GPIO_4_4:		\
--		__gpio = GPIO_4_4;		\
--		break;				\
-+	__gpio = GPIO_4_4;			\
-+	break;					\
- 	case MX25_PAD_D15__GPIO_4_5:		\
--		__gpio = GPIO_4_5;		\
--		break;				\
-+	__gpio = GPIO_4_5;			\
-+	break;					\
- 	case MX25_PAD_D14__GPIO_4_6:		\
--		__gpio = GPIO_4_6;		\
--		break;				\
-+	__gpio = GPIO_4_6;			\
-+	break;					\
- 	case MX25_PAD_D13__GPIO_4_7:		\
--		__gpio = GPIO_4_7;		\
--		break;				\
-+	__gpio = GPIO_4_7;			\
-+	break;					\
- 	case MX25_PAD_D12__GPIO_4_8:		\
--		__gpio = GPIO_4_8;		\
--		break;				\
-+	__gpio = GPIO_4_8;			\
-+	break;					\
- 	case MX25_PAD_D11__GPIO_4_9:		\
--		__gpio = GPIO_4_9;		\
--		break;				\
-+	__gpio = GPIO_4_9;			\
-+	break;					\
- 	case MX25_PAD_D10__GPIO_4_10:		\
--		__gpio = GPIO_4_10;		\
--		break;				\
-+	__gpio = GPIO_4_10;			\
-+	break;					\
- 	case MX25_PAD_D9__GPIO_4_11:		\
--		__gpio = GPIO_4_11;		\
--		break;				\
-+	__gpio = GPIO_4_11;			\
-+	break;					\
- 	case MX25_PAD_D8__GPIO_4_12:		\
--		__gpio = GPIO_4_12;		\
--		break;				\
-+	__gpio = GPIO_4_12;			\
-+	break;					\
- 	case MX25_PAD_D7__GPIO_4_13:		\
--		__gpio = GPIO_4_13;		\
--		break;				\
-+	__gpio = GPIO_4_13;			\
-+	break;					\
- 	case MX25_PAD_D6__GPIO_4_14:		\
--		__gpio = GPIO_4_14;		\
--		break;				\
-+	__gpio = GPIO_4_14;			\
-+	break;					\
- 	case MX25_PAD_D5__GPIO_4_15:		\
--		__gpio = GPIO_4_15;		\
--		break;				\
-+	__gpio = GPIO_4_15;			\
-+	break;					\
- 	case MX25_PAD_D4__GPIO_4_16:		\
--		__gpio = GPIO_4_16;		\
--		break;				\
-+	__gpio = GPIO_4_16;			\
-+	break;					\
- 	case MX25_PAD_D3__GPIO_4_17:		\
--		__gpio = GPIO_4_17;		\
--		break;				\
-+	__gpio = GPIO_4_17;			\
-+	break;					\
- 	case MX25_PAD_D2__GPIO_4_18:		\
--		__gpio = GPIO_4_18;		\
--		break;				\
-+	__gpio = GPIO_4_18;			\
-+	break;					\
- 	case MX25_PAD_D1__GPIO_4_19:		\
--		__gpio = GPIO_4_19;		\
--		break;				\
-+	__gpio = GPIO_4_19;			\
-+	break;					\
- 	case MX25_PAD_D0__GPIO_4_20:		\
--		__gpio = GPIO_4_20;		\
--		break;				\
-+	__gpio = GPIO_4_20;			\
-+	break;					\
- 	case MX25_PAD_CSI_D9__GPIO_4_21:	\
--		__gpio = GPIO_4_21;		\
--		break;				\
-+	__gpio = GPIO_4_21;			\
-+	break;					\
- 	case MX25_PAD_UART1_RXD__GPIO_4_22:	\
--		__gpio = GPIO_4_22;		\
--		break;				\
-+	__gpio = GPIO_4_22;			\
-+	break;					\
- 	case MX25_PAD_UART1_TXD__GPIO_4_23:	\
--		__gpio = GPIO_4_23;		\
--		break;				\
-+	__gpio = GPIO_4_23;			\
-+	break;					\
- 	case MX25_PAD_UART1_RTS__GPIO_4_24:	\
--		__gpio = GPIO_4_24;		\
--		break;				\
-+	__gpio = GPIO_4_24;			\
-+	break;					\
- 	case MX25_PAD_UART1_CTS__GPIO_4_25:	\
--		__gpio = GPIO_4_25;		\
--		break;				\
-+	__gpio = GPIO_4_25;			\
-+	break;					\
- 	case MX25_PAD_UART2_RXD__GPIO_4_26:	\
--		__gpio = GPIO_4_26;		\
--		break;				\
-+	__gpio = GPIO_4_26;			\
-+	break;					\
- 	case MX25_PAD_UART2_TXD__GPIO_4_27:	\
--		__gpio = GPIO_4_27;		\
--		break;				\
-+	__gpio = GPIO_4_27;			\
-+	break;					\
- 	case MX25_PAD_UART2_RTS__GPIO_4_28:	\
--		__gpio = GPIO_4_28;		\
--		break;				\
-+	__gpio = GPIO_4_28;			\
-+	break;					\
- 	case MX25_PAD_UART2_CTS__GPIO_4_29:	\
--		__gpio = GPIO_4_29;		\
--		break;				\
-+	__gpio = GPIO_4_29;			\
-+	break;					\
- 	case MX25_PAD_BOOT_MODE0__GPIO_4_30:	\
--		__gpio = GPIO_4_30;		\
--		break;				\
-+	__gpio = GPIO_4_30;			\
-+	break;					\
- 	case MX25_PAD_BOOT_MODE1__GPIO_4_31:	\
--		__gpio = GPIO_4_31;		\
--		break;				\
-+	__gpio = GPIO_4_31;			\
-+	break;					\
- 	}					\
- 	__gpio;					\
- })
--#endif
- 
- #endif // __ASSEMBLY__
- #endif // __IOMUX_MX25_H__
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/iomux-v3.h linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/include/mach/iomux-v3.h
---- linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/iomux-v3.h	2009-06-02 18:02:08.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/include/mach/iomux-v3.h	2009-06-25 15:27:32.000000000 +0200
-@@ -52,18 +52,37 @@ struct pad_desc {
- 	unsigned pad_ctrl:17;
- 	unsigned select_input_ofs:12; /* IOMUXC_SELECT_INPUT offset */
- 	unsigned select_input:3;
-+#ifdef IOMUX_DEBUG
-+	char *name;
-+#endif
- };
- 
--#define IOMUX_PAD(_pad, _func, _pad_ctrl_ofs, _mux_ctrl_ofs, _mux_mode, _select_input_ofs, \
--		_select_input, _pad_ctrl)				\
--		{							\
--			.mux_ctrl_ofs     = _mux_ctrl_ofs,		\
--			.mux_mode         = _mux_mode,			\
--			.pad_ctrl_ofs     = _pad_ctrl_ofs,		\
--			.pad_ctrl         = _pad_ctrl,			\
--			.select_input_ofs = _select_input_ofs,		\
--			.select_input     = _select_input,		\
-+#ifdef IOMUX_DEBUG
-+#define MXC_PAD_NAME(pd)	(pd)->name
-+#define IOMUX_PAD(_pad, _func, _pad_ctrl_ofs, _mux_ctrl_ofs, _mux_mode, _select_input_ofs,	\
-+		_select_input, _pad_ctrl)							\
-+		{										\
-+			.mux_ctrl_ofs     = _mux_ctrl_ofs,					\
-+			.mux_mode         = _mux_mode,						\
-+			.pad_ctrl_ofs     = _pad_ctrl_ofs,					\
-+			.pad_ctrl         = _pad_ctrl,						\
-+			.select_input_ofs = _select_input_ofs,					\
-+			.select_input     = _select_input,					\
-+			.name		  = #_pad"__"#_func,					\
- 		}
-+#else
-+#define MXC_PAD_NAME(pd)	""
-+#define IOMUX_PAD(_pad, _func, _pad_ctrl_ofs, _mux_ctrl_ofs, _mux_mode, _select_input_ofs,	\
-+		_select_input, _pad_ctrl)							\
-+		{										\
-+			.mux_ctrl_ofs     = _mux_ctrl_ofs,					\
-+			.mux_mode         = _mux_mode,						\
-+			.pad_ctrl_ofs     = _pad_ctrl_ofs,					\
-+			.pad_ctrl         = _pad_ctrl,						\
-+			.select_input_ofs = _select_input_ofs,					\
-+			.select_input     = _select_input,					\
-+		}
-+#endif
- 
- /*
-  * Use to set PAD control
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/mx25.h linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/include/mach/mx25.h
---- linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/mx25.h	2009-06-02 18:02:13.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/include/mach/mx25.h	2009-07-01 11:21:51.000000000 +0200
-@@ -79,7 +79,7 @@
- #define I2C_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00080000)
- #define I2C3_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00084000)
- #define CAN1_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00088000)
--#define CAN3_BASE_ADDR		(AIPS1_BASE_ADDR + 0x0008C000)
-+#define CAN2_BASE_ADDR		(AIPS1_BASE_ADDR + 0x0008C000)
- #define UART1_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00090000)
- #define UART2_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00094000)
- #define I2C2_BASE_ADDR		(AIPS1_BASE_ADDR + 0x00098000)
-@@ -199,7 +199,8 @@
- #define RTIC_BASE_ADDR			(AIPS2_BASE_ADDR + 0x000EC000)
- #define IIM_BASE_ADDR			(AIPS2_BASE_ADDR + 0x000F0000)
- #define USBOTG_BASE_ADDR		(AIPS2_BASE_ADDR + 0x000F4000)
--#define OTG_BASE_ADDR			USBOTG_BASE_ADDR
-+#define OTG_BASE_ADDR			(USBOTG_BASE_ADDR + 0x000)
-+#define USBH2_BASE_ADDR			(USBOTG_BASE_ADDR + 0x400)
- #define CSI_BASE_ADDR			(AIPS2_BASE_ADDR + 0x000F8000)
- #define DRYICE_BASE_ADDR		(AIPS2_BASE_ADDR + 0x000FC000)
- 
-@@ -406,7 +407,7 @@
- #define MXC_INT_UART2			32
- #define MXC_INT_NANDFC			33
- #define MXC_INT_SDMA			34
--#define MXC_INT_USB_HTG			35
-+#define MXC_INT_USB_H2			35
- #define MXC_INT_PWM2			36
- #define MXC_INT_USB_OTG			37
- #define MXC_INT_SLCDC			38
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/mxc_can.h linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/include/mach/mxc_can.h
---- linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/mxc_can.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/include/mach/mxc_can.h	2009-07-01 11:31:19.000000000 +0200
-@@ -0,0 +1,26 @@
-+/*
-+ * Copyright (C) 2009  Lothar Wassmann <LW@KARO-electronics.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the:
-+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-+ */
-+
-+#include <linux/platform_device.h>
-+
-+struct flexcan_platform_data {
-+	char *core_reg;
-+	char *io_reg;
-+	int (*xcvr_enable)(struct platform_device *pdev, int en);
-+	int (*active)(struct platform_device *pdev);
-+	void (*inactive)(struct platform_device *pdev);
-+};
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/mxc_ehci.h linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/include/mach/mxc_ehci.h
---- linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/mxc_ehci.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/include/mach/mxc_ehci.h	2009-07-01 11:31:34.000000000 +0200
-@@ -0,0 +1,9 @@
-+#ifndef __INCLUDE_ASM_ARCH_MXC_EHCI_H
-+#define __INCLUDE_ASM_ARCH_MXC_EHCI_H
-+
-+struct mxc_usbh_platform_data {
-+	int (*init)(struct platform_device *pdev);
-+	int (*exit)(struct platform_device *pdev);
-+};
-+#endif /* __INCLUDE_ASM_ARCH_MXC_EHCI_H */
-+
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/timex.h linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/include/mach/timex.h
---- linux-2.6.30-rc4-karo/arch/arm/plat-mxc/include/mach/timex.h	2009-06-02 18:02:12.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/include/mach/timex.h	2009-07-06 15:41:30.000000000 +0200
-@@ -26,7 +26,7 @@
- #ifndef CONFIG_MACH_MX25
- #define CLOCK_TICK_RATE		13300000
- #else
--#define CLOCK_TICK_RATE		12000000
-+#define CLOCK_TICK_RATE		66500000
- #endif
- #elif defined CONFIG_ARCH_MX3
- #define CLOCK_TICK_RATE		16625000
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/plat-mxc/system.c linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/system.c
---- linux-2.6.30-rc4-karo/arch/arm/plat-mxc/system.c	2009-06-08 11:16:01.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/system.c	2009-06-29 10:49:32.000000000 +0200
-@@ -39,16 +39,11 @@
- #define WDOG_WCR_ENABLE		(1 << 2)
- #endif
- 
--static struct clk *mxc_wdt_clk;
--
- /*
-  * Reset the system. It is called by machine_restart().
-  */
- void arch_reset(char mode, const char *cmd)
- {
--	if (mxc_wdt_clk)
--		clk_enable(mxc_wdt_clk);
--
- 	/* Assert SRS signal */
- 	__raw_writew(WDOG_WCR_ENABLE, WDOG_WCR_REG);
- 
-@@ -66,17 +61,19 @@ void arch_reset(char mode, const char *c
- 
- static int mxc_wdt_init(void)
- {
-+	struct clk *wdt_clk;
-+
- 	if (cpu_is_mx1())
- 		return 0;
- 
--	mxc_wdt_clk = clk_get_sys("imx-wdt.0", NULL);
--	if (IS_ERR(mxc_wdt_clk)) {
--		int ret = PTR_ERR(mxc_wdt_clk);
--
--		printk(KERN_ERR "%s: Failed to get imx-wdt.0 clk: %d\n", __FUNCTION__, ret);
--		mxc_wdt_clk = NULL;
--		return ret;
-+	wdt_clk = clk_get_sys("imx-wdt.0", NULL);
-+	if (IS_ERR(wdt_clk)) {
-+		printk(KERN_ERR "%s: Failed to get imx-wdt.0 clk: %ld\n",
-+		       __FUNCTION__, PTR_ERR(wdt_clk));
-+		return PTR_ERR(wdt_clk);
- 	}
-+	clk_enable(wdt_clk);
-+	clk_put(wdt_clk);
- 	return 0;
- }
- arch_initcall(mxc_wdt_init);
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/arch/arm/plat-mxc/time.c linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/time.c
---- linux-2.6.30-rc4-karo/arch/arm/plat-mxc/time.c	2009-06-02 18:02:02.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/arch/arm/plat-mxc/time.c	2009-07-06 15:41:29.000000000 +0200
-@@ -287,7 +287,6 @@ void __init mxc_timer_init(struct clk *t
- 	int irq;
- 
- 	clk_enable(timer_clk);
--printk(KERN_DEBUG "%s: \n", __FUNCTION__);
- 
- 	if (cpu_is_mx1()) {
- #ifdef CONFIG_ARCH_MX1
-@@ -307,7 +306,6 @@ printk(KERN_DEBUG "%s: \n", __FUNCTION__
- 	} else
- 		BUG();
- 
--printk(KERN_DEBUG "%s: timer_base=%p IRQ=%d\n", __FUNCTION__, timer_base, irq);
- 	/*
- 	 * Initialise to a known state (all timers off, and timing reset)
- 	 */
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/drivers/input/touchscreen/mxc_tsadcc.c linux-2.6.30-rc4-karo2/drivers/input/touchscreen/mxc_tsadcc.c
---- linux-2.6.30-rc4-karo/drivers/input/touchscreen/mxc_tsadcc.c	2009-07-06 17:32:59.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/drivers/input/touchscreen/mxc_tsadcc.c	2009-07-01 11:27:20.000000000 +0200
-@@ -529,7 +529,7 @@ static irqreturn_t mxc_tsadcc_interrupt(
- 			reg |= CQMR_EOQ_IRQ_MSK;
- 			mxc_tsadcc_write(ts_dev, GCQMR, reg);
- 		}
--	}		
-+	}
- 	return IRQ_HANDLED;
- }
- 
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/drivers/net/can/Kconfig linux-2.6.30-rc4-karo2/drivers/net/can/Kconfig
---- linux-2.6.30-rc4-karo/drivers/net/can/Kconfig	2008-05-29 10:48:57.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/drivers/net/can/Kconfig	2009-07-01 11:28:55.000000000 +0200
-@@ -22,4 +22,21 @@ config CAN_DEBUG_DEVICES
- 	  a problem with CAN support and want to see more of what is going
- 	  on.
- 
-+config CAN_FLEXCAN
-+        tristate "Freescale FlexCAN"
-+        depends on CAN && (MACH_MX25 || ARCH_MX35)
-+        default m
-+        ---help---
-+          This select the support of Freescale CAN(FlexCAN).
-+          This driver can also be built as a module.
-+          If unsure, say N.
-+
-+config CAN_FLEXCAN_CAN1
-+	bool "Enable CAN1 interface on i.MX25/i.MX35"
-+	depends on CAN_FLEXCAN && (MACH_MX25 && !ARCH_MXC_EHCI_USBOTG)
-+
-+config CAN_FLEXCAN_CAN2
-+	bool "Enable CAN2 interface on i.MX25/i.MX35"
-+	depends on CAN_FLEXCAN
-+
- endmenu
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/drivers/net/can/Makefile linux-2.6.30-rc4-karo2/drivers/net/can/Makefile
---- linux-2.6.30-rc4-karo/drivers/net/can/Makefile	2008-05-29 10:48:57.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/drivers/net/can/Makefile	2009-07-01 11:29:31.000000000 +0200
-@@ -1,5 +1,9 @@
- #
- #  Makefile for the Linux Controller Area Network drivers.
- #
-+ifneq ($(CONFIG_CAN_DEBUG_DEVICES),)
-+	EXTRA_CFLAGS += -DDEBUG
-+endif
- 
- obj-$(CONFIG_CAN_VCAN)		+= vcan.o
-+obj-$(CONFIG_CAN_FLEXCAN)	+= flexcan.o
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/drivers/net/can/flexcan.c linux-2.6.30-rc4-karo2/drivers/net/can/flexcan.c
---- linux-2.6.30-rc4-karo/drivers/net/can/flexcan.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo2/drivers/net/can/flexcan.c	2009-07-06 15:46:51.000000000 +0200
-@@ -0,0 +1,1784 @@
-+/*
-+ * drivers/net/can/flexcan.c
-+ *
-+ * Copyright (C) 2009  Lothar Wassmann <LW@KARO-electronics.de>
-+ *
-+ * based on: drivers/net/can/flexcan/
-+ *   Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
-+ *
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the:
-+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-+ */
-+
-+/*
-+ * Driver for Freescale CAN Controller FlexCAN.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/slab.h>
-+#include <linux/netdevice.h>
-+#include <linux/if_arp.h>
-+#include <linux/if_ether.h>
-+#include <linux/platform_device.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/clk.h>
-+
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <mach/hardware.h>
-+#include <mach/mxc_can.h>
-+
-+#include "flexcan.h"
-+
-+#ifdef DEBUG
-+static int debug = 0;
-+#define dbg_lvl(n)	((n) < debug)
-+module_param(debug, int, S_IRUGO | S_IWUSR);
-+
-+#define DBG(lvl, fmt...)	do { if (dbg_lvl(lvl)) printk(KERN_DEBUG fmt); } while (0)
-+#else
-+static int debug;
-+#define dbg_lvl(n)	0
-+module_param(debug, int, 0);
-+
-+#define DBG(lvl, fmt...)	do { } while (0)
-+#endif
-+
-+#define ndev_dbg(d, l, fmt...)		do { if (dbg_lvl(l)) dev_dbg(&(d)->dev, fmt); } while (0)
-+#define pdev_dbg(p, l, fmt...)		do { if (dbg_lvl(l)) dev_dbg(&(p)->dev, fmt); } while (0)
-+#define flexcan_dbg(f, l, fmt...)	do { if (dbg_lvl(l)) dev_dbg(&(f)->dev->dev, fmt); } while (0)
-+
-+#define ndev_err(d, fmt...)	dev_err(&(d)->dev, fmt)
-+#define pdev_err(p, fmt...)	dev_err(&(p)->dev, fmt)
-+
-+enum {
-+	FLEXCAN_ATTR_STATE = 0,
-+	FLEXCAN_ATTR_BITRATE,
-+	FLEXCAN_ATTR_BR_PRESDIV,
-+	FLEXCAN_ATTR_BR_RJW,
-+	FLEXCAN_ATTR_BR_PROPSEG,
-+	FLEXCAN_ATTR_BR_PSEG1,
-+	FLEXCAN_ATTR_BR_PSEG2,
-+	FLEXCAN_ATTR_BR_CLKSRC,
-+	FLEXCAN_ATTR_MAXMB,
-+	FLEXCAN_ATTR_XMIT_MAXMB,
-+	FLEXCAN_ATTR_FIFO,
-+	FLEXCAN_ATTR_WAKEUP,
-+	FLEXCAN_ATTR_SRX_DIS,
-+	FLEXCAN_ATTR_WAK_SRC,
-+	FLEXCAN_ATTR_BCC,
-+	FLEXCAN_ATTR_LOCAL_PRIORITY,
-+	FLEXCAN_ATTR_ABORT,
-+	FLEXCAN_ATTR_LOOPBACK,
-+	FLEXCAN_ATTR_SMP,
-+	FLEXCAN_ATTR_BOFF_REC,
-+	FLEXCAN_ATTR_TSYN,
-+	FLEXCAN_ATTR_LISTEN,
-+	FLEXCAN_ATTR_EXTEND_MSG,
-+	FLEXCAN_ATTR_STANDARD_MSG,
-+#ifdef CONFIG_CAN_DEBUG_DEVICES
-+	FLEXCAN_ATTR_DUMP_REG,
-+	FLEXCAN_ATTR_DUMP_XMIT_MB,
-+	FLEXCAN_ATTR_DUMP_RX_MB,
-+#endif
-+	FLEXCAN_ATTR_MAX
-+};
-+
-+#ifdef DEBUG
-+#define flexcan_reg_read(f,r)	_flexcan_reg_read(f, r, #r, __FUNCTION__)
-+static inline unsigned long _flexcan_reg_read(struct flexcan_device *flexcan, int reg,
-+					      const char *name, const char *fn)
-+{
-+	unsigned long val;
-+	val = __raw_readl(flexcan->io_base + reg);
-+	DBG(2, "%s: Read %08lx from %s[%p]\n", fn, val, name,
-+	    flexcan->io_base + reg);
-+	return val;
-+}
-+
-+#define flexcan_reg_write(f,r,v)	_flexcan_reg_write(f, r, v, #r, __FUNCTION__)
-+static inline void _flexcan_reg_write(struct flexcan_device *flexcan, int reg, unsigned long val,
-+				      const char *name, const char *fn)
-+{
-+	DBG(2, "%s: Writing %08lx to %s[%p]\n", fn, val, name, flexcan->io_base + reg);
-+	__raw_writel(val, flexcan->io_base + reg);
-+}
-+#else
-+static inline unsigned long flexcan_reg_read(struct flexcan_device *flexcan, int reg)
-+{
-+	return __raw_readl(flexcan->io_base + reg);
-+}
-+
-+static inline void flexcan_reg_write(struct flexcan_device *flexcan, int reg, unsigned long val)
-+{
-+	__raw_writel(val, flexcan->io_base + reg);
-+}
-+#endif
-+
-+static ssize_t flexcan_show_attr(struct device *dev,
-+				 struct device_attribute *attr, char *buf);
-+static ssize_t flexcan_set_attr(struct device *dev,
-+				struct device_attribute *attr, const char *buf,
-+				size_t count);
-+
-+static struct device_attribute flexcan_dev_attr[FLEXCAN_ATTR_MAX] = {
-+	[FLEXCAN_ATTR_STATE] = __ATTR(state, 0444, flexcan_show_attr, NULL),
-+	[FLEXCAN_ATTR_BITRATE] =
-+	    __ATTR(bitrate, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_BR_PRESDIV] =
-+	    __ATTR(br_presdiv, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_BR_RJW] =
-+	    __ATTR(br_rjw, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_BR_PROPSEG] =
-+	    __ATTR(br_propseg, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_BR_PSEG1] =
-+	    __ATTR(br_pseg1, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_BR_PSEG2] =
-+	    __ATTR(br_pseg2, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_BR_CLKSRC] =
-+	    __ATTR(br_clksrc, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_MAXMB] =
-+	    __ATTR(maxmb, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_XMIT_MAXMB] =
-+	    __ATTR(xmit_maxmb, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_FIFO] =
-+	    __ATTR(fifo, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_WAKEUP] =
-+	    __ATTR(wakeup, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_SRX_DIS] =
-+	    __ATTR(srx_dis, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_WAK_SRC] =
-+	    __ATTR(wak_src, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_BCC] =
-+	    __ATTR(bcc, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_LOCAL_PRIORITY] =
-+	    __ATTR(local_priority, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_ABORT] =
-+	    __ATTR(abort, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_LOOPBACK] =
-+	    __ATTR(loopback, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_SMP] =
-+	    __ATTR(smp, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_BOFF_REC] =
-+	    __ATTR(boff_rec, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_TSYN] =
-+	    __ATTR(tsyn, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_LISTEN] =
-+	    __ATTR(listen, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_EXTEND_MSG] =
-+	    __ATTR(ext_msg, 0644, flexcan_show_attr, flexcan_set_attr),
-+	[FLEXCAN_ATTR_STANDARD_MSG] =
-+	    __ATTR(std_msg, 0644, flexcan_show_attr, flexcan_set_attr),
-+#ifdef CONFIG_CAN_DEBUG_DEVICES
-+	[FLEXCAN_ATTR_DUMP_REG] =
-+	    __ATTR(dump_reg, 0444, flexcan_show_attr, NULL),
-+	[FLEXCAN_ATTR_DUMP_XMIT_MB] =
-+	    __ATTR(dump_xmit_mb, 0444, flexcan_show_attr, NULL),
-+	[FLEXCAN_ATTR_DUMP_RX_MB] =
-+	    __ATTR(dump_rx_mb, 0444, flexcan_show_attr, NULL),
-+#endif
-+};
-+
-+static void flexcan_set_bitrate(struct flexcan_device *flexcan, int bitrate)
-+{
-+	/* TODO:: implement in future
-+	 * based on the bitrate to get the timing of
-+	 * presdiv, pseg1, pseg2, propseg
-+	 */
-+}
-+
-+static void flexcan_update_bitrate(struct flexcan_device *flexcan)
-+{
-+	int rate, div;
-+
-+	if (flexcan->br_clksrc)
-+		rate = clk_get_rate(flexcan->clk);
-+	else {
-+		struct clk *clk;
-+		clk = clk_get_sys(NULL, "ckih");
-+		if (IS_ERR(clk))
-+			return;
-+		rate = clk_get_rate(clk);
-+		clk_put(clk);
-+	}
-+	if (!rate)
-+		return;
-+
-+	flexcan_dbg(flexcan, 0, "%s: master clock rate %u from %s\n",
-+		    __FUNCTION__, rate, flexcan->br_clksrc ? "osc" : "pll");
-+
-+	div = flexcan->br_presdiv + 1;
-+	div *= flexcan->br_propseg + flexcan->br_pseg1 + flexcan->br_pseg2 + 4;
-+	flexcan->bitrate = (rate + div - 1) / div;
-+
-+	flexcan_dbg(flexcan, 0, "%s: flexcan bitrate %u time quantum %uns\n",
-+		    __FUNCTION__, flexcan->bitrate,
-+		    1000000000 / (flexcan->bitrate *
-+				  (flexcan->br_propseg + flexcan->br_pseg1 +
-+				   flexcan->br_pseg2 + 4)));
-+}
-+
-+static inline void flexcan_read_hw_mb(struct flexcan_device *flexcan, struct can_hw_mb *mb,
-+				      int buf_no)
-+{
-+	__raw_readsl(mb, flexcan->hwmb + buf_no * sizeof(*mb), sizeof(*mb));
-+}
-+
-+static inline void flexcan_write_hw_mb(struct flexcan_device *flexcan, struct can_hw_mb *mb,
-+				       int buf_no)
-+{
-+	__raw_writesl(flexcan->hwmb + buf_no * sizeof(*mb), mb, sizeof(*mb));
-+}
-+
-+#ifdef CONFIG_CAN_DEBUG_DEVICES
-+static int flexcan_dump_reg(struct flexcan_device *flexcan, char *buf)
-+{
-+	int ret = 0;
-+	unsigned int reg;
-+
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
-+	ret += sprintf(buf + ret, "MCR::0x%08x\n", reg);
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_CTRL);
-+	ret += sprintf(buf + ret, "CTRL::0x%08x\n", reg);
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_RXGMASK);
-+	ret += sprintf(buf + ret, "RXGMASK::0x%08x\n", reg);
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_RX14MASK);
-+	ret += sprintf(buf + ret, "RX14MASK::0x%08x\n", reg);
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_RX15MASK);
-+	ret += sprintf(buf + ret, "RX15MASK::0x%08x\n", reg);
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_ECR);
-+	ret += sprintf(buf + ret, "ECR::0x%08x\n", reg);
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_ESR);
-+	ret += sprintf(buf + ret, "ESR::0x%08x\n", reg);
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_IMASK2);
-+	ret += sprintf(buf + ret, "IMASK2::0x%08x\n", reg);
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_IMASK1);
-+	ret += sprintf(buf + ret, "IMASK1::0x%08x\n", reg);
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_IFLAG2);
-+	ret += sprintf(buf + ret, "IFLAG2::0x%08x\n", reg);
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_IFLAG1);
-+	ret += sprintf(buf + ret, "IFLAG1::0x%08x\n", reg);
-+	return ret;
-+}
-+
-+static int flexcan_dump_xmit_mb(struct flexcan_device *flexcan, char *buf)
-+{
-+	int ret = 0, i;
-+
-+	clk_enable(flexcan->clk);
-+	for (i = flexcan->xmit_maxmb + 1; i <= flexcan->maxmb; i++) {
-+		int j;
-+
-+		ret += sprintf(buf + ret,
-+			       "mb[%d]::CS:0x%08x ID:0x%08x DATA",
-+			       i, flexcan->hwmb[i].mb_cs.data,
-+			       flexcan->hwmb[i].mb_id);
-+		for (j = 0; j < sizeof(flexcan->hwmb[i].mb_data); j++) {
-+			ret += sprintf(buf + ret, ":%02x",
-+				       flexcan->hwmb[i].mb_data[j]);
-+		}
-+		ret += sprintf(buf + ret, "\n");
-+	}
-+	clk_disable(flexcan->clk);
-+	return ret;
-+}
-+
-+static int flexcan_dump_rx_mb(struct flexcan_device *flexcan, char *buf)
-+{
-+	int ret = 0, i;
-+
-+	clk_enable(flexcan->clk);
-+	for (i = 0; i <= flexcan->xmit_maxmb; i++) {
-+		int j;
-+
-+		ret += sprintf(buf + ret,
-+			       "mb[%d]::CS:0x%08x ID:0x%08x DATA",
-+			       i, flexcan->hwmb[i].mb_cs.data,
-+			       flexcan->hwmb[i].mb_id);
-+		for (j = 0; j < sizeof(flexcan->hwmb[i].mb_data); j++) {
-+			ret += sprintf(buf + ret, ":%02x",
-+				       flexcan->hwmb[i].mb_data[j]);
-+		}
-+		ret += sprintf(buf + ret, "\n");
-+	}
-+	clk_disable(flexcan->clk);
-+	return ret;
-+}
-+#endif
-+
-+static ssize_t flexcan_show_state(struct net_device *net, char *buf)
-+{
-+	int ret, esr;
-+	struct flexcan_device *flexcan = netdev_priv(net);
-+
-+	ret = sprintf(buf, "%s::", netif_running(net) ? "Start" : "Stop");
-+	if (netif_carrier_ok(net)) {
-+		esr = flexcan_reg_read(flexcan, CAN_HW_REG_ESR);
-+		switch ((esr & __ESR_FLT_CONF_MASK) >> __ESR_FLT_CONF_OFF) {
-+		case 0:
-+			ret += sprintf(buf + ret, "normal\n");
-+			break;
-+		case 1:
-+			ret += sprintf(buf + ret, "error passive\n");
-+			break;
-+		default:
-+			ret += sprintf(buf + ret, "bus off\n");
-+		}
-+	} else
-+		ret += sprintf(buf + ret, "bus off\n");
-+	return ret;
-+}
-+
-+static ssize_t flexcan_show_attr(struct device *dev,
-+				 struct device_attribute *attr, char *buf)
-+{
-+	int attr_id;
-+	struct net_device *net = dev_get_drvdata(dev);
-+	struct flexcan_device *flexcan = netdev_priv(net);
-+
-+	attr_id = attr - flexcan_dev_attr;
-+	switch (attr_id) {
-+	case FLEXCAN_ATTR_STATE:
-+		return flexcan_show_state(net, buf);
-+	case FLEXCAN_ATTR_BITRATE:
-+		return sprintf(buf, "%d\n", flexcan->bitrate);
-+	case FLEXCAN_ATTR_BR_PRESDIV:
-+		return sprintf(buf, "%d\n", flexcan->br_presdiv + 1);
-+	case FLEXCAN_ATTR_BR_RJW:
-+		return sprintf(buf, "%d\n", flexcan->br_rjw);
-+	case FLEXCAN_ATTR_BR_PROPSEG:
-+		return sprintf(buf, "%d\n", flexcan->br_propseg + 1);
-+	case FLEXCAN_ATTR_BR_PSEG1:
-+		return sprintf(buf, "%d\n", flexcan->br_pseg1 + 1);
-+	case FLEXCAN_ATTR_BR_PSEG2:
-+		return sprintf(buf, "%d\n", flexcan->br_pseg2 + 1);
-+	case FLEXCAN_ATTR_BR_CLKSRC:
-+		return sprintf(buf, "%s\n", flexcan->br_clksrc ? "bus" : "osc");
-+	case FLEXCAN_ATTR_MAXMB:
-+		return sprintf(buf, "%d\n", flexcan->maxmb + 1);
-+	case FLEXCAN_ATTR_XMIT_MAXMB:
-+		return sprintf(buf, "%d\n", flexcan->xmit_maxmb + 1);
-+	case FLEXCAN_ATTR_FIFO:
-+		return sprintf(buf, "%d\n", flexcan->fifo);
-+	case FLEXCAN_ATTR_WAKEUP:
-+		return sprintf(buf, "%d\n", flexcan->wakeup);
-+	case FLEXCAN_ATTR_SRX_DIS:
-+		return sprintf(buf, "%d\n", flexcan->srx_dis);
-+	case FLEXCAN_ATTR_WAK_SRC:
-+		return sprintf(buf, "%d\n", flexcan->wak_src);
-+	case FLEXCAN_ATTR_BCC:
-+		return sprintf(buf, "%d\n", flexcan->bcc);
-+	case FLEXCAN_ATTR_LOCAL_PRIORITY:
-+		return sprintf(buf, "%d\n", flexcan->lprio);
-+	case FLEXCAN_ATTR_ABORT:
-+		return sprintf(buf, "%d\n", flexcan->abort);
-+	case FLEXCAN_ATTR_LOOPBACK:
-+		return sprintf(buf, "%d\n", flexcan->loopback);
-+	case FLEXCAN_ATTR_SMP:
-+		return sprintf(buf, "%d\n", flexcan->smp);
-+	case FLEXCAN_ATTR_BOFF_REC:
-+		return sprintf(buf, "%d\n", flexcan->boff_rec);
-+	case FLEXCAN_ATTR_TSYN:
-+		return sprintf(buf, "%d\n", flexcan->tsyn);
-+	case FLEXCAN_ATTR_LISTEN:
-+		return sprintf(buf, "%d\n", flexcan->listen);
-+	case FLEXCAN_ATTR_EXTEND_MSG:
-+		return sprintf(buf, "%d\n", flexcan->ext_msg);
-+	case FLEXCAN_ATTR_STANDARD_MSG:
-+		return sprintf(buf, "%d\n", flexcan->std_msg);
-+#ifdef CONFIG_CAN_DEBUG_DEVICES
-+	case FLEXCAN_ATTR_DUMP_REG:
-+		return flexcan_dump_reg(flexcan, buf);
-+	case FLEXCAN_ATTR_DUMP_XMIT_MB:
-+		return flexcan_dump_xmit_mb(flexcan, buf);
-+	case FLEXCAN_ATTR_DUMP_RX_MB:
-+		return flexcan_dump_rx_mb(flexcan, buf);
-+#endif
-+	default:
-+		return sprintf(buf, "%s:%p->%p\n", __func__, flexcan_dev_attr,
-+			       attr);
-+	}
-+}
-+
-+static ssize_t flexcan_set_attr(struct device *dev,
-+				struct device_attribute *attr, const char *buf,
-+				size_t count)
-+{
-+	int attr_id, tmp;
-+	struct net_device *net = dev_get_drvdata(dev);
-+	struct flexcan_device *flexcan = netdev_priv(net);
-+
-+	attr_id = attr - flexcan_dev_attr;
-+
-+	mutex_lock(&flexcan->mutex);
-+
-+	if (netif_running(net))
-+		goto set_finish;
-+
-+	if (attr_id == FLEXCAN_ATTR_BR_CLKSRC) {
-+		if (!strcasecmp(buf, "bus"))
-+			flexcan->br_clksrc = 1;
-+		else if (!strcasecmp(buf, "osc"))
-+			flexcan->br_clksrc = 0;
-+		goto set_finish;
-+	}
-+
-+	tmp = simple_strtoul(buf, NULL, 0);
-+	switch (attr_id) {
-+	case FLEXCAN_ATTR_BITRATE:
-+		flexcan_set_bitrate(flexcan, tmp);
-+		break;
-+	case FLEXCAN_ATTR_BR_PRESDIV:
-+		if ((tmp > 0) && (tmp <= FLEXCAN_MAX_PRESDIV)) {
-+			flexcan->br_presdiv = tmp - 1;
-+			flexcan_update_bitrate(flexcan);
-+		}
-+		break;
-+	case FLEXCAN_ATTR_BR_RJW:
-+		if ((tmp > 0) && (tmp <= FLEXCAN_MAX_RJW))
-+			flexcan->br_rjw = tmp - 1;
-+		break;
-+	case FLEXCAN_ATTR_BR_PROPSEG:
-+		if ((tmp > 0) && (tmp <= FLEXCAN_MAX_PROPSEG)) {
-+			flexcan->br_propseg = tmp - 1;
-+			flexcan_update_bitrate(flexcan);
-+		}
-+		break;
-+	case FLEXCAN_ATTR_BR_PSEG1:
-+		if ((tmp > 0) && (tmp <= FLEXCAN_MAX_PSEG1)) {
-+			flexcan->br_pseg1 = tmp - 1;
-+			flexcan_update_bitrate(flexcan);
-+		}
-+		break;
-+	case FLEXCAN_ATTR_BR_PSEG2:
-+		if ((tmp > 0) && (tmp <= FLEXCAN_MAX_PSEG2)) {
-+			flexcan->br_pseg2 = tmp - 1;
-+			flexcan_update_bitrate(flexcan);
-+		}
-+		break;
-+	case FLEXCAN_ATTR_MAXMB:
-+		if ((tmp > 0) && (tmp <= FLEXCAN_MAX_MB)) {
-+			if (flexcan->maxmb != (tmp - 1)) {
-+				flexcan->maxmb = tmp - 1;
-+				if (flexcan->xmit_maxmb < flexcan->maxmb)
-+					flexcan->xmit_maxmb = flexcan->maxmb;
-+			}
-+		}
-+		break;
-+	case FLEXCAN_ATTR_XMIT_MAXMB:
-+		if ((tmp > 0) && (tmp <= (flexcan->maxmb + 1))) {
-+			if (flexcan->xmit_maxmb != (tmp - 1))
-+				flexcan->xmit_maxmb = tmp - 1;
-+		}
-+		break;
-+	case FLEXCAN_ATTR_FIFO:
-+		flexcan->fifo = !!tmp;
-+		break;
-+	case FLEXCAN_ATTR_WAKEUP:
-+		flexcan->wakeup = !!tmp;
-+		break;
-+	case FLEXCAN_ATTR_SRX_DIS:
-+		flexcan->srx_dis = !!tmp;
-+		break;
-+	case FLEXCAN_ATTR_WAK_SRC:
-+		flexcan->wak_src = !!tmp;
-+		break;
-+	case FLEXCAN_ATTR_BCC:
-+		flexcan->bcc = !!tmp;
-+		break;
-+	case FLEXCAN_ATTR_LOCAL_PRIORITY:
-+		flexcan->lprio = !!tmp;
-+		break;
-+	case FLEXCAN_ATTR_ABORT:
-+		flexcan->abort = !!tmp;
-+		break;
-+	case FLEXCAN_ATTR_LOOPBACK:
-+		flexcan->loopback = !!tmp;
-+		break;
-+	case FLEXCAN_ATTR_SMP:
-+		flexcan->smp = !!tmp;
-+		break;
-+	case FLEXCAN_ATTR_BOFF_REC:
-+		flexcan->boff_rec = !!tmp;
-+		break;
-+	case FLEXCAN_ATTR_TSYN:
-+		flexcan->tsyn = !!tmp;
-+		break;
-+	case FLEXCAN_ATTR_LISTEN:
-+		flexcan->listen = !!tmp;
-+		break;
-+	case FLEXCAN_ATTR_EXTEND_MSG:
-+		flexcan->ext_msg = !!tmp;
-+		break;
-+	case FLEXCAN_ATTR_STANDARD_MSG:
-+		flexcan->std_msg = !!tmp;
-+		break;
-+	}
-+ set_finish:
-+	mutex_unlock(&flexcan->mutex);
-+	return count;
-+}
-+
-+static void flexcan_device_default(struct flexcan_device *dev)
-+{
-+	dev->br_clksrc = 1;
-+	dev->br_rjw = 2;
-+	dev->br_presdiv = 6;
-+	dev->br_propseg = 4;
-+	dev->br_pseg1 = 4;
-+	dev->br_pseg2 = 7;
-+
-+	dev->bcc = 1;
-+	dev->srx_dis = 1;
-+	dev->smp = 1;
-+	dev->abort = 1;
-+
-+	dev->maxmb = FLEXCAN_MAX_MB - 1;
-+	dev->xmit_maxmb = (FLEXCAN_MAX_MB >> 1) - 1;
-+	dev->xmit_mb = dev->maxmb - dev->xmit_maxmb;
-+
-+	dev->ext_msg = 1;
-+	dev->std_msg = 1;
-+}
-+
-+static int flexcan_device_attach(struct flexcan_device *flexcan)
-+{
-+	int ret;
-+	struct resource *res;
-+	struct platform_device *pdev = flexcan->dev;
-+	struct flexcan_platform_data *plat_data = pdev->dev.platform_data;
-+	int irq;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res)
-+		return -ENODEV;
-+
-+	irq = platform_get_irq(pdev, 0);
-+	if (irq < 0)
-+		return -ENODEV;
-+
-+	if (!request_mem_region(res->start, resource_size(res), "flexcan")) {
-+		return -EBUSY;
-+	}
-+
-+	flexcan->irq = irq;
-+	flexcan->io_base = ioremap_nocache(res->start, resource_size(res));
-+	if (!flexcan->io_base) {
-+		ret = -ENOMEM;
-+		goto release;
-+	}
-+	pdev_dbg(pdev, 0, "controller registers %08lx remapped to %p\n",
-+		 (unsigned long)res->start, flexcan->io_base);
-+
-+	flexcan->hwmb = flexcan->io_base + CAN_MB_BASE;
-+	flexcan->rx_mask = flexcan->io_base + CAN_RXMASK_BASE;
-+
-+	flexcan->clk = clk_get(&pdev->dev, "can_clk");
-+	if (IS_ERR(flexcan->clk)) {
-+		ret = PTR_ERR(flexcan->clk);
-+		dev_err(&pdev->dev, "Failed to get clock: %d\n", ret);
-+		goto unmap;
-+	}
-+
-+	if (plat_data) {
-+		if (plat_data->active) {
-+			ret = plat_data->active(pdev);
-+			if (ret)
-+				goto put_clk;
-+		}
-+		if (plat_data->core_reg) {
-+			flexcan->core_reg = regulator_get(&pdev->dev,
-+							  plat_data->core_reg);
-+			if (IS_ERR(flexcan->core_reg)) {
-+				ret = PTR_ERR(flexcan->core_reg);
-+				goto deactivate;
-+			}
-+		}
-+
-+		if (plat_data->io_reg) {
-+			flexcan->io_reg = regulator_get(&pdev->dev,
-+							plat_data->io_reg);
-+			if (IS_ERR(flexcan->core_reg)) {
-+				ret = PTR_ERR(flexcan->io_reg);
-+				goto put_reg;
-+			}
-+		}
-+	}
-+	return 0;
-+
-+ put_reg:
-+	regulator_put(flexcan->core_reg);
-+ deactivate:
-+	if (plat_data->inactive)
-+		plat_data->inactive(pdev);
-+ put_clk:
-+	clk_put(flexcan->clk);
-+ unmap:
-+	iounmap(flexcan->io_base);
-+ release:
-+	release_mem_region(res->start, resource_size(res));
-+	return ret;
-+}
-+
-+static void flexcan_device_detach(struct flexcan_device *flexcan)
-+{
-+	struct platform_device *pdev = flexcan->dev;
-+	struct flexcan_platform_data *plat_data = pdev->dev.platform_data;
-+	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+
-+	BUG_ON(!res);
-+
-+	clk_put(flexcan->clk);
-+
-+	if (flexcan->io_reg) {
-+		regulator_put(flexcan->io_reg);
-+	}
-+
-+	if (flexcan->core_reg) {
-+		regulator_put(flexcan->core_reg);
-+	}
-+
-+	if (plat_data && plat_data->inactive)
-+		plat_data->inactive(pdev);
-+
-+	iounmap(flexcan->io_base);
-+	release_mem_region(res->start, resource_size(res));
-+}
-+
-+static void flexcan_mbm_isr(struct work_struct *work);
-+static void flexcan_err_handler(struct work_struct *work);
-+
-+static struct net_device *flexcan_device_alloc(struct platform_device *pdev,
-+					       void (*setup)(struct net_device *dev))
-+{
-+	struct flexcan_device *flexcan;
-+	struct net_device *net;
-+	int i, num;
-+	int ret;
-+
-+	net = alloc_netdev(sizeof(*flexcan), "can%d", setup);
-+	if (net == NULL) {
-+		pdev_err(pdev, "Failed to allocate netdevice\n");
-+		return ERR_PTR(-ENOMEM);
-+	}
-+	flexcan = netdev_priv(net);
-+
-+	init_timer(&flexcan->timer);
-+	mutex_init(&flexcan->mutex);
-+	INIT_WORK(&flexcan->mb_work, flexcan_mbm_isr);
-+	INIT_WORK(&flexcan->err_work, flexcan_err_handler);
-+
-+	flexcan->dev = pdev;
-+	ret = flexcan_device_attach(flexcan);
-+	if (ret) {
-+		free_netdev(net);
-+		return ERR_PTR(ret);
-+	}
-+	flexcan_device_default(flexcan);
-+	flexcan_update_bitrate(flexcan);
-+
-+	num = ARRAY_SIZE(flexcan_dev_attr);
-+
-+	for (i = 0; i < num; i++) {
-+		ret = device_create_file(&pdev->dev, flexcan_dev_attr + i);
-+		if (ret) {
-+			pdev_err(pdev, "Failed to create attribute file %s: %d\n",
-+				(flexcan_dev_attr + i)->attr.name, ret);
-+			for (i--; i >= 0; i--)
-+				device_remove_file(&pdev->dev, flexcan_dev_attr + i);
-+			flexcan_device_detach(flexcan);
-+			free_netdev(net);
-+			return ERR_PTR(ret);
-+		}
-+	}
-+	platform_set_drvdata(pdev, net);
-+	return net;
-+}
-+
-+static void flexcan_device_free(struct net_device *dev)
-+{
-+	struct flexcan_device *flexcan = netdev_priv(dev);
-+	struct platform_device *pdev = flexcan->dev;
-+	int i;
-+
-+	ndev_dbg(dev, 0, "%s: Deleting timer\n", __FUNCTION__);
-+	del_timer_sync(&flexcan->timer);
-+
-+	ndev_dbg(dev, 0, "%s: Removing sysfs files\n", __FUNCTION__);
-+	for (i = 0; i < ARRAY_SIZE(flexcan_dev_attr); i++)
-+		device_remove_file(&pdev->dev, flexcan_dev_attr + i);
-+
-+	ndev_dbg(dev, 0, "%s: Detaching can device\n", __FUNCTION__);
-+	flexcan_device_detach(flexcan);
-+	ndev_dbg(dev, 0, "%s: Freeing net_device\n", __FUNCTION__);
-+	free_netdev(dev);
-+}
-+
-+#define flexcan_swab32(x)				\
-+	(((x) << 24) | ((x) >> 24) |			\
-+		(((x) & (__u32)0x0000ff00UL) << 8) |	\
-+		(((x) & (__u32)0x00ff0000UL) >> 8))
-+
-+static inline void flexcan_mb_write(struct can_frame *frame, struct can_hw_mb __iomem *hwmb,
-+				    int code)
-+{
-+	int i;
-+	unsigned long __iomem *s = (unsigned long *)&frame->data[0];
-+	unsigned long __iomem *d = (unsigned long *)&hwmb->mb_data[0];
-+	struct can_hw_mb mb;
-+	unsigned int can_id;
-+	int n_words = (frame->can_dlc + 3) / sizeof(unsigned int);
-+
-+	mb.mb_cs.data = 0;
-+	mb.mb_cs.cs.code = code;
-+	mb.mb_cs.cs.length = frame->can_dlc;
-+
-+	mb.mb_cs.cs.rtr = !!(frame->can_id & CAN_RTR_FLAG);
-+
-+	if (frame->can_id & CAN_EFF_FLAG) {
-+		mb.mb_cs.cs.ide = 1;
-+		mb.mb_cs.cs.srr = 1;
-+		can_id = frame->can_id & CAN_EFF_MASK;
-+	} else {
-+		mb.mb_cs.cs.ide = 0;
-+		can_id = (frame->can_id & CAN_SFF_MASK) << 18;
-+	}
-+
-+	DBG(0, "%s: writing can_id %08x to mb_id %p\n", __FUNCTION__, can_id, &hwmb->mb_id);
-+	__raw_writel(can_id, &hwmb->mb_id);
-+	for (i = 0; i < n_words; i++, s++, d++) {
-+		DBG(0, "%s: writing data %08lx to mb_data %p\n", __FUNCTION__,
-+		    flexcan_swab32(*s), d);
-+		__raw_writel(flexcan_swab32(*s), d);
-+	}
-+	DBG(0, "%s: Writing CS %08x to mb_cs %p\n", __FUNCTION__, mb.mb_cs.data, &hwmb->mb_cs);
-+	__raw_writel(mb.mb_cs.data, &hwmb->mb_cs.data);
-+}
-+
-+static inline void flexcan_mb_read(struct can_frame *frame, struct can_hw_mb __iomem *hwmb)
-+{
-+	int i;
-+	unsigned long __iomem *s = (unsigned long *)&hwmb->mb_data[0];
-+	unsigned long __iomem *d = (unsigned long *)&frame->data[0];
-+	struct can_hw_mb mb;
-+	unsigned int can_id;
-+	int n_words;
-+
-+	mb.mb_cs.data = __raw_readl(&hwmb->mb_cs);
-+	BUG_ON(mb.mb_cs.cs.code & CAN_MB_RX_BUSY);
-+
-+	can_id = __raw_readl(&hwmb->mb_id);
-+
-+	if (mb.mb_cs.cs.ide)
-+		frame->can_id = (can_id & CAN_EFF_MASK) | CAN_EFF_FLAG;
-+	else
-+		frame->can_id = (can_id >> 18) & CAN_SFF_MASK;
-+	if (mb.mb_cs.cs.rtr)
-+		frame->can_id |= CAN_RTR_FLAG;
-+
-+	frame->can_dlc = mb.mb_cs.cs.length;
-+	if (frame->can_dlc == 0 || frame->can_dlc > 8)
-+		return;
-+
-+	n_words = (frame->can_dlc + 3) / sizeof(unsigned int);
-+	for (i = 0; i < n_words; i++, s++, d++)
-+		*d = flexcan_swab32(__raw_readl(s));
-+}
-+
-+static inline void flexcan_memcpy(void *dst, void *src, int len)
-+{
-+	int i;
-+	unsigned int __iomem *d = dst, *s = src;
-+
-+	DBG(2, "%s: Copying %u byte from %p to %p\n", __FUNCTION__, len, s, d);
-+	WARN_ON(len & 3);
-+	len = (len + 3) >> 2;
-+	for (i = 0; i < len; i++, s++, d++)
-+		__raw_writel(flexcan_swab32(*s), d);
-+	if (dbg_lvl(1)) {
-+		print_hex_dump(KERN_DEBUG, "swdat: ", DUMP_PREFIX_OFFSET, 16, 4,
-+			       src, len << 2, 0);
-+		print_hex_dump(KERN_DEBUG, "hwdat: ", DUMP_PREFIX_OFFSET, 16, 4,
-+			       dst, len << 2, 0);
-+	}
-+}
-+
-+static inline struct can_frame *flexcan_skb_put(struct sk_buff *skb, unsigned int len)
-+{
-+	return (struct can_frame *)skb_put(skb, len);
-+}
-+
-+static inline struct can_frame *flexcan_skb_data(struct sk_buff *skb)
-+{
-+	BUG_ON(skb == NULL);
-+	return (struct can_frame *)skb->data;
-+}
-+
-+static struct net_device_stats *flexcan_get_stats(struct net_device *dev)
-+{
-+	ndev_dbg(dev, 3, "%s@%d: \n", __FUNCTION__, __LINE__);
-+	if (!netif_running(dev))
-+		return &dev->stats;
-+	ndev_dbg(dev, 3, "%s@%d: \n", __FUNCTION__, __LINE__);
-+	return &dev->stats;
-+}
-+
-+static void flexcan_mb_bottom(struct net_device *dev, int index)
-+{
-+	struct flexcan_device *flexcan = netdev_priv(dev);
-+	struct net_device_stats *stats = flexcan_get_stats(dev);
-+	struct can_hw_mb __iomem *hwmb;
-+	struct can_frame *frame;
-+	struct sk_buff *skb;
-+	struct can_hw_mb mb;
-+
-+	ndev_dbg(dev, 1, "%s: index: %d\n", __FUNCTION__, index);
-+
-+	hwmb = flexcan->hwmb + index;
-+	mb.mb_cs.data = __raw_readl(&hwmb->mb_cs.data);
-+	if (flexcan->fifo ||
-+	    index >= flexcan->maxmb - flexcan->xmit_maxmb) {
-+		/* handle transmit MBs */
-+
-+		if (mb.mb_cs.cs.code == CAN_MB_TX_ABORT) {
-+			mb.mb_cs.cs.code = CAN_MB_TX_INACTIVE;
-+			__raw_writel(mb.mb_cs.data, &hwmb->mb_cs.data);
-+		}
-+		if (mb.mb_cs.cs.code & CAN_MB_TX_INACTIVE) {
-+			if (flexcan->xmit_buffers++ == 0) {
-+				ndev_dbg(dev, 1, "%s: Starting netif queue\n", __FUNCTION__);
-+				netif_start_queue(dev);
-+			}
-+			BUG_ON(flexcan->xmit_buffers > flexcan->maxmb - flexcan->xmit_maxmb);
-+			return;
-+		}
-+		/* if fifo is enabled all RX MBs should be handled in the fifo_isr */
-+		BUG();
-+	}
-+	if (dbg_lvl(1))
-+		print_hex_dump(KERN_DEBUG, "rx_mb: ", DUMP_PREFIX_OFFSET, 16, 4,
-+			       hwmb, sizeof(*hwmb), 0);
-+	/* handle RX MB in case fifo is not used */
-+	BUG_ON(flexcan->fifo);
-+	if (mb.mb_cs.cs.code & CAN_MB_RX_BUSY) {
-+		ndev_dbg(dev, -1, "%s: MB[%02x] is busy: %x\n", __FUNCTION__,
-+			 index, mb.mb_cs.cs.code);
-+		/* unlock buffer */
-+		(void)flexcan_reg_read(flexcan, CAN_HW_REG_TIMER);
-+		return;
-+	}
-+
-+	skb = dev_alloc_skb(sizeof(struct can_frame));
-+	if (skb) {
-+		frame = flexcan_skb_put(skb, sizeof(*frame));
-+		flexcan_mb_read(frame, hwmb);
-+		/* unlock buffer */
-+		(void)flexcan_reg_read(flexcan, CAN_HW_REG_TIMER);
-+
-+		dev->last_rx = jiffies;
-+		stats->rx_packets++;
-+		stats->rx_bytes += frame->can_dlc;
-+
-+		skb->dev = dev;
-+		skb->protocol = __constant_htons(ETH_P_CAN);
-+		skb->ip_summed = CHECKSUM_UNNECESSARY;
-+		netif_receive_skb(skb);
-+	} else {
-+		flexcan_dbg(flexcan, 0, "%s: Could not allocate SKB; dropping packet\n",
-+			    __FUNCTION__);
-+
-+		stats->rx_dropped++;
-+	}
-+}
-+
-+static void flexcan_fifo_isr(struct net_device *dev, unsigned int iflag1)
-+{
-+	struct flexcan_device *flexcan = netdev_priv(dev);
-+	struct net_device_stats *stats = flexcan_get_stats(dev);
-+	struct sk_buff *skb;
-+	struct can_hw_mb __iomem *hwmb = flexcan->hwmb;
-+	struct can_frame *frame;
-+
-+	ndev_dbg(dev, 2, "%s: \n", __FUNCTION__);
-+	if (dbg_lvl(1))
-+		print_hex_dump(KERN_DEBUG, "rx_mb: ", DUMP_PREFIX_OFFSET, 16, 4,
-+			       hwmb, sizeof(*hwmb), 0);
-+	if (iflag1 & __FIFO_RDY_INT) {
-+		skb = dev_alloc_skb(sizeof(struct can_frame));
-+		if (skb) {
-+			frame = flexcan_skb_put(skb, sizeof(*frame));
-+			flexcan_mb_read(frame, hwmb);
-+			/* unlock mb */
-+			(void) flexcan_reg_read(flexcan, CAN_HW_REG_TIMER);
-+
-+			dev->last_rx = jiffies;
-+
-+			stats->rx_packets++;
-+			stats->rx_bytes += frame->can_dlc;
-+
-+			skb->dev = dev;
-+			skb->protocol = __constant_htons(ETH_P_CAN);
-+			skb->ip_summed = CHECKSUM_UNNECESSARY;
-+			netif_receive_skb(skb);
-+		} else {
-+			(void)__raw_readl(&hwmb->mb_cs.data);
-+			/* unlock mb */
-+			(void) flexcan_reg_read(flexcan, CAN_HW_REG_TIMER);
-+		}
-+	}
-+
-+	if (iflag1 & (__FIFO_OV_INT | __FIFO_WARN_INT)) {
-+		skb = dev_alloc_skb(sizeof(struct can_frame));
-+		if (skb) {
-+			frame = flexcan_skb_put(skb, sizeof(*frame));
-+			frame->can_id = CAN_ERR_FLAG | CAN_ERR_CRTL;
-+			frame->can_dlc = CAN_ERR_DLC;
-+			if (iflag1 & __FIFO_WARN_INT)
-+				frame->data[1] |=
-+				    CAN_ERR_CRTL_TX_WARNING |
-+				    CAN_ERR_CRTL_RX_WARNING;
-+			if (iflag1 & __FIFO_OV_INT)
-+				frame->data[1] |= CAN_ERR_CRTL_RX_OVERFLOW;
-+			if (dbg_lvl(1))
-+				print_hex_dump(KERN_DEBUG, "err_mb: ", DUMP_PREFIX_OFFSET, 16, 4,
-+					       frame, sizeof(*frame), 0);
-+
-+			skb->dev = dev;
-+			skb->protocol = __constant_htons(ETH_P_CAN);
-+			skb->ip_summed = CHECKSUM_UNNECESSARY;
-+			netif_receive_skb(skb);
-+		}
-+	}
-+}
-+
-+/*
-+ * called by CAN ISR to handle mb events.
-+ */
-+static void flexcan_mbm_isr(struct work_struct *work)
-+{
-+	struct flexcan_device *flexcan = container_of(work, struct flexcan_device, mb_work);
-+	struct net_device *dev = platform_get_drvdata(flexcan->dev);
-+	int i, iflag1, iflag2, maxmb;
-+
-+	i = 0;
-+
-+	ndev_dbg(dev, 2, "%s: \n", __FUNCTION__);
-+
-+	iflag1 = flexcan_reg_read(flexcan, CAN_HW_REG_IFLAG1) &
-+		flexcan_reg_read(flexcan, CAN_HW_REG_IMASK1);
-+	if (flexcan->maxmb > 31) {
-+		maxmb = flexcan->maxmb + 1 - 32;
-+		iflag2 = flexcan_reg_read(flexcan, CAN_HW_REG_IFLAG2) &
-+		    flexcan_reg_read(flexcan, CAN_HW_REG_IMASK2);
-+		iflag2 &= (1 << maxmb) - 1;
-+		maxmb = 32;
-+	} else {
-+		maxmb = flexcan->maxmb + 1;
-+		iflag1 &= (1 << maxmb) - 1;
-+		iflag2 = 0;
-+	}
-+
-+	ndev_dbg(dev, 2, "%s: loop=%d iflag1=%08x\n", __FUNCTION__, i, iflag1);
-+
-+	flexcan_reg_write(flexcan, CAN_HW_REG_IFLAG1, iflag1);
-+	flexcan_reg_write(flexcan, CAN_HW_REG_IFLAG2, iflag2);
-+
-+	if (flexcan->fifo) {
-+		flexcan_fifo_isr(dev, iflag1);
-+		iflag1 &= ~0xFF;
-+	}
-+	for (i = 0; iflag1 && (i < maxmb); i++) {
-+		if (iflag1 & (1 << i)) {
-+			iflag1 &= ~(1 << i);
-+			flexcan_mb_bottom(dev, i);
-+		}
-+	}
-+
-+	for (i = maxmb; iflag2 && (i <= flexcan->maxmb); i++) {
-+		if (iflag2 & (1 << (i - 32))) {
-+			iflag2 &= ~(1 << (i - 32));
-+			flexcan_mb_bottom(dev, i);
-+		}
-+	}
-+	enable_irq(flexcan->irq);
-+}
-+
-+static int flexcan_mbm_xmit(struct flexcan_device *flexcan, struct can_frame *frame)
-+{
-+	int i = flexcan->xmit_mb;
-+	struct can_hw_mb __iomem *hwmb = flexcan->hwmb;
-+	static int last;
-+
-+	if (flexcan->xmit_buffers != last) {
-+		flexcan_dbg(flexcan, 1, "%s: %d free buffers\n", __FUNCTION__,
-+			    flexcan->xmit_buffers);
-+		last = flexcan->xmit_buffers;
-+	}
-+	do {
-+		struct can_hw_mb mb;
-+
-+		mb.mb_cs.data = __raw_readl(&hwmb[i].mb_cs);
-+
-+		if (mb.mb_cs.cs.code == CAN_MB_TX_INACTIVE)
-+			break;
-+		if (++i > flexcan->maxmb) {
-+			if (flexcan->fifo)
-+				i = FLEXCAN_MAX_FIFO_MB;
-+			else
-+				i = flexcan->xmit_maxmb + 1;
-+		}
-+		if (i == flexcan->xmit_mb) {
-+			flexcan_dbg(flexcan, 0, "%s: no free xmit buffer\n", __FUNCTION__);
-+			return 0;
-+		}
-+	} while (1);
-+
-+	flexcan->xmit_mb = i + 1;
-+	if (flexcan->xmit_mb > flexcan->maxmb) {
-+		if (flexcan->fifo)
-+			flexcan->xmit_mb = FLEXCAN_MAX_FIFO_MB;
-+		else
-+			flexcan->xmit_mb = flexcan->xmit_maxmb + 1;
-+	}
-+
-+	flexcan_dbg(flexcan, 1, "%s: Enabling transmission of buffer %d\n", __FUNCTION__, i);
-+	flexcan_mb_write(frame, &hwmb[i], CAN_MB_TX_ONCE);
-+
-+	if (dbg_lvl(1))
-+		print_hex_dump(KERN_DEBUG, "tx_mb: ", DUMP_PREFIX_OFFSET, 16, 4,
-+			       &hwmb[i], sizeof(*hwmb), 0);
-+	return 1;
-+}
-+
-+static void flexcan_mbm_init(struct flexcan_device *flexcan)
-+{
-+	struct can_hw_mb __iomem *hwmb;
-+	int rx_mb, i;
-+
-+	flexcan_dbg(flexcan, 0, "%s@%d: \n", __FUNCTION__, __LINE__);
-+
-+	/* Set global mask to receive all messages */
-+	flexcan_reg_write(flexcan, CAN_HW_REG_RXGMASK, 0);
-+	flexcan_reg_write(flexcan, CAN_HW_REG_RX14MASK, 0);
-+	flexcan_reg_write(flexcan, CAN_HW_REG_RX15MASK, 0);
-+
-+	for (i = 0; i < FLEXCAN_MAX_MB; i++) {
-+		int j;
-+		void __iomem *mb = &flexcan->hwmb[i];
-+		void __iomem *rxm = &flexcan->rx_mask[i];
-+
-+		__raw_writel(0, rxm);
-+		for (j = 0; j < sizeof(*flexcan->hwmb); j += 4) {
-+			__raw_writel(0, mb + j);
-+		}
-+	}
-+
-+	if (flexcan->fifo)
-+		rx_mb = FLEXCAN_MAX_FIFO_MB;
-+	else
-+		rx_mb = flexcan->maxmb - flexcan->xmit_maxmb;
-+
-+	hwmb = flexcan->hwmb;
-+	if (flexcan->fifo) {
-+		unsigned long *id_table = flexcan->io_base + CAN_FIFO_BASE;
-+		for (i = 0; i < rx_mb; i++)
-+			__raw_writel(0, &id_table[i]);
-+	} else {
-+		for (i = 0; i < rx_mb; i++) {
-+			struct can_hw_mb mb;
-+
-+			mb.mb_cs.data = 0;
-+			mb.mb_cs.cs.code = CAN_MB_RX_EMPTY;
-+			if (flexcan->ext_msg && flexcan->std_msg)
-+				mb.mb_cs.cs.ide = i & 1;
-+			else if (flexcan->ext_msg)
-+				mb.mb_cs.cs.ide = 1;
-+
-+			__raw_writel(mb.mb_cs.data, &hwmb[i]);
-+		}
-+	}
-+
-+	for (; i <= flexcan->maxmb; i++) {
-+		struct can_hw_mb mb;
-+
-+		mb.mb_cs.data = 0;
-+		mb.mb_cs.cs.code = CAN_MB_TX_INACTIVE;
-+		__raw_writel(mb.mb_cs.data, &hwmb[i]);
-+	}
-+
-+	flexcan->xmit_mb = rx_mb;
-+	flexcan->xmit_buffers = flexcan->maxmb - flexcan->xmit_maxmb;
-+}
-+
-+static void flexcan_hw_start(struct flexcan_device *flexcan)
-+{
-+	unsigned int reg;
-+
-+	flexcan_dbg(flexcan, 0, "%s: \n", __FUNCTION__);
-+
-+	if ((flexcan->maxmb + 1) > 32) {
-+		flexcan_reg_write(flexcan, CAN_HW_REG_IMASK1, ~0);
-+		reg = (1 << (flexcan->maxmb - 31)) - 1;
-+		flexcan_reg_write(flexcan, CAN_HW_REG_IMASK2, reg);
-+	} else {
-+		reg = (1 << (flexcan->maxmb + 1)) - 1;
-+		flexcan_reg_write(flexcan, CAN_HW_REG_IMASK1, reg);
-+		flexcan_reg_write(flexcan, CAN_HW_REG_IMASK2, 0);
-+	}
-+
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
-+	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg & ~__MCR_HALT);
-+}
-+
-+static void flexcan_hw_stop(struct flexcan_device *flexcan)
-+{
-+	unsigned int reg;
-+
-+	flexcan_dbg(flexcan, 0, "%s: \n", __FUNCTION__);
-+
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
-+	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg | __MCR_HALT);
-+}
-+
-+static int flexcan_hw_reset(struct flexcan_device *flexcan)
-+{
-+	struct platform_device *pdev __attribute__((unused)) = flexcan->dev;
-+	unsigned int reg;
-+	int timeout = 100000;
-+
-+	flexcan_dbg(flexcan, 0, "%s: \n", __FUNCTION__);
-+
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
-+	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg | __MCR_MDIS);
-+
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_CTRL);
-+	if (flexcan->br_clksrc)
-+		reg |= __CTRL_CLK_SRC;
-+	else
-+		reg &= ~__CTRL_CLK_SRC;
-+	flexcan_reg_write(flexcan, CAN_HW_REG_CTRL, reg);
-+
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR) & ~__MCR_MDIS;
-+	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg);
-+	reg |= __MCR_SOFT_RST;
-+	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg);
-+
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
-+	while (reg & __MCR_SOFT_RST) {
-+		if (--timeout <= 0) {
-+			dev_err(&pdev->dev, "Flexcan software Reset Timeout\n");
-+			return -ETIME;
-+		}
-+		udelay(10);
-+		reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
-+	}
-+	return 0;
-+}
-+
-+static void flexcan_mcr_setup(struct flexcan_device *flexcan)
-+{
-+	unsigned int reg;
-+
-+	flexcan_dbg(flexcan, 0, "%s: \n", __FUNCTION__);
-+
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
-+	reg &= ~(__MCR_MAX_MB_MASK | __MCR_WAK_MSK | __MCR_MAX_IDAM_MASK);
-+
-+	if (flexcan->fifo)
-+		reg |= __MCR_FEN;
-+	else
-+		reg &= ~__MCR_FEN;
-+
-+	if (flexcan->wakeup)
-+		reg |= __MCR_SLF_WAK | __MCR_WAK_MSK;
-+	else
-+		reg &= ~(__MCR_SLF_WAK | __MCR_WAK_MSK);
-+
-+	if (flexcan->wak_src)
-+		reg |= __MCR_WAK_SRC;
-+	else
-+		reg &= ~__MCR_WAK_SRC;
-+
-+	if (flexcan->srx_dis)
-+		reg |= __MCR_SRX_DIS;
-+	else
-+		reg &= ~__MCR_SRX_DIS;
-+
-+	if (flexcan->bcc)
-+		reg |= __MCR_BCC;
-+	else
-+		reg &= ~__MCR_BCC;
-+
-+	if (flexcan->lprio)
-+		reg |= __MCR_LPRIO_EN;
-+	else
-+		reg &= ~__MCR_LPRIO_EN;
-+
-+	if (flexcan->abort)
-+		reg |= __MCR_AEN;
-+	else
-+		reg &= ~__MCR_AEN;
-+
-+	reg |= (flexcan->maxmb << __MCR_MAX_MB_OFFSET);
-+	reg |= __MCR_DOZE | __MCR_MAX_IDAM_C;
-+	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg);
-+}
-+
-+static void flexcan_ctrl_setup(struct flexcan_device *flexcan)
-+{
-+	unsigned int reg;
-+
-+	flexcan_dbg(flexcan, 0, "%s: \n", __FUNCTION__);
-+
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_CTRL);
-+	reg &= ~(__CTRL_PRESDIV_MASK | __CTRL_RJW_MASK | __CTRL_PSEG1_MASK |
-+		 __CTRL_PSEG2_MASK | __CTRL_PROPSEG_MASK);
-+
-+	if (flexcan->loopback)
-+		reg |= __CTRL_LPB;
-+	else
-+		reg &= ~__CTRL_LPB;
-+
-+	if (flexcan->smp)
-+		reg |= __CTRL_SMP;
-+	else
-+		reg &= ~__CTRL_SMP;
-+
-+	if (flexcan->boff_rec)
-+		reg |= __CTRL_BOFF_REC;
-+	else
-+		reg &= ~__CTRL_BOFF_REC;
-+
-+	if (flexcan->tsyn)
-+		reg |= __CTRL_TSYN;
-+	else
-+		reg &= ~__CTRL_TSYN;
-+
-+	if (flexcan->listen)
-+		reg |= __CTRL_LOM;
-+	else
-+		reg &= ~__CTRL_LOM;
-+
-+	reg |= (flexcan->br_presdiv << __CTRL_PRESDIV_OFFSET) |
-+	    (flexcan->br_rjw << __CTRL_RJW_OFFSET) |
-+	    (flexcan->br_pseg1 << __CTRL_PSEG1_OFFSET) |
-+	    (flexcan->br_pseg2 << __CTRL_PSEG2_OFFSET) |
-+	    (flexcan->br_propseg << __CTRL_PROPSEG_OFFSET);
-+
-+	reg &= ~__CTRL_LBUF;
-+
-+	reg |= __CTRL_TWRN_MSK | __CTRL_RWRN_MSK | __CTRL_BOFF_MSK |
-+	    __CTRL_ERR_MSK;
-+
-+	flexcan_reg_write(flexcan, CAN_HW_REG_CTRL, reg);
-+}
-+
-+static int flexcan_hw_restart(struct net_device *dev)
-+{
-+	unsigned int reg;
-+	struct flexcan_device *flexcan = netdev_priv(dev);
-+
-+	ndev_dbg(dev, 0, "%s: \n", __FUNCTION__);
-+
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
-+	if (reg & __MCR_SOFT_RST)
-+		return 1;
-+
-+	flexcan_mcr_setup(flexcan);
-+
-+	flexcan_reg_write(flexcan, CAN_HW_REG_IMASK2, 0);
-+	flexcan_reg_write(flexcan, CAN_HW_REG_IMASK1, 0);
-+
-+	flexcan_reg_write(flexcan, CAN_HW_REG_IFLAG2, 0xFFFFFFFF);
-+	flexcan_reg_write(flexcan, CAN_HW_REG_IFLAG1, 0xFFFFFFFF);
-+
-+	flexcan_reg_write(flexcan, CAN_HW_REG_ECR, 0);
-+
-+	flexcan_mbm_init(flexcan);
-+	netif_carrier_on(dev);
-+	flexcan_hw_start(flexcan);
-+
-+	if (netif_queue_stopped(dev)) {
-+		ndev_dbg(dev, 1, "%s@%d: Starting netif queue\n",
-+			 __FUNCTION__, __LINE__);
-+		netif_start_queue(dev);
-+	}
-+	return 0;
-+}
-+
-+static void flexcan_hw_watch(unsigned long data)
-+{
-+	unsigned int reg, ecr;
-+	struct net_device *dev = (struct net_device *)data;
-+	struct flexcan_device *flexcan = netdev_priv(dev);
-+
-+	ndev_dbg(dev, 1, "%s: \n", __FUNCTION__);
-+
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
-+	if (reg & __MCR_MDIS) {
-+		if (flexcan_hw_restart(dev))
-+			mod_timer(&flexcan->timer, HZ / 20);
-+		return;
-+	}
-+	ecr = flexcan_reg_read(flexcan, CAN_HW_REG_ECR);
-+	if (flexcan->boff_rec) {
-+		if (((reg & __ESR_FLT_CONF_MASK) >> __ESR_FLT_CONF_OFF) > 1) {
-+			reg |= __MCR_SOFT_RST;
-+			ndev_dbg(dev, 1, "%s: Initiating soft reset\n", __FUNCTION__);
-+			flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg);
-+			mod_timer(&flexcan->timer, HZ / 20);
-+			return;
-+		}
-+		netif_carrier_on(dev);
-+	}
-+	ndev_dbg(dev, 1, "%s: Done\n", __FUNCTION__);
-+}
-+
-+static void flexcan_hw_busoff(struct net_device *dev)
-+{
-+	struct flexcan_device *flexcan = netdev_priv(dev);
-+	unsigned int reg;
-+
-+	netif_carrier_off(dev);
-+
-+	flexcan->timer.function = flexcan_hw_watch;
-+	flexcan->timer.data = (unsigned long)dev;
-+
-+	if (flexcan->boff_rec) {
-+		mod_timer(&flexcan->timer, HZ / 10);
-+		return;
-+	}
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_MCR);
-+	flexcan_reg_write(flexcan, CAN_HW_REG_MCR, reg | __MCR_SOFT_RST);
-+	mod_timer(&flexcan->timer, HZ / 20);
-+}
-+
-+static int flexcan_hw_open(struct flexcan_device *flexcan)
-+{
-+	int ret;
-+
-+	if ((ret = flexcan_hw_reset(flexcan)) != 0)
-+		return ret;
-+
-+	flexcan_mcr_setup(flexcan);
-+	flexcan_ctrl_setup(flexcan);
-+
-+	flexcan_reg_write(flexcan, CAN_HW_REG_IMASK2, 0);
-+	flexcan_reg_write(flexcan, CAN_HW_REG_IMASK1, 0);
-+
-+	flexcan_reg_write(flexcan, CAN_HW_REG_IFLAG2, 0xFFFFFFFF);
-+	flexcan_reg_write(flexcan, CAN_HW_REG_IFLAG1, 0xFFFFFFFF);
-+
-+	flexcan_reg_write(flexcan, CAN_HW_REG_ECR, 0);
-+	return 0;
-+}
-+
-+static void flexcan_err_handler(struct work_struct *work)
-+{
-+	struct flexcan_device *flexcan = container_of(work, struct flexcan_device, err_work);
-+	struct net_device *dev = platform_get_drvdata(flexcan->dev);
-+	struct sk_buff *skb;
-+	struct can_frame *frame;
-+	unsigned int esr, ecr;
-+
-+	ndev_dbg(dev, 1, "%s@%d: \n", __FUNCTION__, __LINE__);
-+
-+	esr = flexcan_reg_read(flexcan, CAN_HW_REG_ESR);
-+	flexcan_reg_write(flexcan, CAN_HW_REG_ESR, esr & __ESR_INTERRUPTS);
-+	enable_irq(flexcan->irq);
-+
-+	if (esr & __ESR_WAK_INT) {
-+		ndev_dbg(dev, 0, "%s@%d: \n", __FUNCTION__, __LINE__);
-+		return;
-+	}
-+
-+	skb = dev_alloc_skb(sizeof(struct can_frame));
-+	if (!skb) {
-+		ndev_err(dev, "%s: Failed to allocate skb\n", __func__);
-+		return;
-+	}
-+	frame = flexcan_skb_put(skb, sizeof(*frame));
-+	frame->can_id = CAN_ERR_FLAG | CAN_ERR_CRTL;
-+	frame->can_dlc = CAN_ERR_DLC;
-+
-+	if (esr & __ESR_TWRN_INT) {
-+		ndev_err(dev, "%s: TX_WARNING\n", __FUNCTION__);
-+		frame->data[1] |= CAN_ERR_CRTL_TX_WARNING;
-+	}
-+	if (esr & __ESR_RWRN_INT) {
-+		ndev_err(dev, "%s: RX_WARNING\n", __FUNCTION__);
-+		frame->data[1] |= CAN_ERR_CRTL_RX_WARNING;
-+	}
-+	if (esr & __ESR_BOFF_INT) {
-+		ndev_err(dev, "%s: BUS_OFF\n", __FUNCTION__);
-+		frame->can_id |= CAN_ERR_BUSOFF;
-+	}
-+	if (esr & __ESR_ERR_INT) {
-+		ndev_dbg(dev, 1, "%s@%d: \n", __FUNCTION__, __LINE__);
-+		if (esr & __ESR_BIT1_ERR) {
-+			ndev_err(dev, "%s: BIT1_ERR\n", __FUNCTION__);
-+			frame->data[2] |= CAN_ERR_PROT_BIT1;
-+		}
-+
-+		if (esr & __ESR_BIT0_ERR) {
-+			ndev_err(dev, "%s: BIT0_ERR\n", __FUNCTION__);
-+			frame->data[2] |= CAN_ERR_PROT_BIT0;
-+		}
-+
-+		if (esr & __ESR_ACK_ERR) {
-+			ndev_err(dev, "%s: ACK_ERR\n", __FUNCTION__);
-+			frame->can_id |= CAN_ERR_ACK;
-+		}
-+
-+		/*TODO:// if (esr & __ESR_CRC_ERR) */
-+
-+		if (esr & __ESR_FRM_ERR) {
-+			ndev_err(dev, "%s: FRM_ERR\n", __FUNCTION__);
-+			frame->data[2] |= CAN_ERR_PROT_FORM;
-+		}
-+
-+		if (esr & __ESR_STF_ERR) {
-+			ndev_err(dev, "%s: STF_ERR\n", __FUNCTION__);
-+			frame->data[2] |= CAN_ERR_PROT_STUFF;
-+		}
-+
-+		ecr = flexcan_reg_read(flexcan, CAN_HW_REG_ECR);
-+		switch ((esr & __ESR_FLT_CONF_MASK) >> __ESR_FLT_CONF_OFF) {
-+		case 0:
-+			ndev_dbg(dev, 0, "%s@%d: \n", __FUNCTION__, __LINE__);
-+			if (__ECR_TX_ERR_COUNTER(ecr) >= __ECR_ACTIVE_THRESHOLD)
-+				frame->data[1] |= CAN_ERR_CRTL_TX_WARNING;
-+			if (__ECR_RX_ERR_COUNTER(ecr) >= __ECR_ACTIVE_THRESHOLD)
-+				frame->data[1] |= CAN_ERR_CRTL_RX_WARNING;
-+			break;
-+		case 1:
-+			ndev_dbg(dev, 0, "%s@%d: \n", __FUNCTION__, __LINE__);
-+			if (__ECR_TX_ERR_COUNTER(ecr) >=
-+			    __ECR_PASSIVE_THRESHOLD)
-+				frame->data[1] |= CAN_ERR_CRTL_TX_PASSIVE;
-+
-+			if (__ECR_RX_ERR_COUNTER(ecr) >=
-+			    __ECR_PASSIVE_THRESHOLD)
-+				frame->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;
-+			break;
-+		default:
-+			ndev_dbg(dev, 0, "%s@%d: \n", __FUNCTION__, __LINE__);
-+			frame->can_id |= CAN_ERR_BUSOFF;
-+		}
-+	}
-+
-+	if (frame->can_id & CAN_ERR_BUSOFF) {
-+		ndev_dbg(dev, 0, "%s: switchung bus off\n", __FUNCTION__);
-+		flexcan_hw_busoff(dev);
-+	}
-+	skb->dev = dev;
-+	skb->ip_summed = CHECKSUM_UNNECESSARY;
-+	netif_receive_skb(skb);
-+}
-+
-+static irqreturn_t flexcan_irq_handler(int irq, void *data)
-+{
-+	struct net_device *dev = data;
-+	struct flexcan_device *flexcan = netdev_priv(dev);
-+	unsigned int reg;
-+
-+	ndev_dbg(dev, 1, "%s: \n", __FUNCTION__);
-+	disable_irq_nosync(irq);
-+
-+	reg = flexcan_reg_read(flexcan, CAN_HW_REG_ESR);
-+	if (reg & __ESR_INTERRUPTS) {
-+		ndev_dbg(dev, 1, "%s: Scheduling err handler\n", __FUNCTION__);
-+		schedule_work(&flexcan->err_work);
-+		return IRQ_HANDLED;
-+	}
-+
-+	ndev_dbg(dev, 1, "%s: Scheduling mbm handler\n", __FUNCTION__);
-+	schedule_work(&flexcan->mb_work);
-+	return IRQ_HANDLED;
-+}
-+
-+static int flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)
-+{
-+	struct can_frame *frame = flexcan_skb_data(skb);
-+	struct flexcan_device *flexcan = netdev_priv(dev);
-+	struct net_device_stats *stats = flexcan_get_stats(dev);
-+
-+	ndev_dbg(dev, 1, "%s: \n", __FUNCTION__);
-+
-+	if (frame->can_dlc > 8)
-+		return -EINVAL;
-+
-+	if (flexcan_mbm_xmit(flexcan, frame)) {
-+		dev_kfree_skb(skb);
-+		stats->tx_bytes += frame->can_dlc;
-+		stats->tx_packets++;
-+		dev->trans_start = jiffies;
-+		if (--flexcan->xmit_buffers == 0) {
-+			ndev_dbg(dev, 1, "%s: Stopping netif queue\n", __FUNCTION__);
-+			netif_stop_queue(dev);
-+		}
-+		BUG_ON(flexcan->xmit_buffers < 0);
-+		return NETDEV_TX_OK;
-+	}
-+	ndev_dbg(dev, 1, "%s: could not transmit message\n", __FUNCTION__);
-+	return NETDEV_TX_BUSY;
-+}
-+
-+static int flexcan_open(struct net_device *dev)
-+{
-+	int ret;
-+	struct flexcan_device *flexcan = netdev_priv(dev);
-+	struct platform_device *pdev = flexcan->dev;
-+	struct flexcan_platform_data *plat_data = pdev->dev.platform_data;
-+
-+	ndev_dbg(dev, 0, "%s: \n", __FUNCTION__);
-+
-+	ret = clk_enable(flexcan->clk);
-+	if (ret)
-+		goto clk_err;
-+
-+	if (flexcan->core_reg) {
-+		ret = regulator_enable(flexcan->core_reg);
-+		if (ret)
-+			goto core_reg_err;
-+	}
-+
-+	if (flexcan->io_reg) {
-+		ret = regulator_enable(flexcan->io_reg);
-+		if (ret)
-+			goto io_reg_err;
-+	}
-+
-+	if (plat_data && plat_data->xcvr_enable) {
-+		ret = plat_data->xcvr_enable(pdev, 1);
-+		if (ret)
-+			goto enable_err;
-+	}
-+
-+	ret = request_irq(flexcan->irq, flexcan_irq_handler, IRQF_SAMPLE_RANDOM,
-+			  dev->name, dev);
-+	if (ret)
-+		goto irq_err;
-+
-+	ret = flexcan_hw_open(flexcan);
-+	if (ret)
-+		goto open_err;
-+
-+	flexcan_mbm_init(flexcan);
-+	netif_carrier_on(dev);
-+	flexcan_hw_start(flexcan);
-+	return 0;
-+
-+ open_err:
-+	free_irq(flexcan->irq, dev);
-+ irq_err:
-+	if (plat_data && plat_data->xcvr_enable)
-+		plat_data->xcvr_enable(pdev, 0);
-+ enable_err:
-+	if (flexcan->io_reg)
-+		regulator_disable(flexcan->io_reg);
-+ io_reg_err:
-+	if (flexcan->core_reg)
-+		regulator_disable(flexcan->core_reg);
-+ core_reg_err:
-+	if (flexcan->clk)
-+		clk_disable(flexcan->clk);
-+ clk_err:
-+	return ret;
-+}
-+
-+static int flexcan_stop(struct net_device *dev)
-+{
-+	struct flexcan_device *flexcan = netdev_priv(dev);
-+	struct platform_device *pdev = flexcan->dev;
-+	struct flexcan_platform_data *plat_data = pdev->dev.platform_data;
-+
-+	flexcan_hw_stop(flexcan);
-+
-+	free_irq(flexcan->irq, dev);
-+
-+	if (plat_data && plat_data->xcvr_enable)
-+		plat_data->xcvr_enable(pdev, 0);
-+
-+	if (flexcan->io_reg)
-+		regulator_disable(flexcan->io_reg);
-+	if (flexcan->core_reg)
-+		regulator_disable(flexcan->core_reg);
-+	clk_disable(flexcan->clk);
-+	return 0;
-+}
-+
-+static const struct net_device_ops flexcan_netdev_ops = {
-+	.ndo_open	= flexcan_open,
-+	.ndo_stop	= flexcan_stop,
-+	.ndo_start_xmit = flexcan_start_xmit,
-+	.ndo_get_stats	= flexcan_get_stats,
-+};
-+
-+static void flexcan_setup(struct net_device *dev)
-+{
-+	dev->type = ARPHRD_CAN;
-+	dev->mtu = sizeof(struct can_frame);
-+	dev->hard_header_len = 0;
-+	dev->addr_len = 0;
-+	dev->tx_queue_len = FLEXCAN_MAX_MB;
-+	dev->flags = IFF_NOARP;
-+	dev->features = NETIF_F_NO_CSUM;
-+
-+	dev->netdev_ops = &flexcan_netdev_ops;
-+	dev->destructor = flexcan_device_free;
-+}
-+
-+static int flexcan_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	struct net_device *net;
-+
-+	net = flexcan_device_alloc(pdev, flexcan_setup);
-+	if (IS_ERR(net))
-+		return PTR_ERR(net);
-+
-+	ret = register_netdev(net);
-+	if (ret) {
-+		flexcan_device_free(net);
-+	}
-+	return ret;
-+}
-+
-+static int flexcan_remove(struct platform_device *pdev)
-+{
-+	struct net_device *net = platform_get_drvdata(pdev);
-+
-+	unregister_netdev(net);
-+	return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int flexcan_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+	struct net_device *net = platform_get_drvdata(pdev);
-+	struct flexcan_device *flexcan = netdev_priv(net);
-+	struct flexcan_platform_data *plat_data;
-+
-+	if (!(net->flags & IFF_UP))
-+		return 0;
-+
-+	if (flexcan->wakeup)
-+		set_irq_wake(flexcan->irq, 1);
-+	else {
-+		int ret;
-+
-+		plat_data = pdev->dev.platform_data;
-+
-+		if (plat_data && plat_data->xcvr_enable) {
-+			ret = plat_data->xcvr_enable(pdev, 0);
-+			if (ret)
-+				return ret;
-+		}
-+		if (flexcan->io_reg) {
-+			ret = regulator_disable(flexcan->io_reg);
-+			if (ret)
-+				return ret;
-+		}
-+		if (flexcan->core_reg) {
-+			ret = regulator_disable(flexcan->core_reg);
-+			if (ret)
-+				return ret;
-+		}
-+		clk_disable(flexcan->clk);
-+		if (plat_data && plat_data->inactive) {
-+			plat_data->inactive(pdev);
-+		}
-+	}
-+	return 0;
-+}
-+
-+static int flexcan_resume(struct platform_device *pdev)
-+{
-+	int ret;
-+	struct net_device *net = platform_get_drvdata(pdev);
-+	struct flexcan_device *flexcan = netdev_priv(net);
-+	struct flexcan_platform_data *plat_data;
-+
-+	if (!(net->flags & IFF_UP))
-+		return 0;
-+
-+	if (flexcan->wakeup)
-+		set_irq_wake(flexcan->irq, 0);
-+	else {
-+		plat_data = pdev->dev.platform_data;
-+		if (plat_data && plat_data->active) {
-+			ret = plat_data->active(pdev);
-+			if (ret)
-+				printk(KERN_ERR "%s: Failed activate hardware: %d\n",
-+				       __func__, ret);
-+		}
-+		ret = clk_enable(flexcan->clk);
-+		if (ret)
-+			printk(KERN_ERR "%s: Failed to enable clock: %d\n",
-+			       __func__, ret);
-+
-+		if (flexcan->core_reg) {
-+			ret = regulator_enable(flexcan->core_reg);
-+			if (ret)
-+				printk(KERN_ERR "%s: Failed to enable core voltage: %d\n",
-+				       __func__, ret);
-+		}
-+		if (flexcan->io_reg) {
-+			ret = regulator_enable(flexcan->io_reg);
-+			if (ret)
-+				printk(KERN_ERR "%s: Failed to enable io voltage: %d\n",
-+				       __func__, ret);
-+		}
-+
-+		if (plat_data && plat_data->xcvr_enable) {
-+			ret = plat_data->xcvr_enable(pdev, 1);
-+			if (ret)
-+				printk(KERN_ERR "%s: Failed to enable transceiver: %d\n",
-+				       __func__, ret);
-+		}
-+	}
-+	return 0;
-+}
-+#else
-+#define flexcan_suspend		NULL
-+#define flexcan_resume		NULL
-+#endif
-+
-+static struct platform_driver flexcan_driver = {
-+	.driver = {
-+		.name = "mxc-flexcan",
-+	},
-+	.probe = flexcan_probe,
-+	.remove = flexcan_remove,
-+	.suspend = flexcan_suspend,
-+	.resume = flexcan_resume,
-+};
-+
-+static __init int flexcan_init(void)
-+{
-+	pr_info("Freescale FlexCAN Driver \n");
-+	return platform_driver_register(&flexcan_driver);
-+}
-+
-+static __exit void flexcan_exit(void)
-+{
-+	return platform_driver_unregister(&flexcan_driver);
-+}
-+
-+module_init(flexcan_init);
-+module_exit(flexcan_exit);
-+
-+MODULE_LICENSE("GPL");
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/drivers/net/can/flexcan.h linux-2.6.30-rc4-karo2/drivers/net/can/flexcan.h
---- linux-2.6.30-rc4-karo/drivers/net/can/flexcan.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo2/drivers/net/can/flexcan.h	2009-07-06 15:46:51.000000000 +0200
-@@ -0,0 +1,214 @@
-+/*
-+ * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/*!
-+ * @file flexcan.h
-+ *
-+ * @brief FlexCan definitions.
-+ *
-+ * @ingroup can
-+ */
-+
-+#ifndef __CAN_FLEXCAN_H__
-+#define __CAN_FLEXCAN_H__
-+
-+#include <linux/list.h>
-+#include <linux/platform_device.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/clk.h>
-+#include <linux/can.h>
-+#include <linux/can/core.h>
-+#include <linux/can/error.h>
-+
-+struct can_mb_cs {
-+	unsigned int time_stamp:16;
-+	unsigned int length:4;
-+	unsigned int rtr:1;
-+	unsigned int ide:1;
-+	unsigned int srr:1;
-+	unsigned int nouse1:1;
-+	unsigned int code:4;
-+	unsigned int nouse2:4;
-+};
-+
-+#define CAN_MB_RX_INACTIVE	0x0
-+#define CAN_MB_RX_EMPTY		0x4
-+#define CAN_MB_RX_FULL		0x2
-+#define CAN_MB_RX_OVERRUN	0x6
-+#define CAN_MB_RX_BUSY		0x1
-+
-+#define CAN_MB_TX_INACTIVE	0x8
-+#define CAN_MB_TX_ABORT		0x9
-+#define CAN_MB_TX_ONCE		0xC
-+#define CAN_MB_TX_REMOTE	0xA
-+
-+struct can_hw_mb {
-+	union {
-+		struct can_mb_cs cs;
-+		unsigned int data;
-+	} mb_cs;
-+	unsigned int mb_id;
-+	unsigned char mb_data[8];
-+};
-+
-+#define CAN_HW_REG_MCR		0x00
-+#define CAN_HW_REG_CTRL		0x04
-+#define CAN_HW_REG_TIMER	0x08
-+#define CAN_HW_REG_RXGMASK	0x10
-+#define CAN_HW_REG_RX14MASK	0x14
-+#define CAN_HW_REG_RX15MASK	0x18
-+#define CAN_HW_REG_ECR		0x1C
-+#define CAN_HW_REG_ESR		0x20
-+#define CAN_HW_REG_IMASK2	0x24
-+#define CAN_HW_REG_IMASK1	0x28
-+#define CAN_HW_REG_IFLAG2	0x2C
-+#define CAN_HW_REG_IFLAG1	0x30
-+
-+#define CAN_MB_BASE	0x0080
-+#define CAN_RXMASK_BASE	0x0880
-+#define CAN_FIFO_BASE	0xE0
-+
-+#define __MCR_MDIS		(1 << 31)
-+#define __MCR_FRZ		(1 << 30)
-+#define __MCR_FEN		(1 << 29)
-+#define __MCR_HALT		(1 << 28)
-+#define __MCR_NOTRDY		(1 << 27)
-+#define __MCR_WAK_MSK		(1 << 26)
-+#define __MCR_SOFT_RST		(1 << 25)
-+#define __MCR_FRZ_ACK		(1 << 24)
-+#define __MCR_SLF_WAK		(1 << 22)
-+#define __MCR_WRN_EN		(1 << 21)
-+#define __MCR_LPM_ACK		(1 << 20)
-+#define __MCR_WAK_SRC		(1 << 19)
-+#define __MCR_DOZE		(1 << 18)
-+#define __MCR_SRX_DIS		(1 << 17)
-+#define __MCR_BCC		(1 << 16)
-+#define __MCR_LPRIO_EN		(1 << 13)
-+#define __MCR_AEN		(1 << 12)
-+#define __MCR_MAX_IDAM_OFFSET 	8
-+#define __MCR_MAX_IDAM_MASK 	(0x3 << __MCR_MAX_IDAM_OFFSET)
-+#define __MCR_MAX_IDAM_A	(0x0 << __MCR_MAX_IDAM_OFFSET)
-+#define __MCR_MAX_IDAM_B	(0x1 << __MCR_MAX_IDAM_OFFSET)
-+#define __MCR_MAX_IDAM_C	(0x2 << __MCR_MAX_IDAM_OFFSET)
-+#define __MCR_MAX_IDAM_D	(0x3 << __MCR_MAX_IDAM_OFFSET)
-+#define __MCR_MAX_MB_OFFSET 	0
-+#define __MCR_MAX_MB_MASK 	(0x3F)
-+
-+#define __CTRL_PRESDIV_OFFSET	24
-+#define __CTRL_PRESDIV_MASK	(0xFF << __CTRL_PRESDIV_OFFSET)
-+#define __CTRL_RJW_OFFSET	22
-+#define __CTRL_RJW_MASK		(0x3 << __CTRL_RJW_OFFSET)
-+#define __CTRL_PSEG1_OFFSET	19
-+#define __CTRL_PSEG1_MASK	(0x7 << __CTRL_PSEG1_OFFSET)
-+#define __CTRL_PSEG2_OFFSET	16
-+#define __CTRL_PSEG2_MASK	(0x7 << __CTRL_PSEG2_OFFSET)
-+#define __CTRL_BOFF_MSK		(0x1 << 15)
-+#define __CTRL_ERR_MSK		(0x1 << 14)
-+#define __CTRL_CLK_SRC		(0x1 << 13)
-+#define __CTRL_LPB		(0x1 << 12)
-+#define __CTRL_TWRN_MSK		(0x1 << 11)
-+#define __CTRL_RWRN_MSK		(0x1 << 10)
-+#define __CTRL_SMP		(0x1 << 7)
-+#define __CTRL_BOFF_REC		(0x1 << 6)
-+#define __CTRL_TSYN		(0x1 << 5)
-+#define __CTRL_LBUF		(0x1 << 4)
-+#define __CTRL_LOM		(0x1 << 3)
-+#define __CTRL_PROPSEG_OFFSET	0
-+#define __CTRL_PROPSEG_MASK	(0x7)
-+
-+#define __ECR_TX_ERR_COUNTER(x) ((x) & 0xFF)
-+#define __ECR_RX_ERR_COUNTER(x) (((x) >> 8) & 0xFF)
-+#define __ECR_PASSIVE_THRESHOLD	128
-+#define __ECR_ACTIVE_THRESHOLD	96
-+
-+#define __ESR_TWRN_INT		(0x1 << 17)
-+#define __ESR_RWRN_INT		(0x1 << 16)
-+#define __ESR_BIT1_ERR		(0x1 << 15)
-+#define __ESR_BIT0_ERR		(0x1 << 14)
-+#define __ESR_ACK_ERR		(0x1 << 13)
-+#define __ESR_CRC_ERR		(0x1 << 12)
-+#define __ESR_FRM_ERR		(0x1 << 11)
-+#define __ESR_STF_ERR		(0x1 << 10)
-+#define __ESR_TX_WRN		(0x1 << 9)
-+#define __ESR_RX_WRN		(0x1 << 8)
-+#define __ESR_IDLE		(0x1 << 7)
-+#define __ESR_TXRX		(0x1 << 6)
-+#define __ESR_FLT_CONF_OFF	4
-+#define __ESR_FLT_CONF_MASK	(0x3 << __ESR_FLT_CONF_OFF)
-+#define __ESR_BOFF_INT		(0x1 << 2)
-+#define __ESR_ERR_INT		(0x1 << 1)
-+#define __ESR_WAK_INT		(0x1)
-+
-+#define __ESR_INTERRUPTS	(__ESR_WAK_INT | __ESR_ERR_INT | \
-+				__ESR_BOFF_INT | __ESR_TWRN_INT | \
-+				__ESR_RWRN_INT)
-+
-+#define __FIFO_OV_INT		(1 << 7)
-+#define __FIFO_WARN_INT		(1 << 6)
-+#define __FIFO_RDY_INT		(1 << 5)
-+
-+#define FLEXCAN_MAX_FIFO_MB	8
-+#define FLEXCAN_MAX_MB		64
-+#define FLEXCAN_MAX_PRESDIV	256
-+#define FLEXCAN_MAX_RJW		4
-+#define FLEXCAN_MAX_PSEG1	8
-+#define FLEXCAN_MAX_PSEG2	8
-+#define FLEXCAN_MAX_PROPSEG	8
-+#define FLEXCAN_MAX_BITRATE	1000000
-+
-+struct flexcan_device {
-+	struct mutex mutex;
-+	struct work_struct err_work;
-+	struct work_struct mb_work;
-+	void __iomem *io_base;
-+	struct can_hw_mb __iomem *hwmb;
-+	unsigned int __iomem *rx_mask;
-+	int xmit_buffers;
-+	unsigned int xmit_mb;
-+	unsigned int bitrate;
-+	/* word 1 */
-+	unsigned int br_presdiv:8;
-+	unsigned int br_rjw:2;
-+	unsigned int br_propseg:3;
-+	unsigned int br_pseg1:3;
-+	unsigned int br_pseg2:3;
-+	unsigned int maxmb:6;
-+	unsigned int xmit_maxmb:6;
-+	unsigned int rsrvd:1;
-+
-+	/* word 2 */
-+	unsigned int fifo:1;
-+	unsigned int wakeup:1;
-+	unsigned int srx_dis:1;
-+	unsigned int wak_src:1;
-+	unsigned int bcc:1;
-+	unsigned int lprio:1;
-+	unsigned int abort:1;
-+	unsigned int br_clksrc:1;
-+	unsigned int loopback:1;
-+	unsigned int smp:1;
-+	unsigned int boff_rec:1;
-+	unsigned int tsyn:1;
-+	unsigned int listen:1;
-+
-+	unsigned int ext_msg:1;
-+	unsigned int std_msg:1;
-+
-+	struct timer_list timer;
-+	struct platform_device *dev;
-+	struct regulator *core_reg;
-+	struct regulator *io_reg;
-+	struct clk *clk;
-+	int irq;
-+};
-+#endif /* __CAN_FLEXCAN_H__ */
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/drivers/net/fec.c linux-2.6.30-rc4-karo2/drivers/net/fec.c
---- linux-2.6.30-rc4-karo/drivers/net/fec.c	2009-07-06 17:06:29.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/drivers/net/fec.c	2009-07-06 15:46:48.000000000 +0200
-@@ -493,45 +493,6 @@ static inline void fec_enet_txbuf_put(st
- 				   len, DMA_TO_DEVICE);
- }
- 
--static void dump_packet(const char *prefix, const unsigned char *data, int len)
--{
--	if (dbg_lvl(3)) {
--		print_hex_dump_bytes(prefix, DUMP_PREFIX_OFFSET, data, len);
--	}
--}
--
--static void dump_tx_buffers(struct fec_enet_private *fep)
--{
--	cbd_t *bdp = fep->tx_bd_base;
--	int i;
--
--	printk(KERN_DEBUG "tx buffers: %u buffers\n", TX_RING_SIZE);
--	for (i = 0; i < TX_RING_SIZE; i++, bdp++) {
--		printk(KERN_DEBUG "  %p: %04x %04x %08x\n",
--		       bdp,
--		       bdp->cbd_sc,
--		       bdp->cbd_datlen,
--		       bdp->cbd_bufaddr);
--		print_hex_dump_bytes("tx buffers:", DUMP_PREFIX_ADDRESS, bdp, sizeof(cbd_t));
--	}
--}
--
--static void dump_rx_buffers(struct fec_enet_private *fep)
--{
--	cbd_t *bdp = fep->rx_bd_base;
--	int i;
--
--	printk(KERN_DEBUG "rx buffers: %lu buffers\n", RX_RING_SIZE);
--	for (i = 0; i < RX_RING_SIZE; i++, bdp++) {
--		printk(KERN_DEBUG "  %p: %04x %04x %08x\n",
--		       bdp,
--		       bdp->cbd_sc,
--		       bdp->cbd_datlen,
--		       bdp->cbd_bufaddr);
--		print_hex_dump_bytes("rx buffers:", DUMP_PREFIX_ADDRESS, bdp, sizeof(cbd_t));
--	}
--}
--
- static int
- fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
- {
-@@ -543,12 +504,11 @@ fec_enet_start_xmit(struct sk_buff *skb,
- 	if (!fep->linkstatus) {
- 		DBG(0, "%s: Cannot send packet; link is down\n", __FUNCTION__);
- 		/* Link is down or autonegotiation is in progress. */
--		return 1;
-+		return NETDEV_TX_BUSY;
- 	}
- 
- 	spin_lock_irqsave(&fep->lock, flags);
- 
--	//WARN_ON(fec_reg_read(fep, FEC_TDAR) & TDAR_BUSY);
- 	fec_enet_cbd_get(fep);
- 
- 	/* Fill in a Tx ring entry */
-@@ -563,7 +523,7 @@ fec_enet_start_xmit(struct sk_buff *skb,
- 		printk("%s: tx queue full!.\n", dev->name);
- 		fec_enet_cbd_put(fep);
- 		spin_unlock_irqrestore(&fep->lock, flags);
--		return 1;
-+		return NETDEV_TX_BUSY;
- 	}
- #endif
- 	/* Clear all of the status flags.
-@@ -574,7 +534,6 @@ fec_enet_start_xmit(struct sk_buff *skb,
- 	*/
- 	bdp->cbd_datlen = skb->len;
- 
--	dump_packet("sending packet:", skb->data, skb->len);
- 	/*
- 	 *	On some FEC implementations data must be aligned on
- 	 *	4-byte boundaries. Use bounce buffers to copy data
-@@ -621,18 +580,13 @@ fec_enet_start_xmit(struct sk_buff *skb,
- 
- 	fep->cur_tx = bdp;
- 	fec_enet_cbd_put(fep);
--#if 0
--	if (dbg_lvl(3)) {
--		dump_tx_buffers(fep);
--		dump_rx_buffers(fep);
--	}
--#endif
-+
- 	/* Trigger transmission start */
- 	fec_reg_write(fep, FEC_TDAR, DONT_CARE);
- 
- 	spin_unlock_irqrestore(&fep->lock, flags);
- 
--	return 0;
-+	return NETDEV_TX_OK;
- }
- 
- static void
-@@ -758,7 +712,6 @@ fec_enet_tx(struct net_device *dev)
- 
- 	spin_lock(&fep->lock);
- 
--	//WARN_ON(fec_reg_read(fep, FEC_TDAR) & TDAR_BUSY);
- 	fec_enet_cbd_get(fep);
- 	bdp = fep->dirty_tx;
- 
-@@ -795,8 +748,6 @@ fec_enet_tx(struct net_device *dev)
- 		if (status & BD_ENET_TX_DEF)
- 			fep->stats.collisions++;
- 
--		dump_packet("sent packet:", fep->tx_skbuff[fep->skb_dirty]->data,
--			    fep->tx_skbuff[fep->skb_dirty]->len);
- 		/* Free the sk buffer associated with this last transmit.
- 		 */
- 		fec_free_skb(fep, bdp, &fep->tx_skbuff[fep->skb_dirty]);
-@@ -895,32 +846,14 @@ while (!((status = bdp->cbd_sc) & BD_ENE
- 		fep->stats.rx_errors++;
- 		fep->stats.rx_frame_errors++;
- 		DBG(0, "%s: Collision detected; dropping packet\n", __FUNCTION__);
--		if (bdp->cbd_datlen > PKT_MAXBUF_SIZE) {
--			printk(KERN_ERR "invalid packet size %u; max %u\n", bdp->cbd_datlen,
--			       PKT_MAXBUF_SIZE);
--		} else {
--			fec_enet_rxbuf_get(fep, bdp, bdp->cbd_datlen);
--			dump_packet("received packet:",
--				    fep->rx_skbuff[rx_index]->data, bdp->cbd_datlen);
--			fec_enet_rxbuf_put(fep, bdp, bdp->cbd_datlen);
--		}
- 		goto rx_processing_done;
- 	}
--#if 1
-+
- 	if (!fep->opened) {
- 		DBG(0, "%s: Driver not opened; ignoring packet\n", __FUNCTION__);
--		if (bdp->cbd_datlen > PKT_MAXBUF_SIZE) {
--			printk(KERN_ERR "invalid packet size %u; max %u\n", bdp->cbd_datlen,
--			       PKT_MAXBUF_SIZE);
--		} else {
--			fec_enet_rxbuf_get(fep, bdp, bdp->cbd_datlen);
--			dump_packet("received packet:",
--				    fep->rx_skbuff[rx_index]->data, bdp->cbd_datlen);
--			fec_enet_rxbuf_put(fep, bdp, bdp->cbd_datlen);
--		}
- 		goto rx_processing_done;
- 	}
--#endif
-+
- 	/* Process the incoming frame.
- 	 */
- 	fep->stats.rx_packets++;
-@@ -971,12 +904,6 @@ while (!((status = bdp->cbd_sc) & BD_ENE
- 		netif_rx(skb);
- 	}
-   rx_processing_done:
--#if 0
--	if (dbg_lvl(3)) {
--		dump_rx_buffers(fep);
--		dump_tx_buffers(fep);
--	}
--#endif
- 	/* Clear the status flags for this buffer.
- 	*/
- 	status &= ~BD_ENET_RX_STATS;
-@@ -2948,8 +2875,6 @@ static int __devexit fec_enet_remove(str
- 	struct fec_enet_private *fep = netdev_priv(dev);
- 
- 	unregister_netdev(dev);
--	free_netdev(dev);
--
- #ifdef CONFIG_PHYLIB
- 	if (fep->mii != NULL) {
- 		kfree(fep->mii->irq);
-@@ -2974,6 +2899,7 @@ static int __devexit fec_enet_remove(str
- 	if (fep->res_mem2 != NULL) {
- 		release_resource(fep->res_mem2);
- 	}
-+	free_netdev(dev);
- 	return 0;
- }
- 
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/drivers/usb/Kconfig linux-2.6.30-rc4-karo2/drivers/usb/Kconfig
---- linux-2.6.30-rc4-karo/drivers/usb/Kconfig	2009-06-02 17:13:42.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/drivers/usb/Kconfig	2009-06-29 10:49:52.000000000 +0200
-@@ -57,6 +57,7 @@ config USB_ARCH_HAS_EHCI
- 	default y if PPC_83xx
- 	default y if SOC_AU1200
- 	default y if ARCH_IXP4XX
-+	default y if ARCH_MXC
- 	default PCI
- 
- # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/drivers/usb/host/Kconfig linux-2.6.30-rc4-karo2/drivers/usb/host/Kconfig
---- linux-2.6.30-rc4-karo/drivers/usb/host/Kconfig	2009-06-02 17:14:19.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/drivers/usb/host/Kconfig	2009-07-06 15:47:38.000000000 +0200
-@@ -106,6 +106,37 @@ config USB_OXU210HP_HCD
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called oxu210hp-hcd.
- 
-+config USB_EHCI_MXC
-+	bool "Support for Freescale on-chip EHCI USB controller"
-+	depends on USB_EHCI_HCD && ARCH_MXC
-+	select USB_EHCI_ROOT_HUB_TT
-+	---help---
-+	  Variation of ARC USB block used in some Freescale chips.
-+
-+config ARCH_MXC_EHCI_USBH1
-+	bool "Enable USB on USBH1 port"
-+	depends on USB_EHCI_MXC && ARCH_MXC_HAS_USBH1
-+
-+config ARCH_MXC_EHCI_USBH2
-+	bool "Enable USB on USBH2 port"
-+	depends on USB_EHCI_MXC && ARCH_MXC_HAS_USBH2
-+
-+config ARCH_MXC_EHCI_USBOTG
-+	bool "Enable USB on USBOTG port"
-+	depends on USB_EHCI_MXC && ARCH_MXC_HAS_USBOTG
-+
-+config ARCH_MXC_HAS_USBH1
-+	bool
-+	depends on USB_EHCI_MXC
-+
-+config ARCH_MXC_HAS_USBH2
-+	bool
-+	depends on USB_EHCI_MXC
-+
-+config ARCH_MXC_HAS_USBOTG
-+	bool
-+	depends on USB_EHCI_MXC
-+
- config USB_ISP116X_HCD
- 	tristate "ISP116X HCD support"
- 	depends on USB
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/drivers/usb/host/ehci-hcd.c linux-2.6.30-rc4-karo2/drivers/usb/host/ehci-hcd.c
---- linux-2.6.30-rc4-karo/drivers/usb/host/ehci-hcd.c	2009-06-02 17:14:21.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/drivers/usb/host/ehci-hcd.c	2009-07-01 11:30:25.000000000 +0200
-@@ -1047,6 +1047,11 @@ MODULE_LICENSE ("GPL");
- #define	PLATFORM_DRIVER		ehci_fsl_driver
- #endif
- 
-+#ifdef CONFIG_USB_EHCI_MXC
-+#include "ehci-mxc.c"
-+#define PLATFORM_DRIVER		ehci_mxc_driver
-+#endif
-+
- #ifdef CONFIG_SOC_AU1200
- #include "ehci-au1xxx.c"
- #define	PLATFORM_DRIVER		ehci_hcd_au1xxx_driver
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/drivers/usb/host/ehci-mxc.c linux-2.6.30-rc4-karo2/drivers/usb/host/ehci-mxc.c
---- linux-2.6.30-rc4-karo/drivers/usb/host/ehci-mxc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo2/drivers/usb/host/ehci-mxc.c	2009-07-01 11:31:58.000000000 +0200
-@@ -0,0 +1,247 @@
-+/*
-+ * Copyright (c) 2008 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License as published by the
-+ * Free Software Foundation; either version 2 of the License, or (at your
-+ * option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software Foundation,
-+ * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <mach/mxc_ehci.h>
-+
-+/* called during probe() after chip reset completes */
-+static int ehci_mxc_setup(struct usb_hcd *hcd)
-+{
-+	struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-+	int retval;
-+
-+	/* EHCI registers start at offset 0x100 */
-+	ehci->caps = hcd->regs + 0x100;
-+	ehci->regs = hcd->regs + 0x100 +
-+	    HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
-+	dbg_hcs_params(ehci, "reset");
-+	dbg_hcc_params(ehci, "reset");
-+
-+	/* cache this readonly data; minimize chip reads */
-+	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
-+
-+	retval = ehci_halt(ehci);
-+	if (retval)
-+		return retval;
-+
-+	/* data structure init */
-+	retval = ehci_init(hcd);
-+	if (retval)
-+		return retval;
-+
-+	hcd->has_tt = 1;
-+
-+	ehci->sbrn = 0x20;
-+
-+	ehci_reset(ehci);
-+
-+	ehci_port_power(ehci, 0);
-+	return 0;
-+}
-+
-+static const struct hc_driver ehci_mxc_hc_driver = {
-+	.description = hcd_name,
-+	.product_desc = "Freescale On-Chip EHCI Host Controller",
-+	.hcd_priv_size = sizeof(struct ehci_hcd),
-+
-+	/*
-+	 * generic hardware linkage
-+	 */
-+	.irq = ehci_irq,
-+	.flags = HCD_USB2 | HCD_MEMORY,
-+
-+	/*
-+	 * basic lifecycle operations
-+	 */
-+	.reset = ehci_mxc_setup,
-+	.start = ehci_run,
-+	.stop = ehci_stop,
-+	.shutdown = ehci_shutdown,
-+
-+	/*
-+	 * managing i/o requests and associated device resources
-+	 */
-+	.urb_enqueue = ehci_urb_enqueue,
-+	.urb_dequeue = ehci_urb_dequeue,
-+	.endpoint_disable = ehci_endpoint_disable,
-+
-+	/*
-+	 * scheduling support
-+	 */
-+	.get_frame_number = ehci_get_frame,
-+
-+	/*
-+	 * root hub support
-+	 */
-+	.hub_status_data = ehci_hub_status_data,
-+	.hub_control = ehci_hub_control,
-+	.bus_suspend = ehci_bus_suspend,
-+	.bus_resume = ehci_bus_resume,
-+	.relinquish_port = ehci_relinquish_port,
-+	.port_handed_over = ehci_port_handed_over,
-+};
-+
-+static int ehci_mxc_drv_probe(struct platform_device *pdev)
-+{
-+	struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
-+	struct usb_hcd *hcd;
-+	struct resource *res;
-+	int irq, ret, temp;
-+	struct clk *usbclk, *ahbclk;
-+
-+	dev_info(&pdev->dev, "initializing i.MX USB Controller\n");
-+
-+	/* Need platform data for setup */
-+	if (!pdata) {
-+		dev_err(&pdev->dev,
-+			"No platform data for %s.\n", dev_name(&pdev->dev));
-+		return -ENODEV;
-+	}
-+
-+	irq = platform_get_irq(pdev, 0);
-+
-+	hcd = usb_create_hcd(&ehci_mxc_hc_driver, &pdev->dev, dev_name(&pdev->dev));
-+	if (!hcd) {
-+		ret = -ENOMEM;
-+		goto err1;
-+	}
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res) {
-+		dev_err(&pdev->dev,
-+			"Found HC with no register addr. Check %s setup!\n",
-+			dev_name(&pdev->dev));
-+		ret = -ENODEV;
-+		goto err1;
-+	}
-+
-+	hcd->rsrc_start = res->start;
-+	hcd->rsrc_len = resource_size(res);
-+
-+	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
-+		dev_dbg(&pdev->dev, "controller already in use\n");
-+		ret = -EBUSY;
-+		goto err1;
-+	}
-+
-+	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
-+	if (!hcd->regs) {
-+		dev_err(&pdev->dev, "error mapping memory\n");
-+		ret = -EFAULT;
-+		goto err2;
-+	}
-+
-+#if 0
-+	ahbclk = clk_get(NULL, "usb_ahb_clk");
-+	if (IS_ERR(ahbclk)) {
-+		ret = PTR_ERR(ahbclk);
-+		printk(KERN_ERR "Failed to get usb_ahb_clk: %d\n", ret);
-+		goto err3;
-+	}
-+	clk_enable(ahbclk);
-+#endif
-+	usbclk = clk_get(&pdev->dev, "usb");
-+	if (IS_ERR(usbclk)) {
-+		ret = PTR_ERR(usbclk);
-+		printk(KERN_ERR "Failed to get usb_clk: %d\n", ret);
-+		goto err4;
-+	}
-+	clk_enable(usbclk);
-+
-+	if (pdata->init) {
-+		ret = pdata->init(pdev);
-+		if (ret) {
-+			dev_err(&pdev->dev, "platform init failed\n");
-+			goto err5;
-+		}
-+	}
-+
-+	/* Set to Host mode */
-+	temp = readl(hcd->regs + 0x1a8);
-+	writel(temp | 0x3, hcd->regs + 0x1a8);
-+
-+	ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
-+	if (ret)
-+		goto err6;
-+
-+	platform_set_drvdata(pdev, hcd);
-+	clk_put(usbclk);
-+
-+	return 0;
-+err6:
-+	if (pdata->exit)
-+		pdata->exit(pdev);
-+err5:
-+	clk_disable(usbclk);
-+	clk_put(usbclk);
-+err4:
-+#if 0
-+	clk_disable(ahbclk);
-+	clk_put(ahbclk);
-+#endif
-+err3:
-+	iounmap(hcd->regs);
-+err2:
-+	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-+err1:
-+	usb_put_hcd(hcd);
-+	return ret;
-+}
-+
-+static int ehci_mxc_drv_remove(struct platform_device *pdev)
-+{
-+	struct usb_hcd *hcd = platform_get_drvdata(pdev);
-+	struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
-+	struct clk *usbclk;
-+
-+	usb_remove_hcd(hcd);
-+	iounmap(hcd->regs);
-+	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-+	usb_put_hcd(hcd);
-+	platform_set_drvdata(pdev, NULL);
-+
-+	if (pdata->exit)
-+		pdata->exit(pdev);
-+
-+	usbclk = clk_get(&pdev->dev, "usb");
-+	if (!IS_ERR(usbclk)) {
-+		clk_disable(usbclk);
-+		clk_put(usbclk);
-+	}
-+#if 0
-+	ahbclk = clk_get(NULL, "usb_ahb_clk");
-+	if (!IS_ERR(ahbclk)) {
-+		clk_disable(ahbclk);
-+		clk_put(ahbclk);
-+	}
-+#endif
-+	return 0;
-+}
-+
-+MODULE_ALIAS("platform:mxc-ehci");
-+
-+static struct platform_driver ehci_mxc_driver = {
-+	.probe = ehci_mxc_drv_probe,
-+	.remove = ehci_mxc_drv_remove,
-+	.shutdown = usb_hcd_platform_shutdown,
-+	.driver = {
-+		   .name = "mxc-ehci",
-+	},
-+};
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/drivers/video/imxfb.c linux-2.6.30-rc4-karo2/drivers/video/imxfb.c
---- linux-2.6.30-rc4-karo/drivers/video/imxfb.c	2009-06-02 18:58:52.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/drivers/video/imxfb.c	2009-07-06 15:47:45.000000000 +0200
-@@ -56,9 +56,9 @@
- #define VPW_VPW(x)	((x) & 0x3ff)
- 
- #define LCDC_CPOS	0x0C
--#define CPOS_CC1	(1<<31)
--#define CPOS_CC0	(1<<30)
--#define CPOS_OP		(1<<28)
-+#define CPOS_CC1	(1 << 31)
-+#define CPOS_CC0	(1 << 30)
-+#define CPOS_OP		(1 << 28)
- #define CPOS_CXP(x)	(((x) & 3ff) << 16)
- 
- #ifdef CONFIG_ARCH_MX1
-@@ -68,7 +68,7 @@
- #endif
- 
- #define LCDC_LCWHB	0x10
--#define LCWHB_BK_EN	(1<<31)
-+#define LCWHB_BK_EN	(1 << 31)
- #define LCWHB_CW(w)	(((w) & 0x1f) << 24)
- #define LCWHB_CH(h)	(((h) & 0x1f) << 16)
- #define LCWHB_BD(x)	((x) & 0xff)
-@@ -112,22 +112,22 @@
- #define LCDC_RMCR	0x34
- 
- #ifdef CONFIG_ARCH_MX1
--#define RMCR_LCDC_EN	(1<<1)
-+#define RMCR_LCDC_EN	(1 << 1)
- #else
- #define RMCR_LCDC_EN	0
- #endif
- 
--#define RMCR_SELF_REF	(1<<0)
-+#define RMCR_SELF_REF	(1 << 0)
- 
- #define LCDC_LCDICR	0x38
--#define LCDICR_INT_SYN	(1<<2)
--#define LCDICR_INT_CON	(1)
-+#define LCDICR_INT_SYN	(1 << 2)
-+#define LCDICR_INT_CON	1
- 
- #define LCDC_LCDISR	0x40
--#define LCDISR_UDR_ERR	(1<<3)
--#define LCDISR_ERR_RES	(1<<2)
--#define LCDISR_EOF	(1<<1)
--#define LCDISR_BOF	(1<<0)
-+#define LCDISR_UDR_ERR	(1 << 3)
-+#define LCDISR_ERR_RES	(1 << 2)
-+#define LCDISR_EOF	(1 << 1)
-+#define LCDISR_BOF	(1 << 0)
- 
- /*
-  * These are the bitfields for each
-@@ -232,11 +232,11 @@ static int imxfb_setpalettereg(u_int reg
- 	struct imxfb_info *fbi = info->par;
- 	u_int val, ret = 1;
- 
--#define CNVT_TOHW(val,width) ((((val)<<(width))+0x7FFF-(val))>>16)
-+#define CNVT_TOHW(val,width) ((((val) << (width)) + 0x7FFF - (val)) >> 16)
- 	if (regno < fbi->palette_size) {
--		val = (CNVT_TOHW(red, 4) << 8) |
--		      (CNVT_TOHW(green,4) << 4) |
--		      CNVT_TOHW(blue,  4);
-+		val = (CNVT_TOHW(red, 6) << 12) |
-+			(CNVT_TOHW(green, 6) << 6) |
-+			CNVT_TOHW(blue,  6);
- 
- 		writel(val, fbi->regs + 0x800 + (regno << 2));
- 		ret = 0;
-@@ -265,7 +265,7 @@ static int imxfb_setcolreg(u_int regno, 
- 
- 	/*
- 	 * If greyscale is true, then we convert the RGB value
--	 * to greyscale no mater what visual we are using.
-+	 * to greyscale no matter what visual we are using.
- 	 */
- 	if (info->var.grayscale)
- 		red = green = blue = (19595 * red + 38470 * green +
-@@ -527,7 +527,7 @@ static int imxfb_activate_var(struct fb_
- 	if (--pcr > 0x3F) {
- 		pcr = 0x3F;
- 		printk(KERN_WARNING "Must limit pixel clock to %uHz\n",
--				lcd_clk / pcr);
-+				lcd_clk / pcr + 1);
- 	}
- 
- 	/* add sync polarities */
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/include/linux/usb/xcvr.h linux-2.6.30-rc4-karo2/include/linux/usb/xcvr.h
---- linux-2.6.30-rc4-karo/include/linux/usb/xcvr.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.30-rc4-karo2/include/linux/usb/xcvr.h	2009-07-01 11:32:10.000000000 +0200
-@@ -0,0 +1,71 @@
-+#ifndef __LINUX_USB_XCVR_H
-+#define __LINUX_USB_XCVR_H
-+
-+struct usb_xcvr;
-+
-+struct usb_xcvr_access_ops {
-+	int (*read)(struct usb_xcvr *xcvr, u32 reg);
-+	int (*write)(struct usb_xcvr *xcvr, u32 val, u32 reg);
-+};
-+
-+struct usb_xcvr_driver {
-+	int  (*init)(struct usb_xcvr *xcvr);
-+	void (*shutdown)(struct usb_xcvr *xcvr);
-+	int  (*set_vbus)(struct usb_xcvr *xcvr, bool en);
-+};
-+
-+struct usb_xcvr {
-+	struct usb_xcvr_access_ops 	*access;
-+	struct usb_xcvr_driver		*driver;
-+	void __iomem			*access_priv;
-+
-+	/* only set this if you don't want the lowlevel driver to
-+	 * handle this */
-+	int (*set_vbus)(struct usb_xcvr *xcvr, bool en);
-+};
-+
-+static inline int usb_xcvr_init(struct usb_xcvr *xcvr)
-+{
-+	if (xcvr->driver && xcvr->driver->init)
-+		return xcvr->driver->init(xcvr);
-+
-+	return -EINVAL;
-+}
-+
-+static inline void usb_xcvr_shutdown(struct usb_xcvr *xcvr)
-+{
-+	if (xcvr->driver && xcvr->driver->shutdown)
-+		xcvr->driver->shutdown(xcvr);
-+}
-+
-+static inline int usb_xcvr_set_vbus(struct usb_xcvr *xcvr, bool en)
-+{
-+	if (xcvr->set_vbus)
-+		return xcvr->set_vbus(xcvr, en);
-+
-+	if (xcvr->driver && xcvr->driver->set_vbus)
-+		return xcvr->driver->set_vbus(xcvr, en);
-+
-+	return -EINVAL;
-+}
-+
-+/* lowlowel access helpers */
-+
-+static inline int usb_xcvr_read(struct usb_xcvr *xcvr, u32 reg)
-+{
-+	if (xcvr->access->read)
-+		return xcvr->access->read(xcvr, reg);
-+
-+	return -EINVAL;
-+}
-+
-+static inline int usb_xcvr_write(struct usb_xcvr *xcvr, u32 val, u32 reg)
-+{
-+	if (xcvr->access->write)
-+		return xcvr->access->write(xcvr, val, reg);
-+
-+	return -EINVAL;
-+}
-+
-+#endif /* __LINUX_USB_XCVR_H */
-+
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/net/can/bcm.c linux-2.6.30-rc4-karo2/net/can/bcm.c
---- linux-2.6.30-rc4-karo/net/can/bcm.c	2009-06-02 17:37:41.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/net/can/bcm.c	2009-07-01 11:30:52.000000000 +0200
-@@ -75,6 +75,7 @@ static __initdata const char banner[] = 
- MODULE_DESCRIPTION("PF_CAN broadcast manager protocol");
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_AUTHOR("Oliver Hartkopp <oliver.hartkopp@volkswagen.de>");
-+MODULE_ALIAS("can-proto-2");
- 
- /* easy access to can_frame payload */
- static inline u64 GET_U64(const struct can_frame *cp)
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/net/can/raw.c linux-2.6.30-rc4-karo2/net/can/raw.c
---- linux-2.6.30-rc4-karo/net/can/raw.c	2009-06-02 17:37:42.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/net/can/raw.c	2009-07-01 11:30:58.000000000 +0200
-@@ -62,6 +62,7 @@ static __initdata const char banner[] =
- MODULE_DESCRIPTION("PF_CAN raw protocol");
- MODULE_LICENSE("Dual BSD/GPL");
- MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>");
-+MODULE_ALIAS("can-proto-1");
- 
- #define MASK_ALL 0
- 
-diff -purN -X linux-2.6.30-rc4-karo/Documentation/dontdiff linux-2.6.30-rc4-karo/net/socket.c linux-2.6.30-rc4-karo2/net/socket.c
---- linux-2.6.30-rc4-karo/net/socket.c	2009-06-02 17:37:00.000000000 +0200
-+++ linux-2.6.30-rc4-karo2/net/socket.c	2009-07-01 11:30:42.000000000 +0200
-@@ -527,6 +527,8 @@ void sock_release(struct socket *sock)
- 	if (sock->ops) {
- 		struct module *owner = sock->ops->owner;
- 
-+		if (sock->sk)
-+			sock_orphan(sock->sk);
- 		sock->ops->release(sock);
- 		sock->ops = NULL;
- 		module_put(owner);
diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/tx25-ts2.patch b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/tx25-ts2.patch
deleted file mode 100644
index de1f748386..0000000000
--- a/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/tx25-ts2.patch
+++ /dev/null
@@ -1,1759 +0,0 @@
-Index: linux-2.6.30-karo/arch/arm/mach-mx2/clock_imx25.c
-===================================================================
---- linux-2.6.30-karo.orig/arch/arm/mach-mx2/clock_imx25.c	2009-06-22 16:51:38.000000000 +0200
-+++ linux-2.6.30-karo/arch/arm/mach-mx2/clock_imx25.c	2009-06-23 12:07:34.000000000 +0200
-@@ -171,7 +171,7 @@
- #define MXC_CCM_CGCR2_SPBA_OFFSET		(42 - 32)
- #define MXC_CCM_CGCR2_SSI1_OFFSET		(43 - 32)
- #define MXC_CCM_CGCR2_SSI2_OFFSET		(44 - 32)
--#define MXC_CCM_CGCR2_TCHSCRN_OFFSET		(45 - 32)
-+#define MXC_CCM_CGCR2_TSC_OFFSET		(45 - 32)
- #define MXC_CCM_CGCR2_UART1_OFFSET		(46 - 32)
- #define MXC_CCM_CGCR2_UART2_OFFSET		(47 - 32)
- #define MXC_CCM_CGCR2_UART3_OFFSET		(48 - 32)
-@@ -615,7 +615,7 @@
- 
- /* Bottom-level clocks */
- 
--struct clk usbotg_clk = {
-+static struct clk usbotg_clk = {
- 	.id = 0,
- 	.parent = &ahb_clk,
- 	.enable = _clk_enable,
-@@ -624,16 +624,27 @@
- 	.disable = _clk_disable,
- };
- 
--struct clk rtic_clk = {
--	.id = 0,
--	.parent = &ahb_clk,
--	.enable = _clk_enable,
--	.enable_reg = MXC_CCM_CGCR0,
--	.enable_shift = MXC_CCM_CGCR0_HCLK_RTIC_OFFSET,
--	.disable = _clk_disable,
-+static struct clk rtic_clk[] = {
-+	{
-+		.id = 0,
-+		.parent = &ipg_clk,
-+		.enable = _clk_enable,
-+		.enable_reg = MXC_CCM_CGCR2,
-+		.enable_shift = MXC_CCM_CGCR2_RTIC_OFFSET,
-+		.disable = _clk_disable,
-+		.secondary = &rtic_clk[1],
-+	},
-+	{
-+		.id = 0,
-+		.parent = &ahb_clk,
-+		.enable = _clk_enable,
-+		.enable_reg = MXC_CCM_CGCR0,
-+		.enable_shift = MXC_CCM_CGCR0_HCLK_RTIC_OFFSET,
-+		.disable = _clk_disable,
-+	},
- };
- 
--struct clk emi_clk = {
-+static struct clk emi_clk = {
- 	.id = 0,
- 	.parent = &ahb_clk,
- 	.enable = _clk_enable,
-@@ -642,7 +653,7 @@
- 	.disable = _clk_disable,
- };
- 
--struct clk brom_clk = {
-+static struct clk brom_clk = {
- 	.id = 0,
- 	.parent = &ahb_clk,
- 	.enable = _clk_enable,
-@@ -813,12 +824,12 @@
- 	},
- };
- 
--struct clk nfc_clk = {
-+static struct clk nfc_clk = {
- 	.id = 0,
- 	.parent = &per_clk[8],
- };
- 
--struct clk audmux_clk = {
-+static struct clk audmux_clk = {
- 	.id = 0,
- 	.parent = &ipg_clk,
- 	.enable = _clk_enable,
-@@ -827,7 +838,7 @@
- 	.disable = _clk_disable,
- };
- 
--struct clk ata_clk[] = {
-+static struct clk ata_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &ipg_clk,
-@@ -847,7 +858,7 @@
- 	},
- };
- 
--struct clk can_clk[] = {
-+static struct clk can_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &ipg_clk,
-@@ -866,7 +877,7 @@
- 	},
- };
- 
--struct clk csi_clk[] = {
-+static struct clk csi_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &per_clk[0],
-@@ -891,7 +902,7 @@
- 	},
- };
- 
--struct clk cspi_clk[] = {
-+static struct clk cspi_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &ipg_clk,
-@@ -918,7 +929,7 @@
- 	},
- };
- 
--struct clk dryice_clk = {
-+static struct clk dryice_clk = {
- 	.id = 0,
- 	.parent = &ipg_clk,
- 	.enable = _clk_enable,
-@@ -927,7 +938,7 @@
- 	.disable = _clk_disable,
- };
- 
--struct clk ect_clk = {
-+static struct clk ect_clk = {
- 	.id = 0,
- 	.parent = &ipg_clk,
- 	.enable = _clk_enable,
-@@ -936,7 +947,7 @@
- 	.disable = _clk_disable,
- };
- 
--struct clk epit1_clk[] = {
-+static struct clk epit1_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &per_clk[1],
-@@ -952,7 +963,7 @@
- 	},
- };
- 
--struct clk epit2_clk[] = {
-+static struct clk epit2_clk[] = {
- 	{
- 		.id = 1,
- 		.parent = &per_clk[1],
-@@ -968,7 +979,7 @@
- 	},
- };
- 
--struct clk esai_clk[] = {
-+static struct clk esai_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &per_clk[2],
-@@ -993,7 +1004,7 @@
- 	},
- };
- 
--struct clk esdhc1_clk[] = {
-+static struct clk esdhc1_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &per_clk[3],
-@@ -1018,7 +1029,7 @@
- 	},
- };
- 
--struct clk esdhc2_clk[] = {
-+static struct clk esdhc2_clk[] = {
- 	{
- 		.id = 1,
- 		.parent = &per_clk[4],
-@@ -1043,7 +1054,7 @@
- 	},
- };
- 
--struct clk fec_clk[] = {
-+static struct clk fec_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &ipg_clk,
-@@ -1063,7 +1074,7 @@
- 	},
- };
- 
--struct clk gpio_clk[] = {
-+static struct clk gpio_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &ipg_clk,
-@@ -1154,7 +1165,7 @@
- 	},
- };
- 
--struct clk i2c_clk[] = {
-+static struct clk i2c_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &per_clk[6],
-@@ -1169,7 +1180,7 @@
- 	},
- };
- 
--struct clk iim_clk = {
-+static struct clk iim_clk = {
- 	.id = 0,
- 	.parent = &ipg_clk,
- 	.enable = _clk_enable,
-@@ -1178,7 +1189,7 @@
- 	.disable = _clk_disable,
- };
- 
--struct clk iomuxc_clk = {
-+static struct clk iomuxc_clk = {
- 	.id = 0,
- 	.parent = &ipg_clk,
- 	.enable = _clk_enable,
-@@ -1187,7 +1198,7 @@
- 	.disable = _clk_disable,
- };
- 
--struct clk kpp_clk = {
-+static struct clk kpp_clk = {
- 	.id = 0,
- 	.parent = &ipg_clk,
- 	.enable = _clk_enable,
-@@ -1196,7 +1207,7 @@
- 	.disable = _clk_disable,
- };
- 
--struct clk lcdc_clk[] = {
-+static struct clk lcdc_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &per_clk[7],
-@@ -1221,7 +1232,7 @@
- 	},
- };
- 
--struct clk owire_clk[] = {
-+static struct clk owire_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &per_clk[9],
-@@ -1237,7 +1248,7 @@
- 	},
- };
- 
--struct clk pwm1_clk[] = {
-+static struct clk pwm1_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &per_clk[10],
-@@ -1253,7 +1264,7 @@
- 	},
- };
- 
--struct clk pwm2_clk[] = {
-+static struct clk pwm2_clk[] = {
- 	{
- 		.id = 1,
- 		.parent = &per_clk[10],
-@@ -1269,7 +1280,7 @@
- 	},
- };
- 
--struct clk pwm3_clk[] = {
-+static struct clk pwm3_clk[] = {
- 	{
- 		.id = 2,
- 		.parent = &per_clk[10],
-@@ -1285,7 +1296,7 @@
- 	},
- };
- 
--struct clk pwm4_clk[] = {
-+static struct clk pwm4_clk[] = {
- 	{
- 		.id = 3,
- 		.parent = &per_clk[10],
-@@ -1301,7 +1312,7 @@
- 	},
- };
- 
--struct clk rngb_clk = {
-+static struct clk rngb_clk = {
- 	.id = 0,
- 	.parent = &ipg_clk,
- 	.enable = _clk_enable,
-@@ -1310,7 +1321,7 @@
- 	.disable = _clk_disable,
- };
- 
--struct clk scc_clk = {
-+static struct clk scc_clk = {
- 	.id = 0,
- 	.parent = &ipg_clk,
- 	.enable = _clk_enable,
-@@ -1319,7 +1330,7 @@
- 	.disable = _clk_disable,
- };
- 
--struct clk sdma_clk[] = {
-+static struct clk sdma_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &ipg_clk,
-@@ -1339,7 +1350,7 @@
- 	},
- };
- 
--struct clk sim1_clk[] = {
-+static struct clk sim1_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &per_clk[11],
-@@ -1355,7 +1366,7 @@
- 	},
- };
- 
--struct clk sim2_clk[] = {
-+static struct clk sim2_clk[] = {
- 	{
- 		.id = 1,
- 		.parent = &per_clk[12],
-@@ -1371,7 +1382,7 @@
- 	},
- };
- 
--struct clk slcdc_clk[] = {
-+static struct clk slcdc_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &ipg_clk,
-@@ -1391,7 +1402,7 @@
- 	},
- };
- 
--struct clk spba_clk = {
-+static struct clk spba_clk = {
- 	.id = 0,
- 	.parent = &ipg_clk,
- 	.enable = _clk_enable,
-@@ -1400,7 +1411,7 @@
- 	.disable = _clk_disable,
- };
- 
--struct clk ssi1_clk[] = {
-+static struct clk ssi1_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &per_clk[13],
-@@ -1416,7 +1427,7 @@
- 	},
- };
- 
--struct clk ssi2_clk[] = {
-+static struct clk ssi2_clk[] = {
- 	{
- 		.id = 1,
- 		.parent = &per_clk[14],
-@@ -1432,16 +1443,16 @@
- 	},
- };
- 
--struct clk tchscrn_clk = {
-+static struct clk tsc_clk = {
- 	.id = 0,
- 	.parent = &ipg_clk,
- 	.enable = _clk_enable,
- 	.enable_reg = MXC_CCM_CGCR2,
--	.enable_shift = MXC_CCM_CGCR2_TCHSCRN_OFFSET,
-+	.enable_shift = MXC_CCM_CGCR2_TSC_OFFSET,
- 	.disable = _clk_disable,
- };
- 
--struct clk uart1_clk[] = {
-+static struct clk uart1_clk[] = {
- 	{
- 		.id = 0,
- 		.parent = &per_clk[15],
-@@ -1457,7 +1468,7 @@
- 	},
- };
- 
--struct clk uart2_clk[] = {
-+static struct clk uart2_clk[] = {
- 	{
- 		.id = 1,
- 		.parent = &per_clk[15],
-@@ -1473,7 +1484,7 @@
- 	},
- };
- 
--struct clk uart3_clk[] = {
-+static struct clk uart3_clk[] = {
- 	{
- 		.id = 2,
- 		.parent = &per_clk[15],
-@@ -1489,7 +1500,7 @@
- 	},
- };
- 
--struct clk uart4_clk[] = {
-+static struct clk uart4_clk[] = {
- 	{
- 		.id = 3,
- 		.parent = &per_clk[15],
-@@ -1505,7 +1516,7 @@
- 	},
- };
- 
--struct clk uart5_clk[] = {
-+static struct clk uart5_clk[] = {
- 	{
- 		.id = 4,
- 		.parent = &per_clk[15],
-@@ -1521,7 +1532,7 @@
- 	},
- };
- 
--struct clk wdog_clk = {
-+static struct clk wdog_clk = {
- 	.id = 0,
- 	.parent = &ipg_clk,
- 	.enable = _clk_enable,
-@@ -1600,6 +1611,7 @@
- 	.set_rate = _clk_usb_set_rate,
- 	.round_rate = _clk_usb_round_rate,
- 	.set_parent = _clk_usb_set_parent,
-+	.secondary = &usbotg_clk,
- };
- 
- /* CLKO */
-@@ -1714,7 +1726,8 @@
- 	_REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk)
- 	_REGISTER_CLOCK(NULL, "audmux", audmux_clk)
- 	_REGISTER_CLOCK(NULL, "ata", ata_clk[0])
--	_REGISTER_CLOCK(NULL, "can", can_clk[0])
-+	_REGISTER_CLOCK("mxc-can.0", NULL, can_clk[0])
-+	_REGISTER_CLOCK("mxc-can.1", NULL, can_clk[1])
- 	_REGISTER_CLOCK(NULL, "csi", csi_clk[0])
- 	_REGISTER_CLOCK(NULL, "cspi.0", cspi_clk[0])
- 	_REGISTER_CLOCK(NULL, "cspi.1", cspi_clk[1])
-@@ -1755,7 +1768,7 @@
- 	_REGISTER_CLOCK(NULL, "spba", spba_clk)
- 	_REGISTER_CLOCK(NULL, "ssi1", ssi1_clk[0])
- 	_REGISTER_CLOCK(NULL, "ssi2", ssi2_clk[0])
--	_REGISTER_CLOCK(NULL, "tchscrn", tchscrn_clk)
-+	_REGISTER_CLOCK("mxc-tsadcc.0", NULL, tsc_clk)
- 	_REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk[0])
- 	_REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk[0])
- 	_REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk[0])
-Index: linux-2.6.30-karo/arch/arm/mach-mx2/karo-tx25.c
-===================================================================
---- linux-2.6.30-karo.orig/arch/arm/mach-mx2/karo-tx25.c	2009-06-23 13:46:03.000000000 +0200
-+++ linux-2.6.30-karo/arch/arm/mach-mx2/karo-tx25.c	2009-06-23 15:04:16.000000000 +0200
-@@ -69,6 +69,7 @@
- //#include <mach/ulpi.h>
- //#include <mach/mxc_ehci.h>
- //#include <mach/board-tx25.h>
-+#include <mach/mxc_tsadcc.h>
- 
- #include "crm_regs.h"
- #include "devices.h"
-@@ -829,6 +830,39 @@
- #endif
- #endif
- 
-+#if defined(CONFIG_TOUCHSCREEN_MXC_TSADCC) || defined(CONFIG_TOUCHSCREEN_MXC_TSADCC_MODULE)
-+static struct resource mxc_tsadcc_resources[] = {
-+	{
-+		.start = TSC_BASE_ADDR,
-+		.end = TSC_BASE_ADDR + 0x85f,
-+		.flags = IORESOURCE_MEM,
-+	},
-+	{
-+		.start = MXC_INT_TSC,
-+		.end = MXC_INT_TSC,
-+		.flags = IORESOURCE_IRQ,
-+	},
-+};
-+
-+static struct mxc_tsadcc_pdata mxc_tsadcc_pdata = {
-+	.pen_debounce_time = 32,
-+	.intref = 1,
-+	.adc_clk = 1666667,
-+	.tsc_mode = MXC_TSC_4WIRE,
-+	.hsyncen = 0,
-+};
-+
-+static struct platform_device mxc_tsadcc_device = {
-+	.id = 0,
-+	.name = "mxc-tsadcc",
-+	.num_resources = ARRAY_SIZE(mxc_tsadcc_resources),
-+	.resource = mxc_tsadcc_resources,
-+	.dev = {
-+		.platform_data = &mxc_tsadcc_pdata,
-+	},
-+};
-+#endif
-+
- struct platform_dev_list {
- 	struct platform_device *pdev;
- 	int flag;
-@@ -851,6 +885,9 @@
- #if defined(CONFIG_MXC_VPU) || defined(CONFIG_MXC_VPU_MODULE)
- 	{ .pdev = &mxc_vpu_device, .flag = 1, },
- #endif
-+#if defined(CONFIG_TOUCHSCREEN_MXC_TSADCC) || defined(CONFIG_TOUCHSCREEN_MXC_TSADCC_MODULE)
-+	{ .pdev = &mxc_tsadcc_device, .flag = 1, },
-+#endif
- };
- #define TX25_NUM_DEVICES		ARRAY_SIZE(tx25_devices)
- 
-Index: linux-2.6.30-karo/arch/arm/plat-mxc/include/mach/mxc_tsadcc.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30-karo/arch/arm/plat-mxc/include/mach/mxc_tsadcc.h	2009-06-23 13:46:20.000000000 +0200
-@@ -0,0 +1,28 @@
-+/*
-+ *  Freescale i.MX25 Touch Screen Driver
-+ *
-+ *  Copyright (c) 2009 Lothar Wassmann <LW@KARO-electronics.de>
-+ *
-+ * Based on code from Freescale BSP
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License version 2 as
-+ *  published by the Free Software Foundation.
-+ */
-+
-+typedef enum {
-+	MXC_TSC_4WIRE,
-+	MXC_TSC_5WIRE,
-+} mxc_tsc_mode;
-+
-+struct mxc_tsadcc_pdata {
-+	int pen_debounce_time;	/* 0: disable debounce;
-+				 * 1..128: # of ADC clock cycles / 8 */
-+	unsigned int intref:1,	/* 0|1: internal reference disabled|enabled */
-+		     hsyncen:1;	/* synchronize measurements with LCD HSYNC */
-+	unsigned int r_xplate;	/* resistance (in Ohms) of X plate
-+				 * (required for pressure measurement */
-+	int adc_clk;		/* ADC clock frequency in Hz (max. 1750000);
-+				 * <= 0: use default (1666667) */
-+	mxc_tsc_mode tsc_mode;	/* select 4 wire or 5 wire mode */
-+};
-Index: linux-2.6.30-karo/drivers/input/touchscreen/Kconfig
-===================================================================
---- linux-2.6.30-karo.orig/drivers/input/touchscreen/Kconfig	2009-06-23 13:46:03.000000000 +0200
-+++ linux-2.6.30-karo/drivers/input/touchscreen/Kconfig	2009-06-23 13:46:20.000000000 +0200
-@@ -287,6 +287,18 @@
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called atmel_tsadcc.
- 
-+config TOUCHSCREEN_MXC_TSADCC
-+	tristate "i.MX25 Touchscreen Interface"
-+	depends on MACH_MX25
-+	help
-+	  Say Y here if you have a 4-wire touchscreen connected to the
-+          ADC Controller on your Freescale i.MX25 SoC.
-+
-+	  If unsure, say N.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called atmel_tsadcc.
-+
- config TOUCHSCREEN_UCB1400
- 	tristate "Philips UCB1400 touchscreen"
- 	depends on AC97_BUS
-Index: linux-2.6.30-karo/drivers/input/touchscreen/Makefile
-===================================================================
---- linux-2.6.30-karo.orig/drivers/input/touchscreen/Makefile	2009-06-23 13:46:03.000000000 +0200
-+++ linux-2.6.30-karo/drivers/input/touchscreen/Makefile	2009-06-23 13:46:20.000000000 +0200
-@@ -16,19 +16,20 @@
- obj-$(CONFIG_TOUCHSCREEN_ELO)		+= elo.o
- obj-$(CONFIG_TOUCHSCREEN_FUJITSU)	+= fujitsu_ts.o
- obj-$(CONFIG_TOUCHSCREEN_INEXIO)	+= inexio.o
--obj-$(CONFIG_TOUCHSCREEN_MIGOR)		+= migor_ts.o
--obj-$(CONFIG_TOUCHSCREEN_MTOUCH)	+= mtouch.o
--obj-$(CONFIG_TOUCHSCREEN_MK712)		+= mk712.o
- obj-$(CONFIG_TOUCHSCREEN_HP600)		+= hp680_ts_input.o
- obj-$(CONFIG_TOUCHSCREEN_HP7XX)		+= jornada720_ts.o
- obj-$(CONFIG_TOUCHSCREEN_HTCPEN)	+= htcpen.o
--obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE)	+= usbtouchscreen.o
-+obj-$(CONFIG_TOUCHSCREEN_MIGOR)		+= migor_ts.o
-+obj-$(CONFIG_TOUCHSCREEN_MTOUCH)	+= mtouch.o
-+obj-$(CONFIG_TOUCHSCREEN_MK712)		+= mk712.o
-+obj-$(CONFIG_TOUCHSCREEN_MXC_TSADCC)	+= mxc_tsadcc.o
- obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)	+= penmount.o
- obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213)	+= touchit213.o
- obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)	+= touchright.o
- obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)	+= touchwin.o
- obj-$(CONFIG_TOUCHSCREEN_TSC2007)	+= tsc2007.o
- obj-$(CONFIG_TOUCHSCREEN_UCB1400)	+= ucb1400_ts.o
-+obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE)	+= usbtouchscreen.o
- obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001)	+= wacom_w8001.o
- obj-$(CONFIG_TOUCHSCREEN_WM97XX)	+= wm97xx-ts.o
- obj-$(CONFIG_TOUCHSCREEN_DA9034)	+= da9034-ts.o
-Index: linux-2.6.30-karo/drivers/input/touchscreen/mxc_tsadcc.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30-karo/drivers/input/touchscreen/mxc_tsadcc.c	2009-06-23 14:54:48.000000000 +0200
-@@ -0,0 +1,897 @@
-+/*
-+ *  Freescale i.MX25 Touch Screen Driver
-+ *
-+ *  Copyright (c) 2009 Lothar Wassmann <LW@KARO-electronics.de>
-+ *
-+ * Based on atmel_tsadcc.c
-+ *  Copyright (c) 2008 ATMEL et. al.
-+ * and code from Freescale BSP
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License version 2 as
-+ *  published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/err.h>
-+#include <linux/input.h>
-+#include <linux/timer.h>
-+#include <linux/interrupt.h>
-+#include <linux/clk.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <mach/mxc_tsadcc.h>
-+
-+#include "mxc_tsadcc.h"
-+
-+#define TSC_NUM_SAMPLES		1
-+#define ADC_NUM_SAMPLES		1
-+
-+#ifdef DEBUG
-+static int debug = 4;
-+#define dbg_lvl(n)	((n) < debug)
-+module_param(debug, int, S_IRUGO | S_IWUSR);
-+
-+#define DBG(lvl, fmt...)	do { if (dbg_lvl(lvl)) printk(KERN_DEBUG fmt); } while (0)
-+#else
-+static int debug;
-+#define dbg_lvl(n)	0
-+module_param(debug, int, 0);
-+
-+#define DBG(lvl, fmt...)	do { } while (0)
-+#endif
-+
-+#define DEFAULT_ADC_CLOCK	1666667
-+#define DEFAULT_RX_VALUE	360
-+
-+//#define REPORT_PRESSURE
-+
-+struct mxc_tsadcc_fifo_data {
-+	unsigned int id:4,
-+		data:12;
-+};
-+
-+/* The layout of this structure depends on the setup created by mxc_tsadcc_config() */
-+struct mxc_tsadcc_tsc_data {
-+	struct mxc_tsadcc_fifo_data pendown[TSC_NUM_SAMPLES];
-+	struct mxc_tsadcc_fifo_data pos_x[TSC_NUM_SAMPLES];
-+	struct mxc_tsadcc_fifo_data pos_y[TSC_NUM_SAMPLES];
-+#ifdef REPORT_PRESSURE
-+	struct mxc_tsadcc_fifo_data yn[TSC_NUM_SAMPLES];
-+	struct mxc_tsadcc_fifo_data xp[TSC_NUM_SAMPLES];
-+#endif
-+	struct mxc_tsadcc_fifo_data pendown2[TSC_NUM_SAMPLES];
-+};
-+
-+struct mxc_tsadcc_adc_data {
-+	struct mxc_tsadcc_fifo_data data[ADC_NUM_SAMPLES];
-+};
-+
-+struct mxc_tsadcc {
-+	struct input_dev	*input;
-+	char			phys[32];
-+	void __iomem		*reg_base;
-+	struct clk		*clk;
-+	int			irq;
-+	struct work_struct	work;
-+	struct timer_list	timer;
-+	wait_queue_head_t	wq;
-+	unsigned int		pendown:1,
-+				clk_enabled:1,
-+				attrs:1,
-+				valid_measure:1;
-+	mxc_tsc_mode		tsc_mode;
-+	struct mxc_tsadcc_tsc_data *tsc_data;
-+	struct mxc_tsadcc_adc_data *adc_data;
-+	unsigned int		r_xplate;
-+
-+	struct mutex		convert_mutex;
-+	unsigned short		pressure;
-+	unsigned short		prev_absx;
-+	unsigned short		prev_absy;
-+};
-+
-+#ifdef DEBUG
-+#define mxc_tsadcc_read(s,reg)		_mxc_tsadcc_read(s,reg,#reg,__FUNCTION__)
-+#define mxc_tsadcc_write(s,reg,val)	_mxc_tsadcc_write(s,reg,val,#reg,__FUNCTION__)
-+
-+static inline unsigned long _mxc_tsadcc_read(struct mxc_tsadcc *ts_dev, int reg,
-+				   const char *name, const char *fn)
-+{
-+	unsigned long val = __raw_readl(ts_dev->reg_base + reg);
-+	DBG(3, "%s: Read %08lx from %s\n", fn, val, name);
-+	return val;
-+}
-+
-+static inline void _mxc_tsadcc_write(struct mxc_tsadcc *ts_dev, int reg, unsigned long val,
-+				     const char *name, const char *fn)
-+{
-+	__raw_writel(val, ts_dev->reg_base + reg);
-+	DBG(3, "%s: Wrote %08lx to %s\n", fn, val, name);
-+}
-+#else
-+static inline unsigned long mxc_tsadcc_read(struct mxc_tsadcc *ts_dev, int reg)
-+{
-+	return __raw_readl(ts_dev->reg_base + reg);
-+}
-+static inline void mxc_tsadcc_write(struct mxc_tsadcc *ts_dev, int reg, unsigned long val)
-+{
-+	__raw_writel(val, ts_dev->reg_base + reg);
-+}
-+#endif
-+
-+static void tsc_clk_enable(struct mxc_tsadcc *ts_dev)
-+{
-+	if (!ts_dev->clk_enabled) {
-+		unsigned long reg;
-+		clk_enable(ts_dev->clk);
-+
-+		reg = mxc_tsadcc_read(ts_dev, TGCR);
-+		reg |= TGCR_IPG_CLK_EN;
-+		mxc_tsadcc_write(ts_dev, TGCR, reg);
-+		ts_dev->clk_enabled = 1;
-+	}
-+}
-+
-+static void tsc_clk_disable(struct mxc_tsadcc *ts_dev)
-+{
-+	if (ts_dev->clk_enabled) {
-+		unsigned long reg;
-+
-+		reg = mxc_tsadcc_read(ts_dev, TGCR);
-+		reg &= ~TGCR_IPG_CLK_EN;
-+		mxc_tsadcc_write(ts_dev, TGCR, reg);
-+
-+		clk_disable(ts_dev->clk);
-+		ts_dev->clk_enabled = 0;
-+	}
-+}
-+
-+static inline int mxc_tsadcc_pendown(struct mxc_tsadcc *ts_dev)
-+{
-+	return ts_dev->pendown;
-+}
-+
-+static int mxc_tsadcc_read_adc(struct mxc_tsadcc *ts_dev, int chan)
-+{
-+	int ret = 1;
-+	unsigned long reg;
-+	unsigned int data_num = 0;
-+	int i;
-+	union {
-+		unsigned int fifo[sizeof(struct mxc_tsadcc_tsc_data) / sizeof(int)];
-+		struct mxc_tsadcc_tsc_data data;
-+	} *fifo_data = (void *)ts_dev->adc_data;
-+	struct mxc_tsadcc_adc_data *adc_data = ts_dev->adc_data;
-+	int lastitemid = 0;
-+	struct input_dev *input_dev = ts_dev->input;
-+	long timeout = msecs_to_jiffies(1 * ADC_NUM_SAMPLES);
-+
-+	mutex_lock(&ts_dev->convert_mutex);
-+	reg = (0xf << CQCR_FIFOWATERMARK_SHIFT) |
-+		(lastitemid << CQCR_LAST_ITEM_ID_SHIFT) | CQCR_QSM_FQS;
-+	mxc_tsadcc_write(ts_dev, GCQCR, reg);
-+
-+	reg = ((ADC_NUM_SAMPLES - 1) << CC_NOS_SHIFT) |
-+		(16 << CC_SETTLING_TIME_SHIFT) |
-+		CC_YPLLSW_OFF | CC_XNURSW_OFF | CC_XPULSW |
-+		CC_SELREFP_INT | chan | CC_SEL_REFN_AGND;
-+	mxc_tsadcc_write(ts_dev, GCC0, reg);
-+
-+	memset(adc_data, 0, sizeof(*adc_data));
-+
-+	reg = mxc_tsadcc_read(ts_dev, GCQCR);
-+	reg |= CQCR_FQS;
-+	mxc_tsadcc_write(ts_dev, GCQCR, reg);
-+
-+	/* enable end of conversion interrupt */
-+	reg = mxc_tsadcc_read(ts_dev, GCQMR);
-+	reg &= ~CQMR_EOQ_IRQ_MSK;
-+	mxc_tsadcc_write(ts_dev, GCQMR, reg);
-+
-+	timeout = wait_event_timeout(ts_dev->wq,
-+				     mxc_tsadcc_read(ts_dev, GCQSR) &
-+				     CQSR_EOQ, timeout);
-+	if (timeout == 0 &&
-+	    !(mxc_tsadcc_read(ts_dev, GCQSR) & CQSR_EOQ)) {
-+		dev_err(&input_dev->dev,
-+			"Timeout waiting for data on channel %d\n",
-+			chan);
-+		ret = -ETIME;
-+		goto exit;
-+	}
-+
-+	reg = mxc_tsadcc_read(ts_dev, GCQCR);
-+	reg &= ~CQCR_FQS;
-+	mxc_tsadcc_write(ts_dev, GCQCR, reg);
-+	reg = mxc_tsadcc_read(ts_dev, GCQSR);
-+
-+	/* clear interrupt status bit */
-+	reg = CQSR_EOQ;
-+	mxc_tsadcc_write(ts_dev, GCQSR, reg);
-+
-+	while (!(mxc_tsadcc_read(ts_dev, GCQSR) & CQSR_EMPT)) {
-+		BUG_ON(data_num >= ARRAY_SIZE(fifo_data->fifo));
-+		reg = mxc_tsadcc_read(ts_dev, GCQFIFO);
-+		fifo_data->fifo[data_num] = reg;
-+		data_num++;
-+	}
-+	DBG(0, "%s: Read %u words from fifo\n", __FUNCTION__, data_num);
-+	for (i = 0; i < data_num; i++) {
-+		DBG(0, "%s: data[%d]=%03x ID %d\n", __FUNCTION__, i,
-+		    adc_data->data[i].data, adc_data->data[i].id);
-+	}
-+ exit:
-+	mutex_unlock(&ts_dev->convert_mutex);
-+
-+	return ret;
-+}
-+
-+struct mxc_tsadcc_attr {
-+	struct device_attribute attr;
-+	unsigned int reg;
-+};
-+
-+#define to_mxc_tsadcc_attr(a)		container_of(a, struct mxc_tsadcc_attr, attr)
-+
-+#define MXC_TSADCC_DEV_ATTR(_name, _mode, _reg, _read, _write)	\
-+	struct mxc_tsadcc_attr mxc_tsadcc_attr_##_name = {	\
-+		.attr = __ATTR(_name,_mode,_read,_write),	\
-+		.reg = _reg,					\
-+	}
-+
-+static ssize_t mxc_tsadcc_attr_get(struct device *dev, struct device_attribute *attr, char *buf)
-+{
-+	ssize_t ret = -EIO;
-+	struct mxc_tsadcc *ts_dev = dev_get_drvdata(dev);
-+	struct mxc_tsadcc_attr *mxc_tsadcc_attr = to_mxc_tsadcc_attr(attr);
-+
-+	if (mxc_tsadcc_read_adc(ts_dev, mxc_tsadcc_attr->reg)) {
-+		ret = sprintf(buf, "0x%04x\n", ts_dev->adc_data->data[0].data);
-+	}
-+	return ret;
-+}
-+
-+#if 0
-+static ssize_t mxc_tsadcc_attr_set(struct device *dev, struct device_attribute *attr,
-+			       const char *buf, size_t count)
-+{
-+	ssize_t ret;
-+	struct mxc_tsadcc *ts_dev = dev_get_drvdata(dev);
-+	struct mxc_tsadcc_attr *mxc_tsadcc_attr = to_mxc_tsadcc_attr(attr);
-+	unsigned long val = simple_strtoul(buf, NULL, 0);
-+
-+	mxc_tsadcc_write(ts_dev, mxc_tsadcc_attr->reg, val);
-+	return count;
-+}
-+#endif
-+
-+MXC_TSADCC_DEV_ATTR(inaux0, S_IRUGO, CC_SELIN_INAUX0, mxc_tsadcc_attr_get, NULL);
-+MXC_TSADCC_DEV_ATTR(inaux1, S_IRUGO, CC_SELIN_INAUX1, mxc_tsadcc_attr_get, NULL);
-+MXC_TSADCC_DEV_ATTR(inaux2, S_IRUGO, CC_SELIN_INAUX2, mxc_tsadcc_attr_get, NULL);
-+
-+static struct attribute *mxc_tsadcc_attrs[] = {
-+	&mxc_tsadcc_attr_inaux0.attr.attr,
-+	&mxc_tsadcc_attr_inaux1.attr.attr,
-+	&mxc_tsadcc_attr_inaux2.attr.attr,
-+	NULL
-+};
-+
-+static const struct attribute_group mxc_tsadcc_attr_group = {
-+	.attrs = mxc_tsadcc_attrs,
-+};
-+
-+static int mxc_tsadcc_read_ts(struct mxc_tsadcc *ts_dev, int force)
-+{
-+	int ret;
-+	unsigned long reg;
-+	unsigned int data_num = 0;
-+	union {
-+		unsigned int fifo[sizeof(struct mxc_tsadcc_tsc_data) / sizeof(int)];
-+		struct mxc_tsadcc_tsc_data data;
-+	} *fifo_data = (void *)ts_dev->tsc_data;
-+	struct mxc_tsadcc_tsc_data *tsc_data = ts_dev->tsc_data;
-+	struct input_dev *input_dev = ts_dev->input;
-+	long timeout = msecs_to_jiffies(1 * TSC_NUM_SAMPLES);
-+
-+	mutex_lock(&ts_dev->convert_mutex);
-+	memset(tsc_data, 0, sizeof(*tsc_data));
-+	if (force) {
-+		reg = (0x1 << CC_YPLLSW_SHIFT) | (0x1 << CC_XNURSW_SHIFT) |
-+		      CC_XPULSW;
-+		mxc_tsadcc_write(ts_dev, TICR, reg);
-+
-+		/* FQS */
-+		reg = mxc_tsadcc_read(ts_dev, TCQCR);
-+		reg &= ~CQCR_QSM_MASK;
-+		reg |= CQCR_QSM_FQS;
-+		mxc_tsadcc_write(ts_dev, TCQCR, reg);
-+		reg = mxc_tsadcc_read(ts_dev, TCQCR);
-+		reg |= CQCR_FQS;
-+		mxc_tsadcc_write(ts_dev, TCQCR, reg);
-+
-+		timeout = wait_event_timeout(ts_dev->wq,
-+					     mxc_tsadcc_read(ts_dev, TCQSR) &
-+					     CQSR_EOQ, timeout);
-+		if (timeout == 0 &&
-+		    !(mxc_tsadcc_read(ts_dev, TCQSR) & CQSR_EOQ)) {
-+			dev_err(&input_dev->dev,
-+				"Timeout waiting for TSC data\n");
-+			ret = -ETIME;
-+			goto exit;
-+		}
-+
-+		/* stop FQS */
-+		reg = mxc_tsadcc_read(ts_dev, TCQCR);
-+		reg &= ~CQCR_QSM_MASK;
-+		mxc_tsadcc_write(ts_dev, TCQCR, reg);
-+		reg = mxc_tsadcc_read(ts_dev, TCQCR);
-+		reg &= ~CQCR_FQS;
-+		mxc_tsadcc_write(ts_dev, TCQCR, reg);
-+
-+		/* clear status bit */
-+		reg = mxc_tsadcc_read(ts_dev, TCQSR);
-+		reg = CQSR_EOQ;
-+		mxc_tsadcc_write(ts_dev, TCQSR, reg);
-+	} else {
-+		/* Config idle for 4-wire */
-+		reg = TSC_4WIRE_TOUCH_DETECT;
-+		mxc_tsadcc_write(ts_dev, TICR, reg);
-+
-+		/* Pen interrupt starts new conversion queue */
-+		reg = mxc_tsadcc_read(ts_dev, TCQCR);
-+		reg &= ~CQCR_QSM_MASK;
-+		reg |= CQCR_QSM_PEN;
-+		mxc_tsadcc_write(ts_dev, TCQCR, reg);
-+
-+		/* PDEN and PDBEN */
-+		reg = mxc_tsadcc_read(ts_dev, TGCR);
-+		reg |= (TGCR_PDB_EN | TGCR_PD_EN);
-+		mxc_tsadcc_write(ts_dev, TGCR, reg);
-+
-+		wait_event_timeout(ts_dev->wq,
-+				   mxc_tsadcc_read(ts_dev, TCQSR) &
-+				   CQSR_EOQ, timeout);
-+		if (timeout == 0 &&
-+		    !(mxc_tsadcc_read(ts_dev, TCQSR) & CQSR_EOQ)) {
-+			dev_err(&input_dev->dev,
-+				"Timeout waiting for TSC data\n");
-+			ret = -ETIME;
-+			goto exit;
-+		}
-+
-+		/* stop the conversion */
-+		reg = mxc_tsadcc_read(ts_dev, TCQCR);
-+		reg &= ~CQCR_QSM_MASK;
-+		mxc_tsadcc_write(ts_dev, TCQCR, reg);
-+
-+		/* clear interrupt status flags */
-+		reg = CQSR_PD | CQSR_EOQ;
-+		mxc_tsadcc_write(ts_dev, TCQSR, reg);
-+
-+		/* change configuration for FQS mode */
-+		reg = (0x1 << CC_YPLLSW_SHIFT) | (0x1 << CC_XNURSW_SHIFT) |
-+		      CC_XPULSW;
-+		mxc_tsadcc_write(ts_dev, TICR, reg);
-+	}
-+
-+	while (!(mxc_tsadcc_read(ts_dev, TCQSR) & CQSR_EMPT)) {
-+		BUG_ON(data_num >= ARRAY_SIZE(fifo_data->fifo));
-+		reg = mxc_tsadcc_read(ts_dev, TCQFIFO);
-+		fifo_data->fifo[data_num] = reg;
-+		data_num++;
-+	}
-+	DBG(0, "%s: Read %u words from fifo\n", __FUNCTION__, data_num);
-+
-+	ret = tsc_data->pendown[0].data <= 0x600 &&
-+		tsc_data->pendown2[0].data <= 0x600;
-+
-+	if (ret) {
-+		DBG(0, "%s: pos_x=%03x pos_y=%03x\n",
-+		    __FUNCTION__, tsc_data->pos_x[0].data,
-+		    tsc_data->pos_y[0].data);
-+#ifdef REPORT_PRESSURE
-+		DBG(0, "%s: pos_x=%03x pos_y=%03x xp=%03x yn=%03x\n",
-+		    __FUNCTION__, tsc_data->xp[0].data,
-+		    tsc_data->yn[0].data);
-+#endif
-+		if (/*(mxc_tsadcc_read(ts_dev, TCQSR) & CQSR_PD) && */
-+		    tsc_data->pos_x[0].data &&
-+		    tsc_data->pos_x[1].data &&
-+		    tsc_data->pos_x[2].data) {
-+#ifdef REPORT_PRESSURE
-+			ts_dev->pressure = ts_dev->r_xplate *
-+				(tsc_data->pos_x[0].data / 4096) *
-+				((tsc_data->yn[0].data - tsc_data->xp[0].data) /
-+				 tsc_data->xp[0].data);
-+#else
-+			ts_dev->pressure = 4095;
-+#endif
-+			DBG(0, "%s: Detected PEN DOWN with pressure %03x\n",
-+			    __FUNCTION__, ts_dev->pressure);
-+			ts_dev->pendown = 1;
-+		} else {
-+			DBG(0, "%s: Detected PEN UP\n", __FUNCTION__);
-+			ts_dev->pendown = 0;
-+		}
-+	} else {
-+		DBG(0, "%s: Discarding measurement\n", __FUNCTION__);
-+		ts_dev->pendown = 0;
-+	}
-+ exit:
-+	mutex_unlock(&ts_dev->convert_mutex);
-+
-+	return ret;
-+}
-+
-+static inline void mxc_tsadcc_enable_pendown(struct mxc_tsadcc *ts_dev)
-+{
-+	unsigned long reg;
-+
-+	/* Config idle for 4-wire */
-+	reg = TSC_4WIRE_TOUCH_DETECT;
-+	mxc_tsadcc_write(ts_dev, TICR, reg);
-+
-+	DBG(0, "%s: Enable PD detect\n", __FUNCTION__);
-+	reg = mxc_tsadcc_read(ts_dev, TGCR);
-+	reg |= TGCR_PD_EN;
-+	mxc_tsadcc_write(ts_dev, TGCR, reg);
-+}
-+
-+static void mxc_tsadcc_work(struct work_struct *w)
-+{
-+	struct mxc_tsadcc *ts_dev = container_of(w, struct mxc_tsadcc, work);
-+	struct input_dev *input_dev = ts_dev->input;
-+
-+	if (mxc_tsadcc_read_ts(ts_dev, 1)) {
-+		DBG(0, "%s: Got sample %d\n", __FUNCTION__, ts_dev->pendown);
-+		if (mxc_tsadcc_pendown(ts_dev)) {
-+			if (!ts_dev->valid_measure) {
-+				ts_dev->valid_measure = 1;
-+			} else {
-+				DBG(0, "%s: Reporting PD event %03x @ %03x,%03x\n",
-+				    __FUNCTION__, ts_dev->pressure,
-+				    ts_dev->tsc_data->pos_x[0].data,
-+				    ts_dev->tsc_data->pos_y[0].data);
-+
-+				input_report_abs(input_dev, ABS_X,
-+						 ts_dev->tsc_data->pos_x[0].data);
-+				input_report_abs(input_dev, ABS_Y,
-+						 ts_dev->tsc_data->pos_y[0].data);
-+#ifdef REPORT_PRESSURE
-+				input_report_abs(input_dev, ABS_PRESSURE,
-+						 ts_dev->pressure);
-+#endif
-+				input_report_key(input_dev, BTN_TOUCH, 1);
-+				input_sync(input_dev);
-+			}
-+			ts_dev->prev_absx = ts_dev->tsc_data->pos_x[0].data;
-+			ts_dev->prev_absy = ts_dev->tsc_data->pos_y[0].data;
-+			DBG(0, "%s: Enabling timer\n", __FUNCTION__);
-+			mod_timer(&ts_dev->timer, jiffies +
-+				  msecs_to_jiffies(10));
-+			return;
-+		}
-+	}
-+	if (ts_dev->valid_measure) {
-+		DBG(0, "%s: Reporting PU event: %03x,%03x\n", __FUNCTION__,
-+		    ts_dev->prev_absx, ts_dev->prev_absy);
-+		input_report_abs(input_dev, ABS_X,
-+				 ts_dev->prev_absx);
-+		input_report_abs(input_dev, ABS_Y,
-+				 ts_dev->prev_absy);
-+#ifdef REPORT_PRESSURE
-+		input_report_abs(input_dev, ABS_PRESSURE, 0);
-+#endif
-+		input_report_key(input_dev, BTN_TOUCH, 0);
-+		input_sync(input_dev);
-+	}
-+	ts_dev->valid_measure = 0;
-+	mxc_tsadcc_enable_pendown(ts_dev);
-+}
-+
-+static void mxc_tsadcc_timer(unsigned long data)
-+{
-+	struct mxc_tsadcc *ts_dev = (void *)data;
-+	schedule_work(&ts_dev->work);
-+}
-+
-+static irqreturn_t mxc_tsadcc_interrupt(int irq, void *dev)
-+{
-+	struct mxc_tsadcc *ts_dev = dev;
-+	//struct input_dev *input_dev = ts_dev->input;
-+	unsigned long reg;
-+	unsigned long status = mxc_tsadcc_read(ts_dev, TGSR);
-+
-+	DBG(0, "%s: TCSR= %08lx\n", __FUNCTION__, status);
-+
-+	if (status & TGSR_TCQ_INT) {
-+		DBG(0, "%s: TCQSR=%08lx\n", __FUNCTION__,
-+		    mxc_tsadcc_read(ts_dev, TCQSR));
-+		reg = mxc_tsadcc_read(ts_dev, TCQSR);
-+		if (reg & CQSR_PD) {
-+			/* disable pen down detect */
-+			DBG(0, "%s: Disable PD detect\n", __FUNCTION__);
-+			reg = mxc_tsadcc_read(ts_dev, TGCR);
-+			reg &= ~TGCR_PD_EN;
-+			mxc_tsadcc_write(ts_dev, TGCR, reg);
-+
-+			/* Now schedule new measurement */
-+			schedule_work(&ts_dev->work);
-+		}
-+	}
-+	if (status & TGSR_GCQ_INT) {
-+		DBG(0, "%s: GCQSR=%08lx\n", __FUNCTION__,
-+		    mxc_tsadcc_read(ts_dev, GCQSR));
-+		reg = mxc_tsadcc_read(ts_dev, GCQSR);
-+		if (reg & CQSR_EOQ) {
-+			reg = mxc_tsadcc_read(ts_dev, GCQMR);
-+			reg |= CQMR_EOQ_IRQ_MSK;
-+			mxc_tsadcc_write(ts_dev, GCQMR, reg);
-+		}
-+	}		
-+	return IRQ_HANDLED;
-+}
-+
-+static void mxc_tsadcc_4wire_config(struct mxc_tsadcc *ts_dev)
-+{
-+	unsigned long reg;
-+	int lastitemid;
-+
-+	/* Level sense */
-+	reg = mxc_tsadcc_read(ts_dev, TCQCR);
-+	reg |= CQCR_PD_CFG;
-+	reg |= (0xf << CQCR_FIFOWATERMARK_SHIFT);  /* watermark */
-+	mxc_tsadcc_write(ts_dev, TCQCR, reg);
-+
-+	/* Configure 4-wire */
-+	reg = TSC_4WIRE_PRECHARGE;
-+	reg |= CC_IGS;
-+	mxc_tsadcc_write(ts_dev, TCC0, reg);
-+
-+	reg = TSC_4WIRE_TOUCH_DETECT;
-+	reg |= (TSC_NUM_SAMPLES - 1) << CC_NOS_SHIFT;	/* 4 samples */
-+	reg |= 32 << CC_SETTLING_TIME_SHIFT;	/* it's important! */
-+	mxc_tsadcc_write(ts_dev, TCC1, reg);
-+
-+	reg = TSC_4WIRE_X_MEASURE;
-+	reg |= (TSC_NUM_SAMPLES - 1) << CC_NOS_SHIFT;	/* 4 samples */
-+	reg |= 16 << CC_SETTLING_TIME_SHIFT;	/* settling time */
-+	mxc_tsadcc_write(ts_dev, TCC2, reg);
-+
-+	reg = TSC_4WIRE_Y_MEASURE;
-+	reg |= (TSC_NUM_SAMPLES - 1) << CC_NOS_SHIFT;	/* 4 samples */
-+	reg |= 16 << CC_SETTLING_TIME_SHIFT;	/* settling time */
-+	mxc_tsadcc_write(ts_dev, TCC3, reg);
-+
-+	reg = TSC_4WIRE_YN_MEASURE;
-+	reg |= (TSC_NUM_SAMPLES - 1) << CC_NOS_SHIFT;	/* 4 samples */
-+	reg |= 16 << CC_SETTLING_TIME_SHIFT;	/* settling time */
-+	mxc_tsadcc_write(ts_dev, TCC4, reg);
-+
-+	reg = TSC_4WIRE_XP_MEASURE;
-+	reg |= (TSC_NUM_SAMPLES - 1) << CC_NOS_SHIFT;	/* 4 samples */
-+	reg |= 16 << CC_SETTLING_TIME_SHIFT;	/* settling time */
-+	mxc_tsadcc_write(ts_dev, TCC5, reg);
-+
-+	reg = (TCQ_ITEM_TCC0 << CQ_ITEM0_SHIFT) |
-+		(TCQ_ITEM_TCC1 << CQ_ITEM1_SHIFT) |
-+		(TCQ_ITEM_TCC2 << CQ_ITEM2_SHIFT) |
-+		(TCQ_ITEM_TCC3 << CQ_ITEM3_SHIFT) |
-+		(TCQ_ITEM_TCC0 << CQ_ITEM4_SHIFT) |
-+		(TCQ_ITEM_TCC1 << CQ_ITEM5_SHIFT);
-+	mxc_tsadcc_write(ts_dev, TCQ_ITEM_7_0, reg);
-+
-+	lastitemid = 5;
-+	reg = mxc_tsadcc_read(ts_dev, TCQCR);
-+	reg = (reg & ~CQCR_LAST_ITEM_ID_MASK) |
-+	      (lastitemid << CQCR_LAST_ITEM_ID_SHIFT);
-+	mxc_tsadcc_write(ts_dev, TCQCR, reg);
-+
-+	/* pen down enable */
-+	reg = mxc_tsadcc_read(ts_dev, TCQCR);
-+	reg &= ~CQCR_PD_MSK;
-+	mxc_tsadcc_write(ts_dev, TCQCR, reg);
-+	reg = mxc_tsadcc_read(ts_dev, TCQMR);
-+	reg &= ~CQMR_PD_IRQ_MSK;
-+	mxc_tsadcc_write(ts_dev, TCQMR, reg);
-+
-+	/* Config idle for 4-wire */
-+	reg = TSC_4WIRE_TOUCH_DETECT;
-+	mxc_tsadcc_write(ts_dev, TICR, reg);
-+
-+	/* Pen interrupt starts new conversion queue */
-+	reg = mxc_tsadcc_read(ts_dev, TCQCR);
-+	reg &= ~CQCR_QSM_MASK;
-+	reg |= CQCR_QSM_PEN;
-+	mxc_tsadcc_write(ts_dev, TCQCR, reg);
-+}
-+
-+static void mxc_tsadcc_config(struct platform_device *pdev)
-+{
-+	struct mxc_tsadcc *ts_dev = platform_get_drvdata(pdev);
-+	struct mxc_tsadcc_pdata *pdata = pdev->dev.platform_data;
-+	unsigned int tgcr;
-+	unsigned int pdbt;
-+	unsigned int pdben;
-+	unsigned int intref;
-+	unsigned int adc_clk = DEFAULT_ADC_CLOCK;
-+	unsigned long ipg_clk;
-+	unsigned int clkdiv;
-+
-+	if (pdata) {
-+		pdbt = pdata->pen_debounce_time - 1;
-+		pdben = pdata->pen_debounce_time > 0;
-+		intref = !!pdata->intref;
-+		if (pdata->adc_clk > 0) {
-+			adc_clk = pdata->adc_clk;
-+		}
-+		ts_dev->r_xplate = pdata->r_xplate;
-+	} else {
-+		dev_dbg(&pdev->dev, "No platform_data; using defaults\n");
-+		pdbt = TGCR_PDBTIME128;
-+		pdben = 1;
-+		intref = 1;
-+	}
-+	if (ts_dev->r_xplate == 0) {
-+		ts_dev->r_xplate = DEFAULT_RX_VALUE;
-+		DBG(0, "%s: Assuming default Rx value of %u Ohms\n",
-+		    __FUNCTION__, ts_dev->r_xplate);
-+	}
-+	ipg_clk = clk_get_rate(ts_dev->clk);
-+	dev_info(&pdev->dev, "Master clock is: %lu.%06luMHz requested ADC clock: %u.%06uMHz\n",
-+		 ipg_clk / 1000000, ipg_clk % 1000000,
-+		 adc_clk / 1000000, adc_clk % 1000000);
-+	/*
-+	 * adc_clk = ipg_clk / (2 * clkdiv + 2)
-+	 * The exact formula for the clock divider would be:
-+	 * clkdiv = ipg_clk / (2 * adc_clk) - 1
-+	 * but we drop the '- 1' due to integer truncation
-+	 * and to make sure the actual clock is always less or equal
-+	 * to the designated clock.
-+	*/
-+	clkdiv = ipg_clk / (2 * adc_clk + 1);
-+	if (clkdiv > 31) {
-+		clkdiv = 31;
-+		dev_warn(&pdev->dev,
-+			 "cannot accomodate designated clock of %u.%06uMHz; using %lu.%06luMHz\n",
-+			 adc_clk / 1000000, adc_clk % 1000000,
-+			 ipg_clk / (2 * clkdiv + 2) / 1000000,
-+			 ipg_clk / (2 * clkdiv + 2) % 1000000);
-+	} else {
-+		dev_dbg(&pdev->dev,
-+			"clkdiv=%u actual ADC clock: %lu.%06luMHz\n",
-+			clkdiv, ipg_clk / (2 * (clkdiv + 1)) / 1000000,
-+			ipg_clk / (2 * clkdiv + 2) % 1000000);
-+	}
-+
-+	tgcr = ((pdbt << TGCR_PDBTIME_SHIFT) & TGCR_PDBTIME_MASK) | /* pen debounce time */
-+		(pdben * TGCR_PDB_EN) | /* pen debounce enable */
-+		(intref * TGCR_INTREFEN) | /* pen debounce enable */
-+		TGCR_POWER_SAVE | /* Switch TSC on */
-+		TGCR_PD_EN |	/* Enable Pen Detect */
-+		((clkdiv << TGCR_ADCCLKCFG_SHIFT) & TGCR_ADCCLKCFG_MASK);
-+
-+	/* reset TSC */
-+	mxc_tsadcc_write(ts_dev, TGCR, TGCR_TSC_RST);
-+	while (mxc_tsadcc_read(ts_dev, TGCR) & TGCR_TSC_RST) {
-+		cpu_relax();
-+	}
-+	mxc_tsadcc_write(ts_dev, TGCR, tgcr);
-+
-+	mxc_tsadcc_4wire_config(ts_dev);
-+	tsc_clk_enable(ts_dev);
-+}
-+
-+static int __devinit mxc_tsadcc_probe(struct platform_device *pdev)
-+{
-+	int err;
-+	struct mxc_tsadcc *ts_dev;
-+	struct input_dev *input_dev;
-+	struct resource	*res;
-+	int irq;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!res) {
-+		dev_err(&pdev->dev, "No mmio resource defined\n");
-+		return -ENODEV;
-+	}
-+
-+	irq = platform_get_irq(pdev, 0);
-+	if (irq < 0) {
-+		dev_err(&pdev->dev, "No IRQ assigned\n");
-+		return -ENODEV;
-+	}
-+
-+	if (!request_mem_region(res->start, resource_size(res),
-+				"mxc tsadcc regs")) {
-+		return -EBUSY;
-+	}
-+
-+	/* Allocate memory for device */
-+	ts_dev = kzalloc(sizeof(struct mxc_tsadcc), GFP_KERNEL);
-+	if (!ts_dev) {
-+		dev_err(&pdev->dev, "Failed to allocate memory\n");
-+		err = -ENOMEM;
-+		goto err_release_mem;
-+	}
-+
-+	/* allocate conversion buffers separately to prevent
-+	 * cacheline alignment issues when using DMA */
-+	ts_dev->tsc_data = kzalloc(sizeof(struct mxc_tsadcc_tsc_data), GFP_KERNEL);
-+	ts_dev->adc_data = kzalloc(sizeof(struct mxc_tsadcc_adc_data), GFP_KERNEL);
-+	if (ts_dev->tsc_data == NULL || ts_dev->adc_data == NULL) {
-+		err = -ENOMEM;
-+		goto err_free_mem;
-+	}
-+	ts_dev->irq = irq;
-+	INIT_WORK(&ts_dev->work, mxc_tsadcc_work);
-+	mutex_init(&ts_dev->convert_mutex);
-+	setup_timer(&ts_dev->timer, mxc_tsadcc_timer, (unsigned long)ts_dev);
-+	init_waitqueue_head(&ts_dev->wq);
-+
-+	platform_set_drvdata(pdev, ts_dev);
-+
-+	input_dev = input_allocate_device();
-+	if (!input_dev) {
-+		dev_err(&pdev->dev, "Failed to allocate input device\n");
-+		err = -ENOMEM;
-+		goto err_free_mem;
-+	}
-+
-+	ts_dev->reg_base = ioremap(res->start, resource_size(res));
-+	if (!ts_dev->reg_base) {
-+		dev_err(&pdev->dev, "Failed to map registers\n");
-+		err = -ENOMEM;
-+		goto err_free_dev;
-+	}
-+
-+	err = request_irq(ts_dev->irq, mxc_tsadcc_interrupt, 0,
-+			pdev->dev.driver->name, ts_dev);
-+	if (err) {
-+		dev_err(&pdev->dev, "Failed to install irq handler: %d\n", err);
-+		goto err_unmap_regs;
-+	}
-+
-+	ts_dev->clk = clk_get(&pdev->dev, NULL);
-+	if (IS_ERR(ts_dev->clk)) {
-+		dev_err(&pdev->dev, "Failed to get ts_clk\n");
-+		err = PTR_ERR(ts_dev->clk);
-+		goto err_free_irq;
-+	}
-+
-+	ts_dev->input = input_dev;
-+
-+	snprintf(ts_dev->phys, sizeof(ts_dev->phys),
-+		 "%s/input0", dev_name(&pdev->dev));
-+
-+	input_dev->name = "mxc touch screen controller";
-+	input_dev->phys = ts_dev->phys;
-+	input_dev->dev.parent = &pdev->dev;
-+
-+	input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-+	input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
-+	input_dev->absbit[0] = BIT_MASK(ABS_X) |
-+		BIT_MASK(ABS_Y) |
-+		BIT_MASK(ABS_PRESSURE);
-+
-+	input_set_abs_params(input_dev, ABS_X, 0, 0xFFF, 0, 0);
-+	input_set_abs_params(input_dev, ABS_Y, 0, 0xFFF, 0, 0);
-+	input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xFFF, 0, 0);
-+
-+	mxc_tsadcc_config(pdev);
-+
-+	/* All went ok, so register to the input system */
-+	err = input_register_device(input_dev);
-+	if (err)
-+		goto err_fail;
-+
-+	err = sysfs_create_group(&pdev->dev.kobj, &mxc_tsadcc_attr_group);
-+	if (err) {
-+		dev_warn(&pdev->dev, "Failed to create sysfs attributes: %d\n",
-+			 err);
-+	}
-+	ts_dev->attrs = !err;
-+
-+	return 0;
-+
-+err_fail:
-+	clk_disable(ts_dev->clk);
-+	clk_put(ts_dev->clk);
-+err_free_irq:
-+	free_irq(ts_dev->irq, ts_dev);
-+err_unmap_regs:
-+	iounmap(ts_dev->reg_base);
-+err_free_dev:
-+	input_free_device(ts_dev->input);
-+err_free_mem:
-+	kfree(ts_dev->tsc_data);
-+	kfree(ts_dev->adc_data);
-+	kfree(ts_dev);
-+err_release_mem:
-+	release_mem_region(res->start, resource_size(res));
-+	return err;
-+}
-+
-+static int __devexit mxc_tsadcc_remove(struct platform_device *pdev)
-+{
-+	struct mxc_tsadcc *ts_dev = dev_get_drvdata(&pdev->dev);
-+	struct resource *res;
-+
-+	if (ts_dev->attrs) {
-+		DBG(0, "%s: Removing sysfs attributes\n", __FUNCTION__);
-+		sysfs_remove_group(&pdev->dev.kobj, &mxc_tsadcc_attr_group);
-+	}
-+	del_timer_sync(&ts_dev->timer);
-+	input_unregister_device(ts_dev->input);
-+
-+	clk_disable(ts_dev->clk);
-+	clk_put(ts_dev->clk);
-+
-+	free_irq(ts_dev->irq, ts_dev);
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	iounmap(ts_dev->reg_base);
-+	release_mem_region(res->start, resource_size(res));
-+
-+	kfree(ts_dev->tsc_data);
-+	kfree(ts_dev->adc_data);
-+	kfree(ts_dev);
-+	return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int mxc_tsadcc_suspend(struct platform_device *pdev, pm_message_t msg)
-+{
-+	struct mxc_tsadcc *ts_dev = dev_get_drvdata(&pdev->dev);
-+
-+	if (ts_dev->clk_enabled) {
-+		tsc_clk_disable(ts_dev);
-+		ts_dev->clk_enabled = 1;
-+	}
-+	return 0;
-+}
-+
-+static int mxc_tsadcc_resume(struct platform_device *pdev)
-+{
-+	struct mxc_tsadcc *ts_dev = dev_get_drvdata(&pdev->dev);
-+
-+	if (ts_dev->clk_enabled) {
-+		ts_dev->clk_enabled = 0;
-+		tsc_clk_enable(ts_dev);
-+	}
-+	return 0;
-+}
-+#else
-+#define mxc_tsadcc_suspend	NULL
-+#define mxc_tsadcc_resume	NULL
-+#endif
-+
-+static struct platform_driver mxc_tsadcc_driver = {
-+	.probe		= mxc_tsadcc_probe,
-+	.remove		= __devexit_p(mxc_tsadcc_remove),
-+	.suspend	= mxc_tsadcc_suspend,
-+	.resume		= mxc_tsadcc_resume,
-+	.driver		= {
-+		.name	= "mxc-tsadcc",
-+	},
-+};
-+
-+static int __init mxc_tsadcc_init(void)
-+{
-+	return platform_driver_register(&mxc_tsadcc_driver);
-+}
-+
-+static void __exit mxc_tsadcc_exit(void)
-+{
-+	platform_driver_unregister(&mxc_tsadcc_driver);
-+}
-+
-+module_init(mxc_tsadcc_init);
-+module_exit(mxc_tsadcc_exit);
-+
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("i.MX25 TouchScreen Driver");
-+MODULE_AUTHOR("Lothar Wassmann <LW@KARO-electronics.de>");
-+
-Index: linux-2.6.30-karo/drivers/input/touchscreen/mxc_tsadcc.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.30-karo/drivers/input/touchscreen/mxc_tsadcc.h	2009-06-23 13:46:20.000000000 +0200
-@@ -0,0 +1,243 @@
-+/*
-+ *  Freescale i.MX25 Touch Screen Driver
-+ *
-+ *  Copyright (c) 2009 Lothar Wassmann <LW@KARO-electronics.de>
-+ *
-+ * Based on code from Freescale BSP
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License version 2 as
-+ *  published by the Free Software Foundation.
-+ */
-+
-+/* TSC General Config Register */
-+#define TGCR			0x000
-+#define TGCR_IPG_CLK_EN		(1 << 0)
-+#define TGCR_TSC_RST		(1 << 1)
-+#define TGCR_FUNC_RST		(1 << 2)
-+#define TGCR_SLPC		(1 << 4)
-+#define TGCR_STLC		(1 << 5)
-+#define TGCR_HSYNC_EN		(1 << 6)
-+#define TGCR_HSYNC_POL		(1 << 7)
-+#define TGCR_POWERMODE_SHIFT	8
-+#define TGCR_POWER_OFF		(0x0 << TGCR_POWERMODE_SHIFT)
-+#define TGCR_POWER_SAVE		(0x1 << TGCR_POWERMODE_SHIFT)
-+#define TGCR_POWER_ON		(0x3 << TGCR_POWERMODE_SHIFT)
-+#define TGCR_POWER_MASK		(0x3 << TGCR_POWERMODE_SHIFT)
-+#define TGCR_INTREFEN		(1 << 10)
-+#define TGCR_ADCCLKCFG_SHIFT	16
-+#define TGCR_ADCCLKCFG_MASK	(0x1f << TGCR_ADCCLKCFG_SHIFT)
-+#define TGCR_PD_EN		(1 << 23)
-+#define TGCR_PDB_EN		(1 << 24)
-+#define TGCR_PDBTIME_SHIFT	25
-+#define TGCR_PDBTIME128		(0x3f << TGCR_PDBTIME_SHIFT)
-+#define TGCR_PDBTIME_MASK	(0x7f << TGCR_PDBTIME_SHIFT)
-+
-+/* TSC General Status Register */
-+#define TGSR			0x004
-+#define TGSR_TCQ_INT		(1 << 0)
-+#define TGSR_GCQ_INT		(1 << 1)
-+#define TGSR_SLP_INT		(1 << 2)
-+#define TGSR_TCQ_DMA		(1 << 16)
-+#define TGSR_GCQ_DMA		(1 << 17)
-+
-+/* TSC IDLE Config Register */
-+#define TICR			0x008
-+
-+/* TouchScreen Convert Queue FIFO Register */
-+#define TCQFIFO			0x400
-+/* TouchScreen Convert Queue Control Register */
-+#define TCQCR			0x404
-+#define CQCR_QSM_SHIFT		0
-+#define CQCR_QSM_STOP		(0x0 << CQCR_QSM_SHIFT)
-+#define CQCR_QSM_PEN		(0x1 << CQCR_QSM_SHIFT)
-+#define CQCR_QSM_FQS		(0x2 << CQCR_QSM_SHIFT)
-+#define CQCR_QSM_FQS_PEN	(0x3 << CQCR_QSM_SHIFT)
-+#define CQCR_QSM_MASK		(0x3 << CQCR_QSM_SHIFT)
-+#define CQCR_FQS		(1 << 2)
-+#define CQCR_RPT		(1 << 3)
-+#define CQCR_LAST_ITEM_ID_SHIFT 4
-+#define CQCR_LAST_ITEM_ID_MASK	(0xf << CQCR_LAST_ITEM_ID_SHIFT)
-+#define CQCR_FIFOWATERMARK_SHIFT 8
-+#define CQCR_FIFOWATERMARK_MASK (0xf << CQCR_FIFOWATERMARK_SHIFT)
-+#define CQCR_REPEATWAIT_SHIFT	12
-+#define CQCR_REPEATWAIT_MASK	(0xf << CQCR_REPEATWAIT_SHIFT)
-+#define CQCR_QRST		(1 << 16)
-+#define CQCR_FRST		(1 << 17)
-+#define CQCR_PD_MSK		(1 << 18)
-+#define CQCR_PD_CFG		(1 << 19)
-+
-+/* TouchScreen Convert Queue Status Register */
-+#define TCQSR			0x408
-+#define CQSR_PD			(1 << 0)
-+#define CQSR_EOQ		(1 << 1)
-+#define CQSR_FOR		(1 << 4)
-+#define CQSR_FUR		(1 << 5)
-+#define CQSR_FER		(1 << 6)
-+#define CQSR_EMPT		(1 << 13)
-+#define CQSR_FULL		(1 << 14)
-+#define CQSR_FDRY		(1 << 15)
-+
-+/* TouchScreen Convert Queue Mask Register */
-+#define TCQMR			0x40c
-+#define CQMR_PD_IRQ_MSK		(1 << 0)
-+#define CQMR_EOQ_IRQ_MSK	(1 << 1)
-+#define CQMR_FOR_IRQ_MSK	(1 << 4)
-+#define CQMR_FUR_IRQ_MSK	(1 << 5)
-+#define CQMR_FER_IRQ_MSK	(1 << 6)
-+#define CQMR_PD_DMA_MSK		(1 << 16)
-+#define CQMR_EOQ_DMA_MSK	(1 << 17)
-+#define CQMR_FOR_DMA_MSK	(1 << 20)
-+#define CQMR_FUR_DMA_MSK	(1 << 21)
-+#define CQMR_FER_DMA_MSK	(1 << 22)
-+#define CQMR_FDRY_DMA_MSK	(1 << 31)
-+
-+/* TouchScreen Convert Queue ITEM 7~0 */
-+#define TCQ_ITEM_7_0		0x420
-+
-+/* TouchScreen Convert Queue ITEM 15~8 */
-+#define TCQ_ITEM_15_8		0x424
-+
-+#define TCQ_ITEM_TCC0		0x0
-+#define TCQ_ITEM_TCC1		0x1
-+#define TCQ_ITEM_TCC2		0x2
-+#define TCQ_ITEM_TCC3		0x3
-+#define TCQ_ITEM_TCC4		0x4
-+#define TCQ_ITEM_TCC5		0x5
-+#define TCQ_ITEM_TCC6		0x6
-+#define TCQ_ITEM_TCC7		0x7
-+#define TCQ_ITEM_GCC7		0x8
-+#define TCQ_ITEM_GCC6		0x9
-+#define TCQ_ITEM_GCC5		0xa
-+#define TCQ_ITEM_GCC4		0xb
-+#define TCQ_ITEM_GCC3		0xc
-+#define TCQ_ITEM_GCC2		0xd
-+#define TCQ_ITEM_GCC1		0xe
-+#define TCQ_ITEM_GCC0		0xf
-+
-+/* TouchScreen Convert Config 0-7 */
-+#define TCC0			0x440
-+#define TCC1			0x444
-+#define TCC2			0x448
-+#define TCC3			0x44c
-+#define TCC4			0x450
-+#define TCC5			0x454
-+#define TCC6			0x458
-+#define TCC7			0x45c
-+#define CC_PEN_IACK		(1 << 1)
-+#define CC_SEL_REFN_SHIFT	2
-+#define CC_SEL_REFN_YNLR	(0x1 << CC_SEL_REFN_SHIFT)
-+#define CC_SEL_REFN_AGND	(0x2 << CC_SEL_REFN_SHIFT)
-+#define CC_SEL_REFN_MASK	(0x3 << CC_SEL_REFN_SHIFT)
-+#define CC_SELIN_SHIFT		4
-+#define CC_SELIN_XPUL		(0x0 << CC_SELIN_SHIFT)
-+#define CC_SELIN_YPLL		(0x1 << CC_SELIN_SHIFT)
-+#define CC_SELIN_XNUR		(0x2 << CC_SELIN_SHIFT)
-+#define CC_SELIN_YNLR		(0x3 << CC_SELIN_SHIFT)
-+#define CC_SELIN_WIPER		(0x4 << CC_SELIN_SHIFT)
-+#define CC_SELIN_INAUX0		(0x5 << CC_SELIN_SHIFT)
-+#define CC_SELIN_INAUX1		(0x6 << CC_SELIN_SHIFT)
-+#define CC_SELIN_INAUX2		(0x7 << CC_SELIN_SHIFT)
-+#define CC_SELIN_MASK		(0x7 << CC_SELIN_SHIFT)
-+#define CC_SELREFP_SHIFT	7
-+#define CC_SELREFP_YPLL		(0x0 << CC_SELREFP_SHIFT)
-+#define CC_SELREFP_XPUL		(0x1 << CC_SELREFP_SHIFT)
-+#define CC_SELREFP_EXT		(0x2 << CC_SELREFP_SHIFT)
-+#define CC_SELREFP_INT		(0x3 << CC_SELREFP_SHIFT)
-+#define CC_SELREFP_MASK		(0x3 << CC_SELREFP_SHIFT)
-+#define CC_XPULSW		(1 << 9)
-+#define CC_XNURSW_SHIFT		10
-+#define CC_XNURSW_HIGH		(0x0 << CC_XNURSW_SHIFT)
-+#define CC_XNURSW_OFF		(0x1 << CC_XNURSW_SHIFT)
-+#define CC_XNURSW_LOW		(0x3 << CC_XNURSW_SHIFT)
-+#define CC_XNURSW_MASK		(0x3 << CC_XNURSW_SHIFT)
-+#define CC_YPLLSW_SHIFT		12
-+#define CC_YPLLSW_HIGH		(0x0 << CC_YPLLSW_SHIFT)
-+#define CC_YPLLSW_OFF		(0x1 << CC_YPLLSW_SHIFT)
-+#define CC_YPLLSW_LOW		(0x3 << CC_YPLLSW_SHIFT)
-+#define CC_YPLLSW_MASK		(0x3 << CC_YPLLSW_SHIFT)
-+#define CC_YNLRSW		(1 << 14)
-+#define CC_WIPERSW		(1 << 15)
-+#define CC_NOS_SHIFT		16
-+#define CC_NOS_MASK		(0xf << CC_NOS_SHIFT)
-+#define CC_IGS			(1 << 20)
-+#define CC_SETTLING_TIME_SHIFT	24
-+#define CC_SETTLING_TIME_MASK	(0xff << CC_SETTLING_TIME_SHIFT)
-+
-+#define TSC_4WIRE_PRECHARGE	0x158c
-+#define TSC_4WIRE_TOUCH_DETECT	0x578e
-+
-+#define TSC_4WIRE_X_MEASURE	0x1c90
-+#define TSC_4WIRE_Y_MEASURE	0x4604
-+#define TSC_4WIRE_XP_MEASURE	0x0f8c
-+#define TSC_4WIRE_YN_MEASURE	0x0fbc
-+
-+#define TSC_GENERAL_ADC_GCC0	0x17dc
-+#define TSC_GENERAL_ADC_GCC1	0x17ec
-+#define TSC_GENERAL_ADC_GCC2	0x17fc
-+
-+/* GeneralADC Convert Queue FIFO Register */
-+#define GCQFIFO			0x800
-+#define GCQFIFO_ADCOUT_SHIFT	4
-+#define GCQFIFO_ADCOUT_MASK	(0xfff << GCQFIFO_ADCOUT_SHIFT)
-+
-+/* GeneralADC Convert Queue Control Register */
-+#define GCQCR			0x804
-+
-+/* GeneralADC Convert Queue Status Register */
-+#define GCQSR			0x808
-+
-+/* GeneralADC Convert Queue Mask Register */
-+#define GCQMR			0x80c
-+
-+/* GeneralADC Convert Queue ITEM 7~0 */
-+#define GCQ_ITEM_7_0		0x820
-+
-+/* GeneralADC Convert Queue ITEM 15~8 */
-+#define GCQ_ITEM_15_8		0x824
-+
-+#define CQ_ITEM7_SHIFT		28
-+#define CQ_ITEM6_SHIFT		24
-+#define CQ_ITEM5_SHIFT		20
-+#define CQ_ITEM4_SHIFT		16
-+#define CQ_ITEM3_SHIFT		12
-+#define CQ_ITEM2_SHIFT		 8
-+#define CQ_ITEM1_SHIFT		 4
-+#define CQ_ITEM0_SHIFT		 0
-+
-+#define CQ_ITEM8_SHIFT		28
-+#define CQ_ITEM9_SHIFT		24
-+#define CQ_ITEM10_SHIFT		20
-+#define CQ_ITEM11_SHIFT		16
-+#define CQ_ITEM12_SHIFT		12
-+#define CQ_ITEM13_SHIFT		 8
-+#define CQ_ITEM14_SHIFT		 4
-+#define CQ_ITEM15_SHIFT		 0
-+
-+#define GCQ_ITEM_GCC0		0x0
-+#define GCQ_ITEM_GCC1		0x1
-+#define GCQ_ITEM_GCC2		0x2
-+#define GCQ_ITEM_GCC3		0x3
-+
-+/* GeneralADC Convert Config 0-7 */
-+#define GCC0			0x840
-+#define GCC1			0x844
-+#define GCC2			0x848
-+#define GCC3			0x84c
-+#define GCC4			0x850
-+#define GCC5			0x854
-+#define GCC6			0x858
-+#define GCC7			0x85c
-+
-+/* TSC Test Register R/W */
-+#define TTR			0xc00
-+/* TSC Monitor Register 1, 2 */
-+#define MNT1			0xc04
-+#define MNT2			0xc04
-+
-+#define DETECT_ITEM_ID_1	1
-+#define DETECT_ITEM_ID_2	5
-+#define TS_X_ITEM_ID		2
-+#define TS_Y_ITEM_ID		3
-+#define TSI_DATA		1
-+#define FQS_DATA		0
diff --git a/recipes/linux/linux-2.6.30/calamari/defconfig b/recipes/linux/linux-2.6.30/calamari/defconfig
new file mode 100644
index 0000000000..bedde49d4b
--- /dev/null
+++ b/recipes/linux/linux-2.6.30/calamari/defconfig
@@ -0,0 +1,1854 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.30
+# Wed Jul 15 10:59:41 2009
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+CONFIG_PPC_85xx=y
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_E500=y
+# CONFIG_PPC_E500MC is not set
+CONFIG_BOOKE=y
+CONFIG_FSL_BOOKE=y
+CONFIG_FSL_EMB_PERFMON=y
+# CONFIG_PHYS_64BIT is not set
+CONFIG_SPE=y
+CONFIG_PPC_MMU_NOHASH=y
+CONFIG_PPC_BOOK3E_MMU=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_GPIO=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DTC=y
+CONFIG_DEFAULT_UIMAGE=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+CONFIG_AUDIT=y
+# CONFIG_AUDITSYSCALL is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_CLASSIC_RCU=y
+# CONFIG_TREE_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_PREEMPT_RCU_TRACE is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_GROUP_SCHED=y
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+# CONFIG_STRIP_ASM_SYMS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_CLK=y
+# CONFIG_SLOW_WORK is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_BLOCK=y
+CONFIG_LBD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_FREEZER is not set
+CONFIG_PPC_MSI_BITMAP=y
+
+#
+# Platform support
+#
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+CONFIG_MPC85xx=y
+CONFIG_MPC8540_ADS=y
+CONFIG_MPC8560_ADS=y
+CONFIG_MPC85xx_CDS=y
+CONFIG_MPC85xx_MDS=y
+CONFIG_MPC8536_DS=y
+CONFIG_MPC85xx_DS=y
+CONFIG_SOCRATES=y
+CONFIG_KSI8560=y
+CONFIG_STX_GP3=y
+CONFIG_TQM8540=y
+CONFIG_TQM8541=y
+CONFIG_TQM8548=y
+CONFIG_TQM8555=y
+CONFIG_TQM8560=y
+CONFIG_SBC8548=y
+# CONFIG_SBC8560 is not set
+CONFIG_TQM85xx=y
+# CONFIG_IPIC is not set
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+CONFIG_PPC_I8259=y
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+CONFIG_CPU_FREQ=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+# CONFIG_CPU_FREQ_STAT is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+
+#
+# CPU Frequency drivers
+#
+CONFIG_QUICC_ENGINE=y
+CONFIG_QE_GPIO=y
+CONFIG_CPM2=y
+CONFIG_FSL_ULI1575=y
+CONFIG_CPM=y
+CONFIG_MPC8xxx_GPIO=y
+# CONFIG_SIMPLE_GPIO is not set
+
+#
+# Kernel options
+#
+CONFIG_HIGHMEM=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_MATH_EMULATION=y
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MIGRATION=y
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_16K_PAGES is not set
+# CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_EXTRA_TARGETS=""
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_SECCOMP is not set
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_FSL_PCI=y
+CONFIG_PPC_PCI_CHOICE=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIEASPM is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_LEGACY is not set
+CONFIG_PCI_DEBUG=y
+# CONFIG_PCI_STUB is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HAS_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_LOWMEM_CAM_NUM=3
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_PHYSICAL_ALIGN=0x04000000
+CONFIG_TASK_SIZE=0xc0000000
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=y
+CONFIG_NET_IPGRE=y
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_OLD_REGULATORY=y
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_LIB80211 is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+CONFIG_OF_DEVICE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_I2C=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_NBD=y
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=131072
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+CONFIG_EEPROM_LEGACY=y
+# CONFIG_EEPROM_93CX6 is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_FCOE is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_SATA_PMP=y
+CONFIG_SATA_AHCI=y
+# CONFIG_SATA_SIL24 is not set
+CONFIG_SATA_FSL=y
+CONFIG_ATA_SFF=y
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
+CONFIG_PATA_ALI=y
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# Enable only one of the two stacks, unless you know what you are doing
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+CONFIG_COMPAT_NET_DEV_OPS=y
+CONFIG_DUMMY=y
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=y
+CONFIG_DAVICOM_PHY=y
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+CONFIG_CICADA_PHY=y
+CONFIG_VITESSE_PHY=y
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+CONFIG_FIXED_PHY=y
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_ETHOC is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_B44 is not set
+# CONFIG_ATL2 is not set
+CONFIG_FS_ENET=y
+CONFIG_FS_ENET_HAS_SCC=y
+CONFIG_FS_ENET_HAS_FCC=y
+# CONFIG_FS_ENET_MDIO_FCC is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+CONFIG_FSL_PQ_MDIO=y
+CONFIG_GIANFAR=y
+CONFIG_UCC_GETH=y
+# CONFIG_UGETH_MAGIC_PACKET is not set
+# CONFIG_UGETH_TX_ON_DEMAND is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL1C is not set
+# CONFIG_JME is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+CONFIG_CHELSIO_T3_DEPENDS=y
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_ENIC is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_VXGE is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NIU is not set
+# CONFIG_MLX4_EN is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_BNX2X is not set
+# CONFIG_QLGE is not set
+# CONFIG_SFC is not set
+# CONFIG_BE2NET is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=m
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_XILINX_XPS_PS2 is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_CPM is not set
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+CONFIG_SERIAL_QE=m
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_HVC_UDBG is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+CONFIG_NVRAM=y
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_CHARDEV is not set
+CONFIG_I2C_HELPER_AUTO=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_CPM=m
+# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_MPC=y
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_SIMTEC is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Graphics adapter I2C/DDC channel drivers
+#
+# CONFIG_I2C_VOODOO3 is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_STUB is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_SPI is not set
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_GPIO_SYSFS is not set
+
+#
+# Memory mapped GPIO expanders:
+#
+# CONFIG_GPIO_XILINX is not set
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+
+#
+# PCI GPIO expanders:
+#
+# CONFIG_GPIO_BT8XX is not set
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_REGULATOR is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+# CONFIG_MEDIA_ATTACH is not set
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+# CONFIG_TTPCI_EEPROM is not set
+# CONFIG_DVB_BUDGET_CORE is not set
+
+#
+# Supported USB Adapters
+#
+# CONFIG_DVB_USB is not set
+# CONFIG_DVB_TTUSB_BUDGET is not set
+# CONFIG_DVB_TTUSB_DEC is not set
+# CONFIG_DVB_SIANO_SMS1XXX is not set
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+# CONFIG_DVB_B2C2_FLEXCOP is not set
+
+#
+# Supported BT878 Adapters
+#
+
+#
+# Supported Pluto2 Adapters
+#
+# CONFIG_DVB_PLUTO2 is not set
+
+#
+# Supported SDMC DM1105 Adapters
+#
+# CONFIG_DVB_DM1105 is not set
+
+#
+# Supported DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_AC97_CODEC=y
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HIFIER is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+CONFIG_SND_INTEL8X0=y
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+CONFIG_SND_PPC=y
+CONFIG_SND_USB=y
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=y
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=y
+CONFIG_HID_APPLE=y
+CONFIG_HID_BELKIN=y
+CONFIG_HID_CHERRY=y
+CONFIG_HID_CHICONY=y
+CONFIG_HID_CYPRESS=y
+# CONFIG_DRAGONRISE_FF is not set
+CONFIG_HID_EZKEY=y
+# CONFIG_HID_KYE is not set
+CONFIG_HID_GYRATION=y
+# CONFIG_HID_KENSINGTON is not set
+CONFIG_HID_LOGITECH=y
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+CONFIG_HID_MICROSOFT=y
+CONFIG_HID_MONTEREY=y
+# CONFIG_HID_NTRIG is not set
+CONFIG_HID_PANTHERLORD=y
+# CONFIG_PANTHERLORD_FF is not set
+CONFIG_HID_PETALYNX=y
+CONFIG_HID_SAMSUNG=y
+CONFIG_HID_SONY=y
+CONFIG_HID_SUNPLUS=y
+# CONFIG_GREENASIA_FF is not set
+# CONFIG_HID_TOPSEED is not set
+CONFIG_THRUSTMASTER_FF=m
+CONFIG_ZEROPLUS_FF=m
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_MON=y
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_FSL=y
+CONFIG_USB_EHCI_HCD_PPC_OF=y
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_FHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_WHCI_HCD is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_MUSB_HDRC is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_VST is not set
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_UWB is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+CONFIG_EDAC=y
+
+#
+# Reporting subsystems
+#
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_MM_EDAC=y
+CONFIG_EDAC_MPC85XX=y
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_GENERIC is not set
+CONFIG_DMADEVICES=y
+
+#
+# DMA Devices
+#
+CONFIG_FSL_DMA=y
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+# CONFIG_NET_DMA is not set
+# CONFIG_ASYNC_TX_DMA is not set
+# CONFIG_DMATEST is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_XFS_FS=y
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_BTRFS_FS=y
+# CONFIG_BTRFS_FS_POSIX_ACL is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_CRAMFS=y
+# CONFIG_SQUASHFS is not set
+CONFIG_VXFS_FS=m
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+# CONFIG_ROMFS_FS is not set
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=y
+# CONFIG_NFSD_V3 is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
+CONFIG_UCC_SLOW=y
+CONFIG_UCC_FAST=y
+CONFIG_UCC=y
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+CONFIG_NLATTR=y
+
+#
+# Kernel hacking
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_TRACING_SUPPORT=y
+
+#
+# Tracers
+#
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_EVENT_TRACER is not set
+# CONFIG_BOOT_TRACER is not set
+# CONFIG_TRACE_BRANCH_PROFILING is not set
+# CONFIG_STACK_TRACER is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_PRINT_STACK_DEPTH=64
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_MSI_BITMAP_SELFTEST is not set
+# CONFIG_XMON is not set
+# CONFIG_IRQSTACKS is not set
+CONFIG_VIRQ_DEBUG=y
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=m
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+CONFIG_CRYPTO_DEV_TALITOS=y
+CONFIG_PPC_CLOCK=y
+CONFIG_PPC_LIB_RHEAP=y
+CONFIG_VIRTUALIZATION=y
+# CONFIG_KVM_E500 is not set
+# CONFIG_VIRTIO_PCI is not set
+# CONFIG_VIRTIO_BALLOON is not set
diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
index 1aa7cf57ac..99be5246a6 100644
--- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
+++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29-omap1
-# Fri May 29 14:47:52 2009
+# Thu Jul 16 15:21:36 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -32,6 +32,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
@@ -189,8 +190,7 @@ CONFIG_ARCH_OMAP3=y
 #
 # CONFIG_OMAP_DEBUG_POWERDOMAIN is not set
 # CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set
-CONFIG_OMAP_SMARTREFLEX=y
-# CONFIG_OMAP_SMARTREFLEX_TESTING is not set
+# CONFIG_OMAP_SMARTREFLEX is not set
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_BOOT_TAG=y
 CONFIG_OMAP_BOOT_REASON=y
@@ -199,7 +199,7 @@ CONFIG_OMAP_BOOT_REASON=y
 # CONFIG_OMAP_MUX is not set
 CONFIG_OMAP_MCBSP=y
 # CONFIG_OMAP_MBOX_FWK is not set
-# CONFIG_OMAP_IOMMU is not set
+CONFIG_OMAP_IOMMU=y
 # CONFIG_OMAP_MPU_TIMER is not set
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_32K_TIMER_HZ=128
@@ -217,9 +217,9 @@ CONFIG_ARCH_OMAP3430=y
 # CONFIG_MACH_NOKIA_RX51 is not set
 # CONFIG_MACH_OMAP_LDP is not set
 # CONFIG_MACH_OMAP_3430SDP is not set
-# CONFIG_MACH_OMAP3EVM is not set
+CONFIG_MACH_OMAP3EVM=y
 CONFIG_MACH_OMAP3_BEAGLE=y
-# CONFIG_MACH_OVERO is not set
+CONFIG_MACH_OVERO=y
 # CONFIG_MACH_OMAP3_PANDORA is not set
 
 #
@@ -268,7 +268,7 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_2G is not set
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
 CONFIG_HZ=128
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
@@ -1034,8 +1034,43 @@ CONFIG_MACVLAN=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
 CONFIG_VETH=m
-# CONFIG_NET_ETHERNET is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+# CONFIG_AX88796 is not set
+# CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
+# CONFIG_ENC28J60 is not set
+CONFIG_SMC911X=y
+CONFIG_SMSC911X=y
+# CONFIG_DNET is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_B44 is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 
@@ -1471,6 +1506,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
 CONFIG_VIDEOBUF_DVB=m
 CONFIG_VIDEO_IR=m
@@ -1494,7 +1530,8 @@ CONFIG_VIDEO_VIVI=m
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
 # CONFIG_VIDEO_AU0828 is not set
-# CONFIG_VIDEO_OMAP3 is not set
+CONFIG_VIDEO_OMAP3=m
+CONFIG_VIDEO_OMAP34XX_ISP_RESIZER=m
 # CONFIG_SOC_CAMERA is not set
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
@@ -1818,6 +1855,7 @@ CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_SOC=y
 CONFIG_SND_OMAP_SOC=y
 CONFIG_SND_OMAP_SOC_MCBSP=y
+# CONFIG_SND_OMAP_SOC_OVERO is not set
 CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
@@ -2514,6 +2552,7 @@ CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@@ -2551,6 +2590,7 @@ CONFIG_TRACING=y
 #
 # CONFIG_FUNCTION_TRACER is not set
 # CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
 # CONFIG_SCHED_TRACER is not set
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
 # CONFIG_BOOT_TRACER is not set
diff --git a/recipes/linux/linux-omap-2.6.29/isp/base/0001-omap3-Add-base-address-definitions-and-resources-fo.patch b/recipes/linux/linux-omap-2.6.29/isp/base/0001-omap3-Add-base-address-definitions-and-resources-fo.patch
deleted file mode 100644
index 902f87943d..0000000000
--- a/recipes/linux/linux-omap-2.6.29/isp/base/0001-omap3-Add-base-address-definitions-and-resources-fo.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 742cc1e62f0d04333c51630f3020da000aeb6de1 Mon Sep 17 00:00:00 2001
-From: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
-Date: Mon, 2 Mar 2009 19:36:26 +0200
-Subject: [PATCH] omap3: Add base address definitions and resources for OMAP 3 ISP
-
-This replaces earlier patch from Sergio Aguirre titled "[REVIEW PATCH 03/14]
-OMAP34XX: CAM: Resources fixes".
-
-Signed-off-by: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
----
- arch/arm/mach-omap2/devices.c              |   66 ++++++++++++++++++++++++---
- arch/arm/plat-omap/include/mach/omap34xx.h |   28 +++++++++++-
- 2 files changed, 85 insertions(+), 9 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
-index dad4528..2568b0c 100644
---- a/arch/arm/mach-omap2/devices.c
-+++ b/arch/arm/mach-omap2/devices.c
-@@ -56,10 +56,60 @@ static inline void omap_init_camera(void)
- 
- #elif defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE)
- 
--static struct resource cam_resources[] = {
-+static struct resource omap3isp_resources[] = {
-+	{
-+		.start		= OMAP3430_ISP_BASE,
-+		.end		= OMAP3430_ISP_END,
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	{
-+		.start		= OMAP3430_ISP_CBUFF_BASE,
-+		.end		= OMAP3430_ISP_CBUFF_END,
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	{
-+		.start		= OMAP3430_ISP_CCP2_BASE,
-+		.end		= OMAP3430_ISP_CCP2_END,
-+		.flags		= IORESOURCE_MEM,
-+	},
- 	{
--		.start		= OMAP34XX_CAMERA_BASE,
--		.end		= OMAP34XX_CAMERA_BASE + 0x1B70,
-+		.start		= OMAP3430_ISP_CCDC_BASE,
-+		.end		= OMAP3430_ISP_CCDC_END,
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	{
-+		.start		= OMAP3430_ISP_HIST_BASE,
-+		.end		= OMAP3430_ISP_HIST_END,
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	{
-+		.start		= OMAP3430_ISP_H3A_BASE,
-+		.end		= OMAP3430_ISP_H3A_END,
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	{
-+		.start		= OMAP3430_ISP_PREV_BASE,
-+		.end		= OMAP3430_ISP_PREV_END,
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	{
-+		.start		= OMAP3430_ISP_RESZ_BASE,
-+		.end		= OMAP3430_ISP_RESZ_END,
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	{
-+		.start		= OMAP3430_ISP_SBL_BASE,
-+		.end		= OMAP3430_ISP_SBL_END,
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	{
-+		.start		= OMAP3430_ISP_CSI2A_BASE,
-+		.end		= OMAP3430_ISP_CSI2A_END,
-+		.flags		= IORESOURCE_MEM,
-+	},
-+	{
-+		.start		= OMAP3430_ISP_CSI2PHY_BASE,
-+		.end		= OMAP3430_ISP_CSI2PHY_END,
- 		.flags		= IORESOURCE_MEM,
- 	},
- 	{
-@@ -68,16 +118,16 @@ static struct resource cam_resources[] = {
- 	}
- };
- 
--static struct platform_device omap_cam_device = {
--	.name		= "omap34xxcam",
-+static struct platform_device omap3isp_device = {
-+	.name		= "omap3isp",
- 	.id		= -1,
--	.num_resources	= ARRAY_SIZE(cam_resources),
--	.resource	= cam_resources,
-+	.num_resources	= ARRAY_SIZE(omap3isp_resources),
-+	.resource	= omap3isp_resources,
- };
- 
- static inline void omap_init_camera(void)
- {
--	platform_device_register(&omap_cam_device);
-+	platform_device_register(&omap3isp_device);
- }
- #else
- static inline void omap_init_camera(void)
-diff --git a/arch/arm/plat-omap/include/mach/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h
-index 27a1e45..3bfbdf7 100644
---- a/arch/arm/plat-omap/include/mach/omap34xx.h
-+++ b/arch/arm/plat-omap/include/mach/omap34xx.h
-@@ -49,6 +49,33 @@
- #define OMAP343X_CTRL_BASE	OMAP343X_SCM_BASE
- 
- #define OMAP34XX_IC_BASE	0x48200000
-+
-+#define OMAP3430_ISP_BASE		(L4_34XX_BASE + 0xBC000)
-+#define OMAP3430_ISP_CBUFF_BASE		(OMAP3430_ISP_BASE + 0x0100)
-+#define OMAP3430_ISP_CCP2_BASE		(OMAP3430_ISP_BASE + 0x0400)
-+#define OMAP3430_ISP_CCDC_BASE		(OMAP3430_ISP_BASE + 0x0600)
-+#define OMAP3430_ISP_HIST_BASE		(OMAP3430_ISP_BASE + 0x0A00)
-+#define OMAP3430_ISP_H3A_BASE		(OMAP3430_ISP_BASE + 0x0C00)
-+#define OMAP3430_ISP_PREV_BASE		(OMAP3430_ISP_BASE + 0x0E00)
-+#define OMAP3430_ISP_RESZ_BASE		(OMAP3430_ISP_BASE + 0x1000)
-+#define OMAP3430_ISP_SBL_BASE		(OMAP3430_ISP_BASE + 0x1200)
-+#define OMAP3430_ISP_MMU_BASE		(OMAP3430_ISP_BASE + 0x1400)
-+#define OMAP3430_ISP_CSI2A_BASE		(OMAP3430_ISP_BASE + 0x1800)
-+#define OMAP3430_ISP_CSI2PHY_BASE	(OMAP3430_ISP_BASE + 0x1970)
-+
-+#define OMAP3430_ISP_END		(OMAP3430_ISP_BASE         + 0x06F)
-+#define OMAP3430_ISP_CBUFF_END		(OMAP3430_ISP_CBUFF_BASE   + 0x077)
-+#define OMAP3430_ISP_CCP2_END		(OMAP3430_ISP_CCP2_BASE    + 0x1EF)
-+#define OMAP3430_ISP_CCDC_END		(OMAP3430_ISP_CCDC_BASE    + 0x0A7)
-+#define OMAP3430_ISP_HIST_END		(OMAP3430_ISP_HIST_BASE    + 0x047)
-+#define OMAP3430_ISP_H3A_END		(OMAP3430_ISP_H3A_BASE     + 0x05F)
-+#define OMAP3430_ISP_PREV_END		(OMAP3430_ISP_PREV_BASE    + 0x09F)
-+#define OMAP3430_ISP_RESZ_END		(OMAP3430_ISP_RESZ_BASE    + 0x0AB)
-+#define OMAP3430_ISP_SBL_END		(OMAP3430_ISP_SBL_BASE     + 0x0FB)
-+#define OMAP3430_ISP_MMU_END		(OMAP3430_ISP_MMU_BASE     + 0x06F)
-+#define OMAP3430_ISP_CSI2A_END		(OMAP3430_ISP_CSI2A_BASE   + 0x16F)
-+#define OMAP3430_ISP_CSI2PHY_END	(OMAP3430_ISP_CSI2PHY_BASE + 0x007)
-+
- #define OMAP34XX_IVA_INTC_BASE	0x40000000
- #define OMAP34XX_HSUSB_OTG_BASE	(L4_34XX_BASE + 0xAB000)
- #define OMAP34XX_HSUSB_HOST_BASE	(L4_34XX_BASE + 0x64000)
-@@ -56,7 +83,6 @@
- #define OMAP34XX_SR1_BASE	0x480C9000
- #define OMAP34XX_SR2_BASE	0x480CB000
- 
--#define OMAP34XX_CAMERA_BASE		(L4_34XX_BASE + 0xBC000)
- #define OMAP34XX_MAILBOX_BASE		(L4_34XX_BASE + 0x94000)
- 
- 
--- 
-1.5.6.5
-
diff --git a/recipes/linux/linux-omap-2.6.29/isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch b/recipes/linux/linux-omap-2.6.29/isp/resizer/0023-OMAP-Resizer-Basic-Resizer-refreshed-with-latest-gi.patch
index f796ce8346..3390599292 100644
--- a/recipes/linux/linux-omap-2.6.29/isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch
+++ b/recipes/linux/linux-omap-2.6.29/isp/resizer/0023-OMAP-Resizer-Basic-Resizer-refreshed-with-latest-gi.patch
@@ -1,99 +1,97 @@
-From 3041daa54b49bcb6ab444c7b9e14bc6a1ade6236 Mon Sep 17 00:00:00 2001
-From: Vaibhav Hiremath <hvaibhav@ti.com>
-Date: Fri, 13 Feb 2009 14:44:20 +0530
-Subject: [PATCH 1/2] Resizer and Previewer driver added to commit
+From 38f3cd5564a466e5251fc2ff47e0504148922304 Mon Sep 17 00:00:00 2001
+From: Vaibhav Hiremath <vaibhav@psp-nfs-02.india.ti.com>
+Date: Wed, 29 Apr 2009 17:18:56 +0530
+Subject: [PATCH 23/26] OMAP-Resizer: Basic Resizer refreshed with latest gitorious tree
 
-The Resizer and Previewer driver added to the commit
-from the patch submitted by Sergio on 12 Dec 2008.
+This is same resizer driver patch posted by Sergio onto
+mailing list quite a some time back. This commit refreshes
+the same patch on top of latest gitorious.org tree.
 
-The new WTBU code base and Nokia fixes package doesn't contain
-standalone resizer driver support.
+List of New/Modified files:
+ modified:   drivers/media/video/Kconfig
+ modified:   drivers/media/video/isp/Makefile
+ modified:   drivers/media/video/isp/isp.c
+ modified:   drivers/media/video/isp/ispreg.h
+ new file:   drivers/media/video/isp/omap_resizer.c
+ new file:   include/linux/omap_resizer.h
 
-Following major changes done -
-
-	- Added stand-alone resizer driver support
-	  in isp.c file.
-	- Seperate Kconfig file created
-	- hardware access of resizer module fixed as per new
-	  isp.c
-
-Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
+TODO:
+ - Resizer driver needs to be independent from camera and ISP
+ - Custom patches implemented ontop of PSP1.0.2 release
+   to fix some V4L2-buf layer issues.
+ -
 ---
- drivers/media/video/Kconfig              |    5 +-
- drivers/media/video/isp/Kconfig          |   16 +
- drivers/media/video/isp/Makefile         |    7 +
- drivers/media/video/isp/isp.c            |   12 +
- drivers/media/video/isp/ispmmu.c         |    1 +
- drivers/media/video/isp/omap_previewer.c |  825 +++++++++++++++
- drivers/media/video/isp/omap_previewer.h |  162 +++
- drivers/media/video/isp/omap_resizer.c   | 1634 ++++++++++++++++++++++++++++++
- include/linux/omap_resizer.h             |  136 +++
- 9 files changed, 2794 insertions(+), 4 deletions(-)
- create mode 100644 drivers/media/video/isp/Kconfig
- create mode 100644 drivers/media/video/isp/omap_previewer.c
- create mode 100644 drivers/media/video/isp/omap_previewer.h
+ drivers/media/video/Kconfig            |    7 +
+ drivers/media/video/isp/Makefile       |    4 +
+ drivers/media/video/isp/isp.c          |   15 +
+ drivers/media/video/isp/omap_resizer.c | 1634 ++++++++++++++++++++++++++++++++
+ include/linux/omap_resizer.h           |  136 +++
+ 5 files changed, 1796 insertions(+), 0 deletions(-)
  create mode 100644 drivers/media/video/isp/omap_resizer.c
  create mode 100644 include/linux/omap_resizer.h
 
-diff --git a/drivers/media/video/isp/Kconfig b/drivers/media/video/isp/Kconfig
-new file mode 100644
-index 0000000..acda63b
---- /dev/null
-+++ b/drivers/media/video/isp/Kconfig
-@@ -0,0 +1,16 @@
-+# Kconfig for OMAP3 ISP driver
-+
-+config VIDEO_OMAP3_ISP
-+	tristate
+diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
+index 3cdb5a4..d2b4ae1 100644
+--- a/drivers/media/video/Kconfig
++++ b/drivers/media/video/Kconfig
+@@ -720,6 +720,13 @@ config VIDEO_OMAP3
+ 	---help---
+ 	  Driver for an OMAP 3 camera controller.
+ 
++config VIDEO_OMAP34XX_ISP_RESIZER
++	tristate "OMAP ISP Resizer"
++	depends on VIDEO_V4L2 && ARCH_OMAP34XX
 +	select VIDEOBUF_GEN
 +	select VIDEOBUF_DMA_SG
++	select OMAP_IOMMU
 +
-+config VIDEO_OMAP34XX_ISP_PREVIEWER
-+	tristate "OMAP ISP Previewer"
-+	depends on !ARCH_OMAP3410
-+	select VIDEO_OMAP3_ISP
-+
-+config VIDEO_OMAP34XX_ISP_RESIZER
-+	tristate "OMAP ISP Resizer"
-+	depends on !ARCH_OMAP3410
-+	select VIDEO_OMAP3_ISP
+ config SOC_CAMERA
+ 	tristate "SoC camera support"
+ 	depends on VIDEO_V4L2 && HAS_DMA
 diff --git a/drivers/media/video/isp/Makefile b/drivers/media/video/isp/Makefile
-index 0f9301c..ed10a51 100644
+index f14d617..d171fb9 100644
 --- a/drivers/media/video/isp/Makefile
 +++ b/drivers/media/video/isp/Makefile
-@@ -7,6 +7,13 @@ else
+@@ -7,6 +7,10 @@ else
  isp-mod-objs += \
  	isp.o ispccdc.o ispmmu.o \
  	isppreview.o ispresizer.o isph3a.o isphist.o isp_af.o ispcsi2.o
 +
-+obj-$(CONFIG_VIDEO_OMAP34XX_ISP_PREVIEWER) += \
-+	omap_previewer.o
-+
 +obj-$(CONFIG_VIDEO_OMAP34XX_ISP_RESIZER) += \
 +	omap_resizer.o
 +
  endif
  
- obj-$(CONFIG_VIDEO_OMAP3_ISP) += isp-mod.o
+ obj-$(CONFIG_VIDEO_OMAP3) += isp-mod.o
 diff --git a/drivers/media/video/isp/isp.c b/drivers/media/video/isp/isp.c
-index 6034a56..09a1792 100644
+index 54c839b..f1f92b4 100644
 --- a/drivers/media/video/isp/isp.c
 +++ b/drivers/media/video/isp/isp.c
-@@ -521,6 +521,13 @@ int isp_set_callback(enum isp_callback_type type, isp_callback_t callback,
- 					OMAP3_ISP_IOMEM_MAIN,
- 					ISP_IRQ0ENABLE);
+@@ -505,6 +505,12 @@ int isp_set_callback(enum isp_callback_type type, isp_callback_t callback,
+ 		isp_reg_or(OMAP3_ISP_IOMEM_MAIN, ISP_IRQ0ENABLE,
+ 			   IRQ0ENABLE_PRV_DONE_IRQ);
  		break;
 +	case CBK_RESZ_DONE:
-+		isp_reg_writel(IRQ0ENABLE_RSZ_DONE_IRQ, OMAP3_ISP_IOMEM_MAIN,
-+				ISP_IRQ0STATUS);
-+		isp_reg_writel(isp_reg_readl(OMAP3_ISP_IOMEM_MAIN, ISP_IRQ0ENABLE) |
-+				IRQ0ENABLE_RSZ_DONE_IRQ, OMAP3_ISP_IOMEM_MAIN,
-+				ISP_IRQ0ENABLE);
++		isp_reg_writel(IRQ0ENABLE_RSZ_DONE_IRQ,
++				OMAP3_ISP_IOMEM_MAIN, ISP_IRQ0STATUS);
++		isp_reg_or(OMAP3_ISP_IOMEM_MAIN, ISP_IRQ0ENABLE,
++				IRQ0ENABLE_RSZ_DONE_IRQ);
 +		break;
  	default:
  		break;
  	}
-@@ -996,6 +1003,11 @@ static irqreturn_t omap34xx_isp_isr(int irq, void *_isp)
+@@ -556,6 +562,10 @@ int isp_unset_callback(enum isp_callback_type type)
+ 		isp_reg_and(OMAP3_ISP_IOMEM_MAIN, ISP_IRQ0ENABLE,
+ 			    ~IRQ0ENABLE_PRV_DONE_IRQ);
+ 		break;
++	case CBK_RESZ_DONE:
++		isp_reg_and(OMAP3_ISP_IOMEM_MAIN, ISP_IRQ0ENABLE,
++				~IRQ0ENABLE_RSZ_DONE_IRQ);
++		break;
+ 	default:
+ 		break;
+ 	}
+@@ -938,6 +948,11 @@ static irqreturn_t omap34xx_isp_isr(int irq, void *_isp)
  			if (!ispresizer_busy())
  				ispresizer_config_shadow_registers();
  			isp_buf_process(bufs);
@@ -105,1017 +103,6 @@ index 6034a56..09a1792 100644
  		}
  	}
  
-diff --git a/drivers/media/video/isp/ispmmu.c b/drivers/media/video/isp/ispmmu.c
-index 076aea1..b943d5b 100644
---- a/drivers/media/video/isp/ispmmu.c
-+++ b/drivers/media/video/isp/ispmmu.c
-@@ -289,6 +289,7 @@ int ispmmu_get_mapeable_space(void)
- 	return (L2P_TABLE_NR - no_of_l2p_alloted) * ISPMMU_TTB_ENTRIES_NR *
- 							ISPMMU_L2D_ENTRIES_NR;
- }
-+EXPORT_SYMBOL_GPL(ispmmu_get_mapeable_space);
- 
- /**
-  * ispmmu_map - Map a physically contiguous buffer to ISP space.
-diff --git a/drivers/media/video/isp/omap_previewer.c b/drivers/media/video/isp/omap_previewer.c
-new file mode 100644
-index 0000000..634a056
---- /dev/null
-+++ b/drivers/media/video/isp/omap_previewer.c
-@@ -0,0 +1,825 @@
-+/*
-+ * drivers/media/video/isp/omap_previewer.c
-+ *
-+ * Wrapper for Preview module in TI's OMAP3430 ISP
-+ *
-+ * Copyright (C) 2008 Texas Instruments, Inc.
-+ *
-+ * Contributors:
-+ * 	Leonides Martinez <leonides.martinez@ti.com>
-+ * 	Sergio Aguirre <saaguirre@ti.com>
-+ *
-+ * This package is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-+ */
-+
-+#include <linux/mutex.h>
-+#include <linux/cdev.h>
-+#include <linux/device.h>
-+#include <linux/delay.h>
-+#include <linux/fs.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/uaccess.h>
-+#include <linux/io.h>
-+#include <media/v4l2-dev.h>
-+#include <asm/cacheflush.h>
-+
-+#include "isp.h"
-+#include "ispmmu.h"
-+#include "ispreg.h"
-+#include "omap_previewer.h"
-+
-+#define OMAP_PREV_NAME		"omap-previewer"
-+
-+static int prev_major = -1;
-+static struct device *prev_dev;
-+static struct class *prev_class;
-+static struct prev_device *prevdevice;
-+static struct platform_driver omap_previewer_driver;
-+
-+static u32 prev_bufsize;
-+
-+/**
-+ * prev_calculate_crop - Calculate crop size according to device parameters
-+ * @device: Structure containing ISP preview wrapper global information
-+ * @crop: Structure containing crop size
-+ *
-+ * This function is used to calculate frame size reduction depending on
-+ * the features enabled by the application.
-+ **/
-+static void prev_calculate_crop(struct prev_device *device,
-+						struct prev_cropsize *crop)
-+{
-+	dev_dbg(prev_dev, "prev_calculate_crop E\n");
-+
-+	if (!device || !crop) {
-+		dev_err(prev_dev, "\nErron in argument");
-+		return;
-+	}
-+
-+	isppreview_try_size(device->params->size_params.hsize,
-+					device->params->size_params.vsize,
-+					&crop->hcrop, &crop->vcrop);
-+	crop->hcrop &= PREV_16PIX_ALIGN_MASK;
-+	dev_dbg(prev_dev, "prev_calculate_crop L\n");
-+}
-+
-+/**
-+ * prev_get_status - Get status of ISP preview module
-+ * @status: Structure containing the busy state.
-+ *
-+ * Checks if the ISP preview module is busy.
-+ *
-+ * Returns 0 if successful, or -EINVAL if the status parameter is invalid.
-+ **/
-+static int prev_get_status(struct prev_status *status)
-+{
-+	if (!status) {
-+		dev_err(prev_dev, "get_status: invalid parameter\n");
-+		return -EINVAL;
-+	}
-+	status->hw_busy = (char)isppreview_busy();
-+	return 0;
-+}
-+
-+/**
-+ * prev_hw_setup - Stores the desired configuration in the proper HW registers
-+ * @config: Structure containing the desired configuration for ISP preview
-+ *          module.
-+ *
-+ * Reads the structure sent, and modifies the desired registers.
-+ *
-+ * Always returns 0.
-+ **/
-+static int prev_hw_setup(struct prev_params *config)
-+{
-+	dev_dbg(prev_dev, "prev_hw_setup E\n");
-+
-+	if (config->features & PREV_AVERAGER)
-+		isppreview_config_averager(config->average);
-+	else
-+		isppreview_config_averager(0);
-+
-+	if (config->features & PREV_INVERSE_ALAW)
-+		isppreview_enable_invalaw(1);
-+	else
-+		isppreview_enable_invalaw(0);
-+
-+	if (config->features & PREV_HORZ_MEDIAN_FILTER) {
-+		isppreview_config_hmed(config->hmf_params);
-+		isppreview_enable_hmed(1);
-+	} else
-+		isppreview_enable_hmed(0);
-+
-+	if (config->features & PREV_DARK_FRAME_SUBTRACT) {
-+		isppreview_set_darkaddr(config->drkf_params.addr);
-+		isppreview_config_darklineoffset(config->drkf_params.offset);
-+		isppreview_enable_drkframe(1);
-+	} else
-+		isppreview_enable_drkframe(0);
-+
-+	if (config->features & PREV_LENS_SHADING) {
-+		isppreview_config_drkf_shadcomp(config->lens_shading_shift);
-+		isppreview_enable_shadcomp(1);
-+	} else
-+		isppreview_enable_shadcomp(0);
-+
-+	dev_dbg(prev_dev, "prev_hw_setup L\n");
-+	return 0;
-+}
-+
-+/**
-+ * prev_validate_params - Validate configuration parameters for Preview Wrapper
-+ * @params: Structure containing configuration parameters
-+ *
-+ * Validate configuration parameters for Preview Wrapper
-+ *
-+ * Returns 0 if successful, or -EINVAL if a parameter value is invalid.
-+ **/
-+static int prev_validate_params(struct prev_params *params)
-+{
-+	if (!params) {
-+		dev_err(prev_dev, "validate_params: error in argument");
-+		goto err_einval;
-+	}
-+
-+	if ((params->features & PREV_AVERAGER) == PREV_AVERAGER) {
-+		if ((params->average != NO_AVE)
-+					&& (params->average != AVE_2_PIX)
-+					&& (params->average != AVE_4_PIX)
-+					&& (params->average != AVE_8_PIX)) {
-+			dev_err(prev_dev, "validate_params: wrong pix "
-+								"average\n");
-+			goto err_einval;
-+		} else if (((params->average == AVE_2_PIX)
-+					&& (params->size_params.hsize % 2))
-+					|| ((params->average == AVE_4_PIX)
-+					&& (params->size_params.hsize % 4))
-+					|| ((params->average == AVE_8_PIX)
-+					&& (params->size_params.hsize % 8))) {
-+			dev_err(prev_dev, "validate_params: "
-+					"wrong pix average for input size\n");
-+			goto err_einval;
-+		}
-+	}
-+
-+	if ((params->size_params.pixsize != PREV_INWIDTH_8BIT)
-+					&& (params->size_params.pixsize
-+					!= PREV_INWIDTH_10BIT)) {
-+		dev_err(prev_dev, "validate_params: wrong pixsize\n");
-+		goto err_einval;
-+	}
-+
-+	if (params->size_params.hsize > MAX_IMAGE_WIDTH
-+					|| params->size_params.hsize < 0) {
-+		dev_err(prev_dev, "validate_params: wrong hsize\n");
-+		goto err_einval;
-+	}
-+
-+	if ((params->pix_fmt != YCPOS_YCrYCb)
-+					&& (YCPOS_YCbYCr != params->pix_fmt)
-+					&& (YCPOS_CbYCrY != params->pix_fmt)
-+					&& (YCPOS_CrYCbY != params->pix_fmt)) {
-+		dev_err(prev_dev, "validate_params: wrong pix_fmt");
-+		goto err_einval;
-+	}
-+
-+	if ((params->features & PREV_DARK_FRAME_SUBTRACT)
-+						&& (params->features
-+						& PREV_DARK_FRAME_CAPTURE)) {
-+		dev_err(prev_dev, "validate_params: DARK FRAME CAPTURE and "
-+						"SUBSTRACT cannot be enabled "
-+						"at same time\n");
-+		goto err_einval;
-+	}
-+
-+	if (params->features & PREV_DARK_FRAME_SUBTRACT)
-+		if (!params->drkf_params.addr
-+					|| (params->drkf_params.offset % 32)) {
-+			dev_err(prev_dev, "validate_params: dark frame "
-+								"address\n");
-+			goto err_einval;
-+		}
-+
-+	if (params->features & PREV_LENS_SHADING)
-+		if ((params->lens_shading_shift > 7)
-+					|| !params->drkf_params.addr
-+					|| (params->drkf_params.offset % 32)) {
-+			dev_err(prev_dev, "validate_params: lens shading "
-+								"shift\n");
-+			goto err_einval;
-+		}
-+
-+	if ((params->size_params.in_pitch <= 0)
-+				|| (params->size_params.in_pitch % 32)) {
-+		params->size_params.in_pitch =
-+				(params->size_params.hsize * 2) & 0xFFE0;
-+		dev_err(prev_dev, "\nError in in_pitch; new value = %d",
-+						params->size_params.in_pitch);
-+	}
-+
-+	return 0;
-+err_einval:
-+	return -EINVAL;
-+}
-+
-+/**
-+ * preview_isr - Callback from ISP driver for ISP Preview Interrupt
-+ * @status: ISP IRQ0STATUS register value
-+ * @arg1: Structure containing ISP preview wrapper global information
-+ * @arg2: Currently not used
-+ **/
-+static void preview_isr(unsigned long status, isp_vbq_callback_ptr arg1,
-+								void *arg2)
-+{
-+	struct prev_device *device = (struct prev_device *)arg1;
-+
-+	if ((status & PREV_DONE) != PREV_DONE)
-+		return;
-+
-+	if (device)
-+		complete(&device->wfc);
-+}
-+
-+/**
-+ * prev_do_preview - Performs the Preview process
-+ * @device: Structure containing ISP preview wrapper global information
-+ * @arg: Currently not used
-+ *
-+ * Returns 0 if successful, or -EINVAL if the sent parameters are invalid.
-+ **/
-+static int prev_do_preview(struct prev_device *device, int *arg)
-+{
-+	int bpp, size;
-+	int ret = 0;
-+	u32 out_hsize, out_vsize, out_line_offset;
-+
-+	dev_dbg(prev_dev, "prev_do_preview E\n");
-+
-+	if (!device) {
-+		dev_err(prev_dev, "preview: invalid parameters\n");
-+		return -EINVAL;
-+	}
-+
-+	if (device->params->size_params.pixsize == PREV_INWIDTH_8BIT)
-+		bpp = 1;
-+	else
-+		bpp = 2;
-+
-+	size = device->params->size_params.hsize *
-+		device->params->size_params.vsize * bpp;
-+
-+	ret = isppreview_set_inaddr(device->isp_addr_read);
-+	if (ret)
-+		goto out;
-+
-+	ret = isppreview_set_outaddr(device->isp_addr_read);
-+	if (ret)
-+		goto out;
-+
-+	isppreview_try_size(device->params->size_params.hsize,
-+					device->params->size_params.vsize,
-+					&out_hsize, &out_vsize);
-+
-+	ret = isppreview_config_inlineoffset(device->params->size_params.hsize
-+						* bpp);
-+	if (ret)
-+		goto out;
-+
-+	out_line_offset = (out_hsize * bpp) & PREV_32BYTES_ALIGN_MASK;
-+
-+	ret = isppreview_config_outlineoffset(out_line_offset);
-+	if (ret)
-+		goto out;
-+
-+	ret = isppreview_config_size(device->params->size_params.hsize,
-+					device->params->size_params.vsize,
-+					out_hsize, out_vsize);
-+	if (ret)
-+		goto out;
-+
-+	isppreview_config_datapath(PRV_RAW_MEM, PREVIEW_MEM);
-+
-+	ret = isp_set_callback(CBK_PREV_DONE, preview_isr, (void *)device,
-+								(void *)NULL);
-+	if (ret) {
-+		dev_err(prev_dev, "ERROR while setting Previewer callback!\n");
-+		goto out;
-+	}
-+	isppreview_enable(1);
-+
-+	wait_for_completion_interruptible(&device->wfc);
-+
-+	if (device->isp_addr_read) {
-+		ispmmu_vunmap(device->isp_addr_read);
-+		device->isp_addr_read = 0;
-+	}
-+
-+	ret = isp_unset_callback(CBK_PREV_DONE);
-+
-+	dev_dbg(prev_dev, "prev_do_preview L\n");
-+out:
-+	return ret;
-+}
-+
-+/**
-+ * previewer_vbq_release - Videobuffer queue release
-+ * @q: Structure containing the videobuffer queue.
-+ * @vb: Structure containing the videobuffer used for previewer processing.
-+ **/
-+static void previewer_vbq_release(struct videobuf_queue *q,
-+						struct videobuf_buffer *vb)
-+{
-+	struct prev_fh *fh = q->priv_data;
-+	struct prev_device *device = fh->device;
-+
-+	ispmmu_vunmap(device->isp_addr_read);
-+	device->isp_addr_read = 0;
-+	spin_lock(&device->vbq_lock);
-+	vb->state = VIDEOBUF_NEEDS_INIT;
-+	spin_unlock(&device->vbq_lock);
-+	dev_dbg(prev_dev, "previewer_vbq_release\n");
-+}
-+
-+/**
-+ * previewer_vbq_setup - Sets up the videobuffer size and validates count.
-+ * @q: Structure containing the videobuffer queue.
-+ * @cnt: Number of buffers requested
-+ * @size: Size in bytes of the buffer used for previewing
-+ *
-+ * Always returns 0.
-+ **/
-+static int previewer_vbq_setup(struct videobuf_queue *q,
-+							unsigned int *cnt,
-+							unsigned int *size)
-+{
-+	struct prev_fh *fh = q->priv_data;
-+	struct prev_device *device = fh->device;
-+	u32 bpp = 1;
-+
-+	spin_lock(&device->vbq_lock);
-+	if (*cnt <= 0)
-+		*cnt = VIDEO_MAX_FRAME;
-+
-+	if (*cnt > VIDEO_MAX_FRAME)
-+		*cnt = VIDEO_MAX_FRAME;
-+
-+	if (!device->params->size_params.hsize ||
-+		!device->params->size_params.vsize) {
-+		dev_err(prev_dev, "Can't setup buffer size\n");
-+		spin_unlock(&device->vbq_lock);
-+		return -EINVAL;
-+	}
-+
-+	if (device->params->size_params.pixsize == PREV_INWIDTH_10BIT)
-+		bpp = 2;
-+	*size = prev_bufsize = bpp * device->params->size_params.hsize
-+					* device->params->size_params.vsize;
-+	spin_unlock(&device->vbq_lock);
-+	dev_dbg(prev_dev, "previewer_vbq_setup\n");
-+	return 0;
-+}
-+
-+/**
-+ * previewer_vbq_prepare - Videobuffer is prepared and mmapped.
-+ * @q: Structure containing the videobuffer queue.
-+ * @vb: Structure containing the videobuffer used for previewer processing.
-+ * @field: Type of field to set in videobuffer device.
-+ *
-+ * Returns 0 if successful, or -EINVAL if buffer couldn't get allocated, or
-+ * -EIO if the ISP MMU mapping fails
-+ **/
-+static int previewer_vbq_prepare(struct videobuf_queue *q,
-+						struct videobuf_buffer *vb,
-+						enum v4l2_field field)
-+{
-+	struct prev_fh *fh = q->priv_data;
-+	struct prev_device *device = fh->device;
-+	int err = -EINVAL;
-+	unsigned int isp_addr;
-+	struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
-+
-+	dev_dbg(prev_dev, "previewer_vbq_prepare E\n");
-+	spin_lock(&device->vbq_lock);
-+	if (vb->baddr) {
-+		vb->size = prev_bufsize;
-+		vb->bsize = prev_bufsize;
-+	} else {
-+		spin_unlock(&device->vbq_lock);
-+		dev_err(prev_dev, "No user buffer allocated\n");
-+		goto out;
-+	}
-+
-+	vb->width = device->params->size_params.hsize;
-+	vb->height = device->params->size_params.vsize;
-+	vb->field = field;
-+	spin_unlock(&device->vbq_lock);
-+
-+	if (vb->state == VIDEOBUF_NEEDS_INIT) {
-+		err = videobuf_iolock(q, vb, NULL);
-+		if (!err) {
-+			isp_addr = ispmmu_vmap(dma->sglist, dma->sglen);
-+			if (!isp_addr)
-+				err = -EIO;
-+			else
-+				device->isp_addr_read = isp_addr;
-+		}
-+	}
-+
-+	if (!err) {
-+		vb->state = VIDEOBUF_PREPARED;
-+		flush_cache_user_range(NULL, vb->baddr,
-+					(vb->baddr + vb->bsize));
-+	} else
-+		previewer_vbq_release(q, vb);
-+
-+	dev_dbg(prev_dev, "previewer_vbq_prepare L\n");
-+out:
-+	return err;
-+}
-+
-+static void previewer_vbq_queue(struct videobuf_queue *q,
-+						struct videobuf_buffer *vb)
-+{
-+	return;
-+}
-+
-+/**
-+ * previewer_open - Initializes and opens the Preview Wrapper
-+ * @inode: Inode structure associated with the Preview Wrapper
-+ * @filp: File structure associated with the Preview Wrapper
-+ *
-+ * Returns 0 if successful, -EACCES if its unable to initialize default config,
-+ * -EBUSY if its already opened or the ISP module is not available, or -ENOMEM
-+ * if its unable to allocate the device in kernel space memory.
-+ **/
-+static int previewer_open(struct inode *inode, struct file *filp)
-+{
-+	int ret = 0;
-+	struct prev_device *device = prevdevice;
-+	struct prev_params *config = isppreview_get_config();
-+	struct prev_fh *fh;
-+
-+	if (config == NULL) {
-+		dev_err(prev_dev, "Unable to initialize default config "
-+			"from isppreviewer\n\n");
-+		return -EACCES;
-+	}
-+
-+	if (device->opened || (filp->f_flags & O_NONBLOCK)) {
-+		dev_err(prev_dev, "previewer_open: device is already "
-+								"opened\n");
-+		return -EBUSY;
-+	}
-+
-+	fh = kzalloc(sizeof(struct prev_fh), GFP_KERNEL);
-+	if (NULL == fh)
-+		return -ENOMEM;
-+
-+	isp_get();
-+	ret = isppreview_request();
-+	if (ret) {
-+		isp_put();
-+		dev_err(prev_dev, "Can't acquire isppreview\n");
-+		return ret;
-+	}
-+
-+	device->params = config;
-+	device->opened = 1;
-+
-+	filp->private_data = fh;
-+	fh->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+	fh->device = device;
-+
-+	videobuf_queue_sg_init(&fh->vbq, &device->vbq_ops, NULL,
-+					&device->vbq_lock, fh->type,
-+					V4L2_FIELD_NONE,
-+					sizeof(struct videobuf_buffer), fh);
-+
-+	init_completion(&device->wfc);
-+	device->wfc.done = 0;
-+	mutex_init(&device->prevwrap_mutex);
-+
-+	return 0;
-+}
-+
-+/**
-+ * previewer_release - Releases Preview Wrapper and frees up allocated memory
-+ * @inode: Inode structure associated with the Preview Wrapper
-+ * @filp: File structure associated with the Preview Wrapper
-+ *
-+ * Always returns 0.
-+ **/
-+static int previewer_release(struct inode *inode, struct file *filp)
-+{
-+	struct prev_fh *fh = filp->private_data;
-+	struct prev_device *device = fh->device;
-+	struct videobuf_queue *q = &fh->vbq;
-+
-+	device->opened = 0;
-+	device->params = NULL;
-+	isppreview_free();
-+	videobuf_mmap_free(q);
-+	isp_put();
-+	prev_bufsize = 0;
-+	filp->private_data = NULL;
-+	kfree(fh);
-+
-+	dev_dbg(prev_dev, "previewer_release\n");
-+	return 0;
-+}
-+
-+/**
-+ * previewer_mmap - Memory maps the Preview Wrapper module.
-+ * @file: File structure associated with the Preview Wrapper
-+ * @vma: Virtual memory area structure.
-+ *
-+ * Returns 0 if successful, or returned value by the videobuf_mmap_mapper()
-+ * function.
-+ **/
-+static int previewer_mmap(struct file *file, struct vm_area_struct *vma)
-+{
-+	struct prev_fh *fh = file->private_data;
-+	dev_dbg(prev_dev, "previewer_mmap\n");
-+
-+	return videobuf_mmap_mapper(&fh->vbq, vma);
-+}
-+
-+/**
-+ * previewer_ioctl - I/O control function for Preview Wrapper
-+ * @inode: Inode structure associated with the Preview Wrapper.
-+ * @file: File structure associated with the Preview Wrapper.
-+ * @cmd: Type of command to execute.
-+ * @arg: Argument to send to requested command.
-+ *
-+ * Returns 0 if successful, -1 if bad command passed or access is denied,
-+ * -EFAULT if copy_from_user() or copy_to_user() fails, -EINVAL if parameter
-+ * validation fails or parameter structure is not present
-+ **/
-+static int previewer_ioctl(struct inode *inode, struct file *file,
-+					unsigned int cmd, unsigned long arg)
-+{
-+	int ret = 0;
-+	struct prev_params params;
-+	struct prev_fh *fh = file->private_data;
-+	struct prev_device *device = fh->device;
-+
-+	dev_dbg(prev_dev, "Entering previewer_ioctl()\n");
-+
-+	if ((_IOC_TYPE(cmd) != PREV_IOC_BASE)
-+					|| (_IOC_NR(cmd) > PREV_IOC_MAXNR)) {
-+		dev_err(prev_dev, "Bad command Value \n");
-+		goto err_minusone;
-+	}
-+
-+	if (_IOC_DIR(cmd) & _IOC_READ)
-+		ret = !access_ok(VERIFY_WRITE, (void *)arg, _IOC_SIZE(cmd));
-+	else if (_IOC_DIR(cmd) & _IOC_WRITE)
-+		ret = !access_ok(VERIFY_READ, (void *)arg, _IOC_SIZE(cmd));
-+	if (ret) {
-+		dev_err(prev_dev, "access denied\n");
-+		goto err_minusone;
-+	}
-+
-+	switch (cmd) {
-+	case PREV_REQBUF:
-+		if (mutex_lock_interruptible(&device->prevwrap_mutex))
-+			goto err_eintr;
-+		ret = videobuf_reqbufs(&fh->vbq, (void *)arg);
-+		mutex_unlock(&device->prevwrap_mutex);
-+		break;
-+
-+	case PREV_QUERYBUF:
-+		if (mutex_lock_interruptible(&device->prevwrap_mutex))
-+			goto err_eintr;
-+		ret = videobuf_querybuf(&fh->vbq, (void *)arg);
-+		mutex_unlock(&device->prevwrap_mutex);
-+		break;
-+
-+	case PREV_QUEUEBUF:
-+		if (mutex_lock_interruptible(&device->prevwrap_mutex))
-+			goto err_eintr;
-+		ret = videobuf_qbuf(&fh->vbq, (void *)arg);
-+		mutex_unlock(&device->prevwrap_mutex);
-+		break;
-+
-+	case PREV_SET_PARAM:
-+		if (mutex_lock_interruptible(&device->prevwrap_mutex))
-+			goto err_eintr;
-+		if (copy_from_user(&params, (struct prev_params *)arg,
-+						sizeof(struct prev_params))) {
-+			mutex_unlock(&device->prevwrap_mutex);
-+			return -EFAULT;
-+		}
-+		ret = prev_validate_params(&params);
-+		if (ret < 0) {
-+			dev_err(prev_dev, "Error validating parameters!\n");
-+			mutex_unlock(&device->prevwrap_mutex);
-+			goto out;
-+		}
-+		if (device->params)
-+			memcpy(device->params, &params,
-+						sizeof(struct prev_params));
-+		else {
-+			mutex_unlock(&device->prevwrap_mutex);
-+			return -EINVAL;
-+		}
-+
-+		ret = prev_hw_setup(device->params);
-+		mutex_unlock(&device->prevwrap_mutex);
-+		break;
-+
-+	case PREV_GET_PARAM:
-+		if (copy_to_user((struct prev_params *)arg, device->params,
-+						sizeof(struct prev_params)))
-+			ret = -EFAULT;
-+		break;
-+
-+	case PREV_GET_STATUS:
-+		ret = prev_get_status((struct prev_status *)arg);
-+		break;
-+
-+	case PREV_PREVIEW:
-+		if (mutex_lock_interruptible(&device->prevwrap_mutex))
-+			goto err_eintr;
-+		ret = prev_do_preview(device, (int *)arg);
-+		mutex_unlock(&device->prevwrap_mutex);
-+		break;
-+
-+	case PREV_GET_CROPSIZE:
-+		{
-+		struct prev_cropsize outputsize;
-+		prev_calculate_crop(device, &outputsize);
-+		if (copy_to_user((struct prev_cropsize *)arg, &outputsize,
-+						sizeof(struct prev_cropsize)))
-+			ret = -EFAULT;
-+		}
-+		break;
-+
-+	default:
-+		dev_err(prev_dev, "previewer_ioctl: Invalid Command Value\n");
-+		ret = -EINVAL;
-+	}
-+out:
-+	return ret;
-+err_minusone:
-+	return -1;
-+err_eintr:
-+	return -EINTR;
-+}
-+
-+/**
-+ * previewer_platform_release - Acts when Reference count is zero
-+ * @device: Structure containing ISP preview wrapper global information
-+ *
-+ * This is called when the reference count goes to zero
-+ **/
-+static void previewer_platform_release(struct device *device)
-+{
-+	dev_dbg(prev_dev, "previewer_platform_release()\n");
-+}
-+
-+static struct file_operations prev_fops = {
-+	.owner = THIS_MODULE,
-+	.open = previewer_open,
-+	.release = previewer_release,
-+	.mmap = previewer_mmap,
-+	.ioctl = previewer_ioctl,
-+};
-+
-+static struct platform_device omap_previewer_device = {
-+	.name = OMAP_PREV_NAME,
-+	.id = -1,
-+	.dev = {
-+		.release = previewer_platform_release,
-+	}
-+};
-+
-+/**
-+ * previewer_probe - Checks for device presence
-+ * @pdev: Structure containing details of the current device.
-+ *
-+ * Always returns 0
-+ **/
-+static int __init previewer_probe(struct platform_device *pdev)
-+{
-+	return 0;
-+}
-+
-+/**
-+ * previewer_remove - Handles the removal of the driver
-+ * @pdev: Structure containing details of the current device.
-+ *
-+ * Always returns 0.
-+ **/
-+static int previewer_remove(struct platform_device *pdev)
-+{
-+	dev_dbg(prev_dev, "previewer_remove()\n");
-+
-+	platform_device_unregister(&omap_previewer_device);
-+	platform_driver_unregister(&omap_previewer_driver);
-+	unregister_chrdev(prev_major, OMAP_PREV_NAME);
-+	return 0;
-+}
-+
-+static struct platform_driver omap_previewer_driver = {
-+	.probe = previewer_probe,
-+	.remove = previewer_remove,
-+	.driver = {
-+		.owner = THIS_MODULE,
-+		.name = OMAP_PREV_NAME,
-+	},
-+};
-+
-+/**
-+ * omap_previewer_init - Initialization of Preview Wrapper
-+ *
-+ * Returns 0 if successful, -ENOMEM if could not allocate memory, -ENODEV if
-+ * could not register the wrapper as a character device, or other errors if the
-+ * device or driver can't register.
-+ **/
-+static int __init omap_previewer_init(void)
-+{
-+	int ret;
-+	struct prev_device *device;
-+
-+	device = kzalloc(sizeof(struct prev_device), GFP_KERNEL);
-+	if (!device) {
-+		dev_err(prev_dev, OMAP_PREV_NAME ": could not allocate"
-+								" memory\n");
-+		return -ENOMEM;
-+	}
-+	prev_major = register_chrdev(0, OMAP_PREV_NAME, &prev_fops);
-+
-+	if (prev_major < 0) {
-+		dev_err(prev_dev, OMAP_PREV_NAME ": initialization "
-+				"failed. could not register character "
-+				"device\n");
-+		return -ENODEV;
-+	}
-+
-+	ret = platform_driver_register(&omap_previewer_driver);
-+	if (ret) {
-+		dev_err(prev_dev, OMAP_PREV_NAME
-+			": failed to register platform driver!\n");
-+		goto fail2;
-+	}
-+	ret = platform_device_register(&omap_previewer_device);
-+	if (ret) {
-+		dev_err(prev_dev, OMAP_PREV_NAME
-+			": failed to register platform device!\n");
-+		goto fail3;
-+	}
-+
-+	prev_class = class_create(THIS_MODULE, OMAP_PREV_NAME);
-+	if (!prev_class)
-+		goto fail4;
-+
-+	prev_dev = device_create(prev_class, prev_dev,
-+						(MKDEV(prev_major, 0)), NULL,
-+						OMAP_PREV_NAME);
-+	dev_dbg(prev_dev, OMAP_PREV_NAME ": Registered Previewer Wrapper\n");
-+	device->opened = 0;
-+
-+	device->vbq_ops.buf_setup = previewer_vbq_setup;
-+	device->vbq_ops.buf_prepare = previewer_vbq_prepare;
-+	device->vbq_ops.buf_release = previewer_vbq_release;
-+	device->vbq_ops.buf_queue = previewer_vbq_queue;
-+	spin_lock_init(&device->vbq_lock);
-+
-+	prevdevice = device;
-+	return 0;
-+
-+fail4:
-+	platform_device_unregister(&omap_previewer_device);
-+fail3:
-+	platform_driver_unregister(&omap_previewer_driver);
-+fail2:
-+	unregister_chrdev(prev_major, OMAP_PREV_NAME);
-+
-+	return ret;
-+}
-+
-+/**
-+ * omap_previewer_exit - Close of Preview Wrapper
-+ **/
-+static void __exit omap_previewer_exit(void)
-+{
-+	previewer_remove(&omap_previewer_device);
-+	kfree(prevdevice);
-+	prev_major = -1;
-+}
-+
-+module_init(omap_previewer_init);
-+module_exit(omap_previewer_exit);
-+
-+MODULE_AUTHOR("Texas Instruments");
-+MODULE_DESCRIPTION("OMAP ISP Previewer");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/media/video/isp/omap_previewer.h b/drivers/media/video/isp/omap_previewer.h
-new file mode 100644
-index 0000000..0bb31cd
---- /dev/null
-+++ b/drivers/media/video/isp/omap_previewer.h
-@@ -0,0 +1,162 @@
-+/*
-+ * drivers/media/video/isp/omap_previewer.h
-+ *
-+ * Header file for Preview module wrapper in TI's OMAP3430 ISP
-+ *
-+ * Copyright (C) 2008 Texas Instruments, Inc.
-+ *
-+ * Contributors:
-+ * 	Leonides Martinez <leonides.martinez@ti.com>
-+ * 	Sergio Aguirre <saaguirre@ti.com>
-+ *
-+ * This package is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-+ */
-+
-+#include "isppreview.h"
-+
-+#ifndef OMAP_ISP_PREVIEW_WRAP_H
-+#define OMAP_ISP_PREVIEW_WRAP_H
-+
-+#define PREV_IOC_BASE			'P'
-+#define PREV_REQBUF			_IOWR(PREV_IOC_BASE, 1,\
-+						struct v4l2_requestbuffers)
-+#define PREV_QUERYBUF			_IOWR(PREV_IOC_BASE, 2,\
-+							struct v4l2_buffer)
-+#define PREV_SET_PARAM			_IOW(PREV_IOC_BASE, 3,\
-+							struct prev_params)
-+#define PREV_GET_PARAM			_IOWR(PREV_IOC_BASE, 4,\
-+							struct prev_params)
-+#define PREV_PREVIEW			_IOR(PREV_IOC_BASE, 5, int)
-+#define PREV_GET_STATUS			_IOR(PREV_IOC_BASE, 6, char)
-+#define PREV_GET_CROPSIZE		_IOR(PREV_IOC_BASE, 7,\
-+							struct prev_cropsize)
-+#define PREV_QUEUEBUF			_IOWR(PREV_IOC_BASE, 8,\
-+							struct v4l2_buffer)
-+#define PREV_IOC_MAXNR			8
-+
-+#define LUMA_TABLE_SIZE			128
-+#define GAMMA_TABLE_SIZE		1024
-+#define CFA_COEFF_TABLE_SIZE		576
-+#define NOISE_FILTER_TABLE_SIZE		256
-+
-+#define MAX_IMAGE_WIDTH			3300
-+
-+#define PREV_INWIDTH_8BIT		0	/* pixel width of 8 bits */
-+#define PREV_INWIDTH_10BIT		1	/* pixel width of 10 bits */
-+
-+#define PREV_32BYTES_ALIGN_MASK		0xFFFFFFE0
-+#define PREV_16PIX_ALIGN_MASK		0xFFFFFFF0
-+
-+/**
-+ * struct prev_rgbblending - Structure for RGB2RGB blending parameters
-+ * @blending: Color correlation 3x3 matrix.
-+ * @offset: Color correlation offsets.
-+ */
-+struct prev_rgbblending {
-+	short blending[RGB_MAX][RGB_MAX];	/* color correlation 3x3
-+						 * matrix.
-+						 */
-+	short offset[RGB_MAX];			/* color correlation offsets */
-+};
-+
-+/**
-+ * struct prev_cfa_coeffs - Structure for CFA coefficients
-+ * @hthreshold: Horizontal threshold.
-+ * @vthreshold: Vertical threshold.
-+ * @coeffs: CFA coefficients
-+ */
-+struct prev_cfa_coeffs {
-+	char hthreshold, vthreshold;
-+	int coeffs[CFA_COEFF_TABLE_SIZE];
-+};
-+
-+/**
-+ * struct prev_gamma_coeffs - Structure for Gamma Coefficients
-+ * @red: Table of gamma correction values for red color.
-+ * @green: Table of gamma correction values for green color.
-+ * @blue: Table of gamma correction values for blue color.
-+ */
-+struct prev_gamma_coeffs {
-+	unsigned char red[GAMMA_TABLE_SIZE];
-+	unsigned char green[GAMMA_TABLE_SIZE];
-+	unsigned char blue[GAMMA_TABLE_SIZE];
-+};
-+
-+/**
-+ * struct prev_noiseflt_coeffs - Structure for Noise Filter Coefficients.
-+ * @noise: Noise filter table.
-+ * @strength: Used to find out weighted average.
-+ */
-+struct prev_noiseflt_coeffs {
-+	unsigned char noise[NOISE_FILTER_TABLE_SIZE];
-+	unsigned char strength;
-+};
-+
-+/**
-+ * struct prev_chroma_spr - Structure for Chroma Suppression.
-+ * @hpfy: High passed version of Y or normal Y.
-+ * @threshold: Threshold for chroma suppress.
-+ * @gain: Chroma suppression gain
-+ */
-+struct prev_chroma_spr {
-+	unsigned char hpfy;
-+	char threshold;
-+	unsigned char gain;
-+};
-+
-+/**
-+ * struct prev_status - Structure to know status of the hardware
-+ * @hw_busy: Flag to indicate if Hardware is Busy.
-+ */
-+struct prev_status {
-+	char hw_busy;
-+};
-+
-+/**
-+ * struct prev_cropsize - Structure to know crop size.
-+ * @hcrop: Horizontal size of crop window.
-+ * @vcrop: Vertical size of crop window.
-+ */
-+struct prev_cropsize {
-+	int hcrop;
-+	int vcrop;
-+};
-+
-+/**
-+ * struct prev_device - Global device information structure.
-+ * @params: Pointer to structure containing preview parameters.
-+ * @opened: State of the device.
-+ * @wfc: Wait for completion. Used for locking operations.
-+ * @prevwrap_mutex: Mutex for preview wrapper use.
-+ * @vbq_lock: Spinlock for videobuf queues.
-+ * @vbq_ops: Videobuf queue operations
-+ * @isp_addr_read: Input/Output address
-+ */
-+struct prev_device {
-+	struct prev_params *params;
-+	unsigned char opened;
-+	struct completion wfc;
-+	struct mutex prevwrap_mutex; /* For generic internal use */
-+	spinlock_t vbq_lock;	/* For videobuffer queue handling */
-+	struct videobuf_queue_ops vbq_ops;
-+	dma_addr_t isp_addr_read;
-+};
-+
-+/**
-+ * struct prev_fh - Per-filehandle data structure
-+ * @type: Used buffer type.
-+ * @vbq: Videobuffer queue.
-+ * @device: Pointer to device information structure.
-+ */
-+struct prev_fh {
-+	enum v4l2_buf_type type;
-+	struct videobuf_queue vbq;
-+	struct prev_device *device;
-+};
-+#endif
 diff --git a/drivers/media/video/isp/omap_resizer.c b/drivers/media/video/isp/omap_resizer.c
 new file mode 100644
 index 0000000..54bc425
@@ -1450,11 +437,11 @@ index 0000000..54bc425
 +	}
 +
 +	if (fh->isp_addr_read) {
-+		ispmmu_vunmap(fh->isp_addr_read);
++		ispmmu_unmap(fh->isp_addr_read);
 +		fh->isp_addr_read = 0;
 +	}
 +	if (fh->isp_addr_write) {
-+		ispmmu_vunmap(fh->isp_addr_write);
++		ispmmu_unmap(fh->isp_addr_write);
 +		fh->isp_addr_write = 0;
 +	}
 +
@@ -2128,8 +1115,8 @@ index 0000000..54bc425
 +		videobuf_dma_free(dma);
 +	}
 +
-+	ispmmu_vunmap(fh->isp_addr_read);
-+	ispmmu_vunmap(fh->isp_addr_write);
++	ispmmu_unmap(fh->isp_addr_read);
++	ispmmu_unmap(fh->isp_addr_write);
 +	fh->isp_addr_read = 0;
 +	fh->isp_addr_write = 0;
 +	spin_lock(&fh->vbq_lock);
@@ -2231,7 +1218,7 @@ index 0000000..54bc425
 +	if (vb->state == VIDEOBUF_NEEDS_INIT) {
 +		err = videobuf_iolock(q, vb, NULL);
 +		if (!err) {
-+			isp_addr = ispmmu_vmap(dma->sglist, dma->sglen);
++			isp_addr = ispmmu_map_sg(dma->sglist, dma->sglen);
 +			if (!isp_addr)
 +				err = -EIO;
 +			else {
@@ -2899,17 +1886,5 @@ index 0000000..5ac0c88
 +
 +#endif
 -- 
-1.6.0.3
+1.6.2.4
 
---- /tmp/Kconfig	2009-04-06 10:56:27.000000000 +0200
-+++ git/drivers/media/video/Kconfig	2009-04-06 10:57:25.000000000 +0200
-@@ -711,6 +711,9 @@
- 	  CMOS camera controller.  This is the controller found on first-
- 	  generation OLPC systems.
- 
-+
-+source "drivers/media/video/isp/Kconfig"
-+
- config VIDEO_OMAP3
-         tristate "OMAP 3 Camera support"
- 	select VIDEOBUF_GEN
diff --git a/recipes/linux/linux-omap-2.6.29/isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch b/recipes/linux/linux-omap-2.6.29/isp/resizer/0024-OMAP3-Resizer-V4L2-buf-layer-issues-fixed.patch
index 631b05f417..2c3023643e 100644
--- a/recipes/linux/linux-omap-2.6.29/isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch
+++ b/recipes/linux/linux-omap-2.6.29/isp/resizer/0024-OMAP3-Resizer-V4L2-buf-layer-issues-fixed.patch
@@ -1,15 +1,14 @@
-From 20d79137ecaa6c7dad007d9ea1d7be5550db4839 Mon Sep 17 00:00:00 2001
-From: Vaibhav Hiremath <hvaibhav@ti.com>
-Date: Fri, 13 Feb 2009 15:40:25 +0530
-Subject: [PATCH 2/2] Resizer bug fixes on top of 1.0.2 release
+From ad3bbadb7fc39a946dfd0cdac19e2ec8647b2c2c Mon Sep 17 00:00:00 2001
+From: Vaibhav Hiremath <vaibhav@psp-nfs-02.india.ti.com>
+Date: Wed, 29 Apr 2009 17:20:27 +0530
+Subject: [PATCH 24/26] OMAP3-Resizer: V4L2-buf layer issues fixed
 
-This commit contains resizer bug fixes on top of
-    PSP1.0.2 release -
-       - 4096 aligned address constraint
-       - workaround for extra page allocation for page aligned
-         size buffers
+V4L2-Buffer layer issues fixed under this commit.
+This patch is same as available with PSP1.0.2 release
 
-Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
+The discussion is initiated on this with V4L2 mailing list.
+
+Please note that this patch is not being tested.
 ---
  drivers/media/video/isp/omap_resizer.c |  417 ++++++++++++++++++++++++--------
  include/linux/omap_resizer.h           |    3 +-
@@ -125,11 +124,11 @@ index 54bc425..8059c70 100644
  	}
  
 -	if (fh->isp_addr_read) {
--		ispmmu_vunmap(fh->isp_addr_read);
+-		ispmmu_unmap(fh->isp_addr_read);
 -		fh->isp_addr_read = 0;
 -	}
 -	if (fh->isp_addr_write) {
--		ispmmu_vunmap(fh->isp_addr_write);
+-		ispmmu_unmap(fh->isp_addr_write);
 -		fh->isp_addr_write = 0;
 -	}
 -
@@ -270,11 +269,11 @@ index 54bc425..8059c70 100644
 +	dma = videobuf_to_dma(q->bufs[vb->i]);
 +	videobuf_dma_unmap(q, dma);
 +	videobuf_dma_free(dma);
-+	ispmmu_vunmap(fh->config->buf_address[vb->i]);
++	ispmmu_unmap(fh->config->buf_address[vb->i]);
 +	fh->config->buf_address[vb->i] = 0;
  
--	ispmmu_vunmap(fh->isp_addr_read);
--	ispmmu_vunmap(fh->isp_addr_write);
+-	ispmmu_unmap(fh->isp_addr_read);
+-	ispmmu_unmap(fh->isp_addr_write);
 -	fh->isp_addr_read = 0;
 -	fh->isp_addr_write = 0;
  	spin_lock(&fh->vbq_lock);
@@ -429,7 +428,7 @@ index 54bc425..8059c70 100644
  	if (vb->state == VIDEOBUF_NEEDS_INIT) {
 -		err = videobuf_iolock(q, vb, NULL);
 -		if (!err) {
--			isp_addr = ispmmu_vmap(dma->sglist, dma->sglen);
+-			isp_addr = ispmmu_map_sg(dma->sglist, dma->sglen);
 -			if (!isp_addr)
 -				err = -EIO;
 -			else {
@@ -491,7 +490,7 @@ index 54bc425..8059c70 100644
 +				goto buf_release;
 +			spin_unlock(&fh->vbq_lock);
 +		}
-+		isp_addr = ispmmu_vmap(dma->sglist, dma->sglen);
++		isp_addr = ispmmu_map_sg(dma->sglist, dma->sglen);
 +		if (!isp_addr)
 +			err = -EIO;
 +		else {
@@ -726,5 +725,5 @@ index 5ac0c88..47b8dd8 100644
  #define RSZ_INTYPE_YCBCR422_16BIT	0
  #define RSZ_INTYPE_PLANAR_8BIT		1
 -- 
-1.6.0.3
+1.6.2.4
 
diff --git a/recipes/linux/linux-omap-2.6.29/isp/resizer/0025-OMAP3-Resizer-Build-issues-fixed.patch b/recipes/linux/linux-omap-2.6.29/isp/resizer/0025-OMAP3-Resizer-Build-issues-fixed.patch
new file mode 100644
index 0000000000..143a846e3c
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.29/isp/resizer/0025-OMAP3-Resizer-Build-issues-fixed.patch
@@ -0,0 +1,36 @@
+From 9fec955e98b4ef7922f629e3a81d2d1af216e028 Mon Sep 17 00:00:00 2001
+From: Vaibhav Hiremath <vaibhav@psp-nfs-02.india.ti.com>
+Date: Wed, 29 Apr 2009 18:12:42 +0530
+Subject: [PATCH 25/26] OMAP3-Resizer: Build issues fixed
+
+There were some building issues with latest gitorious tree,
+fixed them.
+---
+ drivers/media/video/isp/omap_resizer.c |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/media/video/isp/omap_resizer.c b/drivers/media/video/isp/omap_resizer.c
+index 8059c70..dd90b24 100644
+--- a/drivers/media/video/isp/omap_resizer.c
++++ b/drivers/media/video/isp/omap_resizer.c
+@@ -1033,7 +1033,7 @@ static void rsz_vbq_release(struct videobuf_queue *q,
+ 	dma = videobuf_to_dma(q->bufs[vb->i]);
+ 	videobuf_dma_unmap(q, dma);
+ 	videobuf_dma_free(dma);
+-	ispmmu_unmap(fh->config->buf_address[vb->i]);
++	ispmmu_vunmap(fh->config->buf_address[vb->i]);
+ 	fh->config->buf_address[vb->i] = 0;
+ 
+ 	spin_lock(&fh->vbq_lock);
+@@ -1293,7 +1293,7 @@ static int rsz_vbq_prepare(struct videobuf_queue *q,
+ 				goto buf_release;
+ 			spin_unlock(&fh->vbq_lock);
+ 		}
+-		isp_addr = ispmmu_map_sg(dma->sglist, dma->sglen);
++		isp_addr = ispmmu_vmap(dma->sglist, dma->sglen);
+ 		if (!isp_addr)
+ 			err = -EIO;
+ 		else {
+-- 
+1.6.2.4
+
diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb
index 32ad025065..e40daa0ec0 100644
--- a/recipes/linux/linux-omap_2.6.29.bb
+++ b/recipes/linux/linux-omap_2.6.29.bb
@@ -151,9 +151,9 @@ SRC_URI_append = " \
            file://isp/omap3camera/0007-omap3isp-Add-CSI2-interface-support.patch;patch=1 \
            file://isp/omap3camera/0008-omap3isp-Add-ISP-tables.patch;patch=1 \
            file://isp/omap3camera/0009-omap34xxcam-Add-camera-driver.patch;patch=1 \
-#           file://isp/base/0001-omap3-Add-base-address-definitions-and-resources-fo.patch;patch=1 \
-#           file://isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch;patch=1 \
-#           file://isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch;patch=1 \
+           file://isp/resizer/0023-OMAP-Resizer-Basic-Resizer-refreshed-with-latest-gi.patch;patch=1 \
+           file://isp/resizer/0024-OMAP3-Resizer-V4L2-buf-layer-issues-fixed.patch;patch=1 \
+           file://isp/resizer/0025-OMAP3-Resizer-Build-issues-fixed.patch;patch=1 \
            file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \
            file://modedb-hd720.patch;patch=1 \
            file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
diff --git a/recipes/linux/linux-omap_2.6.30+2.6.31-rc1.bb b/recipes/linux/linux-omap_2.6.30+2.6.31-rc1.bb
deleted file mode 100644
index c5f56fc873..0000000000
--- a/recipes/linux/linux-omap_2.6.30+2.6.31-rc1.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-require linux.inc
-
-DESCRIPTION = "Linux kernel for OMAP processors"
-KERNEL_IMAGETYPE = "uImage"
-
-COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm|omap3-pandora|overo|omapzoom"
-
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_omapzoom2 = "1"
-
-SRCREV = "7c5cb7862d32cb344be7831d466535d5255e35ac"
-
-FILESPATHPKG_prepend = "linux-omap-2.6.31:"
-
-# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
-PV = "2.6.30+2.6.31-rc1+gitr${SRCREV}"
-PR = "r0"
-
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
-	   file://defconfig"
-
-SRC_URI_append = " \
-"
-
-S = "${WORKDIR}/git"
-
-module_autoload_ohci-hcd_omap5912osk = "ohci-hcd"
-
diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc
index 42fb56a22b..96feba642f 100644
--- a/recipes/linux/linux.inc
+++ b/recipes/linux/linux.inc
@@ -21,7 +21,7 @@ CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfs
 
 # Set the verbosity of kernel messages during runtime
 # You can define CMDLINE_DEBUG in your local.conf or distro.conf to override this behaviour  
-CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
+CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug", d)}'
 CMDLINE_append = " ${CMDLINE_DEBUG} "
 
 # Support for binary device tree generation
@@ -29,6 +29,7 @@ CMDLINE_append = " ${CMDLINE_DEBUG} "
 FILES_kernel-devicetree = "/boot/devicetree*"
 
 KERNEL_DEVICETREE_boc01 = "${WORKDIR}/boc01.dts"
+KERNEL_DEVICETREE_calamari = "arch/${ARCH}/boot/dts/mpc8536ds.dts"
 KERNEL_DEVICETREE_canyonlands = "arch/${ARCH}/boot/dts/canyonlands.dts"
 KERNEL_DEVICETREE_kilauea = "arch/${ARCH}/boot/dts/kilauea.dts"
 KERNEL_DEVICETREE_lsppchd = "arch/${ARCH}/boot/dts/kuroboxHD.dts"
diff --git a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb
index 673ed70188..d014298dc2 100644
--- a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb
+++ b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb
@@ -3,7 +3,7 @@ require linux.inc
 KERNEL_RELEASE = "2.6.30-rc4"
 OLD_KERNEL_RELEASE = "2.6.29"
 PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}"
-PR = "r2"
+PR = "r4"
 
 S = "${WORKDIR}/linux-${OLD_KERNEL_RELEASE}"
 
@@ -32,7 +32,5 @@ SRC_URI_append_afeb9260 = " \
 "
 
 SRC_URI_append_tx25 = " file://linux-2.6.30-rc4-git.patch;patch=1 \
-	file://linux-2.6.30-rc4-karo.diff;patch=1 \
-	file://tx25-ts2.patch;patch=1 \
-        file://tx25-can.patch;patch=1 "
+	file://linux-2.6.30-rc4-karo3.diff;patch=1"
 
diff --git a/recipes/linux/linux_2.6.30.bb b/recipes/linux/linux_2.6.30.bb
index 5dc9451c40..c7f0bde791 100644
--- a/recipes/linux/linux_2.6.30.bb
+++ b/recipes/linux/linux_2.6.30.bb
@@ -7,6 +7,7 @@ S = "${WORKDIR}/linux-${PV}"
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_mpc8315e-rdb = "1"
+DEFAULT_PREFERENCE_calamari = "1"
 DEFAULT_PREFERENCE_mx27ads = "1"
 
 # machine boots with it, works but was not tested too much
@@ -19,3 +20,4 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 SRC_URI_append_mpc8315e-rdb = " file://mpc8315erdb-add-msi-to-dts.patch;patch=1"
 
 SRC_URI_append_at91sam9263ek = " file://hrw-linux-2.6.30-exp.patch;patch=1 "
+
diff --git a/recipes/musicpd/mpd_0.15.bb b/recipes/musicpd/mpd_0.15.bb
new file mode 100644
index 0000000000..8a8573fab9
--- /dev/null
+++ b/recipes/musicpd/mpd_0.15.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "Music Player Daemon (mpd)"
+HOMEPAGE = "http://www.musicpd.org"
+SECTION = "console/multimedia"
+LICENSE = "GPLv2"
+DEPENDS = "libvorbis libogg libao zlib libmikmod flac audiofile virtual/libiconv faad2 pulseaudio \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag lame', d)}"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \
+	   file://mpd/mpd.conf \
+           file://mpd/mpd.init"
+
+inherit autotools update-rc.d
+INITSCRIPT_NAME = "mpd"
+
+# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
+# be built, instead we use the OE built versions which should be installed
+# in staging - remove the --with and replace with --enable to use the local
+# versions.
+
+EXTRA_OECONF = "\
+		--enable-ogg \
+		--with-id3tag-libraries=${STAGING_LIBDIR} \
+		--with-id3tag-includes=${STAGING_INCDIR} \
+		--with-mad-libraries=${STAGING_LIBDIR} \
+		--with-mad-includes=${STAGING_INCDIR} \
+        --with-faad-libraries=${STAGING_LIBDIR} \
+		--with-faad-includes=${STAGING_INCDIR} \
+        --disable-curl \
+        --disable-ffmpeg \
+        --disable-jack \
+        --enable-pulse \
+        --enable-mod \
+        --disable-oggflac \
+	--with-lame-includes=${STAGING_INCDIR}"
+
+do_compile_prepend() {
+    find -name Makefile | xargs sed -i 's~-I/usr/include~-I${STAGING_INCDIR}~g'
+}
+
+do_install_append() {
+    install -d ${D}${sysconfdir}/init.d
+    install -m 755 ${WORKDIR}/mpd/mpd.init ${D}${sysconfdir}/init.d/mpd
+    install -m 644 ${WORKDIR}/mpd/mpd.conf ${D}${sysconfdir}/mpd.conf
+}
+
diff --git a/recipes/mythtv/mythtv_svn.bb b/recipes/mythtv/mythtv_svn.bb
index 83ce8252fa..5272bb6e81 100644
--- a/recipes/mythtv/mythtv_svn.bb
+++ b/recipes/mythtv/mythtv_svn.bb
@@ -5,15 +5,12 @@ inherit qmake2 qt4x11
 DEFAULT_PREFERENCE = "-1"
 
 PV = "0.21+0.22rc+svnr${SRCREV}"
-PR = "r2"
+PR = "r0"
 REALPV = "0.22"
 
-SRCREV = "17892"
+SRCREV = "20923"
 SRC_URI = "svn://svn.mythtv.org/svn/trunk;module=mythtv;proto=http"
 
-SRC_URI += "file://configure.patch;patch=1 \
-           "
-
 S = "${WORKDIR}/mythtv"
 
 QMAKE_PROFILES = "mythtv.pro"
@@ -47,38 +44,32 @@ python __anonymous () {
     bb.data.setVar("PACKAGES", packages, d)
 }
 
-EXTRA_OECONF_armv5te = " --enable-armv5te "
-EXTRA_OECONF_armv6 = " --enable-armv6 "
-EXTRA_OECONF_armv7a = " --enable-armv6"
-
-#build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)
-#not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt
-MY_ARCH := "${PACKAGE_ARCH}"
-PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '${MY_ARCH}',d)}"
-
-MY_TARGET_CC_ARCH := "${TARGET_CC_ARCH}"
-TARGET_CC_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', '-march=iwmmxt -mtune=iwmmxt', '${MY_TARGET_CC_ARCH}',d)}"
-
-EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'iwmmxt', '--enable-pxa --enable-iwmmxt', '',d)} "
+EXTRA_MYTHTVCONF_armv7a  = "--cpu=cortex-a8"
+EXTRA_MYTHTVCONF ?= ""
 
+EXTRA_OECONF = " \
+        --cross-prefix=${TARGET_PREFIX} \
+        --prefix=${prefix} \
+        \
+        --arch=${TARGET_ARCH} \
+        --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
+        --extra-ldflags="${TARGET_LDFLAGS}" \
+        ${EXTRA_MYTHTVCONF} \
+"
 
 do_configure_prepend() {
 # it's not autotools anyway, so we call ./configure directly
 	find . -name "Makefile"|xargs rm -f
 
-	./configure	--prefix=/usr		\
-			--mandir=/usr/man 	\
-			--cpu=${MYTHTV_ARCH}	\
-			--arch=${MYTHTV_ARCH} \
+	./configure     --qmake=qmake2          \
 			--disable-altivec	\
 		 	--disable-opengl-video \
-			--disable-strip \
+			--disable-stripping	\
+			--disable-xvmc		\
 			--enable-v4l		\
 			--enable-audio-oss	\
-			--enable-proc-opt	\
 			--enable-dvb		\
 			--enable-libmp3lame \
-			--cross-compile	\
             --dvb-path=${STAGING_INCDIR} \
 			--with-bindings= \
 			${EXTRA_OECONF}
diff --git a/recipes/nilfs-utils/nilfs-utils_2.0.12.bb b/recipes/nilfs-utils/nilfs-utils_2.0.13.bb
index 37b3762113..e45e028d4d 100644
--- a/recipes/nilfs-utils/nilfs-utils_2.0.12.bb
+++ b/recipes/nilfs-utils/nilfs-utils_2.0.13.bb
@@ -10,7 +10,7 @@ RRECOMMENDS_${PN} = "nilfs-utils-mkfs nilfs-utils-stats"
 
 PR = "r0"
 
-SRC_URI ="http://www.nilfs.org/download/nilfs-utils-2.0.12.tar.bz2 \
+SRC_URI ="http://www.nilfs.org/download/nilfs-utils-${PV}.tar.bz2 \
 file://no-ldconfig-during-install.patch;patch=1"
 
 S = "${WORKDIR}/nilfs-utils-${PV}"
diff --git a/recipes/opie-taskbar/opie-taskbar/server-pro-cvs.patch b/recipes/opie-taskbar/opie-taskbar/server-pro-cvs.patch
new file mode 100644
index 0000000000..72d6ce55eb
--- /dev/null
+++ b/recipes/opie-taskbar/opie-taskbar/server-pro-cvs.patch
@@ -0,0 +1,68 @@
+--- launcher/server.pro	2009-07-13 23:55:07.000000000 +0100
++++ launcher/server.pro	2009-07-17 00:03:40.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ CONFIG		+= qt warn_on 
+ 
+-DESTDIR		= $$(OPIEDIR)/bin
++DESTDIR		= 
+ 
+ HEADERS		+= server.h \
+ 		  qrr.h \
+@@ -20,7 +20,7 @@
+ 		  shutdownimpl.h \
+ 		  launcher.h \
+ 		  launcherview.h \
+-		  $$(OPIEDIR)/core/apps/calibrate/calibrate.h \
++		  calibrate/calibrate.h \
+ 		  startmenu.h \
+ 		  transferserver.h \
+ 		  qcopbridge.h \
+@@ -31,7 +31,7 @@
+ 		  serverapp.h \
+ 		  qprocess.h \
+ 		  screensaver.h \
+-		  $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.h \
++		  mediummount/mediumwidget.h \
+                   mediadlg.h \
+ 		  virtualfs.h
+ 
+@@ -51,7 +51,7 @@
+ 		  shutdownimpl.cpp \
+ 		  launcher.cpp \
+ 		  launcherview.cpp \
+-		  $$(OPIEDIR)/core/apps/calibrate/calibrate.cpp \
++		  calibrate/calibrate.cpp \
+ 		  transferserver.cpp \
+ 		  packageslave.cpp \
+    		  irserver.cpp \
+@@ -64,21 +64,21 @@
+ 		  qprocess.cpp \
+ 		  qprocess_unix.cpp \
+ 		  screensaver.cpp \
+-		  $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.cc \
++		  mediummount/mediumwidget.cc \
+                   mediadlg.cpp \
+ 		  virtualfs.cpp
+ 
+ 
+-INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
+-DEPENDPATH	+= $(OPIEDIR)/core/apps/calibrate
++INCLUDEPATH += calibrate
++DEPENDPATH	+= calibrate
+ 
+-INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync
+-DEPENDPATH	+= $(OPIEDIR)/rsync
++INCLUDEPATH += $(OPIEDIR)/include rsync
++DEPENDPATH	+= rsync
+ 
+-INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount
+-DEPENDPATH  += $(OPIEDIR)/noncore/settings/mediummount
++INCLUDEPATH += mediummount
++DEPENDPATH	+= mediummount
+ 
+-LIBS        += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
++LIBS         = -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
+ TARGET       = qpe
+ 
+ ## not ready for use yet
diff --git a/recipes/opie-taskbar/opie-taskbar_cvs.bb b/recipes/opie-taskbar/opie-taskbar_cvs.bb
index e84e35d820..08c4d3bbec 100644
--- a/recipes/opie-taskbar/opie-taskbar_cvs.bb
+++ b/recipes/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r16"
+PR = "r17"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -13,6 +13,6 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            file://no-builtin-qss-startup.patch;patch=1 \
            file://kbdlocks-runtime.patch;patch=1 \
 	   file://restart-from-bindir.patch;patch=1 \
-           file://server.pro \
+           file://server-pro-cvs.patch;patch=1 \
 	   file://firstuse-path.patch;patch=1 \
           "
diff --git a/recipes/powervr-drivers/libgles-omap3-3.00.00.09/rc.pvr b/recipes/powervr-drivers/libgles-omap3-3.00.00.09/rc.pvr
new file mode 100755
index 0000000000..69c9f81c1c
--- /dev/null
+++ b/recipes/powervr-drivers/libgles-omap3-3.00.00.09/rc.pvr
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+if [ "$1" = "" ]; then
+	echo PVR-INIT: Please use start, stop, or restart.
+	exit 1
+fi
+
+if [ "$1" = "stop" -o  "$1" = "restart" ]; then
+	echo Stopping PVR
+	#rmmod bc_example
+	rmmod omaplfb 2>/dev/null
+	rmmod pvrsrvkm 2>/dev/null
+fi
+
+if [ "$1" = "stop" ]; then
+	exit 0
+fi
+
+echo Starting PVR
+insmod $(busybox find /lib/modules/$(uname -r) -name "pvrsrvkm.ko")
+#modprobe bc_example
+modprobe omaplfb
+
+pvr_maj=`grep "pvrsrvkm$" /proc/devices | cut -b1,2,3`
+
+if [ -e /dev/pvrsrvkm ] ; then 
+	rm -f /dev/pvrsrvkm
+fi
+
+mknod /dev/pvrsrvkm c $pvr_maj 0 
+chmod 666 /dev/pvrsrvkm
+
+touch /etc/powervr-esrev
+
+SAVED_ESREVISION="$(cat /etc/powervr-esrev)"
+ES_REVISION="$(cat /proc/cpuinfo | grep "CPU revision" | awk -F: '{print $2}')"
+
+if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" ] ; then
+	echo -n "Starting SGX fixup for"
+	if [ "${ES_REVISION}" = " 3" ] ; then
+	echo " ES3.x"
+	cp -a /usr/lib/ES3.0/* /usr/lib
+	cp -a /usr/bin/ES3.0/* /usr/bin	
+	else
+	echo "ES 2.x"
+	cp -a /usr/lib/ES2.0/* /usr/lib
+	cp -a /usr/bin/ES2.0/* /usr/bin	
+	fi
+	
+	echo "${ES_REVISION}" > /etc/powervr-esrev
+fi
+
+/usr/bin/pvrsrvinit
+
diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc
index 6813b71aab..789632237b 100644
--- a/recipes/powervr-drivers/libgles-omap3.inc
+++ b/recipes/powervr-drivers/libgles-omap3.inc
@@ -66,15 +66,7 @@ inherit update-rc.d
 INITSCRIPT_NAME = "pvr-init"
 INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ."
 
-do_accept_license() {
-	export HOME="${WORKDIR}"
-	echo "Y
-q 
-Y
-${S}" | ${WORKDIR}/OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin --mode console
-}
-
-addtask accept_license after do_unpack before do_configure
+require ../dvsdk/ti-dspbios.inc
 
 do_compile() {
     for sofile in $(find ${S} -name "lib*Open*.so") $(find ${S} -name "lib*srv*.so")   $(find ${S} -name "lib*gl*.so") $(find ${S} -name "libpvr*.so") $(find ${S} -name "lib*GL*.so"); do
@@ -96,7 +88,7 @@ do_install () {
 	cp -pP ${BINLOCATION}/gles1test1 ${D}${bindir}/
 	cp -pP ${BINLOCATION}/gles1_texture_stream ${D}${bindir}/
 	cp -pP ${BINLOCATION}/gles2test1 ${D}${bindir}/
-	cp -pP ${BINLOCATION}/pvrsrvinit ${D}${bindir}/
+	cp -pP ${BINLOCATION}/p[dv]* ${D}${bindir}/
 	cp -pP ${BINLOCATION}/xgles1test1 ${D}${bindir}/
 
 	cp -pP ${BINLOCATION}/freedesktop/kdrive/usr/X11R6_SGX/bin/Xsgx ${D}${bindir}/|| true
@@ -106,6 +98,7 @@ do_install () {
 	cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${D}${includedir}/
 	cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES/
 	cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES2/
+	cp -PPr ${S}/include/*.h ${D}${includedir} || true
 	
 	install -d ${D}${sysconfdir}/init.d/
 	cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-init
@@ -134,6 +127,7 @@ do_stage () {
     cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${STAGING_INCDIR}/
     cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${STAGING_INCDIR}/GLES/
     cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/Include/GLES/* ${STAGING_INCDIR}/GLES2/
+	cp -PPr ${S}/include/*.h ${STAGING_INCDIR} || true
 }
 
 pkg_postinst() {
diff --git a/recipes/powervr-drivers/libgles-omap3_3.00.00.08.bb b/recipes/powervr-drivers/libgles-omap3_3.00.00.08.bb
index a5c0d99143..2256c5b032 100644
--- a/recipes/powervr-drivers/libgles-omap3_3.00.00.08.bb
+++ b/recipes/powervr-drivers/libgles-omap3_3.00.00.08.bb
@@ -4,6 +4,7 @@ DEFAULT_PREFERENCE = "1"
 
 SGXPV = "3_00_00_08"
 IMGPV = "1.3.13.1607"
+BINFILE := "OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin"
 
 # Quality control is really poor on these SDKs, so hack around the latest madness:
 FILES_${PN} += "${libdir}/*.so"
diff --git a/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb b/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb
new file mode 100644
index 0000000000..6a04e8359b
--- /dev/null
+++ b/recipes/powervr-drivers/libgles-omap3_3.00.00.09.bb
@@ -0,0 +1,26 @@
+require libgles-omap3.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SGXPV = "3_00_00_09"
+IMGPV = "1.3.13.1832"
+BINFILE := "OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin"
+
+# The ES2.x and ES3.x CPUs have different SGX hardware, so we need to install 2 sets of userspace
+do_install_append() {
+	install -d ${D}${libdir}/ES3.0
+	install -d ${D}${libdir}/ES2.0
+	install -d ${D}${bindir}/ES3.0
+	install -d ${D}${bindir}/ES2.0
+
+	cp ${S}/gfx_rel_es2.x/lib* ${D}${libdir}/ES2.0/
+	cp ${S}/gfx_rel_es2.x/p[dv]* ${D}${bindir}/ES2.0/
+
+	cp ${D}${libdir}/lib*${IMGPV} ${D}${libdir}/ES3.0/
+	cp ${D}${bindir}/p[dv]* ${D}${bindir}/ES3.0
+}
+
+# Quality control is really poor on these SDKs, so hack around the latest madness:
+FILES_${PN} += "${libdir}/*.so"
+FILES_${PN}-dev = "${includedir}"
+
diff --git a/recipes/powervr-drivers/omap3-sgx-modules/0002-Compile-fixes-for-DSS2.patch b/recipes/powervr-drivers/omap3-sgx-modules/0002-Compile-fixes-for-DSS2.patch
new file mode 100644
index 0000000000..c319ac57a9
--- /dev/null
+++ b/recipes/powervr-drivers/omap3-sgx-modules/0002-Compile-fixes-for-DSS2.patch
@@ -0,0 +1,11 @@
+--- a/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c
++++ b/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c
+@@ -171,7 +171,7 @@
+ #if !defined (CONFIG_OMAP2_DSS)
+ 	omap_dispc_free_irq(DISPC_IRQ_VSYNC, OMAPLFBVSyncISR, psSwapChain);
+ #else
+-	omap_dispc_unregister_isr(OMAPLFBVSyncISR);
++	omap_dispc_unregister_isr(OMAPLFBVSyncISR, psSwapChain, DISPC_IRQ_VSYNC);
+ #endif
+ 	return PVRSRV_OK;		
+ } 
diff --git a/recipes/powervr-drivers/omap3-sgx-modules/build_es3.x_sgx.patch b/recipes/powervr-drivers/omap3-sgx-modules/build_es3.x_sgx.patch
new file mode 100644
index 0000000000..93df6b3da5
--- /dev/null
+++ b/recipes/powervr-drivers/omap3-sgx-modules/build_es3.x_sgx.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile	2009-05-04 01:14:25.000000000 +0530
++++ omap3-sgx-modules-1.3.13.1607/Makefile	2009-05-04 01:14:36.000000000 +0530
+@@ -10,7 +10,7 @@ export BUILD = debug
+ export KBUILD_EXTRA_SYMBOLS = `pwd`/services4/srvkm/env/linux/kbuild/Module.symvers
+ 
+ SGXCORE = 530
+-CORE = -DSGX530 -DSUPPORT_SGX530 -DSGX_CORE_REV=103
++CORE = -DSGX530 -DSUPPORT_SGX530 -DSGX_CORE_REV=121
+ 
+ SUPPORT_SGX = 1
+ SUPPORT_HW_RECOVERY = 1
diff --git a/recipes/powervr-drivers/omap3-sgx-modules/omap3-sgx-modules-1.3.13.1607.tar.bz2 b/recipes/powervr-drivers/omap3-sgx-modules/omap3-sgx-modules-1.3.13.1607.tar.bz2
new file mode 100644
index 0000000000..5c2fd6a0ab
--- /dev/null
+++ b/recipes/powervr-drivers/omap3-sgx-modules/omap3-sgx-modules-1.3.13.1607.tar.bz2
diff --git a/recipes/powervr-drivers/omap3-sgx-modules/rotation-dss2.patch b/recipes/powervr-drivers/omap3-sgx-modules/rotation-dss2.patch
new file mode 100644
index 0000000000..ea4a6a10c6
--- /dev/null
+++ b/recipes/powervr-drivers/omap3-sgx-modules/rotation-dss2.patch
@@ -0,0 +1,21 @@
+--- a/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c    2009-01-22 17:08:25.000000000 +0530
++++ b/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c 2009-04-25 16:43:22.000000000 +0530
+@@ -1014,8 +1014,16 @@
+ 	psPVRFBInfo->sSysAddr.uiAddr = psLINFBInfo->fix.smem_start;
+ 	psPVRFBInfo->sCPUVAddr = psLINFBInfo->screen_base;
+ 
+-	psPVRFBInfo->ui32Width = psLINFBInfo->var.xres;
+-	psPVRFBInfo->ui32Height = psLINFBInfo->var.yres;
++	if ((psLINFBInfo->var.rotate == FB_ROTATE_CW)
++		|| (psLINFBInfo->var.rotate == FB_ROTATE_CCW) ) {
++
++		psPVRFBInfo->ui32Width = psLINFBInfo->var.yres;
++		psPVRFBInfo->ui32Height = psLINFBInfo->var.xres;
++
++	} else {
++		psPVRFBInfo->ui32Width = psLINFBInfo->var.xres;
++		psPVRFBInfo->ui32Height = psLINFBInfo->var.yres;
++	}
+ 	psPVRFBInfo->ui32ByteStride =  psLINFBInfo->fix.line_length;
+ 	psPVRFBInfo->ui32FBSize = FBSize;
+ 	psPVRFBInfo->ui32BufferSize = psPVRFBInfo->ui32Height * psPVRFBInfo->ui32ByteStride;
diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb
new file mode 100644
index 0000000000..8e4d2a25bd
--- /dev/null
+++ b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs"
+LICENSE = "GPLv2"
+
+inherit module
+
+SRC_URI = "file://omap3-sgx-modules-${PV}.tar.bz2 \
+           file://0002-Compile-fixes-for-DSS2.patch;patch=1 \
+           file://rotation-dss2.patch;patch=1 \
+           file://build_es3.x_sgx.patch;patch=1 \
+"
+
+PVRBUILD = "release"
+
+MAKE_TARGETS = " BUILD=${PVRBUILD}"
+
+do_install() {
+	mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
+	cp ${S}/pvrsrvkm.ko ${S}/services4/3rdparty/dc_omap3430_linux/omaplfb.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
+}
diff --git a/recipes/python/python-elementtree_1.2.7-20070827-preview.bb b/recipes/python/python-elementtree_1.2.7-20070827-preview.bb
deleted file mode 100644
index f1e4c8b322..0000000000
--- a/recipes/python/python-elementtree_1.2.7-20070827-preview.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Lightweight Python components for handling XML"
-SECTION = "devel/python"
-LICENSE = "Python"
-HOMEPAGE = "http://effbot.org/zone/element-index.htm"
-PR = "r0"
-
-inherit distutils
-
-SRC_URI = "http://effbot.org/media/downloads/elementtree-${PV}.zip"
-S = "${WORKDIR}/elementtree-${PV}"
-
-FILES_${PN} += "${datadir}"
-
-
diff --git a/recipes/qt4/qt4-embedded-gles_4.5.2.bb b/recipes/qt4/qt4-embedded-gles_4.5.2.bb
index 4e207c1863..31bfe0fee2 100644
--- a/recipes/qt4/qt4-embedded-gles_4.5.2.bb
+++ b/recipes/qt4/qt4-embedded-gles_4.5.2.bb
@@ -11,16 +11,14 @@ SRC_URI += "file://sgx-hack.patch;patch=1"
 
 export EXTRA_QMAKE_MUNGE = " glmunge "
 
-CXXFLAGS_append = " -I${S}/src/3rdparty/powervr/"
-CFLAGS_append = " -I${S}/src/3rdparty/powervr/"
-
-
 glmunge() {
-sed -e /QMAKE_INCDIR_OPENGL/d -e /QMAKE_LIBDIR_OPENGL/d -e /QMAKE_LIBS_OPENGL/d -e /QMAKE_LIBS_OPENGL_QT/d -i mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
-echo "QMAKE_INCDIR_OPENGL = ${STAGING_INCDIR}/GLES/" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
-echo "QMAKE_LIBDIR_OPENGL  = ${STAGING_LIBDIR}" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
-echo "QMAKE_LIBS_OPENGL = -lEGL -lGLES_CM -lIMGegl -lsrv_um" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
-echo "QMAKE_LIBS_OPENGL_QT = -lEGL -lGLES_CM -lIMGegl -lsrv_um" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
+	sed -e /QMAKE_INCDIR_OPENGL/d -e /QMAKE_LIBDIR_OPENGL/d -e /QMAKE_LIBS_OPENGL/d -e /QMAKE_LIBS_OPENGL_QT/d -i mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
+
+	echo "QMAKE_INCDIR_OPENGL = ${STAGING_INCDIR}/GLES/" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
+	echo "QMAKE_LIBDIR_OPENGL  = ${STAGING_LIBDIR}" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
+	echo "QMAKE_LIBS_OPENGL = -lEGL -lGLES_CM -lIMGegl -lsrv_um" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
+	echo "QMAKE_LIBS_OPENGL_QT = -lEGL -lGLES_CM -lIMGegl -lsrv_um" >> mkspecs/${OE_QMAKE_PLATFORM}/qmake.conf
+	sed -i -e s:MBX_SYNC:HW_SYNC:g ${S}/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c
 }
 
 
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 4c109e2f60..392ddc30bf 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r13"
+INC_PR = "r14"
 
 QT_BASE_NAME = "qt4-embedded"
 QT_BASE_LIB  = "libqt-embedded"
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 42e2726e5a..9d82a1bc0c 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -24,6 +24,9 @@ export QT_CONF_PATH="${WORKDIR}/qt.conf"
 
 # Library packages
 QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml phonon"
+
+QT_EXTRA_LIBS = "pvrQWSWSEGL"
+
 python __anonymous () {
     import bb
 
@@ -48,6 +51,20 @@ python __anonymous () {
     for name in bb.data.getVar("OTHER_PACKAGES", d, 1).split():
         dbg_packages.append("%s-dbg" % name)
 
+    for name in bb.data.getVar("QT_EXTRA_LIBS", d, 1).split():
+        pkg = "${QT_BASE_LIB}" + name.lower().replace("qt", "") + "4"
+        bb.data.setVar("FILES_%s" % pkg, "${libdir}/lib%(name)s.so.*" % locals(), d)
+        bb.data.setVar("FILES_%s-dev" % pkg, """${libdir}/lib%(name)s.prl
+                  ${libdir}/lib%(name)s.a
+                  ${libdir}/lib%(name)s.la
+                  ${libdir}/lib%(name)s.so
+                  ${includedir}/${QT_DIR_NAME}/%(incname)s
+                  ${libdir}/pkgconfig/%(name)s.pc""" % locals(), d)
+        bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so.*" % locals(), d)
+        lib_packages.append(pkg)
+        dev_packages.append("%s-dev" % pkg)
+        dbg_packages.append("%s-dbg" % pkg)
+
     bb.data.setVar("LIB_PACKAGES", " ".join(lib_packages), d)
     bb.data.setVar("DEV_PACKAGES", " ".join(dev_packages), d)
     bb.data.setVar("DBG_PACKAGES", " ".join(dbg_packages), d)