Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...

[cascardo/linux.git] / arch / arm64 / boot / dts / renesas / r8a7795-salvator-x.dts

diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index b992b1a..b1eab68 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -62,7 +62,7 @@
                clock-frequency = <24576000>;
        };
 
-       vcc_sdhi0: regulator@1 {
+       vcc_sdhi0: regulator-vcc-sdhi0 {
                compatible = "regulator-fixed";
 
                regulator-name = "SDHI0 Vcc";
@@ -73,7 +73,7 @@
                enable-active-high;
        };
 
-       vccq_sdhi0: regulator@2 {
+       vccq_sdhi0: regulator-vccq-sdhi0 {
                compatible = "regulator-gpio";
 
                regulator-name = "SDHI0 VccQ";
@@ -86,7 +86,7 @@
                          1800000 0>;
        };
 
-       vcc_sdhi3: regulator@3 {
+       vcc_sdhi3: regulator-vcc-sdhi3 {
                compatible = "regulator-fixed";
 
                regulator-name = "SDHI3 Vcc";
@@ -97,7 +97,7 @@
                enable-active-high;
        };
 
-       vccq_sdhi3: regulator@4 {
+       vccq_sdhi3: regulator-vccq-sdhi3 {
                compatible = "regulator-gpio";
 
                regulator-name = "SDHI3 VccQ";
@@ -110,6 +110,17 @@
                          1800000 0>;
        };
 
+       vbus0_usb2: regulator-vbus0-usb2 {
+               compatible = "regulator-fixed";
+
+               regulator-name = "USB20_VBUS0";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+
+               gpio = <&gpio6 16 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+
        audio_clkout: audio_clkout {
                /*
                 * This is same as <&rcar_sound 0>
@@ -135,68 +146,128 @@
                        sound-dai = <&ak4613>;
                };
        };
+
+       vga-encoder {
+               compatible = "adi,adv7123";
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+                               adv7123_in: endpoint {
+                                       remote-endpoint = <&du_out_rgb>;
+                               };
+                       };
+                       port@1 {
+                               reg = <1>;
+                               adv7123_out: endpoint {
+                                       remote-endpoint = <&vga_in>;
+                               };
+                       };
+               };
+       };
+
+       vga {
+               compatible = "vga-connector";
+
+               port {
+                       vga_in: endpoint {
+                               remote-endpoint = <&adv7123_out>;
+                       };
+               };
+       };
+};
+
+&du {
+       pinctrl-0 = <&du_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+
+       ports {
+               port@0 {
+                       endpoint {
+                               remote-endpoint = <&adv7123_in>;
+                       };
+               };
+       };
 };
 
 &extal_clk {
        clock-frequency = <16666666>;
 };
 
+&extalr_clk {
+       clock-frequency = <32768>;
+};
+
 &pfc {
        pinctrl-0 = <&scif_clk_pins>;
        pinctrl-names = "default";
 
        scif1_pins: scif1 {
-               renesas,groups = "scif1_data_a", "scif1_ctrl";
-               renesas,function = "scif1";
+               groups = "scif1_data_a", "scif1_ctrl";
+               function = "scif1";
        };
        scif2_pins: scif2 {
-               renesas,groups = "scif2_data_a";
-               renesas,function = "scif2";
+               groups = "scif2_data_a";
+               function = "scif2";
        };
        scif_clk_pins: scif_clk {
-               renesas,groups = "scif_clk_a";
-               renesas,function = "scif_clk";
+               groups = "scif_clk_a";
+               function = "scif_clk";
        };
 
        i2c2_pins: i2c2 {
-               renesas,groups = "i2c2_a";
-               renesas,function = "i2c2";
+               groups = "i2c2_a";
+               function = "i2c2";
        };
 
        avb_pins: avb {
-               renesas,groups = "avb_mdc";
-               renesas,function = "avb";
+               groups = "avb_mdc";
+               function = "avb";
+       };
+
+       du_pins: du {
+               groups = "du_rgb888", "du_sync", "du_oddf", "du_clk_out_0";
+               function = "du";
        };
 
        sdhi0_pins: sd0 {
-               renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
-               renesas,function = "sdhi0";
+               groups = "sdhi0_data4", "sdhi0_ctrl";
+               function = "sdhi0";
        };
 
        sdhi3_pins: sd3 {
-               renesas,groups = "sdhi3_data4", "sdhi3_ctrl";
-               renesas,function = "sdhi3";
+               groups = "sdhi3_data4", "sdhi3_ctrl";
+               function = "sdhi3";
        };
 
        sound_pins: sound {
-               renesas,groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a";
-               renesas,function = "ssi";
+               groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a";
+               function = "ssi";
        };
 
        sound_clk_pins: sound_clk {
-               renesas,groups = "audio_clk_a_a", "audio_clk_b_a", "audio_clk_c_a",
-                                "audio_clkout_a", "audio_clkout3_a";
-               renesas,function = "audio_clk";
+               groups = "audio_clk_a_a", "audio_clk_b_a", "audio_clk_c_a",
+                        "audio_clkout_a", "audio_clkout3_a";
+               function = "audio_clk";
+       };
+
+       usb0_pins: usb0 {
+               groups = "usb0";
+               function = "usb0";
        };
 
        usb1_pins: usb1 {
-               renesas,groups = "usb1";
-               renesas,function = "usb1";
+               groups = "usb1";
+               function = "usb1";
        };
 
        usb2_pins: usb2 {
-               renesas,groups = "usb2";
-               renesas,function = "usb2";
+               groups = "usb2";
+               function = "usb2";
        };
 };
 
@@ -204,6 +275,7 @@
        pinctrl-0 = <&scif1_pins>;
        pinctrl-names = "default";
 
+       uart-has-rtscts;
        status = "okay";
 };
 
@@ -325,6 +397,11 @@
        shared-pin;
 };
 
+&wdt0 {
+       timeout-sec = <60>;
+       status = "okay";
+};
+
 &audio_clk_a {
        clock-frequency = <22579200>;
 };
@@ -359,6 +436,14 @@
        status = "okay";
 };
 
+&usb2_phy0 {
+       pinctrl-0 = <&usb0_pins>;
+       pinctrl-names = "default";
+
+       vbus-supply = <&vbus0_usb2>;
+       status = "okay";
+};
+
 &usb2_phy1 {
        pinctrl-0 = <&usb1_pins>;
        pinctrl-names = "default";
@@ -373,6 +458,10 @@
        status = "okay";
 };
 
+&ehci0 {
+       status = "okay";
+};
+
 &ehci1 {
        status = "okay";
 };
@@ -381,6 +470,10 @@
        status = "okay";
 };
 
+&ohci0 {
+       status = "okay";
+};
+
 &ohci1 {
        status = "okay";
 };
@@ -388,3 +481,20 @@
 &ohci2 {
        status = "okay";
 };
+
+&hsusb {
+       status = "okay";
+};
+
+&pcie_bus_clk {
+       clock-frequency = <100000000>;
+       status = "okay";
+};
+
+&pciec0 {
+       status = "okay";
+};
+
+&pciec1 {
+       status = "okay";
+};