From: Tony Lindgren <tony@atomide.com>
Date: Mon, 14 Oct 2013 18:33:07 +0000 (-0700)
Subject: Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f41509ad0d4c11d0911630440749d409ce2aa1aa;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

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

f41509ad0d4c11d0911630440749d409ce2aa1aa
diff --cc arch/arm/boot/dts/omap3.dtsi
index b41bd57f4328,16420ae16004,695e2d34c9c6..f275beea67b6
--- a/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 {