diff options
author | Jason Chen <jason.chen@linaro.org> | 2011-12-05 18:18:59 +0800 |
---|---|---|
committer | Eric Miao <eric.miao@linaro.org> | 2012-01-11 21:39:11 +0800 |
commit | ddf51fe00663c6ddeacbf0c2b77bf5aa23425ae3 (patch) | |
tree | 89e3f06a697ce026d49d921e7b82d86c2e3c7666 /arch | |
parent | 95756b30fb488275e2a2b9925c1e52f8a06aeca1 (diff) |
imx6q-sabrelite: add ipuv3 fb dt support
Signed-off-by: Jason Chen <jason.chen@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/imx6q-sabrelite.dts | 35 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/ipu-v3.h | 2 |
2 files changed, 36 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts index a8bd4dcdd4d..b199cd9a7e6 100644 --- a/arch/arm/boot/dts/imx6q-sabrelite.dts +++ b/arch/arm/boot/dts/imx6q-sabrelite.dts @@ -61,4 +61,39 @@ di = <0>; }; }; + + leds { + compatible = "gpio-leds"; + + debug-led { + label = "Heartbeat"; + gpios = <&gpio2 25 0>; /* GPIO3_25 */ + linux,default-trigger = "heartbeat"; + }; + }; + + displays { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + ranges; + + disp1: fb@0 { + compatible = "fsl,mxcfb-ipuv3"; + disp_dev = "hdmi"; + interface_pix_fmt = "RGB24"; + mode_str = "1280x720M@60"; + internal_clk = "false"; + reg = <0x00000000 0x0>; /* reserve fb mem */ + }; + + disp2: fb@1 { + compatible = "fsl,mxcfb-ipuv3"; + disp_dev = "ldb"; + interface_pix_fmt = "RGB666"; + mode_str = "LDB-XGA"; + internal_clk = "false"; + reg = <0x00000001 0x0>; /* reserve fb mem */ + }; + }; }; diff --git a/arch/arm/plat-mxc/include/mach/ipu-v3.h b/arch/arm/plat-mxc/include/mach/ipu-v3.h index 480b4ea338e..bccb8811673 100644 --- a/arch/arm/plat-mxc/include/mach/ipu-v3.h +++ b/arch/arm/plat-mxc/include/mach/ipu-v3.h @@ -691,7 +691,7 @@ uint32_t bytes_per_pixel(uint32_t fmt); struct ipuv3_fb_platform_data { char disp_dev[32]; u32 interface_pix_fmt; - char *mode_str; + char mode_str[32]; int default_bpp; bool int_clk; |