[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-146-gc51bd73
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-146-gc51bd73
|
From: Julien B a. A. <ar...@us...> - 2010-11-26 11:01:34
|
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 c51bd7325d77d2e6bd29464c323280df2e228d16 (commit)
via 203bb24a699662bd2bd2fd64068aa6c223f03b0e (commit)
from 3438a26981680f297da668258c5072441cb2c6b6 (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 c51bd7325d77d2e6bd29464c323280df2e228d16
Merge: 203bb24a699662bd2bd2fd64068aa6c223f03b0e 3438a26981680f297da668258c5072441cb2c6b6
Author: Julien Boibessot <jul...@ar...>
Date: Fri Nov 26 12:01:06 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 203bb24a699662bd2bd2fd64068aa6c223f03b0e
Author: Julien Boibessot <jul...@ar...>
Date: Fri Nov 26 12:00:40 2010 +0100
[LINUX] 2.6.36: Import patches 341, 342, 345, 347c & 348 from 2.6.29
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.36.config | 6 ++++
...ial-add_uart_modules_selection_in_kconfig.patch | 22 +++++++-------
..._are_not_available_on_apf27_based_designs.patch | 12 ++++----
...isplay_gpio_number_when_reservation_fails.patch | 30 ++++++++++++++++++++
...c-armadeus-lan95xx-activate_blinking_leds.patch | 20 ++++++------
...at-mxc-gpio-mxc_gpio_set_behaviour_change.patch | 21 ++++++++++++++
6 files changed, 84 insertions(+), 27 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch (82%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch (80%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/347c-armadeus-lan95xx-activate_blinking_leds.patch (63%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/348-armadeus-plat-mxc-gpio-mxc_gpio_set_behaviour_change.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
index 83916f6..9c928d0 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
@@ -981,6 +981,12 @@ CONFIG_DEVKMEM=y
# CONFIG_SERIAL_MAX3107 is not set
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_IMX_UART1=y
+# CONFIG_SERIAL_IMX_UART2 is not set
+CONFIG_SERIAL_IMX_UART3=y
+# CONFIG_SERIAL_IMX_UART3_USE_RTSCTS is not set
+# CONFIG_SERIAL_IMX_UART5 is not set
+# CONFIG_SERIAL_IMX_UART6 is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_TIMBERDALE is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
similarity index 82%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
index 5b38d71..3a250f0 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
@@ -3,11 +3,11 @@ functionnalities, so it can be interesting to individually select them or not.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29.6/drivers/serial/Kconfig
+Index: linux-2.6.36/drivers/serial/Kconfig
===================================================================
---- linux-2.6.29.6.orig/drivers/serial/Kconfig 2009-12-14 20:38:17.000000000 +0100
-+++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-15 07:51:45.000000000 +0100
-@@ -831,6 +831,67 @@
+--- linux-2.6.36.orig/drivers/serial/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/serial/Kconfig 2010-11-26 10:16:02.000000000 +0100
+@@ -906,6 +906,67 @@
your boot loader (lilo or loadlin) about how to pass options to the
kernel at boot time.)
@@ -16,7 +16,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ depends on SERIAL_IMX && (ARCH_MX1 || ARCH_MX2 || ARCH_MX3)
+ default y
+ help
-+ /dev/ttySMX0
++ /dev/ttymxc0
+
+config SERIAL_IMX_UART1_USE_RTSCTS
+ bool "Uses UART1 RTS/CTS lines"
@@ -26,7 +26,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ bool "UART2"
+ depends on SERIAL_IMX && (ARCH_MX1 || ARCH_MX2 || ARCH_MX3)
+ help
-+ /dev/ttySMX1
++ /dev/ttymxc1
+
+config SERIAL_IMX_UART2_USE_RTSCTS
+ bool "Uses UART2 RTS/CTS lines"
@@ -36,7 +36,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ bool "UART3"
+ depends on SERIAL_IMX && (ARCH_MX2 || ARCH_MX3)
+ help
-+ /dev/ttySMX2
++ /dev/ttymxc2
+
+config SERIAL_IMX_UART3_USE_RTSCTS
+ bool "Uses UART3 RTS/CTS lines"
@@ -46,7 +46,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ bool "UART4"
+ depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31)
+ help
-+ /dev/ttySMX3
++ /dev/ttymxc3
+
+config SERIAL_IMX_UART4_USE_RTSCTS
+ bool "Uses UART4 RTS/CTS lines"
@@ -56,7 +56,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ bool "UART5"
+ depends on SERIAL_IMX && (MACH_MX25 || MACH_MX27 || MACH_MX31)
+ help
-+ /dev/ttySMX4
++ /dev/ttymxc4
+
+config SERIAL_IMX_UART5_USE_RTSCTS
+ bool "Uses UART5 RTS/CTS lines"
@@ -66,7 +66,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ bool "UART6"
+ depends on SERIAL_IMX && (MACH_MX27)
+ help
-+ /dev/ttySMX5
++ /dev/ttymxc5
+
+config SERIAL_IMX_UART6_USE_RTSCTS
+ bool "Uses UART6 RTS/CTS lines"
@@ -74,4 +74,4 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+
config SERIAL_UARTLITE
tristate "Xilinx uartlite serial port support"
- depends on PPC32
+ depends on PPC32 || MICROBLAZE || MFD_TIMBERDALE
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
similarity index 80%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
index 291c7cd..40490b0 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
@@ -6,11 +6,11 @@ On APF27 based designs some UART pins are missing:
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29.6/drivers/serial/Kconfig
+Index: linux-2.6.36/drivers/serial/Kconfig
===================================================================
---- linux-2.6.29.6.orig/drivers/serial/Kconfig 2009-12-16 12:08:10.000000000 +0100
-+++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-16 12:08:10.000000000 +0100
-@@ -840,7 +840,7 @@
+--- linux-2.6.36.orig/drivers/serial/Kconfig 2010-11-26 10:16:02.000000000 +0100
++++ linux-2.6.36/drivers/serial/Kconfig 2010-11-26 10:31:53.000000000 +0100
+@@ -915,7 +915,7 @@
config SERIAL_IMX_UART1_USE_RTSCTS
bool "Uses UART1 RTS/CTS lines"
@@ -19,7 +19,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
config SERIAL_IMX_UART2
bool "UART2"
-@@ -860,11 +860,11 @@
+@@ -935,11 +935,11 @@
config SERIAL_IMX_UART3_USE_RTSCTS
bool "Uses UART3 RTS/CTS lines"
@@ -31,5 +31,5 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
- depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31)
+ depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31) && (!MACH_APF27_DEV)
help
- /dev/ttySMX3
+ /dev/ttymxc3
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch
new file mode 100644
index 0000000..31136dc
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch
@@ -0,0 +1,30 @@
+Ease debugging when GPIO allocation fails.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.36/arch/arm/plat-mxc/iomux-v1.c
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/iomux-v1.c 2010-11-26 10:38:39.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/iomux-v1.c 2010-11-26 10:42:18.000000000 +0100
+@@ -174,9 +174,10 @@
+ {
+ size_t i;
+ int ret;
++ unsigned gpio;
+
+ for (i = 0; i < count; ++i) {
+- unsigned gpio = pin_list[i] & (GPIO_PIN_MASK | GPIO_PORT_MASK);
++ gpio = pin_list[i] & (GPIO_PIN_MASK | GPIO_PORT_MASK);
+
+ ret = gpio_request(gpio, label);
+ if (ret)
+@@ -193,6 +194,9 @@
+ BUG_ON(i != count);
+
+ err_gpio_request:
++ printk("*** Failed to reserve GPIO %d (port %c pin %d)\n", gpio,
++ 0x41 + ((gpio & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT),
++ gpio & GPIO_PIN_MASK);
+ mxc_gpio_release_multiple_pins(pin_list, i);
+
+ return ret;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/347c-armadeus-lan95xx-activate_blinking_leds.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/347c-armadeus-lan95xx-activate_blinking_leds.patch
similarity index 63%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/347c-armadeus-lan95xx-activate_blinking_leds.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/347c-armadeus-lan95xx-activate_blinking_leds.patch
index 598896a..9c1afa6 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/347c-armadeus-lan95xx-activate_blinking_leds.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/347c-armadeus-lan95xx-activate_blinking_leds.patch
@@ -1,15 +1,15 @@
-smsc95xx: Separe link led and activity led
+smsc95xx: Separe link and activity LEDs.
Signed-off-by: Fabien Marteau <fab...@ar...>
----
-Index: linux-2.6.29.6/drivers/net/usb/smsc95xx.c
+Index: linux-2.6.36/drivers/net/usb/smsc95xx.c
===================================================================
---- linux-2.6.29.6.orig/drivers/net/usb/smsc95xx.c 2010-04-13 16:27:42.000000000 +0200
-+++ linux-2.6.29.6/drivers/net/usb/smsc95xx.c 2010-04-13 16:33:39.000000000 +0200
-@@ -941,8 +941,11 @@
- devdbg(dev, "ID_REV = 0x%08x", read_buf);
+--- linux-2.6.36.orig/drivers/net/usb/smsc95xx.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/net/usb/smsc95xx.c 2010-11-26 10:55:57.000000000 +0100
+@@ -933,8 +933,11 @@
+ netif_dbg(dev, ifup, dev->net, "ID_REV = 0x%08x\n", read_buf);
/* Configure GPIO pins as LED outputs */
- write_buf = LED_GPIO_CFG_SPD_LED | LED_GPIO_CFG_LNK_LED |
@@ -21,11 +21,11 @@ Index: linux-2.6.29.6/drivers/net/usb/smsc95xx.c
+
ret = smsc95xx_write_reg(dev, LED_GPIO_CFG, write_buf);
if (ret < 0) {
- devwarn(dev, "Failed to write LED_GPIO_CFG register, ret=%d",
-Index: linux-2.6.29.6/drivers/net/usb/smsc95xx.h
+ netdev_warn(dev->net, "Failed to write LED_GPIO_CFG register, ret=%d\n",
+Index: linux-2.6.36/drivers/net/usb/smsc95xx.h
===================================================================
---- linux-2.6.29.6.orig/drivers/net/usb/smsc95xx.h 2010-04-13 16:27:40.000000000 +0200
-+++ linux-2.6.29.6/drivers/net/usb/smsc95xx.h 2010-04-13 16:36:41.000000000 +0200
+--- linux-2.6.36.orig/drivers/net/usb/smsc95xx.h 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/net/usb/smsc95xx.h 2010-11-26 10:55:57.000000000 +0100
@@ -99,10 +99,15 @@
#define PM_CTL_WUPS_MULTI_ (0x00000003)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/348-armadeus-plat-mxc-gpio-mxc_gpio_set_behaviour_change.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/348-armadeus-plat-mxc-gpio-mxc_gpio_set_behaviour_change.patch
new file mode 100644
index 0000000..28753b9
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/348-armadeus-plat-mxc-gpio-mxc_gpio_set_behaviour_change.patch
@@ -0,0 +1,21 @@
+Fix mxc_gpio_set() behaviour bug.
+
+This patch modify mxc_gpio_set() function to have the same behaviour as others
+platform *_gpio_set() function.
+When value=0 set pin to 0 in all other cases set pin to 1.
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
+Index: linux-2.6.36/arch/arm/plat-mxc/gpio.c
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/gpio.c 2010-11-26 11:15:25.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/gpio.c 2010-11-26 11:15:52.000000000 +0100
+@@ -235,7 +235,7 @@
+ unsigned long flags;
+
+ spin_lock_irqsave(&port->lock, flags);
+- l = (__raw_readl(reg) & (~(1 << offset))) | (value << offset);
++ l = (__raw_readl(reg) & (~(1 << offset))) | ((value ? 1:0) << offset);
+ __raw_writel(l, reg);
+ spin_unlock_irqrestore(&port->lock, flags);
+ }
hooks/post-receive
--
armadeus
|
