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

Commit 2e33f294 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-for-v4.11/dt' of... 

Merge tag 'davinci-for-v4.11/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt

Device tree updates for DaVinci DA850

* GPIO keys on DA850 LCDK
* LCDC display on DA850 LCDK
* USB OHCI on DA850 LCDK
* VPIF (video input) on DA850 LCDK
* Add a DA8xx specific compatible for UARTs
* Introduce support for Lego Mindstorms EV3

* tag 'davinci-for-v4.11/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: dts: Add LEGO MINDSTORMS EV3 dts
  dt-bindings: add "microchip,24c128" compatible string
  dt-bindings: Add LEGO MINDSTORMS EV3 compatible specification
  dt-bindings: Add vendor prefix for LEGO
  ARM: dts: da850: Add ti,da830-uart compatible for serial ports
  ARM: dts: davinci: da850-lcdk: enable VPIF
  ARM: dts: davinci: da850-evm: enable VPIF
  ARM: dts: davinci: da850: VPIF: add node and muxing
  ARM: dts: da850-lcdk: Enable ohci for omapl138 lcdk
  ARM: dts: da850: Add usb device node
  ARM: dts: da850: specify the maximum pixel clock rate for tilcdc
  ARM: dts: da850-lcdk: add the vga-bridge node
  ARM: dts: da850: rename the display node label
  ARM: dts: da850-lcdk: add gpio-keys

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 43d08e21 4302a38e

Documentation/devicetree/bindings/arm/davinci.txt

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ EnBW AM1808 based CMC board 
Required root node properties:

    - compatible = "enbw,cmc", "ti,da850;



LEGO MINDSTORMS EV3 (AM1808 based)

Required root node properties:

    - compatible = "lego,ev3", "ti,da850";



Generic DaVinci Boards

----------------------

Documentation/devicetree/bindings/eeprom/eeprom.txt

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ Required properties: 


	"catalyst,24c32"



	"microchip,24c128"



	"ramtron,24c64"



	"renesas,r1ex24002"

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ kosagi Sutajio Ko-Usagi PTE Ltd. 
kyo	Kyocera Corporation

lacie	LaCie

lantiq	Lantiq Semiconductor

lego	LEGO Systems A/S

lenovo	Lenovo Group Ltd.

lg	LG Corporation

linux	Linux-specific binding

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -132,7 +132,8 @@ dtb-$(CONFIG_ARCH_CLPS711X) += \ 
dtb-$(CONFIG_ARCH_DAVINCI) += \

	da850-lcdk.dtb \

	da850-enbw-cmc.dtb \

	da850-evm.dtb

	da850-evm.dtb \

	da850-lego-ev3.dtb

dtb-$(CONFIG_ARCH_DIGICOLOR) += \

	cx92755_equinox.dtb

dtb-$(CONFIG_ARCH_EFM32) += \

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

+20 −0
Original line number Diff line number Diff line
@@ -289,3 +289,23 @@ 
		};

	};

};



&vpif {

	pinctrl-names = "default";

	pinctrl-0 = <&vpif_capture_pins>;

	status = "okay";



	/* VPIF capture port */

	port {

		vpif_ch0: endpoint@0 {

			  reg = <0>;

			  bus-width = <8>;

		};



		vpif_ch1: endpoint@1 {

			  reg = <1>;

			  bus-width = <8>;

			  data-shift = <8>;

		};

	};

};