Commit 891f1866 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.15/dt-part2' of... 

Merge tag 'omap-for-v3.15/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "omap device tree changes for v3.15, part 2" from Tony Lindgren:

Part two of omap device tree changes enabling driver features
in the dts files.

* tag 'omap-for-v3.15/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: am335x-evmsk: enable dual_emac mode
  ARM: dts: DRA7: Add device nodes for ABB
  ARM: dts: OMAP4: Add device nodes for ABB
  ARM: dts: OMAP36xx: Add device node for ABB
  ARM: dts: am43x-epos-evm: add SD card hotplug support
  ARM: dts: am335x-evm: add SD card hotplug support
  ARM: dts: am437x gp-evm: add sd card dt nodes
  ARM: dts: omap5: added dt properties to adapt to the new phy framwork
  ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
  ARM: dts: Update echi-omap DT binding example usage
  ARM: dts: Get rid of incompatible ids for hci-omap USB host nodes
  ARM: OMAP2+: Remove legacy_init_ehci_clk()
  ARM: dts: Add support for OMAP4 Gumstix DuoVero/Parlor

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fdc52533 18c49af3

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

+3 −0
Original line number Diff line number Diff line
@@ -99,6 +99,9 @@ Boards: 
- OMAP4 PandaBoard : Low cost community board

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



- OMAP4 DuoVero with Parlor : Commercial expansion board with daughter board

  compatible = "gumstix,omap4-duovero-parlor", "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";



- OMAP3 EVM : Software Development Board for OMAP35x, AM/DM37x

  compatible = "ti,omap3-evm", "ti,omap3"

Documentation/devicetree/bindings/usb/ehci-omap.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Documentation/devicetree/bindings/mfd/omap-usb-host.txt 
Example for OMAP4:



usbhsehci: ehci@4a064c00 {

	compatible = "ti,ehci-omap", "usb-ehci";

	compatible = "ti,ehci-omap";

	reg = <0x4a064c00 0x400>;

	interrupts = <0 77 0x4>;

};

Documentation/devicetree/bindings/usb/ohci-omap3.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Required properties: 
Example for OMAP4:



usbhsohci: ohci@4a064800 {

	compatible = "ti,ohci-omap3", "usb-ohci";

	compatible = "ti,ohci-omap3";

	reg = <0x4a064800 0x400>;

	interrupts = <0 76 0x4>;

};

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap3-igep0030.dtb \

	omap3-lilly-dbb056.dtb \

	omap3-zoom3.dtb \

	omap4-duovero-parlor.dtb \

	omap4-panda.dtb \

	omap4-panda-a4.dtb \

	omap4-panda-es.dtb \

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

+9 −0
Original line number Diff line number Diff line
@@ -260,6 +260,12 @@ 
		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

		pinctrl-single,pins = <

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

		>;

	};



	lcd_pins_s0: lcd_pins_s0 {

		pinctrl-single,pins = <

			0x20 0x01	/* gpmc_ad8.lcd_data16, OUTPUT | MODE1 */
@@ -644,6 +650,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 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE