Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM soc driver specific changes from Olof Johansson:
 - A long-coming conversion of various platforms to a common LED
   infrastructure
 - AT91 is moved over to use the newer MCI driver for MMC
 - Pincontrol conversions for samsung platforms
 - DT bindings for gscaler on samsung
 - i2c driver fixes for tegra, acked by i2c maintainer

Fix up conflicts as per Olof.

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
  drivers: bus: omap_l3: use resources instead of hardcoded irqs
  pinctrl: exynos: Fix wakeup IRQ domain registration check
  pinctrl: samsung: Uninline samsung_pinctrl_get_soc_data
  pinctrl: exynos: Correct the detection of wakeup-eint node
  pinctrl: exynos: Mark exynos_irq_demux_eint as inline
  pinctrl: exynos: Handle only unmasked wakeup interrupts
  pinctrl: exynos: Fix typos in gpio/wkup _irq_mask
  pinctrl: exynos: Set pin function to EINT in irq_set_type of GPIO EINTa
  drivers: bus: Move the OMAP interconnect driver to drivers/bus/
  i2c: tegra: dynamically control fast clk
  i2c: tegra: I2_M_NOSTART functionality not supported in Tegra20
  ARM: tegra: clock: remove unused clock entry for i2c
  ARM: tegra: clock: add connection name in i2c clock entry
  i2c: tegra: pass proper name for getting clock
  ARM: tegra: clock: add i2c fast clock entry in clock table
  ARM: EXYNOS: Adds G-Scaler device from Device Tree
  ARM: EXYNOS: Add clock support for G-Scaler
  ARM: EXYNOS: Enable pinctrl driver support for EXYNOS4 device tree enabled platform
  ARM: dts: Add pinctrl node entries for SAMSUNG EXYNOS4210 SoC
  ARM: EXYNOS: skip wakeup interrupt setup if pinctrl driver is used
  ...

2 files changed, 68 insertions, 228 deletions

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index d15a4a6d6146..ca83a7659aef 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -42,9 +42,8 @@ config OMAP_DEBUG_DEVICES
           For debug cards on TI reference boards.
 
 config OMAP_DEBUG_LEDS
-        bool
+        def_bool y if NEW_LEDS
         depends on OMAP_DEBUG_DEVICES
-        default y if LEDS_CLASS
 
 config POWER_AVS_OMAP
         bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2"
diff --git a/arch/arm/plat-omap/debug-leds.c b/arch/arm/plat-omap/debug-leds.c
index 195aaae65872..ea29bbe8e5cf 100644
--- a/arch/arm/plat-omap/debug-leds.c
+++ b/arch/arm/plat-omap/debug-leds.c
@@ -1,280 +1,119 @@
 /*
  * linux/arch/arm/plat-omap/debug-leds.c
  *
+ * Copyright 2011 by Bryan Wu <bryan.wu@canonical.com>
  * Copyright 2003 by Texas Instruments Incorporated
  *
  * 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/gpio.h>
+
+#include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
 #include <linux/io.h>
 #include <linux/platform_data/gpio-omap.h>
+#include <linux/slab.h>
 
 #include <mach/hardware.h>
-#include <asm/leds.h>
 #include <asm/mach-types.h>
 
 #include <plat/fpga.h>
 
-
 /* Many OMAP development platforms reuse the same "debug board"; these
  * platforms include H2, H3, H4, and Perseus2.  There are 16 LEDs on the
  * debug board (all green), accessed through FPGA registers.
- *
- * The "surfer" expansion board and H2 sample board also have two-color
- * green+red LEDs (in parallel), used here for timer and idle indicators
- * in preference to the ones on the debug board, for a "Disco LED" effect.
- *
- * This driver exports either the original ARM LED API, the new generic
- * one, or both.
- */
-
-static spinlock_t                       lock;
-static struct h2p2_dbg_fpga __iomem     *fpga;
-static u16                              led_state, hw_led_state;
-
-
-#ifdef  CONFIG_OMAP_DEBUG_LEDS
-#define new_led_api()   1
-#else
-#define new_led_api()   0
-#endif
-
-
-/*-------------------------------------------------------------------------*/
-
-/* original ARM debug LED API:
- *  - timer and idle leds (some boards use non-FPGA leds here);
- *  - up to 4 generic leds, easily accessed in-kernel (any context)
  */
 
