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

Commit 20e3ecd7 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

DaVinci device-tree source additions for
LCD, SPI and cfgchip syscon.

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

:
  ARM: dts: da850: Add cfgchip syscon node
  ARM: dts: da850: Add DMA to SPI0
  ARM: dts: da850: add a node for the LCD controller

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4eb8883d 1b499f25

arch/arm/boot/dts/da850.dtsi

+40 −0
Original line number Diff line number Diff line
@@ -186,8 +186,39 @@ 
					0xc 0x88888888 0xffffffff

				>;

			};

			lcd_pins: pinmux_lcd_pins {

				pinctrl-single,bits = <

					/*

					 * LCD_D[2], LCD_D[3], LCD_D[4], LCD_D[5],

					 * LCD_D[6], LCD_D[7]

					 */

					0x40 0x22222200 0xffffff00

					/*

					 * LCD_D[10], LCD_D[11], LCD_D[12], LCD_D[13],

					 * LCD_D[14], LCD_D[15], LCD_D[0], LCD_D[1]

					 */

					0x44 0x22222222 0xffffffff

					/* LCD_D[8], LCD_D[9] */

					0x48 0x00000022 0x000000ff



					/* LCD_PCLK */

					0x48 0x02000000 0x0f000000

					/* LCD_AC_ENB_CS, LCD_VSYNC, LCD_HSYNC */

					0x4c 0x02000022 0x0f0000ff

				>;

			};



		};

		cfgchip: chip-controller@1417c {

			compatible = "ti,da830-cfgchip", "syscon", "simple-mfd";

			reg = <0x1417c 0x14>;



			usb_phy: usb-phy {

				compatible = "ti,da830-usb-phy";

				#phy-cells = <1>;

				status = "disabled";

			};

		};

		edma0: edma@0 {

			compatible = "ti,edma3-tpcc";

			/* eDMA3 CC0: 0x01c0 0000 - 0x01c0 7fff */
@@ -336,6 +367,8 @@ 
			num-cs = <6>;

			ti,davinci-spi-intr-line = <1>;

			interrupts = <20>;

			dmas = <&edma0 14 0>, <&edma0 15 0>;

			dma-names = "rx", "tx";

			status = "disabled";

		};

		spi1: spi@30e000 {
@@ -399,6 +432,13 @@ 
				<&edma0 0 1>;

			dma-names = "tx", "rx";

		};



		display: display@213000 {

			compatible = "ti,da850-tilcdc";

			reg = <0x213000 0x1000>;

			interrupts = <52>;

			status = "disabled";

		};

	};

	aemif: aemif@68000000 {

		compatible = "ti,da850-aemif";