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, 101 insertions, 0 deletions

diff --git a/arch/arm/mach-stmp37xx/stmp37xx_devb.c b/arch/arm/mach-stmp37xx/stmp37xx_devb.c
new file mode 100644
index 000000000000..394f21ab59e6
--- /dev/null
+++ b/arch/arm/mach-stmp37xx/stmp37xx_devb.c
@@ -0,0 +1,101 @@
+/*
+ * Freescale STMP37XX development board support
+ *
+ * Embedded Alley Solutions, Inc <source@embeddedalley.com>
+ *
+ * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2008 Embedded Alley Solutions, 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
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+#include <mach/stmp3xxx.h>
+#include <mach/pins.h>
+#include <mach/pinmux.h>
+#include "stmp37xx.h"
+
+/*
+ * List of STMP37xx development board specific devices
+ */
+static struct platform_device *stmp37xx_devb_devices[] = {
+        &stmp3xxx_dbguart,
+        &stmp3xxx_appuart,
+};
+
+static struct pin_desc dbguart_pins_0[] = {
+        { PINID_PWM0, PIN_FUN3, },
+        { PINID_PWM1, PIN_FUN3, },
+};
+
+struct pin_desc appuart_pins_0[] = {
+        { PINID_UART2_CTS, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
+        { PINID_UART2_RTS, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
+        { PINID_UART2_RX, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
+        { PINID_UART2_TX, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
+};
+
+static struct pin_group appuart_pins[] = {
+        [0] = {
+                .pins           = appuart_pins_0,
+                .nr_pins        = ARRAY_SIZE(appuart_pins_0),
+        },
+        /* 37xx has the only app uart */
+};
+
+static struct pin_group dbguart_pins[] = {
+        [0] = {
+                .pins           = dbguart_pins_0,
+                .nr_pins        = ARRAY_SIZE(dbguart_pins_0),
+        },
+};
+
+static int dbguart_pins_control(int id, int request)
+{
+        int r = 0;
+
+        if (request)
+                r = stmp3xxx_request_pin_group(&dbguart_pins[id], "debug uart");
+        else
+                stmp3xxx_release_pin_group(&dbguart_pins[id], "debug uart");
+        return r;
+}
+
+
+static void __init stmp37xx_devb_init(void)
+{
+        stmp3xxx_pinmux_init(NR_REAL_IRQS);
+
+        /* Init STMP3xxx platform */
+        stmp3xxx_init();
+
+        stmp3xxx_dbguart.dev.platform_data = dbguart_pins_control;
+        stmp3xxx_appuart.dev.platform_data = appuart_pins;
+
+        /* Add STMP37xx development board devices */
+        platform_add_devices(stmp37xx_devb_devices,
+                        ARRAY_SIZE(stmp37xx_devb_devices));
+}
+
+MACHINE_START(STMP37XX, "STMP37XX")
+        .phys_io        = 0x80000000,
+        .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
+        .boot_params    = 0x40000100,
+        .map_io         = stmp37xx_map_io,
+        .init_irq       = stmp37xx_init_irq,
+        .timer          = &stmp3xxx_timer,
+        .init_machine   = stmp37xx_devb_init,
+MACHINE_END