-#define GPIO_LED_RED            3
-#define GPIO_LED_GREEN          OMAP_MPUIO(4)
-
-#define LED_STATE_ENABLED       0x01
-#define LED_STATE_CLAIMED       0x02
-#define LED_TIMER_ON            0x04
-
-#define GPIO_IDLE               GPIO_LED_GREEN
-#define GPIO_TIMER              GPIO_LED_RED
-
-static void h2p2_dbg_leds_event(led_event_t evt)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&lock, flags);
-
-        if (!(led_state & LED_STATE_ENABLED) && evt != led_start)
-                goto done;
-
-        switch (evt) {
-        case led_start:
-                if (fpga)
-                        led_state |= LED_STATE_ENABLED;
-                break;
-
-        case led_stop:
-        case led_halted:
-                /* all leds off during suspend or shutdown */
-
-                if (!(machine_is_omap_perseus2() || machine_is_omap_h4())) {
-                        gpio_set_value(GPIO_TIMER, 0);
-                        gpio_set_value(GPIO_IDLE, 0);
-                }
-
-                __raw_writew(~0, &fpga->leds);
-                led_state &= ~LED_STATE_ENABLED;
-                goto done;
-
-        case led_claim:
-                led_state |= LED_STATE_CLAIMED;
-                hw_led_state = 0;
-                break;
-
-        case led_release:
-                led_state &= ~LED_STATE_CLAIMED;
-                break;
-
-#ifdef CONFIG_LEDS_TIMER
-        case led_timer:
-                led_state ^= LED_TIMER_ON;
-
-                if (machine_is_omap_perseus2() || machine_is_omap_h4())
-                        hw_led_state ^= H2P2_DBG_FPGA_P2_LED_TIMER;
-                else {
-                        gpio_set_value(GPIO_TIMER,
-                                        led_state & LED_TIMER_ON);
-                        goto done;
-                }
-
-                break;
-#endif
-
-#ifdef CONFIG_LEDS_CPU
-        /* LED lit iff busy */
-        case led_idle_start:
-                if (machine_is_omap_perseus2() || machine_is_omap_h4())
-                        hw_led_state &= ~H2P2_DBG_FPGA_P2_LED_IDLE;
-                else {
-                        gpio_set_value(GPIO_IDLE, 1);
-                        goto done;
-                }
-
-                break;
+static struct h2p2_dbg_fpga __iomem *fpga;
 
-        case led_idle_end:
-                if (machine_is_omap_perseus2() || machine_is_omap_h4())
-                        hw_led_state |= H2P2_DBG_FPGA_P2_LED_IDLE;
-                else {
-                        gpio_set_value(GPIO_IDLE, 0);
-                        goto done;
-                }
-
-                break;
-#endif
-
-        case led_green_on:
-                hw_led_state |= H2P2_DBG_FPGA_LED_GREEN;
-                break;
-        case led_green_off:
-                hw_led_state &= ~H2P2_DBG_FPGA_LED_GREEN;
-                break;
-
-        case led_amber_on:
-                hw_led_state |= H2P2_DBG_FPGA_LED_AMBER;
-                break;
-        case led_amber_off:
-                hw_led_state &= ~H2P2_DBG_FPGA_LED_AMBER;
-                break;
-
-        case led_red_on:
-                hw_led_state |= H2P2_DBG_FPGA_LED_RED;
-                break;
-        case led_red_off:
-                hw_led_state &= ~H2P2_DBG_FPGA_LED_RED;
-                break;
-
-        case led_blue_on:
-                hw_led_state |= H2P2_DBG_FPGA_LED_BLUE;
-                break;
-        case led_blue_off:
-                hw_led_state &= ~H2P2_DBG_FPGA_LED_BLUE;
-                break;
-
-        default:
-                break;
-        }
-
-
-        /*
-         *  Actually burn the LEDs
-         */
-        if (led_state & LED_STATE_ENABLED)
-                __raw_writew(~hw_led_state, &fpga->leds);
-
-done:
-        spin_unlock_irqrestore(&lock, flags);
-}
-
-/*-------------------------------------------------------------------------*/
-
-/* "new" LED API
- *  - with syfs access and generic triggering
- *  - not readily accessible to in-kernel drivers
- */
+static u16 fpga_led_state;
 
 struct dbg_led {
         struct led_classdev     cdev;
         u16                     mask;
 };
 
