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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/omap4.dtsi
index 5d1c48459e6e302ba63a36531762cc5a6e95aeb8,8a780b2a5083e7b3db509c1d5917cbfbbe7c5039..3883f94fdbd0ed29430ec35815689ae4ff692cc5
--- 1/arch/arm/boot/dts/omap4.dtsi
--- 2/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@@ -354,81 -296,12 +354,89 @@@
                        ti,hwmods = "dmic";
                };
  
 +              mcbsp1: mcbsp@40122000 {
 +                      compatible = "ti,omap4-mcbsp";
 +                      reg = <0x40122000 0xff>, /* MPU private access */
 +                            <0x49022000 0xff>; /* L3 Interconnect */
 +                      reg-names = "mpu", "dma";
 +                      interrupts = <0 17 0x4>;
 +                      interrupt-names = "common";
 +                      interrupt-parent = <&gic>;
 +                      ti,buffer-size = <128>;
 +                      ti,hwmods = "mcbsp1";
 +              };
 +
 +              mcbsp2: mcbsp@40124000 {
 +                      compatible = "ti,omap4-mcbsp";
 +                      reg = <0x40124000 0xff>, /* MPU private access */
 +                            <0x49024000 0xff>; /* L3 Interconnect */
 +                      reg-names = "mpu", "dma";
 +                      interrupts = <0 22 0x4>;
 +                      interrupt-names = "common";
 +                      interrupt-parent = <&gic>;
 +                      ti,buffer-size = <128>;
 +                      ti,hwmods = "mcbsp2";
 +              };
 +
 +              mcbsp3: mcbsp@40126000 {
 +                      compatible = "ti,omap4-mcbsp";
 +                      reg = <0x40126000 0xff>, /* MPU private access */
 +                            <0x49026000 0xff>; /* L3 Interconnect */
 +                      reg-names = "mpu", "dma";
 +                      interrupts = <0 23 0x4>;
 +                      interrupt-names = "common";
 +                      interrupt-parent = <&gic>;
 +                      ti,buffer-size = <128>;
 +                      ti,hwmods = "mcbsp3";
 +              };
 +
 +              mcbsp4: mcbsp@48096000 {
 +                      compatible = "ti,omap4-mcbsp";
 +                      reg = <0x48096000 0xff>; /* L4 Interconnect */
 +                      reg-names = "mpu";
 +                      interrupts = <0 16 0x4>;
 +                      interrupt-names = "common";
 +                      interrupt-parent = <&gic>;
 +                      ti,buffer-size = <128>;
 +                      ti,hwmods = "mcbsp4";
 +              };
 +
 +              keypad: keypad@4a31c000 {
 +                      compatible = "ti,omap4-keypad";
 +                      reg = <0x4a31c000 0x80>;
 +                      interrupts = <0 120 0x4>;
 +                      reg-names = "mpu";
 +                      ti,hwmods = "kbd";
 +              };
 +
 +              emif1: emif@4c000000 {
 +                      compatible = "ti,emif-4d";
 +                      reg = <0x4c000000 0x100>;
 +                      interrupts = <0 110 0x4>;
 +                      ti,hwmods = "emif1";
 +                      phy-type = <1>;
 +                      hw-caps-read-idle-ctrl;
 +                      hw-caps-ll-interface;
 +                      hw-caps-temp-alert;
 +              };
 +
 +              emif2: emif@4d000000 {
 +                      compatible = "ti,emif-4d";
 +                      reg = <0x4d000000 0x100>;
 +                      interrupts = <0 111 0x4>;
 +                      ti,hwmods = "emif2";
 +                      phy-type = <1>;
 +                      hw-caps-read-idle-ctrl;
 +                      hw-caps-ll-interface;
 +                      hw-caps-temp-alert;
 +              };
++
+               ocp2scp {
+                       compatible = "ti,omap-ocp2scp";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+                       ti,hwmods = "ocp2scp_usb_phy";
+               };
        };
  };

diff --cc arch/arm/kernel/Makefile
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9261_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9rl_devices.c
Simple merge

diff --cc arch/arm/mach-clps711x/Makefile
Simple merge

diff --cc arch/arm/mach-exynos/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos/clock-exynos5.c
Simple merge

diff --cc arch/arm/mach-exynos/include/mach/map.h
Simple merge

diff --cc arch/arm/mach-integrator/core.c
Simple merge

diff --cc arch/arm/mach-omap1/board-h2.c
index af283a2bc7c78ed1b4b1212f07f825ae282ddebc,cd8836f43f01ebb57e927ebb0db58f65a8db050d..376f7f29ef77391fc8de34c9cb8bb6264abdef09
--- 1/arch/arm/mach-omap1/board-h2.c
--- 2/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@@ -31,7 -31,7 +31,8 @@@
  #include <linux/i2c/tps65010.h>
  #include <linux/smc91x.h>
  #include <linux/omapfb.h>
 +#include <linux/platform_data/gpio-omap.h>
+ #include <linux/leds.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>

