[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-365-g4db8e87
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-365-g4db8e87
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2013-08-09 08:28:06
|
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 4db8e87f77180c2d706e004a23d3fe3e93d5a156 (commit)
via 1385339d17cfca7313abd91125a109ba5515bb14 (commit)
via 8eb569ed4d5ece5de02cb50acffbd4c05a0cdb5f (commit)
via 7079412580758a080dc3bf1dca852e0cb5b5324e (commit)
via d5aa2ab2ed1b3d8236ecf16bc3652ad8a64b4e5d (commit)
from 1a21f9d6163e817dbb2a1423810685e05cb7c907 (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 4db8e87f77180c2d706e004a23d3fe3e93d5a156
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date: Fri Aug 9 10:28:03 2013 +0200
[LINUX][3.11] 0204: update hook to dt
commit 1385339d17cfca7313abd91125a109ba5515bb14
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date: Fri Aug 9 10:27:18 2013 +0200
[LINUX][3.11] imxfb: dt: add pwmr attribute
commit 8eb569ed4d5ece5de02cb50acffbd4c05a0cdb5f
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date: Fri Aug 9 10:26:13 2013 +0200
[LINUX][3.11] imx27-apf27dev: add framebuffer and display support
commit 7079412580758a080dc3bf1dca852e0cb5b5324e
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date: Fri Aug 9 10:25:12 2013 +0200
[LINUX][3.11] imx27: dt: add framebuffer pinctrl
commit d5aa2ab2ed1b3d8236ecf16bc3652ad8a64b4e5d
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date: Fri Aug 9 10:24:33 2013 +0200
[LINUX][3.11] imx27: dt: backport framebuffer support
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-mx27-imxfb-fix_pwm_contrast_issue.patch | 54 ++++++++++++++------
...naro-imx27-dts-add_imx_framebuffer_device.patch | 35 +++++++++++++
...madeus-imx27_dtsi-add_framebuffer_pinctrl.patch | 48 +++++++++++++++++
...armadeus-imx27-apf27dev-add_imxfb_support.patch | 50 ++++++++++++++++++
...re_to_setup_PWM_Contrast_Control_Register.patch | 49 ++++++++++++++++++
5 files changed, 220 insertions(+), 16 deletions(-)
create mode 100644 patches/linux/3.11/0208-linaro-imx27-dts-add_imx_framebuffer_device.patch
create mode 100644 patches/linux/3.11/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
create mode 100644 patches/linux/3.11/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
create mode 100644 patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
diff --git a/patches/linux/3.11/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch b/patches/linux/3.11/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
index 2d18bbd..1172852 100644
--- a/patches/linux/3.11/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
+++ b/patches/linux/3.11/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
@@ -10,34 +10,56 @@ Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
drivers/video/imxfb.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
-diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
-index 38733ac..0289f86 100644
---- a/drivers/video/imxfb.c
-+++ b/drivers/video/imxfb.c
-@@ -866,6 +866,9 @@ static int imxfb_probe(struct platform_device *pdev)
+Index: linux-3.11-rc3/drivers/video/imxfb.c
+===================================================================
+--- linux-3.11-rc3.orig/drivers/video/imxfb.c
++++ linux-3.11-rc3/drivers/video/imxfb.c
+@@ -137,6 +137,7 @@ struct imxfb_rgb {
+ enum imxfb_type {
+ IMX1_FB,
+ IMX21_FB,
++ IMX27_FB,
+ };
+
+ struct imxfb_info {
+@@ -189,6 +190,9 @@ static struct platform_device_id imxfb_d
+ .name = "imx21-fb",
+ .driver_data = IMX21_FB,
+ }, {
++ .name = "imx27-fb",
++ .driver_data = IMX27_FB,
++ }, {
+ /* sentinel */
+ }
+ };
+@@ -202,6 +206,9 @@ static struct of_device_id imxfb_of_dev_
+ .compatible = "fsl,imx21-fb",
+ .data = &imxfb_devtype[IMX21_FB],
+ }, {
++ .compatible = "fsl,imx27-fb",
++ .data = &imxfb_devtype[IMX27_FB],
++ }, {
+ /* sentinel */
+ }
+ };
+@@ -866,6 +873,7 @@ static int imxfb_probe(struct platform_d
const struct of_device_id *of_id;
int ret, i;
int bytes_per_pixel;
-+#ifdef CONFIG_SOC_IMX27
+ unsigned long per3clk;
-+#endif
dev_info(&pdev->dev, "i.MX Framebuffer driver\n");
-@@ -959,6 +962,13 @@ static int imxfb_probe(struct platform_device *pdev)
+@@ -959,6 +967,12 @@ static int imxfb_probe(struct platform_d
goto failed_getclock;
}
-+#ifdef CONFIG_SOC_IMX27
-+ per3clk = clk_round_rate(fbi->clk_per, 134000000);
-+ if (clk_set_rate(fbi->clk_per, per3clk)) {
-+ pr_debug("mx2fb: Unable to set clock to %lu\n", per3clk);
++ if (fbi->devtype == IMX27_FB) {
++ per3clk = clk_round_rate(fbi->clk_per, 134000000);
++ if (clk_set_rate(fbi->clk_per, per3clk))
++ pr_debug("mx2fb: Unable to set clock to %lu\n", per3clk);
+ }
-+#endif
+
fbi->regs = ioremap(res->start, resource_size(res));
if (fbi->regs == NULL) {
dev_err(&pdev->dev, "Cannot map frame buffer registers\n");
---
-1.7.4.4
-
diff --git a/patches/linux/3.11/0208-linaro-imx27-dts-add_imx_framebuffer_device.patch b/patches/linux/3.11/0208-linaro-imx27-dts-add_imx_framebuffer_device.patch
new file mode 100644
index 0000000..46a1edf
--- /dev/null
+++ b/patches/linux/3.11/0208-linaro-imx27-dts-add_imx_framebuffer_device.patch
@@ -0,0 +1,35 @@
+From ec3b0ca2d3e1ee855f8b126e62098c8ce3214cf1 Mon Sep 17 00:00:00 2001
+From: Markus Pargmann <mp...@pe...>
+Date: Fri, 28 Jun 2013 16:50:34 +0200
+Subject: [PATCH] ARM: dts: imx27: Add imx framebuffer device
+
+Signed-off-by: Markus Pargmann <mp...@pe...>
+Acked-by: Sascha Hauer <s....@pe...>
+Signed-off-by: Shawn Guo <sha...@li...>
+---
+ arch/arm/boot/dts/imx27.dtsi | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
+index 36836ee..c5747d7 100644
+--- a/arch/arm/boot/dts/imx27.dtsi
++++ b/arch/arm/boot/dts/imx27.dtsi
+@@ -366,6 +366,15 @@
+ reg = <0x10020000 0x20000>;
+ ranges;
+
++ fb: fb@10021000 {
++ compatible = "fsl,imx27-fb";
++ interrupts = <61>;
++ reg = <0x10021000 0x1000>;
++ clocks = <&clks 36>, <&clks 65>, <&clks 59>;
++ clock-names = "ipg", "ahb", "per";
++ status = "disabled";
++ };
++
+ coda: coda@10023000 {
+ compatible = "fsl,imx27-vpu";
+ reg = <0x10023000 0x0200>;
+--
+1.7.9.5
+
diff --git a/patches/linux/3.11/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch b/patches/linux/3.11/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
new file mode 100644
index 0000000..7f1f571
--- /dev/null
+++ b/patches/linux/3.11/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
@@ -0,0 +1,48 @@
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+Index: linux-3.11-rc3/arch/arm/boot/dts/imx27.dtsi
+===================================================================
+--- linux-3.11-rc3.orig/arch/arm/boot/dts/imx27.dtsi
++++ linux-3.11-rc3/arch/arm/boot/dts/imx27.dtsi
+@@ -316,6 +316,40 @@
+ };
+ };
+
++ imxfb {
++ pinctrl_imxfb: imxfb-1 {
++ fsl,pins = <
++ MX27_PAD_LSCLK__LSCLK 0x0
++ MX27_PAD_LD0__LD0 0x0
++ MX27_PAD_LD1__LD1 0x0
++ MX27_PAD_LD2__LD2 0x0
++ MX27_PAD_LD3__LD3 0x0
++ MX27_PAD_LD4__LD4 0x0
++ MX27_PAD_LD5__LD5 0x0
++ MX27_PAD_LD6__LD6 0x0
++ MX27_PAD_LD7__LD7 0x0
++ MX27_PAD_LD8__LD8 0x0
++ MX27_PAD_LD9__LD9 0x0
++ MX27_PAD_LD10__LD10 0x0
++ MX27_PAD_LD11__LD11 0x0
++ MX27_PAD_LD12__LD12 0x0
++ MX27_PAD_LD13__LD13 0x0
++ MX27_PAD_LD14__LD14 0x0
++ MX27_PAD_LD15__LD15 0x0
++ MX27_PAD_LD16__LD16 0x0
++ MX27_PAD_LD17__LD17 0x0
++ MX27_PAD_REV__REV 0x0
++ MX27_PAD_CLS__CLS 0x0
++ MX27_PAD_PS__PS 0x0
++ MX27_PAD_SPL_SPR__SPL_SPR 0x0
++ MX27_PAD_HSYNC__HSYNC 0x0
++ MX27_PAD_VSYNC__VSYNC 0x0
++ MX27_PAD_CONTRAST__CONTRAST 0x0
++ MX27_PAD_OE_ACD__OE_ACD 0x0
++ >;
++ };
++ };
++
+ owire {
+ pinctrl_owire: owire-1 {
+ fsl,pins = <
diff --git a/patches/linux/3.11/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch b/patches/linux/3.11/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
new file mode 100644
index 0000000..1a94c96
--- /dev/null
+++ b/patches/linux/3.11/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
@@ -0,0 +1,50 @@
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+Index: linux-3.11-rc3/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.11-rc3.orig/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.11-rc3/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -35,6 +35,26 @@
+ linux,default-trigger = "heartbeat";
+ };
+ };
++
++ display0: display0 {
++ model = "Chimei-LW700AT9003";
++ native-mode = <&timing0>;
++ bits-per-pixel = <16>; /* non-standard but required */
++ fsl,pcr = <0xfae80083>; /* non-standard but required */
++ display-timings {
++ timing0: timing0 {
++ clock-frequency = <33000033>;
++ hactive = <800>;
++ vactive = <480>;
++ hback-porch = <96>;
++ hfront-porch = <96>;
++ vback-porch = <20>;
++ vfront-porch = <21>;
++ hsync-len = <64>;
++ vsync-len = <4>;
++ };
++ };
++ };
+ };
+
+ &cspi1 {
+@@ -64,6 +84,15 @@
+ status = "okay";
+ };
+
++&fb {
++ display = <&display0>;
++ fsl,pwmr = <0x00a903ff>;
++ fsl,dmacr = <0x00020010>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_imxfb>;
++ status = "okay";
++};
++
+ &iomuxc {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_hog>;
diff --git a/patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch b/patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
new file mode 100644
index 0000000..cb6fbce
--- /dev/null
+++ b/patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
@@ -0,0 +1,49 @@
+This patch adds feature to setup PWM Contrast Control Register.
+This register is used to control the signal output at the contrast pin,
+which controls contrast of the LCD panel.
+
+Signed-off-by: Alexander Shiyan <shc...@ma...>
+---
+ Documentation/devicetree/bindings/video/fsl,imx-fb.txt | 1 +
+ drivers/video/imxfb.c | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+Index: linux-3.11-rc3/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
+===================================================================
+--- linux-3.11-rc3.orig/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
++++ linux-3.11-rc3/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
+@@ -18,6 +18,7 @@ Optional properties:
+ - fsl,dmacr: DMA Control Register value. This is optional. By default, the
+ register is not modified as recommended by the datasheet.
+ - fsl,lscr1: LCDC Sharp Configuration Register value.
++- fsl,pwmr: LCDC PWM Contrast Control Register value.
+
+ Example:
+
+Index: linux-3.11-rc3/drivers/video/imxfb.c
+===================================================================
+--- linux-3.11-rc3.orig/drivers/video/imxfb.c
++++ linux-3.11-rc3/drivers/video/imxfb.c
+@@ -814,8 +814,8 @@ static int imxfb_init_fbinfo(struct plat
+
+ fbi->lscr1 = IMXFB_LSCR1_DEFAULT;
+ of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1);
+-
+ of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr);
++ of_property_read_u32(np, "fsl,pwmr", &fbi->pwmr);
+
+ /* These two function pointers could be used by some specific
+ * platforms. */
+Index: linux-3.11-rc3/drivers/video/Kconfig
+===================================================================
+--- linux-3.11-rc3.orig/drivers/video/Kconfig
++++ linux-3.11-rc3/drivers/video/Kconfig
+@@ -363,7 +363,7 @@ config FB_SA1100
+
+ config FB_IMX
+ tristate "Freescale i.MX1/21/25/27 LCD support"
+- depends on FB && IMX_HAVE_PLATFORM_IMX_FB
++ depends on FB
+ select FB_CFB_FILLRECT
+ select FB_CFB_COPYAREA
+ select FB_CFB_IMAGEBLIT
hooks/post-receive
--
armadeus
|
