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

Commit 703cc5df authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

Merge branch '3.15/dss-dt-dts' into 3.15/fbdev 

OMAP DSS related .dts changes
parents 17d5ca91 1133420f

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
OMAP Dynamic Memory Manager (DMM) bindings



The dynamic memory manager (DMM) is a module located immediately in front of the

SDRAM controllers (called EMIFs on OMAP). DMM manages various aspects of memory

accesses such as priority generation amongst initiators, configuration of SDRAM

interleaving, optimizing transfer of 2D block objects, and provide MMU-like page

translation for initiators which need contiguous dma bus addresses.



Required properties:

- compatible:	Should contain "ti,omap4-dmm" for OMAP4 family

		Should contain "ti,omap5-dmm" for OMAP5 and DRA7x family

- reg:		Contains DMM register address range (base address and length)

- interrupts:	Should contain an interrupt-specifier for DMM_IRQ.

- ti,hwmods:	Name of the hwmod associated to DMM, which is typically "dmm"



Example:



dmm@4e000000 {

	compatible = "ti,omap4-dmm";

	reg = <0x4e000000 0x800>;

	ti,hwmods = "dmm";

};

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

+6 −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"
@@ -114,5 +117,8 @@ Boards: 
- AM43x EPOS EVM

  compatible = "ti,am43x-epos-evm", "ti,am4372", "ti,am43"



- AM437x GP EVM

  compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43"



- DRA7 EVM:  Software Developement Board for DRA7XX

  compatible = "ti,dra7-evm", "ti,dra7"

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

+8 −0
Original line number Diff line number Diff line
@@ -199,6 +199,10 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap2420-n810-wimax.dtb \

	omap3430-sdp.dtb \

	omap3-beagle.dtb \

	omap3-cm-t3517.dtb \

	omap3-sbc-t3517.dtb \

	omap3-cm-t3530.dtb \

	omap3-sbc-t3530.dtb \

	omap3-cm-t3730.dtb \

	omap3-sbc-t3730.dtb \

	omap3-devkit8000.dtb \
@@ -214,7 +218,9 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap3-gta04.dtb \

	omap3-igep0020.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 \
@@ -228,9 +234,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	am335x-boneblack.dtb \

	am335x-nano.dtb \

	am335x-base0033.dtb \

	am3517-craneboard.dtb \

	am3517-evm.dtb \

	am3517_mt_ventoux.dtb \

	am43x-epos-evm.dtb \

	am437x-gp-evm.dtb \

	dra7-evm.dtb

dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb