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
  ...

1 files changed, 0 insertions, 34 deletions

diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c
index d45c3345b4af..a0e2f7d70355 100644
--- a/drivers/char/nwflash.c
+++ b/drivers/char/nwflash.c
@@ -30,7 +30,6 @@
 
 #include <asm/hardware/dec21285.h>
 #include <asm/io.h>
-#include <asm/leds.h>
 #include <asm/mach-types.h>
 #include <asm/uaccess.h>
 
@@ -179,9 +178,6 @@ static ssize_t flash_write(struct file *file, const char __user *buf,
 
         written = 0;
 
-        leds_event(led_claim);
-        leds_event(led_green_on);
-
         nBlock = (int) p >> 16; //block # of 64K bytes
 
         /*
@@ -258,11 +254,6 @@ static ssize_t flash_write(struct file *file, const char __user *buf,
                         printk(KERN_DEBUG "flash_write: written 0x%X bytes OK.\n", written);
         }
 
-        /*
-         * restore reg on exit
-         */
-        leds_event(led_release);
-
         mutex_unlock(&nwflash_mutex);
 
         return written;
@@ -334,11 +325,6 @@ static int erase_block(int nBlock)
         int temp, temp1;
 
         /*
-         * orange LED == erase
-         */
-        leds_event(led_amber_on);
-
-        /*
          * reset footbridge to the correct offset 0 (...0..3)
          */
         *CSR_ROMWRITEREG = 0;
@@ -446,12 +432,6 @@ static int write_block(unsigned long p, const char __user *buf, int count)
         unsigned long timeout;
         unsigned long timeout1;
 
-        /*
-         * red LED == write
-         */
-        leds_event(led_amber_off);
-        leds_event(led_red_on);
-
         pWritePtr = (unsigned char *) ((unsigned int) (FLASH_BASE + p));
 
         /*
@@ -558,17 +538,9 @@ static int write_block(unsigned long p, const char __user *buf, int count)
                                                pWritePtr - FLASH_BASE);
 
                                 /*
-                                 * no LED == waiting
-                                 */
-                                leds_event(led_amber_off);
-                                /*
                                  * wait couple ms
                                  */
                                 msleep(10);
-                                /*
-                                 * red LED == write
-                                 */
-                                leds_event(led_red_on);
 
                                 goto WriteRetry;
                         } else {
@@ -583,12 +555,6 @@ static int write_block(unsigned long p, const char __user *buf, int count)
                 }
         }
 
-        /*
-         * green LED == read/verify
-         */
-        leds_event(led_amber_off);
-        leds_event(led_green_on);
-
         msleep(10);
 
         pWritePtr = (unsigned char *) ((unsigned int) (FLASH_BASE + p));