[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-226-gbb7c62b
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-226-gbb7c62b
|
From: Gwenhael <gwe...@us...> - 2011-01-09 16:31:14
|
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 bb7c62bf01c318b29450250ff8d06a19d7d8a2cf (commit)
via f33c51fa98f4cf5dd2dfe930af34cc6d459b66bf (commit)
via a85c7d4334a2b62fcac9e94dd842fa58119ac443 (commit)
via e467a1bfafe928384d6c0ad042ce5c5e2a59ae2f (commit)
via 309fc60a65d6820f6c2e566d70109c2d0e9be049 (commit)
from 97c5a2df794aeb4ce33443a314f9fdc0ff7fdf74 (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 bb7c62bf01c318b29450250ff8d06a19d7d8a2cf
Author: gwenhael <gw...@tr...>
Date: Sun Jan 9 17:34:08 2011 +0100
[LINUX][2.6.36][APF9328] 101 : avoid crash when clk_get is called by drivers selected as module
commit f33c51fa98f4cf5dd2dfe930af34cc6d459b66bf
Author: gwenhael <gw...@tr...>
Date: Sun Jan 9 17:33:55 2011 +0100
[LINUX][2.6.36][APF9328] 100 : correct mxc_decode_pll on imx1
commit a85c7d4334a2b62fcac9e94dd842fa58119ac443
Author: gwenhael <gw...@tr...>
Date: Sun Jan 9 17:33:37 2011 +0100
[LINUX][2.6.36][APF9328] 075 : add clock for spi2
commit e467a1bfafe928384d6c0ad042ce5c5e2a59ae2f
Author: gwenhael <gw...@tr...>
Date: Sun Jan 9 17:33:19 2011 +0100
[LINUX][2.6.36][APF9328] adapt patch 075-armadeus-spi2-reg-defines.patch
commit 309fc60a65d6820f6c2e566d70109c2d0e9be049
Author: gwenhael <gw...@tr...>
Date: Sun Jan 9 17:32:59 2011 +0100
[LINUX][2.6.36][APF9328] 072 : avoid compilation error when imxfb is selected
-----------------------------------------------------------------------
Summary of changes:
...adeus-imxfb-suppress_32_bpp_case_for_imx1.patch | 16 ++++++++++++++++
.../075-armadeus-clock-imx1_add_spi2_clock.patch | 10 ++++++++++
.../2.6.36/075-armadeus-spi2-reg-defines.patch | 11 +++++++++++
...eus-clock_correct_mxc_decode_pll_for_imx1.patch | 18 ++++++++++++++++++
...madeus-clock-imx1_avoid_crash_with_module.patch | 12 ++++++++++++
5 files changed, 67 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/072-armadeus-imxfb-suppress_32_bpp_case_for_imx1.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/075-armadeus-clock-imx1_add_spi2_clock.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/075-armadeus-spi2-reg-defines.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/100-armadeus-clock_correct_mxc_decode_pll_for_imx1.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/101-armadeus-clock-imx1_avoid_crash_with_module.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/072-armadeus-imxfb-suppress_32_bpp_case_for_imx1.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/072-armadeus-imxfb-suppress_32_bpp_case_for_imx1.patch
new file mode 100644
index 0000000..22daa81
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/072-armadeus-imxfb-suppress_32_bpp_case_for_imx1.patch
@@ -0,0 +1,16 @@
+iMX1 cpu is unable to use 32bits per pixels.
+--- a/drivers/video/imxfb.c 2010-12-18 15:29:31.000000000 +0100
++++ b/drivers/video/imxfb.c 2010-12-18 15:30:27.000000000 +0100
+@@ -386,10 +386,12 @@
+ }
+
+ switch (var->bits_per_pixel) {
++#ifndef CONFIG_ARCH_MX1
+ case 32:
+ pcr |= PCR_BPIX_18;
+ rgb = &def_rgb_18;
+ break;
++#endif
+ case 16:
+ default:
+ if (cpu_is_mx1())
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/075-armadeus-clock-imx1_add_spi2_clock.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/075-armadeus-clock-imx1_add_spi2_clock.patch
new file mode 100644
index 0000000..ba4bb40
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/075-armadeus-clock-imx1_add_spi2_clock.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-imx/clock-imx1.c 2011-01-09 16:09:00.000000000 +0100
++++ b/arch/arm/mach-imx/clock-imx1.c 2011-01-09 16:09:23.000000000 +0100
+@@ -593,6 +593,7 @@
+ _REGISTER_CLOCK("imx-uart.2", NULL, uart_clk)
+ _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk)
+ _REGISTER_CLOCK("spi_imx.0", NULL, spi_clk)
++ _REGISTER_CLOCK("spi_imx.1", NULL, spi_clk)
+ _REGISTER_CLOCK("imx-mmc.0", NULL, sdhc_clk)
+ _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk)
+ _REGISTER_CLOCK(NULL, "mshc", mshc_clk)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/075-armadeus-spi2-reg-defines.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/075-armadeus-spi2-reg-defines.patch
new file mode 100644
index 0000000..2108fe9
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/075-armadeus-spi2-reg-defines.patch
@@ -0,0 +1,11 @@
+--- a/arch/arm/plat-mxc/include/mach/iomux-mx1.h 2010-12-19 11:11:37.000000000 +0100
++++ b/arch/arm/plat-mxc/include/mach/iomux-mx1.h 2010-12-19 11:11:55.000000000 +0100
+@@ -119,7 +119,7 @@
+ #define PD6_PF_LSCLK (GPIO_PORTD | GPIO_PF | GPIO_OUT | 6)
+ #define PD7_PF_REV (GPIO_PORTD | GPIO_PF | 7)
+ #define PD7_AF_UART2_DTR (GPIO_PORTD | GPIO_AF | GPIO_IN | 7)
+-#define PD7_AIN_SPI2_SCLK (GPIO_PORTD | GPIO_AIN | 7)
++#define PD7_AIN_SPI2_SCLK (GPIO_PORTD | GPIO_AIN | GPIO_OUT | 7)
+ #define PD8_PF_CLS (GPIO_PORTD | GPIO_PF | 8)
+ #define PD8_AF_UART2_DCD (GPIO_PORTD | GPIO_AF | GPIO_OUT | 8)
+ #define PD8_AIN_SPI2_SS (GPIO_PORTD | GPIO_AIN | 8)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/100-armadeus-clock_correct_mxc_decode_pll_for_imx1.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/100-armadeus-clock_correct_mxc_decode_pll_for_imx1.patch
new file mode 100644
index 0000000..bad2ff9
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/100-armadeus-clock_correct_mxc_decode_pll_for_imx1.patch
@@ -0,0 +1,18 @@
+The current mxc_decode_pll function provide wrong values on imx1 cpu.
+--- a/arch/arm/plat-mxc/clock.c 2010-10-20 22:30:22.000000000 +0200
++++ b/arch/arm/plat-mxc/clock.c 2010-12-05 11:14:32.000000000 +0100
+@@ -221,6 +222,14 @@
+ pd = (reg_val >> 26) & 0xf;
+
+ mfi = mfi <= 5 ? 5 : mfi;
++ if (cpu_is_mx1()) {
++ ll = 2 * (unsigned long long)freq *
++ ((mfi << 16) + (mfn << 16) / (mfd + 1));
++ quot = (pd + 1) * (1 << 16);
++ ll += quot / 2;
++ do_div(ll, quot);
++ return (unsigned long)ll;
++ }
+
+ mfn_abs = mfn;
+
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/101-armadeus-clock-imx1_avoid_crash_with_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/101-armadeus-clock-imx1_avoid_crash_with_module.patch
new file mode 100644
index 0000000..d6a1205
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/101-armadeus-clock-imx1_avoid_crash_with_module.patch
@@ -0,0 +1,12 @@
+This patch suppress kernel oops when a driver, compiled as module, get a clock.
+--- a/arch/arm/mach-imx/clock-imx1.c 2011-01-09 16:11:35.000000000 +0100
++++ b/arch/arm/mach-imx/clock-imx1.c 2011-01-09 16:11:47.000000000 +0100
+@@ -582,7 +582,7 @@
+ .con_id = n, \
+ .clk = &c, \
+ },
+-static struct clk_lookup lookups[] __initdata = {
++static struct clk_lookup lookups[] = {
+ _REGISTER_CLOCK(NULL, "dma", dma_clk)
+ _REGISTER_CLOCK("mx1-camera.0", NULL, csi_clk)
+ _REGISTER_CLOCK(NULL, "mma", mma_clk)
hooks/post-receive
--
armadeus
|
