aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2013-03-08 14:33:53 +0530
committerTushar Behera <tushar.behera@linaro.org>2013-05-09 15:22:23 +0530
commit3e8eeb9f1dc4795df82762f5d03a5d20ad86609e (patch)
tree25b25f40652f65253c89ba779e858090367ff2e9
parentf8c111eb1dd7f7571bdb565e4d0cce12e8ad0699 (diff)
ARM: EXYNOS: Add support for framebuffer
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-rw-r--r--arch/arm/boot/dts/exynos5250-arndale.dts33
-rw-r--r--arch/arm/boot/dts/exynos5250.dtsi2
-rw-r--r--arch/arm/mach-exynos/Kconfig1
-rw-r--r--arch/arm/mach-exynos/mach-exynos5-dt.c2
4 files changed, 36 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 281dda18878..5aa567c695e 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -435,6 +435,39 @@
};
};
+ lcd_fimd0: lcd_panel0 {
+ compatible = "lcd-powercontrol";
+ lcd-reset-gpio = <&gph1 4 1 0 0>;
+ lcd-htiming = <64 16 48 1024>;
+ lcd-vtiming = <64 16 3 600>;
+ };
+
+ fimd: fimd@14400000 {
+ samsung,fimd-display = <&lcd_fimd0>;
+ samsung,fimd-vidout-rgb;
+ samsung,fimd-inv-hsync;
+ samsung,fimd-inv-vsync;
+ samsung,fimd-inv-vclk;
+ samsung,fimd-frame-rate = <60>;
+
+ gpios = <&gph1 0 2 0 0>,
+ <&gph1 1 2 0 0>;
+
+ window0 {
+ samsung,fimd-win-id = <0>;
+ samsung,fimd-win-bpp = <32 24>;
+ samsung,fimd-win-res = <1024 600>;
+ samsung,fimd-win-vres = <1024 600>;
+ };
+
+ window1 {
+ samsung,fimd-win-id = <1>;
+ samsung,fimd-win-bpp = <32 24>;
+ samsung,fimd-win-res = <1024 600>;
+ samsung,fimd-win-vres = <1024 600>;
+ };
+ };
+
gpio_keys {
compatible = "gpio-keys";
#address-cells = <1>;
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 39d3b6b4ccd..66035ae75f4 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -667,7 +667,7 @@
};
fimd: fimd@14400000 {
- compatible = "samsung,exynos5-fimd";
+ compatible = "samsung,exynos4210-fimd";
interrupt-parent = <&combiner>;
reg = <0x14400000 0x40000>;
interrupts = <18 5>, <18 4>, <18 6>;
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 568d5a40f1e..4c7c8bf6e9a 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -424,6 +424,7 @@ config MACH_EXYNOS5_DT
select ARM_AMBA
select USE_OF
select USB_ARCH_HAS_XHCI
+ select S5P_DEV_FIMD0
help
Machine support for Samsung EXYNOS5 machine with device tree enabled.
Select this if a fdt blob is available for the EXYNOS5 SoC based board.
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index fe3740a80c3..a120eb742d5 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -148,7 +148,7 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
"exynos-ohci", NULL),
OF_DEV_AUXDATA("samsung,exynos-ehci", 0x12110000,
"s5p-ehci", NULL),
- OF_DEV_AUXDATA("samsung,exynos5-fimd", EXYNOS5_PA_FIMD1,
+ OF_DEV_AUXDATA("samsung,exynos4210-fimd", EXYNOS5_PA_FIMD1,
"exynos5-fb.1", NULL),
{},
};