[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-445-g007f49d
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-445-g007f49d
|
From: jorasse <jo...@us...> - 2012-07-11 01:36:00
|
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 007f49d4537d79c67f89fac3e84b61b388e9f318 (commit)
via 629e42c30eb6de5c81da811a6d078118950657e6 (commit)
via e26da7e2ef4422dde7a275b65a52ca99eda7d5f7 (commit)
via 285cd3b4c994857543ca293d50724fa0cf15d047 (commit)
via fe63b8ea86e05e486815d255e8f9062f5dbff9ac (commit)
from 1fdbf211cfe46717457052e4742b61e7b69ba8d0 (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 007f49d4537d79c67f89fac3e84b61b388e9f318
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jul 11 03:38:18 2012 +0200
[LINUX] apf9328,2.6.26: enable imx watchdog driver
commit 629e42c30eb6de5c81da811a6d078118950657e6
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jul 11 03:36:59 2012 +0200
[LINUX] apf9328,2.6.26: add watchdog driver
commit e26da7e2ef4422dde7a275b65a52ca99eda7d5f7
Merge: 285cd3b 1fdbf21
Author: Eric Jarrige <eri...@ar...>
Date: Tue Jul 10 22:17:48 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 285cd3b4c994857543ca293d50724fa0cf15d047
Merge: fe63b8e 7a1c774
Author: Eric Jarrige <eri...@ar...>
Date: Tue Jun 26 11:30:11 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit fe63b8ea86e05e486815d255e8f9062f5dbff9ac
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jun 25 16:49:47 2012 +0200
[UBOOT] apf9328: update Nico email from copyrights
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf9328/apf9328-linux-2.6.29.config | 16 ++-
patches/linux/2.6.29/021-armadeus-apf9328.patch | 19 ++-
.../2.6.29/442-armadeus-support_watchdog.patch | 168 ++++++++++++++++++++
patches/u-boot/2012.04/103-apf9328.patch | 4 +-
4 files changed, 202 insertions(+), 5 deletions(-)
create mode 100644 patches/linux/2.6.29/442-armadeus-support_watchdog.patch
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
index 819da46..d07e803 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Tue Aug 9 09:23:34 2011
+# Wed Jul 11 03:20:51 2012
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -830,7 +830,19 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_W83627EHF is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_IMX_WDT=y
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
CONFIG_SSB_POSSIBLE=y
#
diff --git a/patches/linux/2.6.29/021-armadeus-apf9328.patch b/patches/linux/2.6.29/021-armadeus-apf9328.patch
index e5b2ab3..70aadd7 100644
--- a/patches/linux/2.6.29/021-armadeus-apf9328.patch
+++ b/patches/linux/2.6.29/021-armadeus-apf9328.patch
@@ -5,7 +5,7 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.29.6/arch/arm/mach-imx/apf9328.c 2011-06-15 12:16:40.000000000 +0200
-@@ -0,0 +1,585 @@
+@@ -0,0 +1,602 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
+ *
@@ -501,6 +501,21 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
+ .num_resources = 1,
+};
+
++static struct resource imx_wdt_resources[] = {
++ [0] = {
++ .start = 0x00201000,
++ .end = 0x00201008,
++ .flags = IORESOURCE_MEM,
++ },
++};
++
++struct platform_device imx_wdt_device = {
++ .name = "imx-wdt",
++ .id = 0,
++ .resource = imx_wdt_resources,
++ .num_resources = ARRAY_SIZE(imx_wdt_resources),
++};
++
+static struct platform_device *devices[] __initdata = {
+ &imx_uart1_device,
+ &imx_uart2_device,
@@ -519,6 +534,8 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
+ &apf9328_ssi_device,
+#endif
+ &apf9328_flash_device,
++ &imx_wdt_device,
++
+};
+
+static void __init apf9328_init(void)
diff --git a/patches/linux/2.6.29/442-armadeus-support_watchdog.patch b/patches/linux/2.6.29/442-armadeus-support_watchdog.patch
new file mode 100644
index 0000000..4e8ee24
--- /dev/null
+++ b/patches/linux/2.6.29/442-armadeus-support_watchdog.patch
@@ -0,0 +1,168 @@
+make imx-wdt driver compatible with the ARCH_IMX configs
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
+Index: linux-2.6.29.6/drivers/watchdog/imx-wdt.c
+===================================================================
+--- linux-2.6.29.6/drivers/watchdog/imx-wdt.c
++++ linux-2.6.29.6/drivers/watchdog/imx-wdt.c
+@@ -37,7 +37,7 @@
+ #include <mach/hardware.h>
+ #include <linux/clk.h>
+
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ # define WDT_MAX_TIME 63 /* seconds */
+
+ # define IMX_WDT_WCR 0x00 /* Control reg */
+@@ -81,7 +81,7 @@ static unsigned int timeout = WDT_DEFAUL
+ static struct watchdog_info imx_wdt_info = {
+ .identity = "imx watchdog",
+ .options = WDIOF_KEEPALIVEPING
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ | WDIOF_SETTIMEOUT
+ #endif
+ };
+@@ -91,7 +91,7 @@ static inline void imx_wdt_stop(struct i
+ {
+ dev_dbg(imx_wdt->dev, "<%s>\n", __func__);
+
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ __raw_writew(0, imx_wdt->base + IMX_WDT_WCR);
+ #else
+ dev_info(imx_wdt->dev, "watchdog is unstoppable on i.MX2/3 !\n");
+@@ -105,11 +105,14 @@ static inline void imx_wdt_start(struct
+
+ dev_dbg(imx_wdt->dev, "<%s>\n", __func__);
+
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
++ __raw_writew(0, imx_wdt->base + IMX_WDT_WCR);
++#endif
+ temp = __raw_readw(imx_wdt->base + IMX_WDT_WCR);
+- temp |= imx_wdt->wdt_time << 8;
++ temp |= (imx_wdt->wdt_time << 8) & WCR_WT;
+ __raw_writew(temp, imx_wdt->base + IMX_WDT_WCR);
+
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ # ifndef CONFIG_WATCHDOG_NOWAYOUT
+ temp |= WCR_WDEC;
+ __raw_writew(temp, imx_wdt->base + IMX_WDT_WCR);
+@@ -121,7 +124,7 @@ static inline void imx_wdt_start(struct
+ __raw_writew(temp, imx_wdt->base + IMX_WDT_WCR);
+ #endif
+
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ __raw_writew(WDT_SEQ1, imx_wdt->base + IMX_WDT_WSR);
+ __raw_writew(WDT_SEQ2, imx_wdt->base + IMX_WDT_WSR);
+ #endif
+@@ -167,7 +170,7 @@ static int imx_wdt_close(struct inode *i
+ return 0;
+ }
+
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ /* Change the watchdog time interval. */
+ static int imx_wdt_settimeout(struct imx_wdt_struct *imx_wdt, int new_time)
+ {
+@@ -189,7 +192,7 @@ static int imx_wdt_ioctl(struct inode *i
+
+ void __user *argp = (void __user *)arg;
+ int __user *p = argp;
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ int new_value;
+ #endif
+
+@@ -203,7 +206,7 @@ static int imx_wdt_ioctl(struct inode *i
+ case WDIOC_GETSUPPORT:
+ return copy_to_user(argp, &imx_wdt_info,
+ sizeof(imx_wdt_info)) ? -EFAULT : 0;
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ case WDIOC_SETTIMEOUT:
+ if (get_user(new_value, p))
+ return -EFAULT;
+@@ -296,6 +299,7 @@ static int __init imx_wdt_probe(struct p
+ goto fail1;
+ }
+
++#if !defined(CONFIG_ARCH_MX1) && !defined(CONFIG_ARCH_IMX)
+ imx_wdt->clk = clk_get(&pdev->dev, "wdog_clk");
+ if (IS_ERR(imx_wdt->clk)) {
+ dev_err(&pdev->dev, "can't get Watchdog clock\n");
+@@ -303,6 +307,7 @@ static int __init imx_wdt_probe(struct p
+ goto fail2;
+ }
+ clk_enable(imx_wdt->clk);
++#endif
+
+ /* Setup imx_wdt driver structure */
+ imx_wdt->dev = &pdev->dev;
+@@ -333,9 +338,11 @@ static int __init imx_wdt_probe(struct p
+ return 0;
+
+ fail3:
++#if !defined(CONFIG_ARCH_MX1) && !defined(CONFIG_ARCH_IMX)
+ clk_disable(imx_wdt->clk);
+ clk_put(imx_wdt->clk);
+ fail2:
++#endif
+ platform_set_drvdata(pdev, NULL);
+ kfree(imx_wdt);
+ fail1:
+@@ -359,9 +366,10 @@ static int __exit imx_wdt_remove(struct
+ release_mem_region(imx_wdt->res->start,
+ imx_wdt->res->end - imx_wdt->res->start + 1);
+
++#if !defined(CONFIG_ARCH_MX1) && !defined(CONFIG_ARCH_IMX)
+ clk_disable(imx_wdt->clk);
+ clk_put(imx_wdt->clk);
+-
++#endif
+ kfree(imx_wdt);
+ return 0;
+ }
+@@ -370,7 +378,7 @@ static int __exit imx_wdt_remove(struct
+
+ static int imx_wdt_suspend(struct platform_device *pdev, pm_message_t message)
+ {
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ struct imx_wdt_struct *imx_wdt = platform_get_drvdata(pdev);
+
+ u32 temp = __raw_readw(imx_wdt->base + IMX_WDT_WCR);
+@@ -381,7 +389,7 @@ static int imx_wdt_suspend(struct platfo
+
+ static int imx_wdt_resume(struct platform_device *pdev)
+ {
+-#ifdef CONFIG_ARCH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ struct imx_wdt_struct *imx_wdt = platform_get_drvdata(pdev);
+ u32 temp;
+
+@@ -405,7 +413,7 @@ static struct platform_driver imx_wdt_dr
+ .suspend = imx_wdt_suspend,
+ .resume = imx_wdt_resume,
+ .driver = {
+-#ifdef CONFIG_MACH_MX1
++#if defined(CONFIG_ARCH_MX1) || defined(CONFIG_ARCH_IMX)
+ .name = "imx-wdt",
+ #else
+ .name = "mxc_wdt",
+Index: linux-2.6.29.6/drivers/watchdog/Kconfig
+===================================================================
+--- linux-2.6.29.6/drivers/watchdog/Kconfig
++++ linux-2.6.29.6/drivers/watchdog/Kconfig
+@@ -68,7 +68,7 @@ config WM8350_WATCHDOG
+
+ config IMX_WDT
+ tristate "IMX Watchdog"
+- depends on ARCH_MXC
++ depends on ARCH_MXC || ARCH_IMX
+ help
+ This is the driver for the hardware watchdog
+ on the Freescale IMX processors.
diff --git a/patches/u-boot/2012.04/103-apf9328.patch b/patches/u-boot/2012.04/103-apf9328.patch
index 5be9d3d..6719864 100644
--- a/patches/u-boot/2012.04/103-apf9328.patch
+++ b/patches/u-boot/2012.04/103-apf9328.patch
@@ -92,7 +92,7 @@ index 0000000..b72491d
@@ -0,0 +1,106 @@
+/*
+ * (C) Copyright 2005-2011
-+ * Nicolas Colombin <th...@us...>
++ * Nicolas Colombain <nic...@ar...>
+ * Eric Jarrige <eri...@ar...>
+ * Copyright (C) 2004 Sascha Hauer, Synertronixx GmbH
+ *
@@ -204,7 +204,7 @@ index 0000000..4c63c4e
@@ -0,0 +1,100 @@
+/*
+ * (C) Copyright 2005-2011
-+ * Nicolas Colombin <th...@us...>
++ * Nicolas Colombain <nic...@ar...>
+ * Eric Jarrige <eri...@ar...>
+ *
+ * See file CREDITS for list of people who contributed to this
hooks/post-receive
--
armadeus
|