-static struct dbg_led dbg_leds[] = {
-        /* REVISIT at least H2 uses different timer & cpu leds... */
-#ifndef CONFIG_LEDS_TIMER
-        { .mask = 1 << 0,  .cdev.name =  "d4:green",
-                .cdev.default_trigger = "heartbeat", },
-#endif
-#ifndef CONFIG_LEDS_CPU
-        { .mask = 1 << 1,  .cdev.name =  "d5:green", },         /* !idle */
-#endif
-        { .mask = 1 << 2,  .cdev.name =  "d6:green", },
-        { .mask = 1 << 3,  .cdev.name =  "d7:green", },
-
-        { .mask = 1 << 4,  .cdev.name =  "d8:green", },
-        { .mask = 1 << 5,  .cdev.name =  "d9:green", },
-        { .mask = 1 << 6,  .cdev.name = "d10:green", },
-        { .mask = 1 << 7,  .cdev.name = "d11:green", },
-
-        { .mask = 1 << 8,  .cdev.name = "d12:green", },
-        { .mask = 1 << 9,  .cdev.name = "d13:green", },
-        { .mask = 1 << 10, .cdev.name = "d14:green", },
-        { .mask = 1 << 11, .cdev.name = "d15:green", },
-
-#ifndef CONFIG_LEDS
-        { .mask = 1 << 12, .cdev.name = "d16:green", },
-        { .mask = 1 << 13, .cdev.name = "d17:green", },
-        { .mask = 1 << 14, .cdev.name = "d18:green", },
-        { .mask = 1 << 15, .cdev.name = "d19:green", },
-#endif
+static const struct {
+        const char *name;
+        const char *trigger;
+} dbg_leds[] = {
+        { "dbg:d4", "heartbeat", },
+        { "dbg:d5", "cpu0", },
+        { "dbg:d6", "default-on", },
+        { "dbg:d7", },
+        { "dbg:d8", },
+        { "dbg:d9", },
+        { "dbg:d10", },
+        { "dbg:d11", },
+        { "dbg:d12", },
+        { "dbg:d13", },
+        { "dbg:d14", },
+        { "dbg:d15", },
+        { "dbg:d16", },
+        { "dbg:d17", },
+        { "dbg:d18", },
+        { "dbg:d19", },
 };
 
-static void
-fpga_led_set(struct led_classdev *cdev, enum led_brightness value)
+/*
+ * The triggers lines up below will only be used if the
+ * LED triggers are compiled in.
+ */
+static void dbg_led_set(struct led_classdev *cdev,
+                              enum led_brightness b)
 {
-        struct dbg_led  *led = container_of(cdev, struct dbg_led, cdev);
-        unsigned long   flags;
+        struct dbg_led *led = container_of(cdev, struct dbg_led, cdev);
+        u16 reg;
 
-        spin_lock_irqsave(&lock, flags);
-        if (value == LED_OFF)
-                hw_led_state &= ~led->mask;
+        reg = __raw_readw(&fpga->leds);
+        if (b != LED_OFF)
+                reg |= led->mask;
         else
-                hw_led_state |= led->mask;
-        __raw_writew(~hw_led_state, &fpga->leds);
-        spin_unlock_irqrestore(&lock, flags);
+                reg &= ~led->mask;
+        __raw_writew(reg, &fpga->leds);
 }
 
-static void __init newled_init(struct device *dev)
+static enum led_brightness dbg_led_get(struct led_classdev *cdev)
 {
-        unsigned        i;
-        struct dbg_led  *led;
-        int             status;
+        struct dbg_led *led = container_of(cdev, struct dbg_led, cdev);
+        u16 reg;
 
-        for (i = 0, led = dbg_leds; i < ARRAY_SIZE(dbg_leds); i++, led++) {
-                led->cdev.brightness_set = fpga_led_set;
-                status = led_classdev_register(dev, &led->cdev);
-                if (status < 0)
-                        break;
-        }
-        return;
+        reg = __raw_readw(&fpga->leds);
+        return (reg & led->mask) ? LED_FULL : LED_OFF;
 }
 
-
-/*-------------------------------------------------------------------------*/
-
-static int /* __init */ fpga_probe(struct platform_device *pdev)
+static int fpga_probe(struct platform_device *pdev)
 {
         struct resource *iomem;
-
-        spin_lock_init(&lock);
+        int i;
 
         iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!iomem)
                 return -ENODEV;
 
         fpga = ioremap(iomem->start, H2P2_DBG_FPGA_SIZE);
-        __raw_writew(~0, &fpga->leds);
+        __raw_writew(0xff, &fpga->leds);
+
+        for (i = 0; i < ARRAY_SIZE(dbg_leds); i++) {
+                struct dbg_led *led;
+
+                led = kzalloc(sizeof(*led), GFP_KERNEL);
+                if (!led)
+                        break;
 
-#ifdef  CONFIG_LEDS
-        leds_event = h2p2_dbg_leds_event;
-        leds_event(led_start);
-#endif
+                led->cdev.name = dbg_leds[i].name;
+                led->cdev.brightness_set = dbg_led_set;
+                led->cdev.brightness_get = dbg_led_get;
+                led->cdev.default_trigger = dbg_leds[i].trigger;
+                led->mask = BIT(i);
 
-        if (new_led_api()) {
-                newled_init(&pdev->dev);
+                if (led_classdev_register(NULL, &led->cdev) < 0) {
+                        kfree(led);
+                        break;
+                }
         }
 
         return 0;
@@ -282,13 +121,15 @@ static int /* __init */ fpga_probe(struct platform_device *pdev)
 
 static int fpga_suspend_noirq(struct device *dev)
 {
-        __raw_writew(~0, &fpga->leds);
+        fpga_led_state = __raw_readw(&fpga->leds);
+        __raw_writew(0xff, &fpga->leds);
+
         return 0;
 }
 
 static int fpga_resume_noirq(struct device *dev)
 {
-        __raw_writew(~hw_led_state, &fpga->leds);
+        __raw_writew(~fpga_led_state, &fpga->leds);
         return 0;
 }