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

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits)
  MAINTAINERS: EB110ATX is not ebsa110
  MAINTAINERS: update Eric Miao's email address and status
  fb: add support of LCD display controller on pxa168/910 (base layer)
  [ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN
  [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines
  [ARM] 5544/1: Trust PrimeCell resource sizes
  [ARM] pxa/sharpsl_pm: cleanup of gpio-related code.
  [ARM] pxa/sharpsl_pm: drop set_irq_type calls
  [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
  [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
  [ARM] sa1100: remove unused collie_pm.c
  [ARM] pxa: fix the conflicting non-static declarations of global_gpios[]
  [ARM] 5550/1: Add default configure file for w90p910 platform
  [ARM] 5549/1: Add clock api for w90p910 platform.
  [ARM] 5548/1: Add gpio api for w90p910 platform
  [ARM] 5551/1: Add multi-function pin api for w90p910 platform.
  [ARM] Make ARM_VIC_NR depend on ARM_VIC
  [ARM] 5546/1: ARM PL022 SSP/SPI driver v3
  ARM: OMAP4: SMP: Update defconfig for OMAP4430
  ARM: OMAP4: SMP: Enable SMP support for OMAP4430
  ...

1 files changed, 58 insertions, 0 deletions

diff --git a/arch/arm/mach-u300/padmux.c b/arch/arm/mach-u300/padmux.c
new file mode 100644
index 000000000000..f3664564f086
--- /dev/null
+++ b/arch/arm/mach-u300/padmux.c
@@ -0,0 +1,58 @@
+/*
+ *
+ * arch/arm/mach-u300/padmux.c
+ *
+ *
+ * Copyright (C) 2009 ST-Ericsson AB
+ * License terms: GNU General Public License (GPL) version 2
+ * U300 PADMUX functions
+ * Author: Linus Walleij <linus.walleij@stericsson.com>
+ *
+ */
+#include <linux/io.h>
+#include <linux/err.h>
+#include <mach/u300-regs.h>
+#include <mach/syscon.h>
+
+#include "padmux.h"
+
+/* Set the PAD MUX to route the MMC reader correctly to GPIO0. */
+void pmx_set_mission_mode_mmc(void)
+{
+        u16 val;
+
+        val = readw(U300_SYSCON_VBASE + U300_SYSCON_PMC1LR);
+        val &= ~U300_SYSCON_PMC1LR_MMCSD_MASK;
+        writew(val, U300_SYSCON_VBASE + U300_SYSCON_PMC1LR);
+        val = readw(U300_SYSCON_VBASE + U300_SYSCON_PMC1HR);
+        val &= ~U300_SYSCON_PMC1HR_APP_GPIO_1_MASK;
+        val |= U300_SYSCON_PMC1HR_APP_GPIO_1_MMC;
+        writew(val, U300_SYSCON_VBASE + U300_SYSCON_PMC1HR);
+}
+
+void pmx_set_mission_mode_spi(void)
+{
+        u16 val;
+
+        /* Set up padmuxing so the SPI port and its chipselects are active */
+        val = readw(U300_SYSCON_VBASE + U300_SYSCON_PMC1HR);
+        /*
+         * Activate the SPI port (disable the use of these pins for generic
+         * GPIO, DSP, AAIF
+         */
+        val &= ~U300_SYSCON_PMC1HR_APP_SPI_2_MASK;
+        val |= U300_SYSCON_PMC1HR_APP_SPI_2_SPI;
+        /*
+         * Use GPIO pin SPI CS1 for CS1 actually (it can be used for other
+         * things also)
+         */
+        val &= ~U300_SYSCON_PMC1HR_APP_SPI_CS_1_MASK;
+        val |= U300_SYSCON_PMC1HR_APP_SPI_CS_1_SPI;
+        /*
+         * Use GPIO pin SPI CS2 for CS2 actually (it can be used for other
+         * things also)
+         */
+        val &= ~U300_SYSCON_PMC1HR_APP_SPI_CS_2_MASK;
+        val |= U300_SYSCON_PMC1HR_APP_SPI_CS_2_SPI;
+        writew(val, U300_SYSCON_VBASE + U300_SYSCON_PMC1HR);
+}