[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-138-g61c0653
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-138-g61c0653
|
From: Julien B a. A. <ar...@us...> - 2010-11-25 18:28:01
|
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 61c0653029aa4b195049c5e570bc16a8c84ff56e (commit)
via 05670a00c15593ba32fc3d9ee436a4c6b3bdd2b6 (commit)
from 3823b7c064b2118c46dfd029f28fd44d12917379 (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 61c0653029aa4b195049c5e570bc16a8c84ff56e
Merge: 05670a00c15593ba32fc3d9ee436a4c6b3bdd2b6 3823b7c064b2118c46dfd029f28fd44d12917379
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 19:27:37 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 05670a00c15593ba32fc3d9ee436a4c6b3bdd2b6
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 19:27:20 2010 +0100
[LINUX] 2.6.36: import patches 330, 331, 333 & 339 from 2.6.29
-----------------------------------------------------------------------
Summary of changes:
...add_platform_data_init_support_to_spidev.patch} | 0
...-imxfb-power_on_backlight_after_lcd_logic.patch | 8 +++---
...-makes_setpalettereg_compatible_with_mx27.patch | 8 +++---
...mx2_bit_per_pixel_selection_in_PCR_fields.patch | 23 ++++++++++++++++++++
...add_platform_data_init_support_to_spidev.patch} | 20 ++++++++--------
5 files changed, 41 insertions(+), 18 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/{339-apf27-armadeus-spidev.patch => 339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch} (100%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch (73%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch (78%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/333-armadeus-imxfb-makes_distinction_between_mx1_and_mx2_bit_per_pixel_selection_in_PCR_fields.patch
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29/339-apf27-armadeus-spidev.patch => 2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch} (62%)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
similarity index 100%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
similarity index 73%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
index 8e09faa..013c431 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
@@ -5,11 +5,11 @@ will be seen.
Signed-off-by: Nicolas Colombain <nic...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29.4/drivers/video/imxfb.c
+Index: linux-2.6.36/drivers/video/imxfb.c
===================================================================
---- linux-2.6.29.4.orig/drivers/video/imxfb.c 2009-06-04 11:24:55.000000000 +0200
-+++ linux-2.6.29.4/drivers/video/imxfb.c 2009-06-04 11:28:59.000000000 +0200
-@@ -397,10 +397,10 @@
+--- linux-2.6.36.orig/drivers/video/imxfb.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/video/imxfb.c 2010-11-25 17:46:43.000000000 +0100
+@@ -542,10 +542,10 @@
clk_enable(fbi->clk);
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch
similarity index 78%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch
index 16741a4..a696083 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch
@@ -3,11 +3,11 @@ On i.MX2(1/7) color palette registers are 18 bits wide for TFT display's modes.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29/drivers/video/imxfb.c
+Index: linux-2.6.36/drivers/video/imxfb.c
===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-06-01 14:39:03.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-06-01 15:49:54.000000000 +0200
-@@ -221,12 +221,17 @@
+--- linux-2.6.36.orig/drivers/video/imxfb.c 2010-11-25 17:46:43.000000000 +0100
++++ linux-2.6.36/drivers/video/imxfb.c 2010-11-25 18:03:18.000000000 +0100
+@@ -244,12 +244,17 @@
{
struct imxfb_info *fbi = info->par;
u_int val, ret = 1;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/333-armadeus-imxfb-makes_distinction_between_mx1_and_mx2_bit_per_pixel_selection_in_PCR_fields.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/333-armadeus-imxfb-makes_distinction_between_mx1_and_mx2_bit_per_pixel_selection_in_PCR_fields.patch
new file mode 100644
index 0000000..0f8a558
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/333-armadeus-imxfb-makes_distinction_between_mx1_and_mx2_bit_per_pixel_selection_in_PCR_fields.patch
@@ -0,0 +1,23 @@
+
+On i.MXL bits per pixel selection in LCD controller's PCR register is slightly
+different than on i.MX2+, so mark this difference.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/imxfb.h
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2010-11-25 18:27:50.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/imxfb.h 2010-11-25 18:28:45.000000000 +0100
+@@ -15,8 +15,12 @@
+ #define PCR_BPIX_4 (2 << 25)
+ #define PCR_BPIX_8 (3 << 25)
+ #define PCR_BPIX_12 (4 << 25)
++#ifdef CONFIG_ARCH_MX1
++#define PCR_BPIX_16 (4 << 25)
++#else
+ #define PCR_BPIX_16 (5 << 25)
+ #define PCR_BPIX_18 (6 << 25)
++#endif
+ #define PCR_PIXPOL (1 << 24)
+ #define PCR_FLMPOL (1 << 23)
+ #define PCR_LPPOL (1 << 22)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
similarity index 62%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
index ec7012c..9b412f4 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
@@ -4,19 +4,19 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Signed-off-by: Gwenhaël Goavec-Merou <gw...@tr...>
---
-Index: linux-2.6.29.6/drivers/spi/spidev.c
+Index: linux-2.6.36/drivers/spi/spidev.c
===================================================================
---- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/spi/spidev.c 2010-01-19 14:37:18.000000000 +0100
-@@ -558,6 +558,7 @@
+--- linux-2.6.36.orig/drivers/spi/spidev.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/spi/spidev.c 2010-11-25 19:22:06.000000000 +0100
+@@ -560,6 +560,7 @@
- static int spidev_probe(struct spi_device *spi)
+ static int __devinit spidev_probe(struct spi_device *spi)
{
+ struct spidev_platform_data *pdata = spi->dev.platform_data;
struct spidev_data *spidev;
int status;
unsigned long minor;
-@@ -595,6 +596,10 @@
+@@ -597,6 +598,10 @@
set_bit(minor, minors);
list_add(&spidev->device_entry, &device_list);
}
@@ -27,11 +27,11 @@ Index: linux-2.6.29.6/drivers/spi/spidev.c
mutex_unlock(&device_list_lock);
if (status == 0)
-Index: linux-2.6.29.6/include/linux/spi/spidev.h
+Index: linux-2.6.36/include/linux/spi/spidev.h
===================================================================
---- linux-2.6.29.6.orig/include/linux/spi/spidev.h 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/include/linux/spi/spidev.h 2010-01-19 14:37:18.000000000 +0100
-@@ -101,6 +101,10 @@
+--- linux-2.6.36.orig/include/linux/spi/spidev.h 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/include/linux/spi/spidev.h 2010-11-25 19:22:06.000000000 +0100
+@@ -103,6 +103,10 @@
*/
};
hooks/post-receive
--
armadeus
|
