diff options
author | Tom Rini <trini@konsulko.com> | 2016-03-15 08:01:17 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-03-15 08:01:17 -0400 |
commit | 4d339a9e8a758889de5da16b562aff5601bb3d8d (patch) | |
tree | 1c1ac403b33a156efbd8f42c8970d771a6ce8f5c /arch/arm/dts | |
parent | e6de55ec5bf306df3b3cc8e7a4cc17fa1e78ca6c (diff) | |
parent | 00b1d2d3178747c113dd8f939cf3e2d449bfaf54 (diff) | |
download | u-boot-imx-4d339a9e8a758889de5da16b562aff5601bb3d8d.zip u-boot-imx-4d339a9e8a758889de5da16b562aff5601bb3d8d.tar.gz u-boot-imx-4d339a9e8a758889de5da16b562aff5601bb3d8d.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'arch/arm/dts')
-rw-r--r-- | arch/arm/dts/rk3288.dtsi | 47 |
1 files changed, 46 insertions, 1 deletions
diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi index e51c75c..3dab0fc 100644 --- a/arch/arm/dts/rk3288.dtsi +++ b/arch/arm/dts/rk3288.dtsi @@ -9,6 +9,7 @@ #include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/power-domain/rk3288.h> #include <dt-bindings/thermal/thermal.h> +#include <dt-bindings/video/rk3288.h> #include "skeleton.dtsi" / { @@ -683,6 +684,10 @@ reg = <1>; remote-endpoint = <&hdmi_in_vopb>; }; + vopb_out_lvds: endpoint@2 { + reg = <2>; + remote-endpoint = <&lvds_in_vopb>; + }; }; }; @@ -719,7 +724,10 @@ reg = <1>; remote-endpoint = <&hdmi_in_vopl>; }; - + vopl_out_lvds: endpoint@2 { + reg = <2>; + remote-endpoint = <&lvds_in_vopl>; + }; }; }; @@ -786,6 +794,34 @@ }; }; + lvds: lvds@ff96c000 { + compatible = "rockchip,rk3288-lvds"; + reg = <0xff96c000 0x4000>; + clocks = <&cru PCLK_LVDS_PHY>; + clock-names = "pclk_lvds"; + pinctrl-names = "default"; + pinctrl-0 = <&lcdc0_ctl>; + rockchip,grf = <&grf>; + status = "disabled"; + ports { + #address-cells = <1>; + #size-cells = <0>; + lvds_in: port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + lvds_in_vopb: endpoint@0 { + reg = <0>; + remote-endpoint = <&vopb_out_lvds>; + }; + lvds_in_vopl: endpoint@1 { + reg = <1>; + remote-endpoint = <&vopl_out_lvds>; + }; + }; + }; + }; + hdmi_audio: hdmi_audio { compatible = "rockchip,rk3288-hdmi-audio"; i2s-controller = <&i2s>; @@ -1109,6 +1145,15 @@ }; }; + lcdc0 { + lcdc0_ctl: lcdc0-ctl { + rockchip,pins = <1 24 RK_FUNC_1 &pcfg_pull_none>, + <1 25 RK_FUNC_1 &pcfg_pull_none>, + <1 26 RK_FUNC_1 &pcfg_pull_none>, + <1 27 RK_FUNC_1 &pcfg_pull_none>; + }; + }; + sdmmc { sdmmc_clk: sdmmc-clk { rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none>; |