11 files changed, 958 insertions, 7 deletions

diff --git a/arch/arm/configs/colibri_vf50_defconfig b/arch/arm/configs/colibri_vf50_defconfig
new file mode 100644
index 000000000000..b4d343dda3bd
--- /dev/null
+++ b/arch/arm/configs/colibri_vf50_defconfig
@@ -0,0 +1,311 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_TINY_RCU=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_CGROUPS=y
+CONFIG_BLK_CGROUP=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_ELF_CORE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_PERF_EVENTS is not set
+CONFIG_SLUB=y
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_MXC=y
+CONFIG_ARCH_MVF=y
+CONFIG_MACH_COLIBRI_VF50=y
+CONFIG_MXC_PWM=y
+CONFIG_MXC_USE_PIT=y
+# CONFIG_CACHE_L2X0 is not set
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+CONFIG_HIGHMEM=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CPU_IDLE=y
+CONFIG_VFP=y
+CONFIG_NEON=y
+CONFIG_PM_RUNTIME=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_TUNNEL=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=y
+CONFIG_NF_CONNTRACK_FTP=y
+CONFIG_NF_CONNTRACK_IRC=y
+CONFIG_NF_CONNTRACK_NETBIOS_NS=y
+CONFIG_NF_CONNTRACK_PPTP=y
+CONFIG_NF_CONNTRACK_SANE=y
+CONFIG_NF_CONNTRACK_SIP=y
+CONFIG_NF_CONNTRACK_TFTP=y
+CONFIG_NETFILTER_TPROXY=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_MATCH_AH=y
+CONFIG_IP_NF_MATCH_ECN=y
+CONFIG_IP_NF_MATCH_TTL=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_LOG=y
+CONFIG_NF_NAT=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_TARGET_NETMAP=y
+CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_ARPTABLES=y
+CONFIG_IP_NF_ARPFILTER=y
+CONFIG_IP_NF_ARP_MANGLE=y
+CONFIG_IP6_NF_IPTABLES=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_NET_CLS_U32=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_U32=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+CONFIG_NET_ACT_GACT=y
+CONFIG_NET_ACT_MIRRED=y
+CONFIG_BT=y
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=y
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=y
+CONFIG_BT_HIDP=y
+CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
+CONFIG_DEVTMPFS=y
+# May crash systemd
+# CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_FSL_NFC=y
+CONFIG_MTD_UBI=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_MISC_DEVICES=y
+CONFIG_MVF_ADC=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=y
+CONFIG_TUN=y
+CONFIG_PHYLIB=y
+CONFIG_MICREL_PHY=y
+CONFIG_NET_ETHERNET=y
+CONFIG_FEC=y
+CONFIG_FEC1=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# Hack to force WIRELESS_EXT required to build Redpine Signals LiteFi driver
+CONFIG_USB_ZD1201=m
+CONFIG_RT2X00=y
+CONFIG_RT2800USB=y
+CONFIG_USB_USBNET=y
+# CONFIG_USB_NET_CDC_NCM is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_BELKIN is not set
+# CONFIG_USB_NET_ZAURUS is not set
+CONFIG_PPP=y
+CONFIG_PPP_ASYNC=y
+CONFIG_PPP_DEFLATE=y
+CONFIG_PPP_BSDCOMP=y
+CONFIG_PPP_MPPE=y
+# CONFIG_INPUT_MOUSEDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_WM97XX=y
+# CONFIG_TOUCHSCREEN_WM9705 is not set
+# CONFIG_TOUCHSCREEN_WM9713 is not set
+CONFIG_TOUCHSCREEN_COLIBRI_VF50=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
+# CONFIG_SERIO is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_IMX=y
+CONFIG_SPI=y
+CONFIG_SPI_MVF=y
+CONFIG_SPI_MVF_DSPI_EDMA=y
+CONFIG_SPI_SPIDEV=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_BATTERY_WM97XX=y
+# CONFIG_MXC_MMA8450 is not set
+# CONFIG_MXC_MMA8451 is not set
+# CONFIG_MFD_MXC_HDMI is not set
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_VIDEO_DEV=y
+CONFIG_USB_VIDEO_CLASS=y
+# CONFIG_RADIO_ADAPTERS is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+CONFIG_FB=y
+CONFIG_FB_MVF_DCU=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_PWM=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_LOGO=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=y
+CONFIG_SND_SOC=y
+CONFIG_SND_MVF_SOC=y
+CONFIG_SND_MVF_SOC_COLIBRI_VF61=y
+CONFIG_HIDRAW=y
+CONFIG_USB_HIDDEV=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG_WHITELIST is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ARC=y
+CONFIG_USB_EHCI_ARC_OTG=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_ACM=y
+CONFIG_USB_WDM=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_LIBUSUAL=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_PL2303=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=y
+CONFIG_MMC=y
+CONFIG_MMC_UNSAFE_RESUME=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_ESDHC_IMX=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_PWM=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_SNVS=y
+CONFIG_DMADEVICES=y
+CONFIG_MVF_EDMA=y
+CONFIG_STAGING=y
+CONFIG_IIO=y
+# CONFIG_MXC_HMP4E is not set
+# CONFIG_MXC_HWEVENT is not set
+CONFIG_MXC_ASRC=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_DNOTIFY is not set
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=y
+CONFIG_CUSE=y
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_VFAT_FS=y
+CONFIG_NTFS_FS=m
+CONFIG_NTFS_RW=y
+CONFIG_TMPFS=y
+CONFIG_UBIFS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_V4_1=y
+CONFIG_ROOT_NFS=y
+CONFIG_CIFS=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_EFI_PARTITION=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_UTF8=m
+CONFIG_PRINTK_TIME=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_FS=y
+CONFIG_FTRACE=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_TWOFISH=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/arm/mach-mvf/Kconfig b/arch/arm/mach-mvf/Kconfig
index 931ef6af6dd4..d82873ce80e5 100644
--- a/arch/arm/mach-mvf/Kconfig
+++ b/arch/arm/mach-mvf/Kconfig
@@ -25,6 +25,40 @@ config FORCE_MAX_ZONEORDER
 config	SOC_MVFA5
 	bool
 