diff --cc arch/arm/mach-omap1/board-h3.c
index 06d11b1ee9c6889482cc355203810c3dd80d0093,1fa9c45c1ae591343e3d4ee4588fa01a34fcd21f..ededdb7ef28c021aa2f43ed4dcacbb8fe1c6e723
--- 1/arch/arm/mach-omap1/board-h3.c
--- 2/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@@ -31,7 -31,7 +31,8 @@@
  #include <linux/i2c/tps65010.h>
  #include <linux/smc91x.h>
  #include <linux/omapfb.h>
 +#include <linux/platform_data/gpio-omap.h>
+ #include <linux/leds.h>
  
  #include <asm/setup.h>
  #include <asm/page.h>

diff --cc arch/arm/mach-omap1/board-osk.c
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc arch/arm/mach-pxa/Makefile
Simple merge

diff --cc arch/arm/mach-realview/core.c
Simple merge

diff --cc arch/arm/mach-realview/realview_eb.c
index ce7747692c8be646f85c556bff6bb7e189c5dcd6,21661ade885ffd7f29c4d7d223332777cf275ce6..d3b3cd216d64b05d55b8c55330f62a1c9492fc33
--- 1/arch/arm/mach-realview/realview_eb.c
--- 2/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@@ -31,8 -30,8 +31,7 @@@
  
  #include <mach/hardware.h>
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  #include <asm/hardware/cache-l2x0.h>

diff --cc arch/arm/mach-realview/realview_pb1176.c
index e21711d72ee212d9ef603aa793393861bbe58cb5,c0ff882c5cb865bb31ef3e07c5c498f0c9de11f7..07d6672ddae70e77776d12d042db72f20e03569c
--- 1/arch/arm/mach-realview/realview_pb1176.c
--- 2/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@@ -33,8 -32,8 +33,7 @@@
  
  #include <mach/hardware.h>
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  #include <asm/hardware/cache-l2x0.h>

diff --cc arch/arm/mach-realview/realview_pb11mp.c
index b442fb276d57fdde4f414d0df03deaeb04d047d3,30779ae40c046a85cdb7456918f02812cc2bc451..ec4fcd9a7e9c793bfd371adae85f5779093fe9d1
--- 1/arch/arm/mach-realview/realview_pb11mp.c
--- 2/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@@ -31,8 -30,8 +31,7 @@@
  
  #include <mach/hardware.h>
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  #include <asm/hardware/cache-l2x0.h>

diff --cc arch/arm/mach-realview/realview_pba8.c
index 1435cd86396596c811a469bbb5b57efdd09dac96,081cd72c090e01ad41a106f86267958bbb3a7505..9992431b8a15121e6a5b56c5727d234f4ab6be5d
--- 1/arch/arm/mach-realview/realview_pba8.c
--- 2/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@@ -27,11 -27,10 +27,10 @@@
  #include <linux/amba/mmci.h>
  #include <linux/amba/pl022.h>
  #include <linux/io.h>
 +#include <linux/platform_data/clk-realview.h>
  
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  

diff --cc arch/arm/mach-realview/realview_pbx.c
index 5d2c8bebb0692206b2e7651217fdca3cb29010fa,1ce62b9f846c2a1b306124b422c4fd9bd73b209a..17954a327e1bb31340ec678844d89ffd4cef5370
--- 1/arch/arm/mach-realview/realview_pbx.c
--- 2/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@@ -26,11 -26,10 +26,10 @@@
  #include <linux/amba/mmci.h>
  #include <linux/amba/pl022.h>
  #include <linux/io.h>
 +#include <linux/platform_data/clk-realview.h>
  
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/smp_twd.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>

diff --cc arch/arm/mach-shark/core.c
Simple merge

diff --cc arch/arm/mach-tegra/tegra20_clocks_data.c
Simple merge

diff --cc arch/arm/mach-tegra/tegra30_clocks_data.c
Simple merge

diff --cc arch/arm/mach-versatile/core.c
Simple merge

diff --cc arch/arm/plat-omap/Kconfig
Simple merge

diff --cc arch/arm/plat-omap/debug-leds.c
index 195aaae658726bf6903f9df739cb90878ede1462,24e23f3dd6a889b5df44a9310d308558d8caa283..ea29bbe8e5cfd5168a864e9fa53783376dcfefab
--- 1/arch/arm/plat-omap/debug-leds.c
--- 2/arch/arm/plat-omap/debug-leds.c
+++ b/arch/arm/plat-omap/debug-leds.c
@@@ -12,10 -14,9 +14,10 @@@
  #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>

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/Makefile
index 8c30e73cd94cd74b031cdfc3e1a99f1f4cd3ce6d,f8cdeeb5c484d033644965da3e2914359f6283ee..acb48fa4531cd9e707643717b88bd37104d60a81
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -5,7 -5,7 +5,8 @@@
  # Rewritten to use lists instead of if-statements.
  #
  
 +obj-y                         += irqchip/
+ obj-y                         += bus/
  
  # GPIO must come after pinctrl as gpios may need to mux pins etc
  obj-y                         += pinctrl/

diff --cc drivers/bus/omap_l3_noc.c
Simple merge

diff --cc drivers/gpio/gpio-samsung.c
Simple merge