Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits)
  ARM: DMA: add support for DMA debugging
  ARM: PL011: add DMA burst threshold support for ST variants
  ARM: PL011: Add support for transmit DMA
  ARM: PL011: Ensure IRQs are disabled in UART interrupt handler
  ARM: PL011: Separate hardware FIFO size from TTY FIFO size
  ARM: PL011: Allow better handling of vendor data
  ARM: PL011: Ensure error flags are clear at startup
  ARM: PL011: include revision number in boot-time port printk
  ARM: vexpress: add sched_clock() for Versatile Express
  ARM i.MX53: Make MX53 EVK bootable
  ARM i.MX53: Some bug fix about MX53 MSL code
  ARM: 6607/1: sa1100: Update platform device registration
  ARM: 6606/1: sa1100: Fix platform device registration
  ARM i.MX51: rename IPU irqs
  ARM i.MX51: Add ipu clock support
  ARM: imx/mx27_3ds: Add PMIC support
  ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()
  mx51: fix usb clock support
  MX51: Add support for usb host 2
  arch/arm/plat-mxc/ehci.c: fix errors/typos
  ...

1 files changed, 101 insertions, 0 deletions

diff --git a/arch/arm/mach-mxs/iomux.c b/arch/arm/mach-mxs/iomux.c
new file mode 100644
index 000000000000..0e804e2f11f4
--- /dev/null
+++ b/arch/arm/mach-mxs/iomux.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2004-2006,2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2008 by Sascha Hauer <kernel@pengutronix.de>
+ * Copyright (C) 2009 by Jan Weitzel Phytec Messtechnik GmbH,
+ *                       <armlinux@phytec.de>
+ *
+ * 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/errno.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <linux/gpio.h>
+
+#include <asm/mach/map.h>
+
+#include <mach/mxs.h>
+#include <mach/iomux.h>
+
+/*
+ * configures a single pad in the iomuxer
+ */
+int mxs_iomux_setup_pad(iomux_cfg_t pad)
+{
+        u32 reg, ofs, bp, bm;
+        void __iomem *iomux_base = MXS_IO_ADDRESS(MXS_PINCTRL_BASE_ADDR);
+
+        /* muxsel */
+        ofs = 0x100;
+        ofs += PAD_BANK(pad) * 0x20 + PAD_PIN(pad) / 16 * 0x10;
+        bp = PAD_PIN(pad) % 16 * 2;
+        bm = 0x3 << bp;
+        reg = __raw_readl(iomux_base + ofs);
+        reg &= ~bm;
+        reg |= PAD_MUXSEL(pad) << bp;
+        __raw_writel(reg, iomux_base + ofs);
+
+        /* drive */
+        ofs = cpu_is_mx23() ? 0x200 : 0x300;
+        ofs += PAD_BANK(pad) * 0x40 + PAD_PIN(pad) / 8 * 0x10;
+        /* mA */
+        if (PAD_MA_VALID(pad)) {
+                bp = PAD_PIN(pad) % 8 * 4;
+                bm = 0x3 << bp;
+                reg = __raw_readl(iomux_base + ofs);
+                reg &= ~bm;
+                reg |= PAD_MA(pad) << bp;
+                __raw_writel(reg, iomux_base + ofs);
+        }
+        /* vol */
+        if (PAD_VOL_VALID(pad)) {
+                bp = PAD_PIN(pad) % 8 * 4 + 2;
+                if (PAD_VOL(pad))
+                        __mxs_setl(1 << bp, iomux_base + ofs);
+                else
+                        __mxs_clrl(1 << bp, iomux_base + ofs);
+        }
+
+        /* pull */
+        if (PAD_PULL_VALID(pad)) {
+                ofs = cpu_is_mx23() ? 0x400 : 0x600;
+                ofs += PAD_BANK(pad) * 0x10;
+                bp = PAD_PIN(pad);
+                if (PAD_PULL(pad))
+                        __mxs_setl(1 << bp, iomux_base + ofs);
+                else
+                        __mxs_clrl(1 << bp, iomux_base + ofs);
+        }
+
+        return 0;
+}
+
+int mxs_iomux_setup_multiple_pads(const iomux_cfg_t *pad_list, unsigned count)
+{
+        const iomux_cfg_t *p = pad_list;
+        int i;
+        int ret;
+
+        for (i = 0; i < count; i++) {
+                ret = mxs_iomux_setup_pad(*p);
+                if (ret)
+                        return ret;
+                p++;
+        }
+
+        return 0;
+}