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 251461f..8623c8a
--- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
@@ -7,6 +7,7 @@
 /dts-v1/;
 #include "jh7110.dtsi"
 #include "jh7110-evb-pinctrl.dtsi"
+#include "codecs/sf_hdmi.dtsi"
 
 / {
        aliases {
@@ -53,7 +54,7 @@
                        reusable;
                        size = <0x0 0x20000000>;
                        alignment = <0x0 0x1000>;
-                       alloc-ranges = <0x0 0xa0000000 0x0 0x20000000>;
+                       alloc-ranges = <0x0 0x80000000 0x0 0x20000000>;
                        linux,cma-default;
                };
 
@@ -182,6 +183,10 @@
                };
        };
 
+       tinker_ft5406: tinker_ft5406@38 {
+               compatible = "tinker_ft5406";
+               reg = <0x38>;
+       };
 };
 
 &i2c3 {
@@ -206,7 +211,7 @@
        status = "okay";
 
        sc2235: sc2235@30 {
-               compatible = "sc2235";
+               compatible = "smartsens,sc2235";
                reg = <0x30>;
                clocks = <&clk_ext_camera>;
                clock-names = "xclk";
@@ -277,8 +282,8 @@
                };
        };
 
-       imx219@10 {
-               compatible = "imx219";
+       imx219: imx219@10 {
+               compatible = "sony,imx219";
                reg = <0x10>;
                clocks = <&clk_ext_camera>;
                clock-names = "xclk";
@@ -385,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>;
        };
 };
 
@@ -454,29 +462,23 @@
 
 &i2srx_3ch {
        pinctrl-names = "default";
-       pinctrl-0 = <&i2srx_pins>;
+       pinctrl-0 = <&i2s_clk_pins &i2srx_pins>;
        status = "disabled";
 };
 
 &i2stx_4ch0 {
-       status = "disabled";
+       pinctrl-names = "default";
+       pinctrl-0 = <&mclk_ext_pins>;
+       status = "okay";
 };
 
 &i2stx_4ch1 {
        pinctrl-names = "default";
-       pinctrl-0 = <&i2s_clk_pins &i2stx_pins>;
+       pinctrl-0 = <&i2stx_pins>;
        status = "disabled";
 };
 
 &spdif_transmitter {
-       compatible = "linux,spdif-dit";
-       #sound-dai-cells = <0>;
-       status = "disabled";
-};
-
-&spdif_receiver {
-       compatible = "linux,spdif-dir";
-       #sound-dai-cells = <0>;
        status = "disabled";
 };
 
@@ -587,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";
 };
 
@@ -651,7 +655,7 @@
        };
 };
 
-&hdmi_output {
+&rgb_output {
        status = "okay";
 
        ports {
@@ -681,7 +685,7 @@
        status = "disabled";
 };
 
-&encoder {
+&dsi_output {
        status = "okay";
 
        ports {
@@ -706,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 {