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

Commit 24002727 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.14/fixes-against-rc1' of... 

Merge tag 'omap-for-v3.14/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Fixes for omaps, mostly to deal with the 34xx vs 36xx SoC
configuration for overo boards.

* tag 'omap-for-v3.14/fixes-against-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  Documentation: dt: OMAP: Update Overo/Tobi
  ARM: dts: Add support for both OMAP35xx and OMAP36xx Overo/Tobi
  ARM: dts: omap3-tobi: Use the correct vendor prefix
  ARM: dts: omap3-tobi: Fix boot with OMAP36xx-based Overo
  ARM: OMAP2+: Remove legacy macros for zoom platforms
  ARM: OMAP2+: Remove MACH_NOKIA_N800
  ARM: dts: N900: add missing compatible property
  ARM: dts: N9/N950: fix boot hang with 3.14-rc1
  ARM: OMAP1: nokia770: enable tahvo-usb
  ARM: OMAP2+: gpmc: fix: DT ONENAND child nodes not probed when MTD_ONENAND is built as module
  ARM: OMAP2+: gpmc: fix: DT NAND child nodes not probed when MTD_NAND is built as module
  ARM: dts: omap3-gta04: Fix mmc1 properties.
  ARM: dts: omap3-gta04: Fix 'aux' gpio key flags.
  ARM: OMAP2+: add missing ARCH_HAS_OPP
  ARM: dts: am335x-evmsk: Fix mmc1 support
  ARM: DTS: am335x-evmsk: Correct audio clock frequency
  ARM: dts: omap3-gta04: Add EOC irq gpio line handling.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 763fbff2 8842446a

Documentation/devicetree/bindings/arm/omap/omap.txt

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ Boards: 
  compatible = "ti,omap3-beagle", "ti,omap3"



- OMAP3 Tobi with Overo : Commercial expansion board with daughter board

  compatible = "ti,omap3-tobi", "ti,omap3-overo", "ti,omap3"

  compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3"



- OMAP4 SDP : Software Development Board

  compatible = "ti,omap4-sdp", "ti,omap4430"

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -209,7 +209,8 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap3-n900.dtb \

	omap3-n9.dtb \

	omap3-n950.dtb \

	omap3-tobi.dtb \

	omap3-overo-tobi.dtb \

	omap3-overo-storm-tobi.dtb \

	omap3-gta04.dtb \

	omap3-igep0020.dtb \

	omap3-igep0030.dtb \

arch/arm/boot/dts/am335x-evmsk.dts

+10 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ 
		ti,model = "AM335x-EVMSK";

		ti,audio-codec = <&tlv320aic3106>;

		ti,mcasp-controller = <&mcasp1>;

		ti,codec-clock-rate = <24576000>;

		ti,codec-clock-rate = <24000000>;

		ti,audio-routing =

			"Headphone Jack",       "HPLOUT",

			"Headphone Jack",       "HPROUT";
@@ -256,6 +256,12 @@ 
		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

		pinctrl-single,pins = <

			0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */

		>;

	};



	mcasp1_pins: mcasp1_pins {

		pinctrl-single,pins = <

			0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_crs.mcasp1_aclkx */
@@ -456,6 +462,9 @@ 
	status = "okay";

	vmmc-supply = <&vmmc_reg>;

	bus-width = <4>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;

};



&sham {

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

+4 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
		aux-button {

			label = "aux";

			linux,code = <169>;

			gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;

			gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;

			gpio-key,wakeup;

		};

	};
@@ -92,6 +92,8 @@ 
	bmp085@77 {

		compatible = "bosch,bmp085";

		reg = <0x77>;

		interrupt-parent = <&gpio4>;

		interrupts = <17 IRQ_TYPE_EDGE_RISING>;

	};



	/* leds */
@@ -141,8 +143,8 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	vmmc-supply = <&vmmc1>;

	vmmc_aux-supply = <&vsim>;

	bus-width = <4>;

	ti,non-removable;

};



&mmc2 {

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

+1 −1
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ 


/ {

	model = "Nokia N9";

	compatible = "nokia,omap3-n9", "ti,omap3";

	compatible = "nokia,omap3-n9", "ti,omap36xx", "ti,omap3";

};