X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=blobdiff_plain;f=arch%2Farm64%2Fboot%2Fdts%2Frockchip%2Frk3399.dtsi;h=12caa2754bf032f1f7cc08ecbb5a60f61c9fb145;hp=4e5e3edda6dc44054f3e19a4985bf58c50e7e473;hb=6959b1dd999d69245aea4d22dfcb0bae513ac26d;hpb=a71426fe3e9e9f27a6acbdcd5b15c3ab8e0b1fde diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 4e5e3edda6dc..12caa2754bf0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -46,10 +46,12 @@ #include #include #include +#include #include / { compatible = "rockchip,rk3399"; + interrupt-parent = <&gic>; #address-cells = <2>; #size-cells = <2>; @@ -112,8 +114,11 @@ reg = <0x0 0x0>; enable-method = "psci"; #cooling-cells = <2>; /* min followed by max */ + dynamic-power-coefficient = <121>; clocks = <&cru ARMCLKL>; + cpu-idle-states = <&cpu_sleep>; operating-points-v2 = <&cluster0_opp>; + sched-energy-costs = <&CPU_COST_A53 &CLUSTER_COST_A53>; }; cpu_l1: cpu@1 { @@ -122,7 +127,9 @@ reg = <0x0 0x1>; enable-method = "psci"; clocks = <&cru ARMCLKL>; + cpu-idle-states = <&cpu_sleep>; operating-points-v2 = <&cluster0_opp>; + sched-energy-costs = <&CPU_COST_A53 &CLUSTER_COST_A53>; }; cpu_l2: cpu@2 { @@ -131,7 +138,9 @@ reg = <0x0 0x2>; enable-method = "psci"; clocks = <&cru ARMCLKL>; + cpu-idle-states = <&cpu_sleep>; operating-points-v2 = <&cluster0_opp>; + sched-energy-costs = <&CPU_COST_A53 &CLUSTER_COST_A53>; }; cpu_l3: cpu@3 { @@ -140,7 +149,9 @@ reg = <0x0 0x3>; enable-method = "psci"; clocks = <&cru ARMCLKL>; + cpu-idle-states = <&cpu_sleep>; operating-points-v2 = <&cluster0_opp>; + sched-energy-costs = <&CPU_COST_A53 &CLUSTER_COST_A53>; }; cpu_b0: cpu@100 { @@ -149,8 +160,11 @@ reg = <0x0 0x100>; enable-method = "psci"; #cooling-cells = <2>; /* min followed by max */ + dynamic-power-coefficient = <1068>; clocks = <&cru ARMCLKB>; + cpu-idle-states = <&cpu_sleep>; operating-points-v2 = <&cluster1_opp>; + sched-energy-costs = <&CPU_COST_A72 &CLUSTER_COST_A72>; }; cpu_b1: cpu@101 { @@ -159,8 +173,25 @@ reg = <0x0 0x101>; enable-method = "psci"; clocks = <&cru ARMCLKB>; + cpu-idle-states = <&cpu_sleep>; operating-points-v2 = <&cluster1_opp>; + sched-energy-costs = <&CPU_COST_A72 &CLUSTER_COST_A72>; }; + + idle-states { + entry-method = "psci"; + cpu_sleep: cpu-sleep-0 { + compatible = "arm,idle-state"; + local-timer-stop; + arm,psci-suspend-param = <0x0010000>; + entry-latency-us = <350>; + exit-latency-us = <600>; + min-residency-us = <1150>; + }; + }; + + /include/ "rk3399-sched-energy.dtsi" + }; cluster0_opp: opp_table0 { @@ -169,20 +200,28 @@ opp00 { opp-hz = /bits/ 64 <408000000>; - opp-microvolt = <900000>; + opp-microvolt = <800000>; clock-latency-ns = <40000>; }; opp01 { opp-hz = /bits/ 64 <600000000>; - opp-microvolt = <900000>; + opp-microvolt = <800000>; }; opp02 { opp-hz = /bits/ 64 <816000000>; - opp-microvolt = <900000>; + opp-microvolt = <800000>; }; opp03 { opp-hz = /bits/ 64 <1008000000>; - opp-microvolt = <900000>; + opp-microvolt = <875000>; + }; + opp04 { + opp-hz = /bits/ 64 <1200000000>; + opp-microvolt = <925000>; + }; + opp05 { + opp-hz = /bits/ 64 <1416000000>; + opp-microvolt = <1025000>; }; }; @@ -192,24 +231,24 @@ opp00 { opp-hz = /bits/ 64 <408000000>; - opp-microvolt = <900000>; + opp-microvolt = <800000>; clock-latency-ns = <40000>; }; opp01 { opp-hz = /bits/ 64 <600000000>; - opp-microvolt = <900000>; + opp-microvolt = <800000>; }; opp02 { opp-hz = /bits/ 64 <816000000>; - opp-microvolt = <900000>; + opp-microvolt = <800000>; }; opp03 { opp-hz = /bits/ 64 <1008000000>; - opp-microvolt = <900000>; + opp-microvolt = <850000>; }; opp04 { opp-hz = /bits/ 64 <1200000000>; - opp-microvolt = <900000>; + opp-microvolt = <925000>; }; }; @@ -284,11 +323,13 @@ reg-offset = <0xf780>; #phy-cells = <0>; rockchip,grf = <&grf>; + ctrl-base = <0xfe330000>; status = "disabled"; }; sdio0: dwmmc@fe310000 { - compatible = "rockchip,rk3399-dw-mshc", "rockchip,rk3288-dw-mshc"; + compatible = "rockchip,rk3399-dw-mshc", + "rockchip,rk3288-dw-mshc"; reg = <0x0 0xfe310000 0x0 0x4000>; interrupts = ; clock-freq-min-max = <400000 150000000>; @@ -300,7 +341,8 @@ }; sdmmc: dwmmc@fe320000 { - compatible = "rockchip,rk3399-dw-mshc", "rockchip,rk3288-dw-mshc"; + compatible = "rockchip,rk3399-dw-mshc", + "rockchip,rk3288-dw-mshc"; reg = <0x0 0xfe320000 0x0 0x4000>; interrupts = ; clock-freq-min-max = <400000 150000000>; @@ -312,11 +354,14 @@ }; sdhci: sdhci@fe330000 { - compatible = "arasan,sdhci-5.1"; + compatible = "rockchip,rk3399-sdhci-5.1", "arasan,sdhci-5.1"; reg = <0x0 0xfe330000 0x0 0x10000>; interrupts = ; clocks = <&cru SCLK_EMMC>, <&cru ACLK_EMMC>; clock-names = "clk_xin", "clk_ahb"; + assigned-clocks = <&cru SCLK_EMMC>; + assigned-clock-parents = <&cru PLL_CPLL>; + assigned-clock-rates = <200000000>; phys = <&emmc_phy>; phy-names = "phy_arasan"; status = "disabled"; @@ -341,7 +386,7 @@ }; }; - usb_host0_echi: usb@fe380000 { + usb_host0_ehci: usb@fe380000 { compatible = "generic-ehci"; reg = <0x0 0xfe380000 0x0 0x20000>; interrupts = ; @@ -361,7 +406,7 @@ status = "disabled"; }; - usb_host1_echi: usb@fe3c0000 { + usb_host1_ehci: usb@fe3c0000 { compatible = "generic-ehci"; reg = <0x0 0xfe3c0000 0x0 0x20000>; interrupts = ; @@ -385,26 +430,24 @@ compatible = "rockchip,dwc3"; clocks = <&cru SCLK_USB3OTG0_REF>, <&cru SCLK_USB3OTG0_SUSPEND>, <&cru ACLK_USB3OTG0>, <&cru ACLK_USB3_RKSOC_AXI_PERF>, - <&cru ACLK_USB3>, <&cru ACLK_USB3_NOC>, - <&cru ACLK_USB3_GRF>; + <&cru ACLK_USB3>, <&cru ACLK_USB3_GRF>; clock-names = "clk_usb3otg0_ref", "clk_usb3otg0_suspend", "aclk_usb3otg0", "aclk_usb3_rksoc_axi_perf", - "aclk_usb3", "aclk_usb3_noc", - "aclk_usb3_grf"; + "aclk_usb3", "aclk_usb3_grf"; #address-cells = <2>; #size-cells = <2>; ranges; status = "disabled"; - usbdrd_dwc3_0: dwc3 { + usbdrd_dwc3_0: dwc3@fe800000 { compatible = "snps,dwc3"; reg = <0x0 0xfe800000 0x0 0x100000>; interrupts = ; dr_mode = "otg"; - tx-fifo-resize; snps,dis_enblslpm_quirk; snps,phyif_utmi_16_bits; snps,dis_u2_freeclk_exists_quirk; snps,dis_del_phy_power_chg_quirk; + snps,xhci_slow_suspend_quirk; status = "disabled"; }; }; @@ -413,26 +456,24 @@ compatible = "rockchip,dwc3"; clocks = <&cru SCLK_USB3OTG1_REF>, <&cru SCLK_USB3OTG1_SUSPEND>, <&cru ACLK_USB3OTG1>, <&cru ACLK_USB3_RKSOC_AXI_PERF>, - <&cru ACLK_USB3>, <&cru ACLK_USB3_NOC>, - <&cru ACLK_USB3_GRF>; + <&cru ACLK_USB3>, <&cru ACLK_USB3_GRF>; clock-names = "clk_usb3otg1_ref", "clk_usb3otg1_suspend", "aclk_usb3otg1", "aclk_usb3_rksoc_axi_perf", - "aclk_usb3", "aclk_usb3_noc", - "aclk_usb3_grf"; + "aclk_usb3", "aclk_usb3_grf"; #address-cells = <2>; #size-cells = <2>; ranges; status = "disabled"; - usbdrd_dwc3_1: dwc3 { + usbdrd_dwc3_1: dwc3@fe900000 { compatible = "snps,dwc3"; reg = <0x0 0xfe900000 0x0 0x100000>; interrupts = ; dr_mode = "otg"; - tx-fifo-resize; snps,dis_enblslpm_quirk; snps,phyif_utmi_16_bits; snps,dis_u2_freeclk_exists_quirk; snps,dis_del_phy_power_chg_quirk; + snps,xhci_slow_suspend_quirk; status = "disabled"; }; }; @@ -567,8 +608,8 @@ interrupts = ; reg-shift = <2>; reg-io-width = <4>; - pinctrl-names = "default"; - pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; + pinctrl-names = "default"; + pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; status = "disabled"; }; @@ -580,8 +621,8 @@ interrupts = ; reg-shift = <2>; reg-io-width = <4>; - pinctrl-names = "default"; - pinctrl-0 = <&uart1_xfer>; + pinctrl-names = "default"; + pinctrl-0 = <&uart1_xfer>; status = "disabled"; }; @@ -593,8 +634,8 @@ interrupts = ; reg-shift = <2>; reg-io-width = <4>; - pinctrl-names = "default"; - pinctrl-0 = <&uart2c_xfer>; + pinctrl-names = "default"; + pinctrl-0 = <&uart2c_xfer>; status = "disabled"; }; @@ -606,8 +647,8 @@ interrupts = ; reg-shift = <2>; reg-io-width = <4>; - pinctrl-names = "default"; - pinctrl-0 = <&uart3_xfer &uart3_cts &uart3_rts>; + pinctrl-names = "default"; + pinctrl-0 = <&uart3_xfer &uart3_cts &uart3_rts>; status = "disabled"; }; @@ -677,7 +718,56 @@ }; thermal-zones { - #include "rk3368-thermal.dtsi" + soc_thermal: soc-thermal { + polling-delay-passive = <100>; /* milliseconds */ + polling-delay = <1000>; /* milliseconds */ + sustainable-power = <2600>; /* milliwatts */ + + thermal-sensors = <&tsadc 0>; + + trips { + threshold: trip-point@0 { + temperature = <70000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "passive"; + }; + target: trip-point@1 { + temperature = <85000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "passive"; + }; + soc_crit: soc-crit { + temperature = <95000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map0 { + trip = <&target>; + cooling-device = + <&cpu_l0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + map1 { + trip = <&target>; + cooling-device = + <&cpu_b0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + map2 { + trip = <&target>; + cooling-device = + <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + + gpu_thermal: gpu-thermal { + polling-delay-passive = <100>; /* milliseconds */ + polling-delay = <1000>; /* milliseconds */ + + thermal-sensors = <&tsadc 1>; + }; }; tsadc: tsadc@ff260000 { @@ -700,34 +790,96 @@ status = "disabled"; }; - pmu: power-management@ff31000 { + qos_gpu: qos_gpu@0xffae0000 { + compatible ="syscon"; + reg = <0x0 0xffae0000 0x0 0x20>; + }; + qos_video_m0: qos_video_m0@0xffab8000 { + compatible ="syscon"; + reg = <0x0 0xffab8000 0x0 0x20>; + }; + qos_video_m1_r: qos_video_m1_r@0xffac0000 { + compatible ="syscon"; + reg = <0x0 0xffac0000 0x0 0x20>; + }; + qos_video_m1_w: qos_video_m1_w@0xffac0080 { + compatible ="syscon"; + reg = <0x0 0xffac0080 0x0 0x20>; + }; + qos_rga_r: qos_rga_r@0xffab0000 { + compatible ="syscon"; + reg = <0x0 0xffab0000 0x0 0x20>; + }; + qos_rga_w: qos_rga_w@0xffab0080 { + compatible ="syscon"; + reg = <0x0 0xffab0000 0x0 0x20>; + }; + qos_iep: qos_iep@0xffa98000 { + compatible ="syscon"; + reg = <0x0 0xffa98000 0x0 0x20>; + }; + qos_vop_big_r: qos_vop_big_r@0xffac8000 { + compatible ="syscon"; + reg = <0x0 0xffac8000 0x0 0x20>; + }; + qos_vop_big_w: qos_vop_big_w@0xffac8080 { + compatible ="syscon"; + reg = <0x0 0xffac8080 0x0 0x20>; + }; + qos_vop_little: qos_vop_little@0xffad0000 { + compatible ="syscon"; + reg = <0x0 0xffad0000 0x0 0x20>; + }; + qos_isp0_m0: qos_isp0_m0@0xffaa0000 { + compatible ="syscon"; + reg = <0x0 0xffaa0000 0x0 0x20>; + }; + qos_isp0_m1: qos_isp0_m1@0xffaa0080 { + compatible ="syscon"; + reg = <0x0 0xffaa0080 0x0 0x20>; + }; + qos_isp1_m0: qos_isp1_m0@0xffaa8000 { + compatible ="syscon"; + reg = <0x0 0xffaa8000 0x0 0x20>; + }; + qos_isp1_m1: qos_isp1_m1@0xffaa8080 { + compatible ="syscon"; + reg = <0x0 0xffaa8080 0x0 0x20>; + }; + qos_hdcp: qos_hdcp@0xffa90000 { + compatible ="syscon"; + reg = <0x0 0xffa90000 0x0 0x20>; + }; + + pmu: power-management@ff310000 { compatible = "rockchip,rk3399-pmu", "syscon", "simple-mfd"; reg = <0x0 0xff310000 0x0 0x1000>; power: power-controller { - status = "disabled"; + status = "okay"; compatible = "rockchip,rk3399-power-controller"; #power-domain-cells = <1>; #address-cells = <1>; #size-cells = <0>; - pd_center { - reg = ; - #address-cells = <1>; - #size-cells = <0>; - pd_vdu { - reg = ; - }; - pd_vcodec { - reg = ; - }; - pd_iep { - reg = ; - }; - pd_rga { - reg = ; - }; + pd_vdu { + reg = ; + pm_qos = <&qos_video_m1_r>, + <&qos_video_m1_w>; + }; + pd_vcodec { + reg = ; + pm_qos = <&qos_video_m0>; + }; + pd_iep { + reg = ; + pm_qos = <&qos_iep>; + }; + pd_rga { + reg = ; + pm_qos = <&qos_rga_r>, + <&qos_rga_w>; }; pd_vio { reg = ; @@ -736,12 +888,17 @@ pd_isp0 { reg = ; + pm_qos = <&qos_isp0_m0>, + <&qos_isp0_m1>; }; pd_isp1 { reg = ; + pm_qos = <&qos_isp1_m0>, + <&qos_isp1_m1>; }; pd_hdcp { reg = ; + pm_qos = <&qos_hdcp>; }; pd_vo { reg = ; @@ -750,21 +907,34 @@ pd_vopb { reg = ; + pm_qos = <&qos_vop_big_r>, + <&qos_vop_big_w>; }; pd_vopl { reg = ; + pm_qos = <&qos_vop_little>; }; }; }; pd_gpu { reg = ; + pm_qos = <&qos_gpu>; }; }; }; pmugrf: syscon@ff320000 { - compatible = "rockchip,rk3399-pmugrf", "syscon"; + compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd"; reg = <0x0 0xff320000 0x0 0x1000>; + + reboot-mode { + compatible = "syscon-reboot-mode"; + offset = <0x300>; + mode-normal = ; + mode-recovery = ; + mode-bootloader = ; + mode-loader = ; + }; }; spi3: spi@ff350000 { @@ -819,6 +989,48 @@ status = "disabled"; }; + pcie0: pcie@f8000000 { + compatible = "rockchip,rk3399-pcie"; + #address-cells = <3>; + #size-cells = <2>; + clocks = <&cru ACLK_PCIE>, <&cru ACLK_PERF_PCIE>, + <&cru PCLK_PCIE>, <&cru SCLK_PCIEPHY_REF>; + clock-names = "aclk_pcie", "aclk_perf_pcie", + "hclk_pcie", "clk_pciephy_ref"; + bus-range = <0x0 0x1>; + interrupts = , + , + ; + interrupt-names = "pcie-sys", "pcie-legacy", "pcie-client"; + ranges = < 0x82000000 0 0xfa000000 0x0 0xfa000000 0 0x600000 + 0x81000000 0 0xfa600000 0x0 0xfa600000 0 0x100000 >; + reg = < 0x0 0xf8000000 0x0 0x2000000 >, + < 0x0 0xfd000000 0x0 0x1000000 >; + reg-name = "axi-base", "apb-base"; + resets = <&cru SRST_PCIEPHY>, <&cru SRST_PCIE_CORE>, + <&cru SRST_PCIE_MGMT>, <&cru SRST_PCIE_MGMT_STICKY>, + <&cru SRST_PCIE_PIPE>; + reset-names = "phy-rst", "core-rst", "mgmt-rst", + "mgmt-sticky-rst", "pipe-rst"; + rockchip,grf = <&grf>; + pcie-conf = <0xe220>; + pcie-status = <0xe2a4>; + pcie-laneoff = <0xe214>; + msi-parent = <&its>; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &pcie0 1>, + <0 0 0 2 &pcie0 2>, + <0 0 0 3 &pcie0 3>, + <0 0 0 4 &pcie0 4>; + status = "disabled"; + pcie_intc: interrupt-controller { + interrupt-controller; + #address-cells = <0>; + #interrupt-cells = <1>; + }; + }; + pwm0: pwm@ff420000 { compatible = "rockchip,rk3399-pwm", "rockchip,rk3288-pwm"; reg = <0x0 0xff420000 0x0 0x10>; @@ -863,6 +1075,18 @@ status = "disabled"; }; + rga: rga@ff680000 { + compatible = "rockchip,rk3399-rga"; + reg = <0x0 0xff680000 0x0 0x10000>; + interrupts = ; + interrupt-names = "rga"; + clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA_CORE>; + clock-names = "aclk", "hclk", "sclk"; + resets = <&cru SRST_RGA_CORE>, <&cru SRST_A_RGA>, <&cru SRST_H_RGA>; + reset-names = "core", "axi", "ahb"; + status = "disabled"; + }; + pmucru: pmu-clock-controller@ff750000 { compatible = "rockchip,rk3399-pmucru"; reg = <0x0 0xff750000 0x0 0x1000>; @@ -878,6 +1102,8 @@ #clock-cells = <1>; #reset-cells = <1>; assigned-clocks = + <&cru ACLK_VOP0>, <&cru HCLK_VOP0>, + <&cru ACLK_VOP1>, <&cru HCLK_VOP1>, <&cru ARMCLKL>, <&cru ARMCLKB>, <&cru PLL_GPLL>, <&cru PLL_CPLL>, <&cru PLL_NPLL>, @@ -887,7 +1113,9 @@ <&cru PCLK_PERILP0>, <&cru HCLK_PERILP1>, <&cru PCLK_PERILP1>; assigned-clock-rates = - <816000000>, <1008000000>, + <400000000>, <200000000>, + <400000000>, <200000000>, + <816000000>, <816000000>, <594000000>, <800000000>, <1000000000>, <150000000>, <75000000>, @@ -902,12 +1130,19 @@ reg = <0x0 0xff770000 0x0 0x10000>; }; - wdt0: watchdog@ff840000 { + watchdog@ff840000 { compatible = "snps,dw-wdt"; reg = <0x0 0xff840000 0x0 0x100>; clocks = <&cru PCLK_WDT>; interrupts = ; - status = "disabled"; + }; + + rktimer: rktimer@ff850000 { + compatible = "rockchip,rk3399-timer"; + reg = <0x0 0xff850000 0x0 0x1000>; + interrupts = ; + clocks = <&cru PCLK_TIMER0>, <&cru SCLK_TIMER00>; + clock-names = "pclk", "timer"; }; spdif: spdif@ff870000 { @@ -926,9 +1161,8 @@ i2s0: i2s@ff880000 { compatible = "rockchip,rk3399-i2s", "rockchip,rk3066-i2s"; reg = <0x0 0xff880000 0x0 0x1000>; + rockchip,grf = <&grf>; interrupts = ; - #address-cells = <1>; - #size-cells = <0>; dmas = <&dmac_bus 0>, <&dmac_bus 1>; dma-names = "tx", "rx"; clock-names = "i2s_clk", "i2s_hclk"; @@ -942,8 +1176,6 @@ compatible = "rockchip,rk3399-i2s", "rockchip,rk3066-i2s"; reg = <0x0 0xff890000 0x0 0x1000>; interrupts = ; - #address-cells = <1>; - #size-cells = <0>; dmas = <&dmac_bus 2>, <&dmac_bus 3>; dma-names = "tx", "rx"; clock-names = "i2s_clk", "i2s_hclk"; @@ -957,8 +1189,6 @@ compatible = "rockchip,rk3399-i2s", "rockchip,rk3066-i2s"; reg = <0x0 0xff8a0000 0x0 0x1000>; interrupts = ; - #address-cells = <1>; - #size-cells = <0>; dmas = <&dmac_bus 4>, <&dmac_bus 5>; dma-names = "tx", "rx"; clock-names = "i2s_clk", "i2s_hclk"; @@ -981,8 +1211,20 @@ clocks = <&cru ACLK_GPU>; clock-names = "clk_mali"; + #cooling-cells = <2>; /* min followed by max */ operating-points-v2 = <&gpu_opp_table>; + power-domains = <&power RK3399_PD_GPU>; status = "disabled"; + + power_model { + compatible = "arm,mali-simple-power-model"; + voltage = <900>; + frequency = <500>; + static-power = <300>; + dynamic-power = <1780>; + ts = <32000 4700 (-80) 2>; + thermal-zone = "gpu-thermal"; + }; }; gpu_opp_table: gpu_opp_table { @@ -1001,10 +1243,7 @@ opp-hz = /bits/ 64 <400000000>; opp-microvolt = <900000>; }; - opp03 { - opp-hz = /bits/ 64 <500000000>; - opp-microvolt = <900000>; - }; + }; vopl: vop@ff8f0000 { @@ -1022,10 +1261,15 @@ #address-cells = <1>; #size-cells = <0>; - vopl_out_mipi: endpoint@1 { - reg = <1>; + vopl_out_mipi: endpoint@0 { + reg = <0>; remote-endpoint = <&mipi_in_vopl>; }; + + vopl_out_edp: endpoint@1 { + reg = <1>; + remote-endpoint = <&edp_in_vopl>; + }; }; }; @@ -1053,6 +1297,11 @@ #address-cells = <1>; #size-cells = <0>; + vopb_out_edp: endpoint@0 { + reg = <0>; + remote-endpoint = <&edp_in_vopb>; + }; + vopb_out_mipi: endpoint@1 { reg = <1>; remote-endpoint = <&mipi_in_vopb>; @@ -1102,6 +1351,41 @@ }; }; + edp: edp@ff970000 { + compatible = "rockchip,rk3399-edp"; + reg = <0x0 0xff970000 0x0 0x8000>; + interrupts = ; + clocks = <&cru PCLK_EDP>, <&cru PCLK_EDP_CTRL>; + clock-names = "dp", "pclk"; + resets = <&cru SRST_P_EDP_CTRL>; + reset-names = "dp"; + rockchip,grf = <&grf>; + status = "disabled"; + pinctrl-names = "default"; + pinctrl-0 = <&edp_hpd>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + edp_in: port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + edp_in_vopb: endpoint@0 { + reg = <0>; + remote-endpoint = <&vopb_out_edp>; + }; + + edp_in_vopl: endpoint@1 { + reg = <1>; + remote-endpoint = <&vopl_out_edp>; + }; + }; + }; + }; + display_subsystem: display-subsystem { compatible = "rockchip,display-subsystem"; ports = <&vopl_out>, <&vopb_out>; @@ -1320,6 +1604,13 @@ <4 17 RK_FUNC_1 &pcfg_pull_none>, <4 16 RK_FUNC_1 &pcfg_pull_none>; }; + + i2c3_gpio: i2c3_gpio { + rockchip,pins = + <4 17 RK_FUNC_GPIO &pcfg_pull_none>, + <4 16 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; i2c4 { @@ -1737,10 +2028,35 @@ }; }; - pmic { - pmic_int_l: pmic-int-l { + edp { + edp_hpd: edp-hpd { + rockchip,pins = + <4 23 RK_FUNC_2 &pcfg_pull_none>; + }; + }; + + hdmi { + hdmi_i2c_xfer: hdmi-i2c-xfer { + rockchip,pins = + <4 17 RK_FUNC_3 &pcfg_pull_none>, + <4 16 RK_FUNC_3 &pcfg_pull_none>; + }; + + hdmi_cec: hdmi-cec { + rockchip,pins = + <4 23 RK_FUNC_1 &pcfg_pull_none>; + }; + }; + + pcie { + pcie_clkreqn: pci-clkreqn { + rockchip,pins = + <2 26 RK_FUNC_2 &pcfg_pull_none>; + }; + + pcie_clkreqnb: pci-clkreqnb { rockchip,pins = - <1 21 RK_FUNC_GPIO &pcfg_pull_up>; + <4 24 RK_FUNC_1 &pcfg_pull_none>; }; }; };