diff options
| author | Sebastian Reichel <sre@kernel.org> | 2014-05-06 15:44:50 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2014-05-06 15:44:50 +0200 |
| commit | 695f5ec02203ef23f127eacb86991d23307f3c6f (patch) | |
| tree | ecb9c29268fa34559dfa06472d991bc5d92708be /arch/arm/boot/dts/imx53-tx53-x03x.dts | |
| parent | 5bdeae302496a8ac49848f4fed26b1d87a67d966 (diff) | |
| parent | 793ec5f7dccf95c0d6d5d57a925a13261a7cbd2b (diff) | |
| download | linux-695f5ec02203ef23f127eacb86991d23307f3c6f.tar.bz2 | |
Merge branch 'n900-modem-support' into n900-dt-with-ssin900-dt-with-ssi
Conflicts:
arch/arm/boot/dts/omap3-n900.dts
Diffstat (limited to 'arch/arm/boot/dts/imx53-tx53-x03x.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx53-tx53-x03x.dts | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx53-tx53-x03x.dts b/arch/arm/boot/dts/imx53-tx53-x03x.dts index 0217dde3b36b..3b73e81dc3f0 100644 --- a/arch/arm/boot/dts/imx53-tx53-x03x.dts +++ b/arch/arm/boot/dts/imx53-tx53-x03x.dts @@ -25,12 +25,17 @@ soc { display: display@di0 { compatible = "fsl,imx-parallel-display"; - crtcs = <&ipu 0>; interface-pix-fmt = "rgb24"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_rgb24_vga1>; status = "okay"; + port { + display0_in: endpoint { + remote-endpoint = <&ipu_di0_disp0>; + }; + }; + display-timings { VGA { clock-frequency = <25200000>; @@ -293,6 +298,10 @@ }; }; +&ipu_di0_disp0 { + remote-endpoint = <&display0_in>; +}; + &kpp { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_kpp>; |