+config MACH_COLIBRI_VF50
+	bool "Support Toradex Colibri VF50 module"
+	select ARCH_MVFA5
+	select SOC_MVFA5
+	select IMX_HAVE_PLATFORM_IMX_UART
+	select IMX_HAVE_PLATFORM_DMA
+	select IMX_HAVE_PLATFORM_FEC
+	select IMX_HAVE_PLATFORM_GPMI_NFC
+	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+	select IMX_HAVE_PLATFORM_IMX_I2C
+	select IMX_HAVE_PLATFORM_VIV_GPU
+	select IMX_HAVE_PLATFORM_IMX_VPU
+	select IMX_HAVE_PLATFORM_IMX_SSI
+	select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+	select IMX_HAVE_PLATFORM_MXC_EHCI
+	select IMX_HAVE_PLATFORM_FSL_OTG
+	select IMX_HAVE_PLATFORM_FSL_USB_WAKEUP
+	select IMX_HAVE_PLATFORM_AHCI
+	select IMX_HAVE_PLATFORM_IMX_OCOTP
+	select IMX_HAVE_PLATFORM_IMX2_WDT
+	select IMX_HAVE_PLATFORM_IMX_SNVS_RTC
+	select IMX_HAVE_PLATFORM_IMX_PM
+	select IMX_HAVE_PLATFORM_MXC_HDMI
+	select IMX_HAVE_PLATFORM_IMX_ASRC
+	select IMX_HAVE_PLATFORM_FLEXCAN
+	select IMX_HAVE_PLATFORM_MVF_SPI
+	select IMX_HAVE_PLATFORM_MVF_DCU
+	select IMX_HAVE_PLATFORM_MVF_SAI
+	select IMX_HAVE_PLATFORM_MXC_NAND
+	select IMX_HAVE_PLATFORM_MVF_CAAM
+	help
+	  Include support for Toradex Colibri VF50 module on Iris carrier board. This
+	  includes specific configurations for the board and its peripherals.
+
 config MACH_MVFA5_TWR_VF700
 	bool "Support MVF CORTEX-A5 TWR-VF700 platform"
 	select ARCH_MVFA5
diff --git a/arch/arm/mach-mvf/Makefile b/arch/arm/mach-mvf/Makefile
index fdbd22479609..ce577e9bea2c 100644
--- a/arch/arm/mach-mvf/Makefile
+++ b/arch/arm/mach-mvf/Makefile
@@ -7,4 +7,5 @@ obj-y   := cpu.o mm.o system.o devices.o dummy_gpio.o irq.o bus_freq.o mvf_fec.o
 obj-y += l2switch.o
 
 obj-$(CONFIG_ARCH_MVFA5) += clock.o mvf_suspend.o
+obj-$(CONFIG_MACH_COLIBRI_VF50) += board-colibri_vf50.o
 obj-$(CONFIG_MACH_MVFA5_TWR_VF700) += board-twr-vf700.o
