diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-10-04 14:22:23 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-04-29 09:43:56 +0100 |
| commit | f9077827430f335a2bed633b709bdb5a615e164e (patch) | |
| tree | 25f0423291916aecbc48448eb43db7c9d6559d9c | |
| parent | 8a7690748b668aa714e79fc38c9817db1202353f (diff) | |
arm64: Add CLCD support to the ARMv8 model platform
This patch enables CLCD support for the VE platform
emulated by the ARMv8 software model. It requires DT support in the
amba-clcd.c driver.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
| -rw-r--r-- | arch/arm64/boot/dts/rtsm_ve-aemv8a.dts | 26 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm64/configs/vexpress_defconfig | 1 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 2 |
4 files changed, 31 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts index 115052184e5..02c0ef2ba3e 100644 --- a/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts +++ b/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts @@ -12,6 +12,9 @@ /memreserve/ 0x80000000 0x00010000; / { +}; + +/ { model = "RTSM_VE_AEMv8A"; compatible = "arm,rtsm_ve,aemv8a", "arm,vexpress"; interrupt-parent = <&gic>; @@ -156,4 +159,27 @@ /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>; + }; + }; }; diff --git a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi index b45e5f39f57..58c289fd407 100644 --- a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi +++ b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi @@ -182,6 +182,9 @@ interrupts = <14>; clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>; clock-names = "clcdclk", "apb_pclk"; + mode = "XVGA"; + use_dma = <0>; + framebuffer = <0x18000000 0x00180000>; }; }; diff --git a/arch/arm64/configs/vexpress_defconfig b/arch/arm64/configs/vexpress_defconfig index c1ee86dc7f4..37fbc8f6eb1 100644 --- a/arch/arm64/configs/vexpress_defconfig +++ b/arch/arm64/configs/vexpress_defconfig @@ -59,6 +59,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set CONFIG_FB=y +CONFIG_FB_ARMCLCD=y # CONFIG_VGA_CONSOLE is not set CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 4c1546f71d5..524936e2474 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -336,7 +336,7 @@ config FB_PM2_FIFO_DISCONNECT config FB_ARMCLCD tristate "ARM PrimeCell PL110 support" - depends on FB && ARM && ARM_AMBA + depends on FB && (ARM || ARM64) && ARM_AMBA select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT |