diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-07-06 16:25:55 +0200 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-07-06 16:25:55 +0200 |
commit | ea1a25c3348abc33d7d94db28501766adf3d1c7d (patch) | |
tree | ca3c5c8b72532117034dd2d57a2a85eead13db7b /arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | |
parent | SCSI: fix new bug in scsi_dev_info_list string matching (diff) | |
parent | qla2xxx: Fix NULL pointer deref in QLA interrupt (diff) | |
download | linux-ea1a25c3348abc33d7d94db28501766adf3d1c7d.tar.xz linux-ea1a25c3348abc33d7d94db28501766adf3d1c7d.zip |
Merge branch 'jejb-fixes' into fixes
Diffstat (limited to 'arch/arm/boot/dts/vf-colibri-eval-v3.dtsi')
-rw-r--r-- | arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi index 4d8b7f693535..a8a8e434fb27 100644 --- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi @@ -50,6 +50,11 @@ clock-frequency = <16000000>; }; + panel: panel { + compatible = "edt,et057090dhu"; + backlight = <&bl>; + }; + reg_3v3: regulator-3v3 { compatible = "regulator-fixed"; regulator-name = "3.3V"; @@ -83,6 +88,13 @@ status = "okay"; }; +&dcu0 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_dcu0_1>; + fsl,panel = <&panel>; + status = "okay"; +}; + &dspi1 { status = "okay"; @@ -134,6 +146,10 @@ vin-supply = <®_3v3>; }; +&tcon0 { + status = "okay"; +}; + &uart0 { status = "okay"; }; |