[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-694-g7c488a4
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-694-g7c488a4
|
From: Sébastien S. <ss...@us...> - 2015-03-30 12:14:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 7c488a4aa6c20a00e57c55ff46147a8061d5f73f (commit)
from 0ce781dcce52e64ff5f2144e89c5b070479e1049 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7c488a4aa6c20a00e57c55ff46147a8061d5f73f
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Mar 30 14:10:42 2015 +0200
[LINUX] 3.10.mx6_legacy: add LCD support
While at it, set hdmi bpp to 32 and fix muxing of MX6QDL_PAD_DI0_PIN4
pad.
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 30 +++++++++++++++++--
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index bfb44d5..8a4eefa 100644
--- a/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.10.mx6_legacy/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -174,7 +174,7 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
===================================================================
--- /dev/null
+++ linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,486 @@
+@@ -0,0 +1,508 @@
+/*
+ * Copyright 2015 Armadeus Systems
+ *
@@ -189,6 +189,7 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+/ {
+ aliases {
+ mxcfb0 = &mxcfb1;
++ mxcfb1 = &mxcfb2;
+ };
+
+ gpio-keys {
@@ -217,12 +218,33 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+ };
+ };
+
++ lcd@0 {
++ compatible = "fsl,lcd";
++ ipu_id = <0>;
++ disp_id = <0>;
++ default_ifmt = "RGB565";
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ipu1_disp1>;
++ status = "okay";
++ };
++
+ mxcfb1: fb@0 {
+ compatible = "fsl,mxc_sdc_fb";
+ disp_dev = "hdmi";
+ interface_pix_fmt = "RGB24";
+ mode_str ="1920x1080M@60";
-+ default_bpp = <24>;
++ default_bpp = <32>;
++ int_clk = <0>;
++ late_init = <0>;
++ status = "okay";
++ };
++
++ mxcfb2: fb@1 {
++ compatible = "fsl,mxc_sdc_fb";
++ disp_dev = "lcd";
++ interface_pix_fmt = "RGB666";
++ mode_str ="CLAA-WVGA";
++ default_bpp = <16>;
+ int_clk = <0>;
+ late_init = <0>;
+ status = "okay";
@@ -334,7 +356,7 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+
+&hdmi_core {
+ ipu_id = <0>;
-+ disp_id = <0>;
++ disp_id = <1>;
+ status = "okay";
+};
+
@@ -529,6 +551,7 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+
+ pinctrl_gpios: gpiosgrp {
+ fsl,pins = <
++ MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x80000000
+ MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12 0x80000000
+ MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13 0x80000000
+ MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14 0x80000000
@@ -574,7 +597,6 @@ Index: linux-wandboard_imx_3.10.31_1.1.0_beta2/arch/arm/boot/dts/imx6qdl-apf6dev
+ MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15 0x10
+ MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x10
+ MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x10
-+ MX6QDL_PAD_DI0_PIN4__IPU1_DI0_PIN04 0x80000000
+ MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00 0x10
+ MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x10
+ MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x10
hooks/post-receive
--
armadeus
|