diff --git a/arch/arm/mach-mvf/board-colibri_vf50.c b/arch/arm/mach-mvf/board-colibri_vf50.c
new file mode 100644
index 000000000000..2eecc72ba2fc
--- /dev/null
+++ b/arch/arm/mach-mvf/board-colibri_vf50.c
@@ -0,0 +1,506 @@
+/*
+ * Copyright 2013 Toradex, Inc.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <linux/types.h>
+#include <linux/sched.h>
+#include <linux/delay.h>
+#include <linux/pm.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/nodemask.h>
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <linux/fsl_devices.h>
+#include <linux/smsc911x.h>
+#include <linux/spi/spi.h>
+#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#include <linux/spi/flash.h>
+#else
+#include <linux/mtd/physmap.h>
+#endif
+#include <linux/i2c.h>
+#include <linux/i2c/pca953x.h>
+#include <linux/ata.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/map.h>
+#include <linux/mtd/partitions.h>
+#include <linux/pmic_external.h>
+#include <linux/pmic_status.h>
+#include <linux/ipu.h>
+#include <linux/mxcfb.h>
+#include <linux/pwm_backlight.h>
+#include <linux/leds_pwm.h>
+#include <linux/fec.h>
+#include <linux/memblock.h>
+#include <linux/gpio.h>
+#include <linux/etherdevice.h>
+#include <linux/regulator/anatop-regulator.h>
+#include <linux/regulator/consumer.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
+#include <sound/pcm.h>
+
+#include <mach/common.h>
+#include <mach/hardware.h>
+#include <mach/mxc_dvfs.h>
+#include <mach/memory.h>
+#include <mach/iomux-mvf.h>
+#include <mach/imx-uart.h>
+#include <mach/spi-mvf.h>
+#include <mach/viv_gpu.h>
+#include <mach/ahci_sata.h>
+#include <mach/ipu-v3.h>
+#include <mach/mxc_hdmi.h>
+#include <mach/mxc_asrc.h>
+#include <mach/mipi_dsi.h>
+#include <mach/mipi_csi2.h>
+#include <mach/fsl_l2_switch.h>
+#include <mach/mxc.h>
+#include <mach/colibri-ts.h>
+#include <asm/irq.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
+
+#include "devices-mvf.h"
+#include "usb.h"
+#include "crm_regs.h"
+
+#define MVF600_SD1_CD  42
+
+static iomux_v3_cfg_t mvf600_pads[] = {
+	/* SDHC1: MMC/SD */
+	MVF600_PAD14_PTA24__SDHC1_CLK,
+	MVF600_PAD15_PTA25__SDHC1_CMD,
+	MVF600_PAD16_PTA26__SDHC1_DAT0,
+	MVF600_PAD17_PTA27__SDHC1_DAT1,
+	MVF600_PAD18_PTA28__SDHC1_DAT2,
+	MVF600_PAD19_PTA29__SDHC1_DAT3,
+	/* set PTB20 as GPIO for sdhc card detecting */
+	MVF600_PAD42_PTB20__SDHC1_SW_CD,
+
+	/* I2C0: I2C_SDA/SCL on SODIMM pin 194/196 (e.g. RTC on carrier board) */
+	MVF600_PAD36_PTB14__I2C0_SCL,
+	MVF600_PAD37_PTB15__I2C0_SDA,
+
+#if 0
+	/*CAN1*/
+	MVF600_PAD38_PTB16__CAN1_RX,
+	MVF600_PAD39_PTB17__CAN1_TX,
+
+	/* DSPI1: SSP on SODIMM pin 86, 88, 90 and 92 */
+	MVF600_PAD84_PTD5__DSPI1_PCS0,
+	MVF600_PAD85_PTD6__DSPI1_SIN,
+	MVF600_PAD86_PTD7__DSPI1_SOUT,
+	MVF600_PAD87_PTD8__DSPI1_SCK,
+#endif
+
+#if defined(CONFIG_FEC1) || defined(CONFIG_FSL_L2_SWITCH)
+	/* FEC1: Ethernet */
+	MVF600_PAD0_PTA6__RMII_CLKOUT,
+	MVF600_PAD54_PTC9__RMII1_MDC,
+	MVF600_PAD55_PTC10__RMII1_MDIO,
+	MVF600_PAD56_PTC11__RMII1_CRS_DV,
+	MVF600_PAD57_PTC12__RMII1_RXD1,
+	MVF600_PAD58_PTC13__RMII1_RXD0,
+	MVF600_PAD59_PTC14__RMII1_RXER,
+	MVF600_PAD60_PTC15__RMII1_TXD1,
+	MVF600_PAD61_PTC16__RMII1_TXD0,
+	MVF600_PAD62_PTC17__RMII1_TXEN,
+#endif
+
+	/* SAI2: AC97 */
+#if 0 // Those pins are disabled on Colibri VP50 since touchscreen uses them...
+	MVF600_PAD6_PTA16_SAI2_TX_BCLK,
+	MVF600_PAD8_PTA18_SAI2_TX_DATA,
+	MVF600_PAD9_PTA19_SAI2_TX_SYNC,
+	MVF600_PAD12_PTA22_SAI2_RX_DATA,
+	MVF600_PAD13_PTA23_SAI2_RX_SYNC,
+//	MVF600_PAD5_PTA12_EXT_AUDIO_MCLK,
+//	MVF600_PAD24_PTB2 WM9715L GENIRQ
+#endif
+	/* Touchscreen */
+	MVF600_PAD4_PTA11,
+	MVF600_PAD5_PTA12,
+	MVF600_PAD6_PTA16_ADC1_SE0,
+	MVF600_PAD24_PTB2_ADC1_SE2,
+	MVF600_PAD8_PTA18_ADC0_SE0,
+	MVF600_PAD9_PTA19_ADC0_SE1,
+	MVF600_PAD12_PTA22,
+	MVF600_PAD13_PTA23,
+
+	/* DCU0: Display */
+	MVF600_PAD105_PTE0_DCU0_HSYNC,
+	MVF600_PAD106_PTE1_DCU0_VSYNC,
+	MVF600_PAD107_PTE2_DCU0_PCLK,
+	MVF600_PAD109_PTE4_DCU0_DE,
+	MVF600_PAD110_PTE5_DCU0_R0,
+	MVF600_PAD111_PTE6_DCU0_R1,
+	MVF600_PAD112_PTE7_DCU0_R2,
+	MVF600_PAD113_PTE8_DCU0_R3,
+	MVF600_PAD114_PTE9_DCU0_R4,
+	MVF600_PAD115_PTE10_DCU0_R5,
+	MVF600_PAD116_PTE11_DCU0_R6,
+	MVF600_PAD117_PTE12_DCU0_R7,
+	MVF600_PAD118_PTE13_DCU0_G0,
+	MVF600_PAD119_PTE14_DCU0_G1,
+	MVF600_PAD120_PTE15_DCU0_G2,
+	MVF600_PAD121_PTE16_DCU0_G3,
+	MVF600_PAD122_PTE17_DCU0_G4,
+	MVF600_PAD123_PTE18_DCU0_G5,
+	MVF600_PAD124_PTE19_DCU0_G6,
+	MVF600_PAD125_PTE20_DCU0_G7,
+	MVF600_PAD126_PTE21_DCU0_B0,
+	MVF600_PAD127_PTE22_DCU0_B1,
+	MVF600_PAD128_PTE23_DCU0_B2,
+	MVF600_PAD129_PTE24_DCU0_B3,
+	MVF600_PAD130_PTE25_DCU0_B4,
+	MVF600_PAD131_PTE26_DCU0_B5,
+	MVF600_PAD132_PTE27_DCU0_B6,
+	MVF600_PAD133_PTE28_DCU0_B7,
+
+	/* UART1: UART_C */
+	MVF600_PAD26_PTB4_UART1_TX,
+	MVF600_PAD27_PTB5_UART1_RX,
+
+	/* UART0: UART_A */
+	MVF600_PAD32_PTB10_UART0_TX,
+	MVF600_PAD33_PTB11_UART0_RX,
+
+#if 0
+	/* UART2: UART_B */
+	MVF600_PAD79_PTD0_UART2_TX,
+	MVF600_PAD80_PTD1_UART2_RX,
+
+	/* USB */
+	MVF600_PAD83_PTD4__USBH_PEN,
+	MVF600_PAD102_PTC29__USBC_DET,
+	MVF600_PAD108_PTE3__USB_OC,
+#endif
+
+	/*
+	 * PTB6 & PTB7 are commented out as they conflict with uart2
+	 * which is the MQX default console (e.g for printf)
+	*/
+	/* MVF600_PAD28_PTB6_FTM0CH6, */
+	/* MVF600_PAD29_PTB7_FTM0CH7, */
+
+	MVF600_PAD22_PTB0_FTM0CH0, //PWM<A> multiplexed
+	MVF600_PAD23_PTB1_FTM0CH1, //PWM<c>
+	MVF600_PAD30_PTB8_FTM1CH0, //PWM<B>
+	MVF600_PAD31_PTB9_FTM1CH1, //PWM<D>
+
+#if 0
+	/* Touch Screen */
+	MVF600_PAD4_PTA11_TS_IRQ,
+
+	/* NAND */
+	MVF600_PAD71_PTD23_NF_IO7,
+	MVF600_PAD72_PTD22_NF_IO6,
+	MVF600_PAD73_PTD21_NF_IO5,
+	MVF600_PAD74_PTD20_NF_IO4,
+	MVF600_PAD75_PTD19_NF_IO3,
+	MVF600_PAD76_PTD18_NF_IO2,
+	MVF600_PAD77_PTD17_NF_IO1,
+	MVF600_PAD78_PTD16_NF_IO0,
+	MVF600_PAD94_PTB24_NF_WE,
+	MVF600_PAD95_PTB25_NF_CE0,
+	MVF600_PAD97_PTB27_NF_RE,
+	MVF600_PAD99_PTC26_NF_RB,
+	MVF600_PAD100_PTC27_NF_ALE,
+	MVF600_PAD101_PTC28_NF_CLE,
+#endif
+};
+
+static struct imxuart_platform_data mvf_uart0_pdata = {
+	.flags = IMXUART_FIFO | IMXUART_EDMA,
+	.dma_req_rx = DMA_MUX03_UART0_RX,
+	.dma_req_tx = DMA_MUX03_UART0_TX,
+};
+
+static struct imxuart_platform_data mvf_uart1_pdata = {
+	.flags = IMXUART_FIFO | IMXUART_EDMA,
+	.dma_req_rx = DMA_MUX03_UART1_RX,
+	.dma_req_tx = DMA_MUX03_UART1_TX,
+};
+
+static struct imxuart_platform_data mvf_uart2_pdata = {
+	.flags = IMXUART_FIFO | IMXUART_EDMA,
+	.dma_req_rx = DMA_MUX03_UART2_RX,
+	.dma_req_tx = DMA_MUX03_UART2_TX,
+};
+
+static inline void mvf_vf700_init_uart(void)
+{
+	mvf_add_imx_uart(0, &mvf_uart0_pdata);
+	mvf_add_imx_uart(1, &mvf_uart1_pdata);
+	mvf_add_imx_uart(2, &mvf_uart2_pdata);
+}
+
+static int colibri_ts_mux_pen_interrupt(struct platform_device *pdev)
+{
+	mxc_iomux_v3_setup_pad(MVF600_PAD8_PTA18);
+	mxc_iomux_v3_setup_pad(MVF600_PAD9_PTA19);
+
+	dev_dbg(&pdev->dev, "Muxed XP/XM as GPIO\n");
+
+	return 0;
+}
+
+static int colibri_ts_mux_adc(struct platform_device *pdev)
+{
+	mxc_iomux_v3_setup_pad(MVF600_PAD8_PTA18_ADC0_SE0);
+	mxc_iomux_v3_setup_pad(MVF600_PAD9_PTA19_ADC0_SE1);
+
+	dev_dbg(&pdev->dev, "Muxed XP/XM for ADC mode\n");
+
+	return 0;
+}
+
+
+static struct colibri_ts_platform_data colibri_ts_pdata = {
+	.mux_pen_interrupt = &colibri_ts_mux_pen_interrupt,
+	.mux_adc = &colibri_ts_mux_adc,
+	.gpio_pen = 8, /* PAD8 */
+};
+
+struct platform_device *__init colibri_add_touchdev(
+		const struct colibri_ts_platform_data *pdata)
+{
+	return imx_add_platform_device("colibri-vf50-ts", 0, NULL, 0,
+			pdata, sizeof(*pdata));
+}
+
+static struct fec_platform_data fec_data __initdata = {
+	.phy = PHY_INTERFACE_MODE_RMII,
+};
+
+static int mvf_vf600_spi_cs[] = {
+	84,
+};
+
+static const struct spi_mvf_master mvf_vf600_spi_data __initconst = {
+	.bus_num = 1,
+	.chipselect = mvf_vf600_spi_cs,
+	.num_chipselect = ARRAY_SIZE(mvf_vf600_spi_cs),
+	.cs_control = NULL,
+};
+
+static struct spi_board_info mvf_spi_board_info[] __initdata = {
+	{
+		.bus_num	= 1,		/* DSPI1: Colibri SSP */
+		.chip_select	= 0,
+		.irq		= 0,
+		.max_speed_hz	= 50000000,
+		.modalias	= "spidev",
+		.mode		= SPI_MODE_0,
+		.platform_data	= NULL,
+	},
+};
+
+static void spi_device_init(void)
+{
+	spi_register_board_info(mvf_spi_board_info,
+				ARRAY_SIZE(mvf_spi_board_info));
+}
+
+static void vf600_suspend_enter(void)
+{
+	/* suspend preparation */
+}
+
+static void vf600_suspend_exit(void)
+{
+	/* resmue resore */
+}
+
+static const struct pm_platform_data mvf_vf600_pm_data __initconst = {
+	.name = "mvf_pm",
+	.suspend_enter = vf600_suspend_enter,
+	.suspend_exit = vf600_suspend_exit,
+};
+
+static struct mvf_dcu_platform_data mvf_dcu_pdata = {
+	.mode_str	= "640x480",
+	.default_bpp	= 24,
+};
+
+static void __init fixup_mxc_board(struct machine_desc *desc, struct tag *tags,
+				   char **cmdline, struct meminfo *mi)
+{
+}
+
+/*
+ * Not defined the cd/wp so far, set it always present for debug */
+static const struct esdhc_platform_data mvfa5_sd1_data __initconst = {
+	.cd_gpio = MVF600_SD1_CD,
+	.wp_gpio = -1,
+};
+
+static struct imxi2c_platform_data mvf600_i2c_data = {
+	.bitrate = 100000,
+};
+
+static struct i2c_board_info mxc_i2c0_board_info[] __initdata = {
+	{
+		/* M41T0M6 real time clock on Iris carrier board */
+		I2C_BOARD_INFO("rtc-ds1307", 0x68),
+			.type = "m41t00",
+	},
+};
+
+static struct mxc_nand_platform_data mvf_data __initdata = {
+	.width = 1,
+};
+
+/* PWM LEDs */
+static struct led_pwm tegra_leds_pwm[] = {
+	{
+		.name		= "PWM<A>",
+		.pwm_id		= 1,
+		.max_brightness	= 255,
+		.pwm_period_ns	= 19600,
+	},
+#if 0
+	{
+		.name		= "PWM<B>",
+		.pwm_id		= 1,
+		.max_brightness	= 255,
+		.pwm_period_ns	= 19600,
+	},
+	{
+		.name		= "PWM<C>",
+		.pwm_id		= 2,
+		.max_brightness	= 255,
+		.pwm_period_ns	= 19600,
+	},
+	{
+		.name		= "PWM<D>",
+		.pwm_id		= 3,
+		.max_brightness	= 255,
+		.pwm_period_ns	= 19600,
+	},
+#endif
+};
+
+static struct led_pwm_platform_data tegra_leds_pwm_data = {
+	.num_leds	= ARRAY_SIZE(tegra_leds_pwm),
+	.leds		= tegra_leds_pwm,
+};
+
+static struct imx_asrc_platform_data imx_asrc_data = {
+	.channel_bits = 4,
+	.clk_map_ver = 3,
+};
+
+static void __init mvf_twr_init_usb(void)
+{
+	imx_otg_base = MVF_IO_ADDRESS(MVF_USBC0_BASE_ADDR);
+	/*mvf_set_otghost_vbus_func(mvf_twr_usbotg_vbus);*/
+#ifdef CONFIG_USB_EHCI_ARC
+	mvf_usb_dr2_init();
+#endif
+#ifdef CONFIG_USB_GADGET_ARC
+	mvf_usb_dr_init();
+#endif
+}
+
+static void __init mvf_init_adc(void)
+{
+	mvf_add_adc(0);
+	mvf_add_adc(1);
+}
+
+/*!
+ * Board specific initialization.
+ */
+static void __init mvf_board_init(void)
+{
+	mxc_iomux_v3_setup_multiple_pads(mvf600_pads,
+					ARRAY_SIZE(mvf600_pads));
+	mvf_vf700_init_uart();
+
+#ifdef CONFIG_FEC
+	mvf_init_fec(fec_data);
+#endif
+
+	mvf_add_snvs_rtc();
+
+	mvf_init_adc();
+	colibri_add_touchdev(&colibri_ts_pdata);
+
+	mvf_add_pm_imx(0, &mvf_vf600_pm_data);
+
+	mvf700_add_caam();
+
+	mvf_add_sdhci_esdhc_imx(1, &mvfa5_sd1_data);
+
+	mvf_add_imx_i2c(0, &mvf600_i2c_data);
+	i2c_register_board_info(0, mxc_i2c0_board_info,
+			ARRAY_SIZE(mxc_i2c0_board_info));
+
+//	mvf_add_dspi(0, &mvf_vf600_spi_data);
+//	spi_device_init();
+
+	mvfa5_add_dcu(0, &mvf_dcu_pdata);
+
+	mvf_add_wdt(0);
+
+	mvf_twr_init_usb();
+
+	mvf_add_nand(&mvf_data);
+
+	mvf_add_mxc_pwm(0);
+//	mvf_add_mxc_pwm(1);
+//	mvf_add_mxc_pwm(2);
+//	mvf_add_mxc_pwm(3);
+	mvf_add_pwm_leds(&tegra_leds_pwm_data);
+
+	imx_asrc_data.asrc_core_clk = clk_get(NULL, "asrc_clk");
+	imx_asrc_data.asrc_audio_clk = clk_get(NULL, "asrc_serial_clk");
+	mvf_add_asrc(&imx_asrc_data);
+}
+
+static void __init mvf_timer_init(void)
+{
+#if 1
+	struct clk *uart_clk;
+	uart_clk = clk_get_sys("mvf-uart.0", NULL);
+	early_console_setup(MVF_UART0_BASE_ADDR, uart_clk);
+#endif
+	mvf_clocks_init(32768, 24000000, 0, 0);
+}
+
+static struct sys_timer mxc_timer = {
+	.init   = mvf_timer_init,
+};
+
+/*
+ * initialize __mach_desc_ data structure.
+ */
+MACHINE_START(COLIBRI_VF50, "Toradex Colibri VF50 Module")
+	.boot_params = MVF_PHYS_OFFSET + 0x100,
+	.fixup = fixup_mxc_board,
+	.map_io = mvf_map_io,
+	.init_irq = mvf_init_irq,
+	.init_machine = mvf_board_init,
+	.timer = &mxc_timer,
+MACHINE_END
diff --git a/arch/arm/mach-mvf/clock.c b/arch/arm/mach-mvf/clock.c
index 5ac0ff1766fb..2f6ccf31ac3f 100644
--- a/arch/arm/mach-mvf/clock.c
+++ b/arch/arm/mach-mvf/clock.c
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2012 Freescale Semiconductor, Inc.
  *
