Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e6a3af7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.10/dt-fixes-for-merge-window' of... 

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
parents 474dbaa7 914dc329

arch/arm/boot/dts/am33xx.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -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";

		};

	};

};

arch/arm/boot/dts/omap3-beagle-xm.dts

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ 


&usb_otg_hs {

	interface-type = <0>;

	usb-phy = <&usb2_phy>;

	mode = <3>;

	power = <50>;

};

arch/arm/boot/dts/omap3-evm.dts

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 


&usb_otg_hs {

	interface-type = <0>;

	usb-phy = <&usb2_phy>;

	mode = <3>;

	power = <50>;

};

arch/arm/boot/dts/omap3-overo.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 


&usb_otg_hs {

	interface-type = <0>;

	usb-phy = <&usb2_phy>;

	mode = <3>;

	power = <50>;

};

arch/arm/boot/dts/omap3.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -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>;