Merge branch 'next/drivers' into HEAD

Conflicts:
	arch/arm/boot/dts/omap4.dtsi
	arch/arm/mach-clps711x/common.c
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/leds-h2p2-debug.c
	arch/arm/mach-omap1/leds.c
	arch/arm/mach-pnx4008/time.c
	arch/arm/plat-omap/debug-leds.c
	drivers/Makefile
	drivers/bus/omap_l3_noc.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/omap4.dtsi
index 5d1c484,8a780b2..3883f94
--- 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 af283a2,cd8836f..376f7f2
--- 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 06d11b1,1fa9c45..ededdb7
--- 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 ce77476,21661ad..d3b3cd2
--- 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 e21711d,c0ff882..07d6672
--- 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 b442fb2,30779ae..ec4fcd9
--- 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 1435cd8,081cd72..9992431
--- 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 5d2c8be,1ce62b9..17954a3
--- 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 195aaae,24e23f3..ea29bbe
--- 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 8c30e73,f8cdeeb..acb48fa
--- 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