Merge tag 'omap-for-v3.10/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:
Omap device tree fixes for issue discovered during the merge window:

- Fix triggering for GPIO interrupts that's needed for 4430sdp
  Ethernet. Otherwise booting with nfsroot won't work.
- Fix CPU operating point values
- Fix wrong assumption that twl PMIC is always connected to omap3
- Add gpmc for am33xx so beaglebone users can use the bus
- Cosmetic fix for mcspi pin muxing to avoid confusion

* tag 'omap-for-v3.10/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: don't assume boards are using twl4030 for omap3
  ARM: dts: Configure and fix the McSPI pins for 4430sdp
  ARM: dts: AM33XX: Add GPMC node
  ARM: dts: OMAP4460: Fix CPU OPP voltages
  ARM: dts: OMAP36xx: Fix CPU OPP voltages
  ARM: dts: OMAP4: Fix ethernet IRQ for OMAP4 boards

9 files changed, 35 insertions, 9 deletions

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index d1101103aa51..1460d9b88adf 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -403,5 +403,17 @@
                                0x44d80000 0x2000>;      /* M3 DMEM */
                         ti,hwmods = "wkup_m3";
                 };
+
+                gpmc: gpmc@50000000 {
+                        compatible = "ti,am3352-gpmc";
+                        ti,hwmods = "gpmc";
+                        reg = <0x50000000 0x2000>;
+                        interrupts = <100>;
+                        num-cs = <7>;
+                        num-waitpins = <2>;
+                        #address-cells = <2>;
+                        #size-cells = <1>;
+                        status = "disabled";
+                };
         };
 };
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 5a31964ae339..3046d1f81be0 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -122,6 +122,7 @@
 
 &usb_otg_hs {
         interface-type = <0>;
+        usb-phy = <&usb2_phy>;
         mode = <3>;
         power = <50>;
 };
diff --git a/arch/arm/boot/dts/omap3-evm.dts b/arch/arm/boot/dts/omap3-evm.dts
index 05f51e10ddd6..96d1c206a57b 100644
--- a/arch/arm/boot/dts/omap3-evm.dts
+++ b/arch/arm/boot/dts/omap3-evm.dts
@@ -68,6 +68,7 @@
 
 &usb_otg_hs {
         interface-type = <0>;
+        usb-phy = <&usb2_phy>;
         mode = <3>;
         power = <50>;
 };
diff --git a/arch/arm/boot/dts/omap3-overo.dtsi b/arch/arm/boot/dts/omap3-overo.dtsi
index d4a7280d18b7..a626c50041f6 100644
--- a/arch/arm/boot/dts/omap3-overo.dtsi
+++ b/arch/arm/boot/dts/omap3-overo.dtsi
@@ -73,6 +73,7 @@
 
 &usb_otg_hs {
         interface-type = <0>;
+        usb-phy = <&usb2_phy>;
         mode = <3>;
         power = <50>;
 };
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 4ad03d9dbf0c..82a404da1c0d 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -519,7 +519,6 @@
                         interrupts = <0 92 0x4>, <0 93 0x4>;
                         interrupt-names = "mc", "dma";
                         ti,hwmods = "usb_otg_hs";
-                        usb-phy = <&usb2_phy>;
                         multipoint = <1>;
                         num-eps = <16>;
                         ram-bits = <12>;
diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
index b89233e43b0f..f3447bc1b032 100644
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -20,9 +20,9 @@
                 cpu@0 {
                         operating-points = <
                                 /* kHz    uV */
-                                300000   975000
-                                600000  1075000
-                                800000  1200000
+                                300000  1012500
+                                600000  1200000
+                                800000  1325000
                         >;
                         clock-latency = <300000>; /* From legacy driver */
                 };
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index c387bdc1b1d1..a35d9cd58063 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -223,6 +223,15 @@
                 >;
         };
 
+        mcspi1_pins: pinmux_mcspi1_pins {
+                pinctrl-single,pins = <
+                        0xf2 0x100      /*  mcspi1_clk.mcspi1_clk INPUT | MODE0 */
+                        0xf4 0x100      /*  mcspi1_somi.mcspi1_somi INPUT | MODE0 */
+                        0xf6 0x100      /*  mcspi1_simo.mcspi1_simo INPUT | MODE0 */
+                        0xf8 0x100      /*  mcspi1_cs0.mcspi1_cs0 INPUT | MODE0*/
+                >;
+        };
+
         dss_hdmi_pins: pinmux_dss_hdmi_pins {
                 pinctrl-single,pins = <
                         0x5a 0x118      /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
@@ -358,12 +367,15 @@
 };
 
 &mcspi1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mcspi1_pins>;
+
         eth@0 {
                 compatible = "ks8851";
                 spi-max-frequency = <24000000>;
                 reg = <0>;
                 interrupt-parent = <&gpio2>;
-                interrupts = <2>; /* gpio line 34 */
+                interrupts = <2 8>; /* gpio line 34, low triggered */
                 vdd-supply = <&vdd_eth>;
         };
 };
diff --git a/arch/arm/boot/dts/omap4-var-som.dts b/arch/arm/boot/dts/omap4-var-som.dts
index 222a413c2c51..7e04103779c4 100644
--- a/arch/arm/boot/dts/omap4-var-som.dts
+++ b/arch/arm/boot/dts/omap4-var-som.dts
@@ -68,7 +68,7 @@
                 spi-max-frequency = <24000000>;
                 reg = <0>;
                 interrupt-parent = <&gpio6>;
-                interrupts = <11>; /* gpio line 171 */
+                interrupts = <11 8>; /* gpio line 171, low triggered */
                 vdd-supply = <&vdd_eth>;
         };
 };
diff --git a/arch/arm/boot/dts/omap4460.dtsi b/arch/arm/boot/dts/omap4460.dtsi
index 7c2c23cc17ef..2cf227c86099 100644
--- a/arch/arm/boot/dts/omap4460.dtsi
+++ b/arch/arm/boot/dts/omap4460.dtsi
@@ -15,9 +15,9 @@
                 cpu@0 {
                         operating-points = <
                                 /* kHz    uV */
-                                350000   975000
-                                700000  1075000
-                                920000  1200000
+                                350000  1025000
+                                700000  1200000
+                                920000  1313000
                         >;
                         clock-latency = <300000>; /* From legacy driver */
                 };