[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-310-g22f6eb0
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-310-g22f6eb0
|
From: Julien B a. A. <ar...@us...> - 2014-06-26 13:15:45
|
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 22f6eb050e41e0d8de86f18f5b8b8bd1932a937f (commit)
from feeb9861cb9de3f5a08ce68ab951fe6f6ad065a8 (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 22f6eb050e41e0d8de86f18f5b8b8bd1932a937f
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 26 15:15:24 2014 +0200
[LINUX] 3.15+: APF27: finally fixes patches needed/not needed to have LCD working on APF27Dev
-----------------------------------------------------------------------
Summary of changes:
...re_to_setup_PWM_Contrast_Control_Register.patch | 33 -------------
...re_to_setup_PWM_Contrast_Control_Register.tofix | 49 --------------------
...s-dts-imx27-apf27dev-set-pwmr-accordingly.patch | 4 +-
...re_to_setup_PWM_Contrast_Control_Register.patch | 33 -------------
...re_to_setup_PWM_Contrast_Control_Register.tofix | 49 --------------------
...s-dts-imx27-apf27dev-set-pwmr-accordingly.patch | 4 +-
6 files changed, 2 insertions(+), 170 deletions(-)
delete mode 100644 patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
delete mode 100644 patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix
delete mode 100644 patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
delete mode 100644 patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix
diff --git a/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch b/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
deleted file mode 100644
index 1f4a21e..0000000
--- a/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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...>
-
-Modified by JB for 3.15.
-
-Index: linux-3.15.1/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
-===================================================================
---- linux-3.15.1.orig/Documentation/devicetree/bindings/video/fsl,imx-fb.txt 2014-06-26 11:54:06.385625557 +0200
-+++ linux-3.15.1/Documentation/devicetree/bindings/video/fsl,imx-fb.txt 2014-06-26 11:56:48.894431399 +0200
-@@ -22,6 +22,7 @@
- default value for the contrast control register.
- If that property is ommited, the register is zeroed.
- - fsl,lscr1: LCDC Sharp Configuration Register value.
-+- fsl,pwmr: LCDC PWM Contrast Control Register value.
-
- Example:
-
-Index: linux-3.15.1/drivers/video/fbdev/imxfb.c
-===================================================================
---- linux-3.15.1.orig/drivers/video/fbdev/imxfb.c 2014-06-26 11:57:23.886604919 +0200
-+++ linux-3.15.1/drivers/video/fbdev/imxfb.c 2014-06-26 11:59:49.143325212 +0200
-@@ -676,6 +676,8 @@
- 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);
- }
-
- return 0;
diff --git a/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix b/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix
deleted file mode 100644
index e5e6601..0000000
--- a/patches/linux/3.15/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix
+++ /dev/null
@@ -1,49 +0,0 @@
-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
diff --git a/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch b/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
index f248815..92123bb 100644
--- a/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
+++ b/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
@@ -1,7 +1,5 @@
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
-Depends on 0211
-
Index: linux-3.15.1/arch/arm/boot/dts/imx27-apf27dev.dts
===================================================================
--- linux-3.15.1.orig/arch/arm/boot/dts/imx27-apf27dev.dts 2014-06-26 12:08:04.865783373 +0200
@@ -10,7 +8,7 @@ Index: linux-3.15.1/arch/arm/boot/dts/imx27-apf27dev.dts
&fb {
display = <&display>;
-+ fsl,pwmr = <0x00a90580>;
++ fsl,lpccr = <0x00a90580>;
fsl,dmacr = <0x00020010>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_imxfb1>;
diff --git a/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch b/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
deleted file mode 100644
index 1f4a21e..0000000
--- a/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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...>
-
-Modified by JB for 3.15.
-
-Index: linux-3.15.1/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
-===================================================================
---- linux-3.15.1.orig/Documentation/devicetree/bindings/video/fsl,imx-fb.txt 2014-06-26 11:54:06.385625557 +0200
-+++ linux-3.15.1/Documentation/devicetree/bindings/video/fsl,imx-fb.txt 2014-06-26 11:56:48.894431399 +0200
-@@ -22,6 +22,7 @@
- default value for the contrast control register.
- If that property is ommited, the register is zeroed.
- - fsl,lscr1: LCDC Sharp Configuration Register value.
-+- fsl,pwmr: LCDC PWM Contrast Control Register value.
-
- Example:
-
-Index: linux-3.15.1/drivers/video/fbdev/imxfb.c
-===================================================================
---- linux-3.15.1.orig/drivers/video/fbdev/imxfb.c 2014-06-26 11:57:23.886604919 +0200
-+++ linux-3.15.1/drivers/video/fbdev/imxfb.c 2014-06-26 11:59:49.143325212 +0200
-@@ -676,6 +676,8 @@
- 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);
- }
-
- return 0;
diff --git a/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix b/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix
deleted file mode 100644
index e5e6601..0000000
--- a/patches/linux/3.16/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.tofix
+++ /dev/null
@@ -1,49 +0,0 @@
-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
diff --git a/patches/linux/3.16/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch b/patches/linux/3.16/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
index f248815..92123bb 100644
--- a/patches/linux/3.16/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
+++ b/patches/linux/3.16/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
@@ -1,7 +1,5 @@
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
-Depends on 0211
-
Index: linux-3.15.1/arch/arm/boot/dts/imx27-apf27dev.dts
===================================================================
--- linux-3.15.1.orig/arch/arm/boot/dts/imx27-apf27dev.dts 2014-06-26 12:08:04.865783373 +0200
@@ -10,7 +8,7 @@ Index: linux-3.15.1/arch/arm/boot/dts/imx27-apf27dev.dts
&fb {
display = <&display>;
-+ fsl,pwmr = <0x00a90580>;
++ fsl,lpccr = <0x00a90580>;
fsl,dmacr = <0x00020010>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_imxfb1>;
hooks/post-receive
--
armadeus
|