@@ -1339,7 +1338,7 @@ static int _clk_dcu0_set_rate(struct clk *clk, unsigned long rate)
 	u32 reg, div;
 	u32 parent_rate = clk_get_rate(clk->parent);
 
-	div = (parent_rate + rate - 1) / rate;
+	div = parent_rate / rate;
 	if (div == 0)
 		div++;
 	if (((parent_rate / div) != rate) || (div > 8))
@@ -1644,6 +1643,16 @@ static struct clk adc_clk[] = {
 		.enable = _clk_enable,
 		.disable = _clk_disable,
 	},
+	{
+		__INIT_CLK_DEBUG(adc_clk)
+		.id = 1,
+		.parent = &ipg_clk,
+		.enable_reg = MXC_CCM_CCGR7,
+		.enable_shift = MXC_CCM_CCGRx_CG11_OFFSET,
+		.enable = _clk_enable,
+		.disable = _clk_disable,
+	},
+
 };
 
 static struct clk i2c_clk[] = {
@@ -1907,6 +1916,7 @@ static struct clk_lookup lookups[] = {
 	_REGISTER_CLOCK("fec.0", NULL, enet_clk[0]),
 	_REGISTER_CLOCK("fec.1", NULL, enet_clk[1]),
 	_REGISTER_CLOCK("mvf-adc.0", NULL, adc_clk[0]),
+	_REGISTER_CLOCK("mvf-adc.1", NULL, adc_clk[1]),
 	_REGISTER_CLOCK("switch.0", NULL, enet_clk[0]),
 	_REGISTER_CLOCK("imx2-wdt.0", NULL, dummy_clk),
 	_REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc1_clk),
@@ -1986,8 +1996,11 @@ int __init mvf_clocks_init(unsigned long ckil, unsigned long osc,
 	clk_set_rate(&esdhc1_clk, 200000000);
 
 	clk_set_parent(&dcu0_clk, &pll1_pfd2_452M);
+#if !defined(CONFIG_MACH_COLIBRI_VF50)
 	clk_set_rate(&dcu0_clk, 113000000);
-
+#else
+	clk_set_rate(&dcu0_clk, clk_round_rate(&dcu0_clk, 150666666));
+#endif
 	clk_set_parent(&sai2_clk, &audio_external_clk);
 	clk_set_rate(&sai2_clk, 24576000);
 
diff --git a/arch/arm/mach-mvf/mvf_fec.c b/arch/arm/mach-mvf/mvf_fec.c
index d51f20519c0b..437ba538d583 100644
--- a/arch/arm/mach-mvf/mvf_fec.c
+++ b/arch/arm/mach-mvf/mvf_fec.c
@@ -52,7 +52,9 @@ void __init mvf_init_fec(struct fec_platform_data fec_data)
 	if (!is_valid_ether_addr(fec_data.mac))
 		memcpy(fec_data.mac, default_mac, ETH_ALEN);
 
+#if !defined(CONFIG_MACH_COLIBRI_VF50)
 	mvf_add_fec(0, &fec_data);
+#endif
 #ifdef CONFIG_FEC1
 	mvf_add_fec(1, &fec_data);
 #endif
diff --git a/arch/arm/plat-mxc/devices/platform-mvf-adc.c b/arch/arm/plat-mxc/devices/platform-mvf-adc.c
index 38add8b5fd4f..085bc4508a31 100644
--- a/arch/arm/plat-mxc/devices/platform-mvf-adc.c
+++ b/arch/arm/plat-mxc/devices/platform-mvf-adc.c
@@ -25,7 +25,8 @@
 
 #ifdef CONFIG_SOC_MVFA5
 const struct mvf_adc_data mvfa5_adc_data[] __initconst = {
-	 mvf_adc_data_entry(MVF, 0, SZ_4K),
+	mvf_adc_data_entry(MVF, 0, SZ_4K),
+	mvf_adc_data_entry(MVF, 1, SZ_4K),
 };
 #endif
 
@@ -48,3 +49,4 @@ struct platform_device *__init mvf_add_adcdev(
 	return imx_add_platform_device("mvf-adc", data->id, res,
 			ARRAY_SIZE(res), NULL, 0);
 }
+
diff --git a/arch/arm/plat-mxc/gpio-mvf.c b/arch/arm/plat-mxc/gpio-mvf.c
index ee1344f35573..58bdb781cf24 100644
--- a/arch/arm/plat-mxc/gpio-mvf.c
+++ b/arch/arm/plat-mxc/gpio-mvf.c
@@ -183,16 +183,18 @@ static void _set_gpio_direction(struct gpio_chip *chip, unsigned offset,
 	pad_addr = MVF_IO_ADDRESS(
 			MVF_IOMUXC_BASE_ADDR + 4 * (chip->base + offset));
 
+	/* Get current flags, clear direction */
+	l = __raw_readl(pad_addr) & ~(PAD_CTL_OBE_ENABLE | PAD_CTL_IBE_ENABLE);
+
 	if (dir)
-		l = MVF600_GPIO_GENERAL_CTRL | PAD_CTL_OBE_ENABLE;
+		l |= PAD_CTL_OBE_ENABLE;
 	else {
-		l = MVF600_GPIO_GENERAL_CTRL | PAD_CTL_IBE_ENABLE;
+		l |= PAD_CTL_IBE_ENABLE;
 		__raw_writel((1 << offset), port->base_int + GPIO_DFER);
 		__raw_writel(1, port->base_int + GPIO_DFCR);
 		__raw_writel(0xFF, port->base_int + GPIO_DFWR);
 	}
 
-	/*Note: This will destroy the original IOMUX settings.*/
 	__raw_writel(l, pad_addr);
 
 	spin_unlock_irqrestore(&port->lock, flags);
diff --git a/arch/arm/plat-mxc/include/mach/colibri-ts.h b/arch/arm/plat-mxc/include/mach/colibri-ts.h
new file mode 100644
index 000000000000..dde7c3ce8687
--- /dev/null
+++ b/arch/arm/plat-mxc/include/mach/colibri-ts.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2013 by Stefan Agner <stefan.agner@toradex.com>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef ASMARM_ARCH_COLIBRI_TS_H
+#define ASMARM_ARCH_COLIBRI_TS_H
+
+struct colibri_ts_platform_data {
+	int (*init)(struct platform_device *pdev);
+	void (*exit)(struct platform_device *pdev);
+	unsigned int gpio_pen;
+	int (*mux_pen_interrupt)(struct platform_device *pdev);
+	int (*mux_adc)(struct platform_device *pdev);
+};
+
+#endif
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mvf.h b/arch/arm/plat-mxc/include/mach/iomux-mvf.h
index b1bbb0955010..0d1ff6abb048 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mvf.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mvf.h
@@ -52,6 +52,8 @@ typedef enum iomux_config {
 #define MVF600_SAI_PAD_CTRL	(PAD_CTL_DSE_50ohm | PAD_CTL_HYS | \
 		PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP)
 
+#define MVF600_TS_PAD_CTRL	(PAD_CTL_DSE_150ohm)
+
 #define MVF600_ESAI_PAD_CTRL	(PAD_CTL_DSE_50ohm | PAD_CTL_HYS | \
 		PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP)
 
@@ -62,7 +64,11 @@ typedef enum iomux_config {
 
 #define MVF600_HIGH_DRV		PAD_CTL_DSE_150ohm
 
+#if defined(CONFIG_MACH_COLIBRI_VF50)
+#define MVF600_DCU_PAD_CTRL	(PAD_CTL_DSE_75ohm | PAD_CTL_OBE_ENABLE)
+#else
 #define MVF600_DCU_PAD_CTRL	(MVF600_HIGH_DRV | PAD_CTL_OBE_ENABLE)
+#endif
 
 #define MVF600_UART_PAD_CTRL	(PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \
 				PAD_CTL_DSE_25ohm)
@@ -91,6 +97,9 @@ typedef enum iomux_config {
 #define MVF600_PAD134_PTA7__SDHC1_SW_CD			\
 		IOMUX_PAD(0x0218, 0x0218, 0, 0x0000, 0, \
 				MVF600_GPIO_GENERAL_CTRL | PAD_CTL_IBE_ENABLE)
+#define MVF600_PAD42_PTB20__SDHC1_SW_CD                 \
+                IOMUX_PAD(0x00a8, 0x00a8, 0, 0x0000, 0, \
+                                MVF600_GPIO_GENERAL_CTRL | PAD_CTL_IBE_ENABLE)
 
 /*I2C0*/
 #define MVF600_PAD36_PTB14__I2C0_SCL				\
@@ -124,6 +133,9 @@ typedef enum iomux_config {
 #define MVF600_PAD0_PTA6__RMII_CLKIN				\
 		IOMUX_PAD(0x0000, 0x0000, 2, 0x02F0, 0, \
 				MVF600_ENET_PAD_CTRL | PAD_CTL_IBE_ENABLE)
+#define MVF600_PAD0_PTA6__RMII_CLKOUT				\
+		IOMUX_PAD(0x0000, 0x0000, 1, 0x02F0, 0, \
+				MVF600_ENET_PAD_CTRL | PAD_CTL_IBE_ENABLE)
 #define MVF600_PAD45_PTC0__RMII0_MDC				\
 		IOMUX_PAD(0x00B4, 0x00B4, 1, 0x0000, 0, \
 				MVF600_ENET_PAD_CTRL | PAD_CTL_OBE_ENABLE)
@@ -240,6 +252,43 @@ typedef enum iomux_config {
 		IOMUX_PAD(0x00A0, 0x00A0, 2, 0x02ec, 2, \
 				MVF600_SAI_PAD_CTRL | PAD_CTL_IBE_ENABLE)
 
+/*Touchscreen*/
+#define MVF600_PAD4_PTA11                  \
+                IOMUX_PAD(0x0010, 0x0010, 0, 0x0370, 0, \
+                                MVF600_TS_PAD_CTRL | PAD_CTL_OBE_ENABLE)
+#define MVF600_PAD5_PTA12                  \
+                IOMUX_PAD(0x0014, 0x0014, 0, 0x0370, 0, \
+                                MVF600_TS_PAD_CTRL | PAD_CTL_OBE_ENABLE)
+
+#define MVF600_PAD6_PTA16_ADC1_SE0                  \
+                IOMUX_PAD(0x0018, 0x0018, 3, 0x0370, 0, \
+                                MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE)
+#define MVF600_PAD24_PTB2_ADC1_SE2                  \
+                IOMUX_PAD(0x0060, 0x0060, 2, 0x0370, 0, \
+                                MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE)
+#define MVF600_PAD8_PTA18_ADC0_SE0                  \
+                IOMUX_PAD(0x0020, 0x0020, 2, 0x0370, 0, \
+                                MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE)
+#define MVF600_PAD9_PTA19_ADC0_SE1                  \
+                IOMUX_PAD(0x0024, 0x0024, 2, 0x0370, 0, \
+                                MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE)
+
+#define MVF600_PAD12_PTA22                  \
+                IOMUX_PAD(0x0030, 0x0030, 0, 0x0370, 0, \
+                                MVF600_TS_PAD_CTRL | PAD_CTL_OBE_ENABLE)
+#define MVF600_PAD13_PTA23                  \
+                IOMUX_PAD(0x0034, 0x0034, 0, 0x0370, 0, \
+                                MVF600_TS_PAD_CTRL | PAD_CTL_OBE_ENABLE)
+
+/*Touchscreen touch detection*/
+#define MVF600_PAD8_PTA18                   \
+                IOMUX_PAD(0x0020, 0x0020, 0, 0x0370, 0, \
+                                MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE)
+#define MVF600_PAD9_PTA19                   \
+                IOMUX_PAD(0x0024, 0x0024, 0, 0x0370, 0, \
+                                MVF600_GPIO_GENERAL_CTRL | PAD_CTL_IBE_ENABLE)
+
+
 /*DCU0*/
 #define MVF600_PAD30_PTB8_LCD_ENABLE				\
 		IOMUX_PAD(0x78, 0x78, 0, 0x0000, 0, MVF600_DCU_PAD_CTRL)
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index b805e9660348..18915e9b90ac 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -1121,3 +1121,4 @@ mvf_twr_vf400		MACH_MVFA5_TWR_VF400	MVFA5_TWR_VF400		4148
 mvf_twr_vf500		MACH_MVFA5_TWR_VF500	MVFA5_TWR_VF500		4147
 mvf_twr_vf600		MACH_MVFA5_TWR_VF600	MVFA5_TWR_VF600		4146
 mvf_twr_vf700		MACH_MVFA5_TWR_VF700	MVFA5_TWR_VF700		2125
+colibri_vf50		MACH_COLIBRI_VF50	COLIBRI_VF50		4749