Merge tag 'for-linus-20170825' of git://git.infradead.org/linux-mtd

[mirror_ubuntu-artful-kernel.git] / arch / arm / boot / dts / da850-lcdk.dts

diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts
index afcb4821deb18ffb71356a4a9c03f1e945728426..a0f0916156e66d83949716c4b571184695fbef3b 100644 (file)
--- a/arch/arm/boot/dts/da850-lcdk.dts
+++ b/arch/arm/boot/dts/da850-lcdk.dts
@@ -6,6 +6,7 @@
 /dts-v1/;
 #include "da850.dtsi"
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
        model = "DA850/AM1808/OMAP-L138 LCDK";
@@ -51,6 +52,62 @@
                        system-clock-frequency = <24576000>;
                };
        };
+
+       gpio-keys {
+               compatible = "gpio-keys";
+               autorepeat;
+
+               user1 {
+                       label = "GPIO Key USER1";
+                       linux,code = <BTN_0>;
+                       gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
+               };
+
+               user2 {
+                       label = "GPIO Key USER2";
+                       linux,code = <BTN_1>;
+                       gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+       vga-bridge {
+               compatible = "ti,ths8135";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+
+                               vga_bridge_in: endpoint {
+                                       remote-endpoint = <&lcdc_out_vga>;
+                               };
+                       };
+
+                       port@1 {
+                               reg = <1>;
+
+                               vga_bridge_out: endpoint {
+                                       remote-endpoint = <&vga_con_in>;
+                               };
+                       };
+               };
+       };
+
+       vga {
+               compatible = "vga-connector";
+
+               ddc-i2c-bus = <&i2c0>;
+
+               port {
+                       vga_con_in: endpoint {
+                               remote-endpoint = <&vga_bridge_out>;
+                       };
+               };
+       };
 };
 
 &pmx_core {
@@ -105,6 +162,10 @@
        status = "okay";
 };
 
+&sata {
+       status = "okay";
+};
+
 &mdio {
        pinctrl-names = "default";
        pinctrl-0 = <&mdio_pins>;
@@ -167,6 +228,10 @@
        status = "okay";
 };
 
+&usb1 {
+       status = "okay";
+};
+
 &aemif {
        pinctrl-names = "default";
        pinctrl-0 = <&nand_pins>;
@@ -236,3 +301,21 @@
 &memctrl {
        status = "okay";
 };
+
+&lcdc {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&lcd_pins>;
+
+       port {
+               lcdc_out_vga: endpoint {
+                       remote-endpoint = <&vga_bridge_in>;
+               };
+       };
+};
+
+&vpif {
+       pinctrl-names = "default";
+       pinctrl-0 = <&vpif_capture_pins>;
+       status = "okay";
+};