diff options
| author | Mark Brown <broonie@linaro.org> | 2014-04-17 19:06:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-17 19:06:13 +0100 |
| commit | 1fe07cd0c79781de1d565a15038e87480adc944a (patch) | |
| tree | 54ac50a6d1032c11083e19cce8fc3c04463da69f /arch/arm64/boot/dts/fvp-base-gicv2-psci.dts | |
| parent | 1b269994c0cf85acd753757f8df573c4bc513482 (diff) | |
| parent | 70830c6164e73518b82719e1e73746cfc984c4dd (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-android-14.04
Diffstat (limited to 'arch/arm64/boot/dts/fvp-base-gicv2-psci.dts')
| -rw-r--r-- | arch/arm64/boot/dts/fvp-base-gicv2-psci.dts | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts b/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts index 79ddd464c7d0..a46be6148b3a 100644 --- a/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts +++ b/arch/arm64/boot/dts/fvp-base-gicv2-psci.dts @@ -261,27 +261,6 @@ /include/ "rtsm_ve-motherboard.dtsi" }; - - panels { - panel@0 { - compatible = "panel"; - mode = "XVGA"; - refresh = <60>; - xres = <1024>; - yres = <768>; - pixclock = <15748>; - left_margin = <152>; - right_margin = <48>; - upper_margin = <23>; - lower_margin = <3>; - hsync_len = <104>; - vsync_len = <4>; - sync = <0>; - vmode = "FB_VMODE_NONINTERLACED"; - tim2 = "TIM2_BCD", "TIM2_IPC"; - cntl = "CNTL_LCDTFT", "CNTL_BGR", "CNTL_LCDVCOMP(1)"; - caps = "CLCD_CAP_5551", "CLCD_CAP_565", "CLCD_CAP_888"; - bpp = <16>; - }; - }; }; + +/include/ "clcd-panels.dtsi" |