From: Olof Johansson Date: Mon, 1 Oct 2012 21:33:55 +0000 (-0700) Subject: Merge branch 'next/drivers' into HEAD X-Git-Tag: v3.7-rc1~154^2~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8b1a13b02812b60b88920801363920956691feb3;p=users%2Fwilly%2Flinux.git 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 --- 8b1a13b02812b60b88920801363920956691feb3 diff --cc arch/arm/boot/dts/omap4.dtsi index 5d1c48459e6e,8a780b2a5083..3883f94fdbd0 --- a/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/mach-omap1/board-h2.c index af283a2bc7c7,cd8836f43f01..376f7f29ef77 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c @@@ -31,7 -31,7 +31,8 @@@ #include #include #include +#include + #include #include #include diff --cc arch/arm/mach-omap1/board-h3.c index 06d11b1ee9c6,1fa9c45c1ae5..ededdb7ef28c --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c @@@ -31,7 -31,7 +31,8 @@@ #include #include #include +#include + #include #include #include diff --cc arch/arm/mach-realview/realview_eb.c index ce7747692c8b,21661ade885f..d3b3cd216d64 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c @@@ -31,8 -30,8 +31,7 @@@ #include #include - #include #include -#include #include #include #include diff --cc arch/arm/mach-realview/realview_pb1176.c index e21711d72ee2,c0ff882c5cb8..07d6672ddae7 --- a/arch/arm/mach-realview/realview_pb1176.c +++ b/arch/arm/mach-realview/realview_pb1176.c @@@ -33,8 -32,8 +33,7 @@@ #include #include - #include #include -#include #include #include #include diff --cc arch/arm/mach-realview/realview_pb11mp.c index b442fb276d57,30779ae40c04..ec4fcd9a7e9c --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c @@@ -31,8 -30,8 +31,7 @@@ #include #include - #include #include -#include #include #include #include diff --cc arch/arm/mach-realview/realview_pba8.c index 1435cd863965,081cd72c090e..9992431b8a15 --- a/arch/arm/mach-realview/realview_pba8.c +++ b/arch/arm/mach-realview/realview_pba8.c @@@ -27,11 -27,10 +27,10 @@@ #include #include #include +#include #include - #include #include -#include #include #include diff --cc arch/arm/mach-realview/realview_pbx.c index 5d2c8bebb069,1ce62b9f846c..17954a327e1b --- a/arch/arm/mach-realview/realview_pbx.c +++ b/arch/arm/mach-realview/realview_pbx.c @@@ -26,11 -26,10 +26,10 @@@ #include #include #include +#include #include - #include #include -#include #include #include #include diff --cc arch/arm/plat-omap/debug-leds.c index 195aaae65872,24e23f3dd6a8..ea29bbe8e5cf --- a/arch/arm/plat-omap/debug-leds.c +++ b/arch/arm/plat-omap/debug-leds.c @@@ -12,10 -14,9 +14,10 @@@ #include #include #include +#include + #include #include - #include #include #include diff --cc drivers/Makefile index 8c30e73cd94c,f8cdeeb5c484..acb48fa4531c --- a/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/