Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13...

We need the fixes in v3.12-rc5, dts changes in omap-for-v3.13/dt, and
the platform data quirk changes in omap-for-v3.13/quirk to start
removing omap3 board files without breaking things.

diff --cc arch/arm/boot/dts/omap3-beagle-xm.dts
Simple merge

diff --cc arch/arm/boot/dts/omap3.dtsi
index b41bd57,16420ae,695e2d3..f275bee
--- 1/arch/arm/boot/dts/omap3.dtsi
--- 2/arch/arm/boot/dts/omap3.dtsi
--- 3/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@@@ -107,17 -107,17 -107,21 +107,21 @@@@
                        reg = <0x48002030 0x05cc>;
                        #address-cells = <1>;
                        #size-cells = <0>;
++                      #interrupt-cells = <1>;
++                      interrupt-controller;
                        pinctrl-single,register-width = <16>;
 --                     pinctrl-single,function-mask = <0x7f1f>;
 ++                     pinctrl-single,function-mask = <0xff1f>;
                };
   
- -             omap3_pmx_wkup: pinmux@0x48002a00 {
+ +             omap3_pmx_wkup: pinmux@48002a00 {
                        compatible = "ti,omap3-padconf", "pinctrl-single";
                        reg = <0x48002a00 0x5c>;
                        #address-cells = <1>;
                        #size-cells = <0>;
++                      #interrupt-cells = <1>;
++                      interrupt-controller;
                        pinctrl-single,register-width = <16>;
 --                     pinctrl-single,function-mask = <0x7f1f>;
 ++                     pinctrl-single,function-mask = <0xff1f>;
                };
   
                gpio1: gpio@48310000 {

diff --cc arch/arm/boot/dts/omap4.dtsi
Simple merge

diff --cc arch/arm/mach-omap2/board-generic.c
Simple merge