Merge tag 'JH7110_515_SDK_v3.6.0' into vf2-515-devel

[platform/kernel/linux-starfive.git] / arch / riscv / boot / dts / starfive / jh7110-common.dtsi

diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
old mode 100644 (file)
new mode 100755 (executable)
index 50d926d..8623c8a
--- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
@@ -183,6 +183,10 @@
                };
        };
 
+       tinker_ft5406: tinker_ft5406@38 {
+               compatible = "tinker_ft5406";
+               reg = <0x38>;
+       };
 };
 
 &i2c3 {
@@ -283,12 +287,8 @@
                reg = <0x10>;
                clocks = <&clk_ext_camera>;
                clock-names = "xclk";
-               //reset-gpio = <&gpio 10 0>;
+               //reset-gpio = <&gpio 18 0>;
                //DOVDD-supply = <&v2v8>;
-               pinctrl-names = "default", "power_up", "power_down";
-               pinctrl-0 = <&csi_pins_default>;
-               pinctrl-1 = <&csi_pins_pwup>;
-               pinctrl-2 = <&csi_pins_pwdn>;
                rotation = <0>;
                orientation = <1>; //CAMERA_ORIENTATION_BACK
 
@@ -390,9 +390,12 @@
        #address-cells = <1>;
        #size-cells = <0>;
        phy0: ethernet-phy@0 {
-               rxc_dly_en = <0>;
+               rxc_dly_en = <1>;
                tx_delay_sel_fe = <5>;
-               tx_delay_sel = <11>;
+               tx_delay_sel = <0xb>;
+               tx_inverted_10 = <0x0>;
+               tx_inverted_100 = <0x0>;
+               tx_inverted_1000 = <0x0>;
        };
 };
 
@@ -586,18 +589,20 @@
 };
 
 &pcie0 {
-       pinctrl-names = "perst-default", "perst-active", "power-active";
+       pinctrl-names = "perst-default", "perst-active", "power-default", "power-active";
        pinctrl-0 = <&pcie0_perst_default>;
        pinctrl-1 = <&pcie0_perst_active>;
-       pinctrl-2 = <&pcie0_power_active>;
+       pinctrl-2 = <&pcie0_power_default>;
+       pinctrl-3 = <&pcie0_power_active>;
        status = "disabled";
 };
 
 &pcie1 {
-       pinctrl-names = "perst-default", "perst-active", "power-active";
+       pinctrl-names = "perst-default", "perst-active", "power-default", "power-active";
        pinctrl-0 = <&pcie1_perst_default>;
        pinctrl-1 = <&pcie1_perst_active>;
-       pinctrl-2 = <&pcie1_power_active>;
+       pinctrl-2 = <&pcie1_power_default>;
+       pinctrl-3 = <&pcie1_power_active>;
        status = "disabled";
 };
 
@@ -705,6 +710,20 @@
 
 &mipi_dsi {
        status = "okay";
+
+       port {
+               dsi_out_port: endpoint@0 {
+                       remote-endpoint = <&panel_dsi_port>;
+               };
+               dsi_in_port: endpoint@1 {
+                       remote-endpoint = <&mipi_out>;
+               };
+       };
+
+       mipi_panel: panel@0 {
+               /*compatible = "";*/
+               status = "okay";
+       };
 };
 
 &mipi_dphy {