[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2551-g969c1bb
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2551-g969c1bb
|
From: Julien B a. A. <ar...@us...> - 2011-10-20 16:37:05
|
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 969c1bb621d4c5fcb223775427e2294d27a92e2f (commit)
from 7516ca9db192bc835e6fffb8d8b8ce3b927aeb51 (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 969c1bb621d4c5fcb223775427e2294d27a92e2f
Author: Julien Boibessot <jul...@ar...>
Date: Thu Oct 20 18:35:16 2011 +0200
|LINUX] 2.6.38: Fixes patches 442-*
-----------------------------------------------------------------------
Summary of changes:
...26692-3-add_mx23_mx25_mx28_security_stuff.patch | 764 ++------------------
...0-add_scc2_and_sahara_drivers_without_rng.patch | 130 ++--
2 files changed, 135 insertions(+), 759 deletions(-)
diff --git a/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_mx23_mx25_mx28_security_stuff.patch b/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_mx23_mx25_mx28_security_stuff.patch
index 0aa3551..59bb5b2 100644
--- a/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_mx23_mx25_mx28_security_stuff.patch
+++ b/patches/linux/2.6.38/442-freescale-0034-ENGR00126692-3-add_mx23_mx25_mx28_security_stuff.patch
@@ -12,12 +12,13 @@ Signed-off-by: Dinh Nguyen <Din...@fr...>
Changes from Armadeus systems:
- extracted DCP stuff from original patch
-diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
---- a/drivers/crypto/Kconfig
-+++ b/drivers/crypto/Kconfig
-@@ -243,4 +243,16 @@ config CRYPTO_DEV_OMAP_SHAM
- OMAP processors have SHA1/MD5 hw accelerator. Select this if you
- want to use the OMAP module for SHA1/MD5 algorithms.
+Index: linux-2.6.38.8/drivers/crypto/Kconfig
+===================================================================
+--- linux-2.6.38.8.orig/drivers/crypto/Kconfig 2011-06-03 03:35:11.000000000 +0200
++++ linux-2.6.38.8/drivers/crypto/Kconfig 2011-10-20 17:27:20.000000000 +0200
+@@ -252,4 +252,16 @@
+ OMAP processors have AES module accelerator. Select this if you
+ want to use the OMAP module for AES algorithms.
+config CRYPTO_DEV_DCP
+ tristate "Support for the DCP engine"
@@ -32,21 +33,20 @@ diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
+ will be called geode-aes.
+
endif # CRYPTO_HW
-diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
-index 6dbbe00..c375d19 100644
---- a/drivers/crypto/Makefile
-+++ b/drivers/crypto/Makefile
-@@ -9,4 +9,5 @@ obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o
- obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o
+Index: linux-2.6.38.8/drivers/crypto/Makefile
+===================================================================
+--- linux-2.6.38.8.orig/drivers/crypto/Makefile 2011-06-03 03:35:11.000000000 +0200
++++ linux-2.6.38.8/drivers/crypto/Makefile 2011-10-20 17:27:20.000000000 +0200
+@@ -10,4 +10,5 @@
obj-$(CONFIG_CRYPTO_DEV_PPC4XX) += amcc/
obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += omap-sham.o
+ obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o
+obj-$(CONFIG_CRYPTO_DEV_DCP) += dcp.o
-diff --git a/drivers/crypto/dcp.c b/drivers/crypto/dcp.c
-new file mode 100644
-index 0000000..9589a19
---- /dev/null
-+++ b/drivers/crypto/dcp.c
+Index: linux-2.6.38.8/drivers/crypto/dcp.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/drivers/crypto/dcp.c 2011-10-20 17:27:20.000000000 +0200
@@ -0,0 +1,1697 @@
+/*
+ * Copyright (C) 2008-2010 Freescale Semiconductor, Inc.
@@ -1745,11 +1745,10 @@ index 0000000..9589a19
+
+module_init(dcp_init);
+module_exit(dcp_exit);
-diff --git a/drivers/crypto/dcp.h b/drivers/crypto/dcp.h
-new file mode 100644
-index 0000000..a4db913
---- /dev/null
-+++ b/drivers/crypto/dcp.h
+Index: linux-2.6.38.8/drivers/crypto/dcp.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/drivers/crypto/dcp.h 2011-10-20 17:27:20.000000000 +0200
@@ -0,0 +1,717 @@
+/*
+ * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -2468,11 +2467,10 @@ index 0000000..a4db913
+
+
+#endif
-diff --git a/drivers/crypto/dcp_bootstream_ioctl.h b/drivers/crypto/dcp_bootstream_ioctl.h
-new file mode 100644
-index 0000000..7c0c07d
---- /dev/null
-+++ b/drivers/crypto/dcp_bootstream_ioctl.h
+Index: linux-2.6.38.8/drivers/crypto/dcp_bootstream_ioctl.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/drivers/crypto/dcp_bootstream_ioctl.h 2011-10-20 17:27:20.000000000 +0200
@@ -0,0 +1,32 @@
+/*
+ * Freescale DCP driver for bootstream update. Only handles the OTP KEY
@@ -2506,11 +2504,10 @@ index 0000000..7c0c07d
+#define DBS_DEC _IOW(DBS_IOCTL_BASE, 0x01, uint8_t[16])
+
+#endif
-diff --git a/drivers/mxc/security/Kconfig b/drivers/mxc/security/Kconfig
-new file mode 100644
-index 0000000..9c829da
---- /dev/null
-+++ b/drivers/mxc/security/Kconfig
+Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/drivers/mxc/security/Kconfig 2011-10-20 17:27:20.000000000 +0200
@@ -0,0 +1,11 @@
+menu "MXC Security Drivers"
+
@@ -2523,18 +2520,16 @@ index 0000000..9c829da
+ If you are unsure about this, say N here.
+
+endmenu
-diff --git a/drivers/mxc/security/Makefile b/drivers/mxc/security/Makefile
-new file mode 100644
-index 0000000..33fd5b8
---- /dev/null
-+++ b/drivers/mxc/security/Makefile
+Index: linux-2.6.38.8/drivers/mxc/security/Makefile
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/drivers/mxc/security/Makefile 2011-10-20 17:27:20.000000000 +0200
@@ -0,0 +1 @@
+obj-$(CONFIG_MXC_DRYICE) += dryice.o
-diff --git a/drivers/mxc/security/dryice-regs.h b/drivers/mxc/security/dryice-regs.h
-new file mode 100644
-index 0000000..bcf0aff
---- /dev/null
-+++ b/drivers/mxc/security/dryice-regs.h
+Index: linux-2.6.38.8/drivers/mxc/security/dryice-regs.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/drivers/mxc/security/dryice-regs.h 2011-10-20 17:27:20.000000000 +0200
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -2743,11 +2738,10 @@ index 0000000..bcf0aff
+#endif
+
+#endif /* __DRYICE_REGS_H__ */
-diff --git a/drivers/mxc/security/dryice.c b/drivers/mxc/security/dryice.c
-new file mode 100644
-index 0000000..bf048da
---- /dev/null
-+++ b/drivers/mxc/security/dryice.c
+Index: linux-2.6.38.8/drivers/mxc/security/dryice.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/drivers/mxc/security/dryice.c 2011-10-20 17:27:20.000000000 +0200
@@ -0,0 +1,1123 @@
+/*
+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -3872,11 +3866,10 @@ index 0000000..bf048da
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("DryIce");
+MODULE_LICENSE("GPL");
-diff --git a/drivers/mxc/security/dryice.h b/drivers/mxc/security/dryice.h
-new file mode 100644
-index 0000000..b98b7cd
---- /dev/null
-+++ b/drivers/mxc/security/dryice.h
+Index: linux-2.6.38.8/drivers/mxc/security/dryice.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/drivers/mxc/security/dryice.h 2011-10-20 17:27:20.000000000 +0200
@@ -0,0 +1,287 @@
+/*
+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -4165,21 +4158,14 @@ index 0000000..b98b7cd
+ unsigned long cookie);
+
+#endif /* __DRYICE_H__ */
-diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
-index 10ba12c..76d846a 100644
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -818,6 +818,27 @@ config RTC_DRV_PXA
- This RTC driver uses PXA RTC registers available since pxa27x
- series (RDxR, RYxR) instead of legacy RCNR, RTAR.
+Index: linux-2.6.38.8/drivers/rtc/Kconfig
+===================================================================
+--- linux-2.6.38.8.orig/drivers/rtc/Kconfig 2011-06-03 03:35:11.000000000 +0200
++++ linux-2.6.38.8/drivers/rtc/Kconfig 2011-10-20 17:28:49.000000000 +0200
+@@ -600,6 +600,13 @@
+ This driver can also be built as a module, if so, the module
+ will be called "rtc-mxc".
-+config RTC_MXC
-+ tristate "Freescale MXC Real Time Clock"
-+ depends on ARCH_MXC
-+ depends on RTC_CLASS
-+ help
-+ Support for Freescale RTC MXC
-+
+config RTC_DRV_MXC_V2
+ tristate "Freescale MXC Secure Real Time Clock"
+ depends on ARCH_MXC
@@ -4187,639 +4173,30 @@ index 10ba12c..76d846a 100644
+ help
+ Support for Freescale SRTC MXC
+
-+config RTC_DRV_IMXDI
-+ tristate "Freescale IMX DryIce Real Time Clock"
-+ depends on ARCH_MXC
-+ depends on RTC_CLASS
-+ help
-+ Support for Freescale IMX DryIce RTC
-+
+ config RTC_DRV_BQ4802
+ tristate "TI BQ4802"
+ help
+@@ -877,7 +884,6 @@
+ This RTC driver uses PXA RTC registers available since pxa27x
+ series (RDxR, RYxR) instead of legacy RCNR, RTAR.
+-
config RTC_DRV_SUN4V
bool "SUN4V Hypervisor RTC"
-diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
-index 5adbba7..6d06d25 100644
---- a/drivers/rtc/Makefile
-+++ b/drivers/rtc/Makefile
-@@ -94,3 +94,6 @@ obj-$(CONFIG_RTC_DRV_VR41XX) += rtc-vr41xx.o
+ depends on SPARC64
+Index: linux-2.6.38.8/drivers/rtc/Makefile
+===================================================================
+--- linux-2.6.38.8.orig/drivers/rtc/Makefile 2011-06-03 03:35:11.000000000 +0200
++++ linux-2.6.38.8/drivers/rtc/Makefile 2011-10-20 17:27:20.000000000 +0200
+@@ -101,3 +101,4 @@
obj-$(CONFIG_RTC_DRV_WM831X) += rtc-wm831x.o
obj-$(CONFIG_RTC_DRV_WM8350) += rtc-wm8350.o
obj-$(CONFIG_RTC_DRV_X1205) += rtc-x1205.o
-+obj-$(CONFIG_RTC_MXC) += rtc-mxc.o
+obj-$(CONFIG_RTC_DRV_MXC_V2) += rtc-mxc_v2.o
-+obj-$(CONFIG_RTC_DRV_IMXDI) += rtc-imxdi.o
-diff --git a/drivers/rtc/rtc-imxdi.c b/drivers/rtc/rtc-imxdi.c
-new file mode 100644
-index 0000000..599c525
---- /dev/null
-+++ b/drivers/rtc/rtc-imxdi.c
-@@ -0,0 +1,581 @@
-+/*
-+ * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
-+ */
-+
-+/*
-+ * The code contained herein is licensed under the GNU General Public
-+ * License. You may obtain a copy of the GNU General Public License
-+ * Version 2 or later at the following locations:
-+ *
-+ * http://www.opensource.org/licenses/gpl-license.html
-+ * http://www.gnu.org/copyleft/gpl.html
-+ */
-+
-+/* based on rtc-mc13892.c */
-+
-+/*
-+ * This driver uses the 47-bit 32 kHz counter in the Freescale DryIce block
-+ * to implement a Linux RTC. Times and alarms are truncated to seconds.
-+ * Since the RTC framework performs API locking via rtc->ops_lock the
-+ * only simultaneous accesses we need to deal with is updating DryIce
-+ * registers while servicing an alarm.
-+ *
-+ * Note that reading the DSR (DryIce Status Register) automatically clears
-+ * the WCF (Write Complete Flag). All DryIce writes are synchronized to the
-+ * LP (Low Power) domain and set the WCF upon completion. Writes to the
-+ * DIER (DryIce Interrupt Enable Register) are the only exception. These
-+ * occur at normal bus speeds and do not set WCF. Periodic interrupts are
-+ * not supported by the hardware.
-+ */
-+
-+/* #define DEBUG */
-+/* #define DI_DEBUG_REGIO */
-+
-+#include <linux/slab.h>
-+#include <linux/io.h>
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/rtc.h>
-+#include <linux/workqueue.h>
-+
-+/* DryIce Register Definitions */
-+
-+#define DTCMR 0x00 /* Time Counter MSB Reg */
-+#define DTCLR 0x04 /* Time Counter LSB Reg */
-+
-+#define DCAMR 0x08 /* Clock Alarm MSB Reg */
-+#define DCALR 0x0c /* Clock Alarm LSB Reg */
-+#define DCAMR_UNSET 0xFFFFFFFF /* doomsday - 1 sec */
-+
-+#define DCR 0x10 /* Control Reg */
-+#define DCR_TCE (1 << 3) /* Time Counter Enable */
-+
-+#define DSR 0x14 /* Status Reg */
-+#define DSR_WBF (1 << 10) /* Write Busy Flag */
-+#define DSR_WNF (1 << 9) /* Write Next Flag */
-+#define DSR_WCF (1 << 8) /* Write Complete Flag */
-+#define DSR_WEF (1 << 7) /* Write Error Flag */
-+#define DSR_CAF (1 << 4) /* Clock Alarm Flag */
-+#define DSR_NVF (1 << 1) /* Non-Valid Flag */
-+#define DSR_SVF (1 << 0) /* Security Violation Flag */
-+
-+#define DIER 0x18 /* Interrupt Enable Reg */
-+#define DIER_WNIE (1 << 9) /* Write Next Interrupt Enable */
-+#define DIER_WCIE (1 << 8) /* Write Complete Interrupt Enable */
-+#define DIER_WEIE (1 << 7) /* Write Error Interrupt Enable */
-+#define DIER_CAIE (1 << 4) /* Clock Alarm Interrupt Enable */
-+
-+#ifndef DI_DEBUG_REGIO
-+/* dryice read register */
-+#define di_read(pdata, reg) __raw_readl((pdata)->ioaddr + (reg))
-+
-+/* dryice write register */
-+#define di_write(pdata, val, reg) __raw_writel((val), (pdata)->ioaddr + (reg))
-+#else
-+/* dryice read register - debug version */
-+static inline u32 di_read(struct rtc_drv_data *pdata, int reg)
-+{
-+ u32 val = __raw_readl(pdata->ioaddr + reg);
-+ pr_info("di_read(0x%02x) = 0x%08x\n", reg, val);
-+ return val;
-+}
-+
-+/* dryice write register - debug version */
-+static inline void di_write(struct rtc_drv_data *pdata, u32 val, int reg)
-+{
-+ printk(KERN_INFO "di_write(0x%08x, 0x%02x)\n", val, reg);
-+ __raw_writel(val, pdata->ioaddr + reg);
-+}
-+#endif
-+
-+/*
-+ * dryice write register with wait and error handling.
-+ * all registers, except for DIER, should use this method.
-+ */
-+#define di_write_wait_err(pdata, val, reg, rc, label) \
-+ do { \
-+ if (di_write_wait((pdata), (val), (reg))) { \
-+ rc = -EIO; \
-+ goto label; \
-+ } \
-+ } while (0)
-+
-+struct rtc_drv_data {
-+ struct platform_device *pdev; /* pointer to platform dev */
-+ struct rtc_device *rtc; /* pointer to rtc struct */
-+ unsigned long baseaddr; /* physical bass address */
-+ void __iomem *ioaddr; /* virtual base address */
-+ int size; /* size of register region */
-+ int irq; /* dryice normal irq */
-+ struct clk *clk; /* dryice clock control */
-+ u32 dsr; /* copy of dsr reg from isr */
-+ spinlock_t irq_lock; /* irq resource lock */
-+ wait_queue_head_t write_wait; /* write-complete queue */
-+ struct mutex write_mutex; /* force reg writes to be sequential */
-+ struct work_struct work; /* schedule alarm work */
-+};
-+
-+/*
-+ * enable a dryice interrupt
-+ */
-+static inline void di_int_enable(struct rtc_drv_data *pdata, u32 intr)
-+{
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&pdata->irq_lock, flags);
-+ di_write(pdata, di_read(pdata, DIER) | intr, DIER);
-+ spin_unlock_irqrestore(&pdata->irq_lock, flags);
-+}
-+
-+/*
-+ * disable a dryice interrupt
-+ */
-+static inline void di_int_disable(struct rtc_drv_data *pdata, u32 intr)
-+{
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&pdata->irq_lock, flags);
-+ di_write(pdata, di_read(pdata, DIER) & ~intr, DIER);
-+ spin_unlock_irqrestore(&pdata->irq_lock, flags);
-+}
-+
-+/*
-+ * This function attempts to clear the dryice write-error flag.
-+ *
-+ * A dryice write error is similar to a bus fault and should not occur in
-+ * normal operation. Clearing the flag requires another write, so the root
-+ * cause of the problem may need to be fixed before the flag can be cleared.
-+ */
-+static void clear_write_error(struct rtc_drv_data *pdata)
-+{
-+ int cnt;
-+
-+ dev_warn(&pdata->pdev->dev, "WARNING: Register write error!\n");
-+
-+ for (;;) {
-+ /* clear the write error flag */
-+ di_write(pdata, DSR_WEF, DSR);
-+
-+ /* wait for it to take effect */
-+ for (cnt = 0; cnt < 100; cnt++) {
-+ if ((di_read(pdata, DSR) & DSR_WEF) == 0)
-+ return;
-+ udelay(10);
-+ }
-+ dev_err(&pdata->pdev->dev,
-+ "ERROR: Cannot clear write-error flag!\n");
-+ }
-+}
-+
-+/*
-+ * Write a dryice register and wait until it completes.
-+ *
-+ * This function uses interrupts to determine when the
-+ * write has completed.
-+ */
-+static int di_write_wait(struct rtc_drv_data *pdata, u32 val, int reg)
-+{
-+ int ret;
-+ int rc = 0;
-+
-+ /* serialize register writes */
-+ mutex_lock(&pdata->write_mutex);
-+
-+ /* enable the write-complete interrupt */
-+ di_int_enable(pdata, DIER_WCIE);
-+
-+ pdata->dsr = 0;
-+
-+ /* do the register write */
-+ di_write(pdata, val, reg);
-+
-+ /* wait for the write to finish */
-+ ret = wait_event_interruptible_timeout(pdata->write_wait,
-+ pdata->dsr & (DSR_WCF | DSR_WEF),
-+ 1 * HZ);
-+ if (ret == 0)
-+ dev_warn(&pdata->pdev->dev, "Write-wait timeout\n");
-+
-+ /* check for write error */
-+ if (pdata->dsr & DSR_WEF) {
-+ clear_write_error(pdata);
-+ rc = -EIO;
-+ }
-+ mutex_unlock(&pdata->write_mutex);
-+ return rc;
-+}
-+
-+/*
-+ * rtc device ioctl
-+ *
-+ * The rtc framework handles the basic rtc ioctls on behalf
-+ * of the driver by calling the functions registered in the
-+ * rtc_ops structure.
-+ */
-+static int dryice_rtc_ioctl(struct device *dev, unsigned int cmd,
-+ unsigned long arg)
-+{
-+ struct rtc_drv_data *pdata = dev_get_drvdata(dev);
-+
-+ dev_dbg(dev, "%s(0x%x)\n", __func__, cmd);
-+ switch (cmd) {
-+ case RTC_AIE_OFF: /* alarm disable */
-+ di_int_disable(pdata, DIER_CAIE);
-+ return 0;
-+
-+ case RTC_AIE_ON: /* alarm enable */
-+ di_int_enable(pdata, DIER_CAIE);
-+ return 0;
-+ }
-+ return -ENOIOCTLCMD;
-+}
-+
-+/*
-+ * read the seconds portion of the current time from the dryice time counter
-+ */
-+static int dryice_rtc_read_time(struct device *dev, struct rtc_time *tm)
-+{
-+ struct rtc_drv_data *pdata = dev_get_drvdata(dev);
-+ unsigned long now;
-+
-+ dev_dbg(dev, "%s\n", __func__);
-+ now = di_read(pdata, DTCMR);
-+ rtc_time_to_tm(now, tm);
-+
-+ return 0;
-+}
-+
-+/*
-+ * set the seconds portion of dryice time counter and clear the
-+ * fractional part.
-+ */
-+static int dryice_rtc_set_time(struct device *dev, struct rtc_time *tm)
-+{
-+ struct rtc_drv_data *pdata = dev_get_drvdata(dev);
-+ unsigned long now;
-+ int rc;
-+
-+ dev_dbg(dev, "%s\n", __func__);
-+ rc = rtc_tm_to_time(tm, &now);
-+ if (rc == 0) {
-+ /* zero the fractional part first */
-+ di_write_wait_err(pdata, 0, DTCLR, rc, err);
-+ di_write_wait_err(pdata, now, DTCMR, rc, err);
-+ }
-+err:
-+ return rc;
-+}
-+
-+/*
-+ * read the seconds portion of the alarm register.
-+ * the fractional part of the alarm register is always zero.
-+ */
-+static int dryice_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
-+{
-+ struct rtc_drv_data *pdata = dev_get_drvdata(dev);
-+ u32 dcamr;
-+
-+ dev_dbg(dev, "%s\n", __func__);
-+ dcamr = di_read(pdata, DCAMR);
-+ rtc_time_to_tm(dcamr, &alarm->time);
-+
-+ /* alarm is enabled if the interrupt is enabled */
-+ alarm->enabled = (di_read(pdata, DIER) & DIER_CAIE) != 0;
-+
-+ /* don't allow the DSR read to mess up DSR_WCF */
-+ mutex_lock(&pdata->write_mutex);
-+
-+ /* alarm is pending if the alarm flag is set */
-+ alarm->pending = (di_read(pdata, DSR) & DSR_CAF) != 0;
-+
-+ mutex_unlock(&pdata->write_mutex);
-+
-+ return 0;
-+}
-+
-+/*
-+ * set the seconds portion of dryice alarm register
-+ */
-+static int dryice_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
-+{
-+ struct rtc_drv_data *pdata = dev_get_drvdata(dev);
-+ unsigned long now;
-+ unsigned long alarm_time;
-+ int rc;
-+
-+ dev_dbg(dev, "%s\n", __func__);
-+ rc = rtc_tm_to_time(&alarm->time, &alarm_time);
-+ if (rc)
-+ return rc;
-+
-+ /* don't allow setting alarm in the past */
-+ now = di_read(pdata, DTCMR);
-+ if (alarm_time < now)
-+ return -EINVAL;
-+
-+ /* write the new alarm time */
-+ di_write_wait_err(pdata, (u32)alarm_time, DCAMR, rc, err);
-+
-+ if (alarm->enabled)
-+ di_int_enable(pdata, DIER_CAIE); /* enable alarm intr */
-+ else
-+ di_int_disable(pdata, DIER_CAIE); /* disable alarm intr */
-+err:
-+ return rc;
-+}
-+
-+static struct rtc_class_ops dryice_rtc_ops = {
-+ .ioctl = dryice_rtc_ioctl,
-+ .read_time = dryice_rtc_read_time,
-+ .set_time = dryice_rtc_set_time,
-+ .read_alarm = dryice_rtc_read_alarm,
-+ .set_alarm = dryice_rtc_set_alarm,
-+};
-+
-+/*
-+ * dryice "normal" interrupt handler
-+ */
-+static irqreturn_t dryice_norm_irq(int irq, void *dev_id)
-+{
-+ struct rtc_drv_data *pdata = dev_id;
-+ u32 dsr, dier;
-+ irqreturn_t rc = IRQ_NONE;
-+
-+ dier = di_read(pdata, DIER);
-+
-+ /* handle write complete and write error cases */
-+ if ((dier & DIER_WCIE)) {
-+ /*If the write wait queue is empty then there is no pending
-+ operations. It means the interrupt is for DryIce -Security.
-+ IRQ must be returned as none.*/
-+ if (list_empty_careful(&pdata->write_wait.task_list))
-+ return rc;
-+
-+ /* DSR_WCF clears itself on DSR read */
-+ dsr = di_read(pdata, DSR);
-+ if ((dsr & (DSR_WCF | DSR_WEF))) {
-+ /* mask the interrupt */
-+ di_int_disable(pdata, DIER_WCIE);
-+
-+ /* save the dsr value for the wait queue */
-+ pdata->dsr |= dsr;
-+
-+ wake_up_interruptible(&pdata->write_wait);
-+ rc = IRQ_HANDLED;
-+ }
-+ }
-+
-+ /* handle the alarm case */
-+ if ((dier & DIER_CAIE)) {
-+ /* DSR_WCF clears itself on DSR read */
-+ dsr = di_read(pdata, DSR);
-+ if (dsr & DSR_CAF) {
-+ /* mask the interrupt */
-+ di_int_disable(pdata, DIER_CAIE);
-+
-+ /* finish alarm in user context */
-+ schedule_work(&pdata->work);
-+ rc = IRQ_HANDLED;
-+ }
-+ }
-+ return rc;
-+}
-+
-+/*
-+ * post the alarm event from user context so it can sleep
-+ * on the write completion.
-+ */
-+static void dryice_work(struct work_struct *work)
-+{
-+ struct rtc_drv_data *pdata = container_of(work, struct rtc_drv_data,
-+ work);
-+ int rc;
-+
-+ /* dismiss the interrupt (ignore error) */
-+ di_write_wait_err(pdata, DSR_CAF, DSR, rc, err);
-+err:
-+ /*
-+ * pass the alarm event to the rtc framework. note that
-+ * rtc_update_irq expects to be called with interrupts off.
-+ */
-+ local_irq_disable();
-+ rtc_update_irq(pdata->rtc, 1, RTC_AF | RTC_IRQF);
-+ local_irq_enable();
-+}
-+
-+/*
-+ * probe for dryice rtc device
-+ */
-+static int dryice_rtc_probe(struct platform_device *pdev)
-+{
-+ struct rtc_device *rtc;
-+ struct resource *res;
-+ struct rtc_drv_data *pdata = NULL;
-+ void __iomem *ioaddr = NULL;
-+ int rc = 0;
-+
-+ dev_dbg(&pdev->dev, "%s\n", __func__);
-+
-+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+ if (!res)
-+ return -ENODEV;
-+
-+ pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
-+ if (!pdata)
-+ return -ENOMEM;
-+
-+ pdata->pdev = pdev;
-+ pdata->irq = -1;
-+ pdata->size = res->end - res->start + 1;
-+
-+ if (!request_mem_region(res->start, pdata->size, pdev->name)) {
-+ rc = -EBUSY;
-+ goto err;
-+ }
-+ pdata->baseaddr = res->start;
-+ ioaddr = ioremap(pdata->baseaddr, pdata->size);
-+ if (!ioaddr) {
-+ rc = -ENOMEM;
-+ goto err;
-+ }
-+ pdata->ioaddr = ioaddr;
-+ pdata->irq = platform_get_irq(pdev, 0);
-+
-+ init_waitqueue_head(&pdata->write_wait);
-+
-+ INIT_WORK(&pdata->work, dryice_work);
-+
-+ mutex_init(&pdata->write_mutex);
-+
-+ pdata->clk = clk_get(NULL, "dryice_clk");
-+ clk_enable(pdata->clk);
-+
-+ if (pdata->irq >= 0) {
-+ if (request_irq(pdata->irq, dryice_norm_irq, IRQF_SHARED,
-+ pdev->name, pdata) < 0) {
-+ dev_warn(&pdev->dev, "interrupt not available.\n");
-+ pdata->irq = -1;
-+ goto err;
-+ }
-+ }
-+
-+ /*
-+ * Initialize dryice hardware
-+ */
-+
-+ /* put dryice into valid state */
-+ if (di_read(pdata, DSR) & DSR_NVF)
-+ di_write_wait_err(pdata, DSR_NVF | DSR_SVF, DSR, rc, err);
-+
-+ /* mask alarm interrupt */
-+ di_int_disable(pdata, DIER_CAIE);
-+
-+ /* initialize alarm */
-+ di_write_wait_err(pdata, DCAMR_UNSET, DCAMR, rc, err);
-+ di_write_wait_err(pdata, 0, DCALR, rc, err);
-+
-+ /* clear alarm flag */
-+ if (di_read(pdata, DSR) & DSR_CAF)
-+ di_write_wait_err(pdata, DSR_CAF, DSR, rc, err);
-+
-+ /* the timer won't count if it has never been written to */
-+ if (!di_read(pdata, DTCMR))
-+ di_write_wait_err(pdata, 0, DTCMR, rc, err);
-+
-+ /* start keeping time */
-+ if (!(di_read(pdata, DCR) & DCR_TCE))
-+ di_write_wait_err(pdata, di_read(pdata, DCR) | DCR_TCE, DCR,
-+ rc, err);
-+
-+ rtc = rtc_device_register(pdev->name, &pdev->dev,
-+ &dryice_rtc_ops, THIS_MODULE);
-+ if (IS_ERR(rtc)) {
-+ rc = PTR_ERR(rtc);
-+ goto err;
-+ }
-+ pdata->rtc = rtc;
-+ platform_set_drvdata(pdev, pdata);
-+
-+ return 0;
-+err:
-+ if (pdata->rtc)
-+ rtc_device_unregister(pdata->rtc);
-+
-+ if (pdata->irq >= 0)
-+ free_irq(pdata->irq, pdata);
-+
-+ if (pdata->clk) {
-+ clk_disable(pdata->clk);
-+ clk_put(pdata->clk);
-+ }
-+
-+ if (pdata->ioaddr)
-+ iounmap(pdata->ioaddr);
-+
-+ if (pdata->baseaddr)
-+ release_mem_region(pdata->baseaddr, pdata->size);
-+
-+ kfree(pdata);
-+
-+ return rc;
-+}
-+
-+static int __exit dryice_rtc_remove(struct platform_device *pdev)
-+{
-+ struct rtc_drv_data *pdata = platform_get_drvdata(pdev);
-+
-+ flush_scheduled_work();
-+
-+ if (pdata->rtc)
-+ rtc_device_unregister(pdata->rtc);
-+
-+ /* mask alarm interrupt */
-+ di_int_disable(pdata, DIER_CAIE);
-+
-+ if (pdata->irq >= 0)
-+ free_irq(pdata->irq, pdata);
-+
-+ if (pdata->clk) {
-+ clk_disable(pdata->clk);
-+ clk_put(pdata->clk);
-+ }
-+
-+ if (pdata->ioaddr)
-+ iounmap(pdata->ioaddr);
-+
-+ if (pdata->baseaddr)
-+ release_mem_region(pdata->baseaddr, pdata->size);
-+
-+ kfree(pdata);
-+
-+ return 0;
-+}
-+
-+static struct platform_driver dryice_rtc_driver = {
-+ .driver = {
-+ .name = "imxdi_rtc",
-+ .owner = THIS_MODULE,
-+ },
-+ .probe = dryice_rtc_probe,
-+ .remove = __exit_p(dryice_rtc_remove),
-+};
-+
-+static int __init dryice_rtc_init(void)
-+{
-+ pr_info("IMXDI Realtime Clock Driver (RTC)\n");
-+ return platform_driver_register(&dryice_rtc_driver);
-+}
-+
-+static void __exit dryice_rtc_exit(void)
-+{
-+ platform_driver_unregister(&dryice_rtc_driver);
-+}
-+
-+module_init(dryice_rtc_init);
-+module_exit(dryice_rtc_exit);
-+
-+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
-+MODULE_DESCRIPTION("IMXDI Realtime Clock Driver (RTC)");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
-index 25ec921..850be48 100644
---- a/drivers/rtc/rtc-mxc.c
-+++ b/drivers/rtc/rtc-mxc.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2004-2008 Freescale Semiconductor, Inc. All Rights Reserved.
-+ * Copyright 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
-@@ -17,8 +17,6 @@
- #include <linux/platform_device.h>
- #include <linux/clk.h>
-
--#include <mach/hardware.h>
--
- #define RTC_INPUT_CLK_32768HZ (0x00 << 5)
- #define RTC_INPUT_CLK_32000HZ (0x01 << 5)
- #define RTC_INPUT_CLK_38400HZ (0x02 << 5)
-diff --git a/drivers/rtc/rtc-mxc_v2.c b/drivers/rtc/rtc-mxc_v2.c
-new file mode 100644
-index 0000000..61e3265
---- /dev/null
-+++ b/drivers/rtc/rtc-mxc_v2.c
+Index: linux-2.6.38.8/drivers/rtc/rtc-mxc_v2.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.8/drivers/rtc/rtc-mxc_v2.c 2011-10-20 17:27:20.000000000 +0200
@@ -0,0 +1,766 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5587,6 +4964,3 @@ index 0000000..61e3265
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("Realtime Clock Driver (RTC)");
+MODULE_LICENSE("GPL");
---
-1.5.4.4
-
diff --git a/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch b/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch
index 7e68abc..befa188 100644
--- a/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch
+++ b/patches/linux/2.6.38/442-freescale-0197-ENGR00131650-add_scc2_and_sahara_drivers_without_rng.patch
@@ -60,11 +60,12 @@ Signed-off-by: Anish Trivedi <an...@fr...>
Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/Kconfig 2011-08-31 15:28:27.000000000 +0200
-@@ -0,0 +1,56 @@
-+menu "MXC Security Drivers"
-+
+--- linux-2.6.38.8.orig/drivers/mxc/security/Kconfig 2011-10-20 17:27:20.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/Kconfig 2011-10-20 17:37:24.000000000 +0200
+@@ -8,4 +8,57 @@
+ This module contains the core API's for accessing the DryIce module.
+ If you are unsure about this, say N here.
+
+config MXC_SECURITY_SCC
+ tristate "MXC SCC Driver"
+ default n
@@ -118,12 +119,13 @@ Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
+source "drivers/mxc/security/sahara2/Kconfig"
+endif
+
-+endmenu
+ endmenu
Index: linux-2.6.38.8/drivers/mxc/security/Makefile
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/Makefile 2011-08-31 15:28:27.000000000 +0200
-@@ -0,0 +1,10 @@
+--- linux-2.6.38.8.orig/drivers/mxc/security/Makefile 2011-10-20 17:27:20.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/Makefile 2011-10-20 17:37:24.000000000 +0200
+@@ -1 +1,11 @@
+ obj-$(CONFIG_MXC_DRYICE) += dryice.o
+# Makefile for the Linux MXC Security API
+ifeq ($( SCC_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
@@ -137,7 +139,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/Makefile
Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/mxc_scc.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/mxc_scc.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,2386 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -2528,7 +2530,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc.c
Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,498 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -3031,7 +3033,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,35 @@
+menu "SAHARA2 Security Hardware Support"
+
@@ -3071,7 +3073,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,47 @@
+# Makefile for the Linux Sahara2 driver
+#
@@ -3123,7 +3125,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,706 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -3834,7 +3836,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -4025,7 +4027,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,266 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -4296,7 +4298,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,837 @@
+/*
+ * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5138,7 +5140,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5239,7 +5241,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5525,7 +5527,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5667,7 +5669,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,967 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -6639,7 +6641,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -6757,7 +6759,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -6878,7 +6880,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -7044,7 +7046,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,2515 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -9564,7 +9566,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,475 @@
+/*
+ * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -10044,7 +10046,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h 2011-10-18 16:20:15.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,1829 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -11878,7 +11880,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2005-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -11898,7 +11900,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,1453 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13356,7 +13358,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13463,7 +13465,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interface.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interface.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interface.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13567,7 +13569,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interfac
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13614,7 +13616,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h 2011-09-01 16:33:21.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13732,7 +13734,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13816,7 +13818,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13884,7 +13886,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -14117,7 +14119,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,2265 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -16387,7 +16389,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -16441,7 +16443,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,466 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -16912,7 +16914,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,849 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -17766,7 +17768,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c 2011-09-02 10:44:12.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,2185 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -19956,7 +19958,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,808 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -20769,7 +20771,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -20990,7 +20992,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,2356 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -23351,7 +23353,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,249 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -23605,7 +23607,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,1050 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -24660,7 +24662,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,734 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -25399,7 +25401,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,1390 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -26794,7 +26796,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c
Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/scc2_driver.c 2011-09-01 16:58:59.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/scc2_driver.c 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,2395 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -29194,7 +29196,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
Index: linux-2.6.38.8/drivers/mxc/security/scc2_internals.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/scc2_internals.h 2011-08-31 16:29:39.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/scc2_internals.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,519 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -29717,8 +29719,8 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_internals.h
+#endif /* SCC_INTERNALS_H */
Index: linux-2.6.38.8/drivers/Kconfig
===================================================================
---- linux-2.6.38.8.orig/drivers/Kconfig 2011-08-31 15:27:30.000000000 +0200
-+++ linux-2.6.38.8/drivers/Kconfig 2011-08-31 15:28:27.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/Kconfig 2011-06-03 03:35:11.000000000 +0200
++++ linux-2.6.38.8/drivers/Kconfig 2011-10-20 17:37:24.000000000 +0200
@@ -117,4 +117,6 @@
source "drivers/platform/Kconfig"
@@ -29729,7 +29731,7 @@ Index: linux-2.6.38.8/drivers/Kconfig
Index: linux-2.6.38.8/drivers/mxc/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/Kconfig 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Kconfig 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,11 @@
+# drivers/video/mxc/Kconfig
+
@@ -29745,13 +29747,13 @@ Index: linux-2.6.38.8/drivers/mxc/Kconfig
Index: linux-2.6.38.8/drivers/mxc/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/Makefile 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Makefile 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1 @@
+obj-y += security/
Index: linux-2.6.38.8/drivers/Makefile
===================================================================
---- linux-2.6.38.8.orig/drivers/Makefile 2011-08-31 15:27:30.000000000 +0200
-+++ linux-2.6.38.8/drivers/Makefile 2011-08-31 15:28:27.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/Makefile 2011-10-20 17:07:07.000000000 +0200
++++ linux-2.6.38.8/drivers/Makefile 2011-10-20 17:37:24.000000000 +0200
@@ -93,6 +93,7 @@
obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_CPU_IDLE) += cpuidle/
@@ -29763,7 +29765,7 @@ Index: linux-2.6.38.8/drivers/Makefile
Index: linux-2.6.38.8/include/linux/mxc_scc2_driver.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/include/linux/mxc_scc2_driver.h 2011-08-31 16:31:03.000000000 +0200
++++ linux-2.6.38.8/include/linux/mxc_scc2_driver.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,975 @@
+
+/*
@@ -30743,7 +30745,7 @@ Index: linux-2.6.38.8/include/linux/mxc_scc2_driver.h
Index: linux-2.6.38.8/include/linux/mxc_scc_driver.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/include/linux/mxc_scc_driver.h 2011-08-31 15:28:27.000000000 +0200
++++ linux-2.6.38.8/include/linux/mxc_scc_driver.h 2011-10-20 17:37:24.000000000 +0200
@@ -0,0 +1,1031 @@
+
+/*
@@ -31778,8 +31780,8 @@ Index: linux-2.6.38.8/include/linux/mxc_scc_driver.h
+#endif /* __ASM_ARCH_MXC_SCC_DRIVER_H__ */
Index: linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2011-10-17 15:00:31.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c 2011-10-17 15:03:55.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2011-10-20 17:07:11.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c 2011-10-20 17:37:24.000000000 +0200
@@ -1255,6 +1255,10 @@
DEFINE_CLOCK(sdma_clk, 1, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG15_OFFSET,
NULL, NULL, &ahb_clk, NULL);
@@ -31801,8 +31803,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/clock-mx51-mx53.c
_REGISTER_CLOCK(NULL, "gpt_32k", gpt_32k_clk)
Index: linux-2.6.38.8/arch/arm/mach-mx5/devices.c
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.c 2011-10-17 15:09:37.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/devices.c 2011-10-17 15:36:04.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.c 2011-06-03 03:35:11.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/devices.c 2011-10-20 17:37:24.000000000 +0200
@@ -120,6 +120,27 @@
},
};
@@ -31833,8 +31835,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/devices.c
.chip.label = "gpio-0",
Index: linux-2.6.38.8/arch/arm/mach-mx5/devices.h
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.h 2011-10-17 15:33:01.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/devices.h 2011-10-17 15:35:17.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/devices.h 2011-06-03 03:35:11.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/devices.h 2011-10-20 17:37:24.000000000 +0200
@@ -3,3 +3,4 @@
extern struct platform_device mxc_usbh2_device;
extern struct platform_device mxc_usbdr_udc_device;
hooks/post-receive
--
armadeus
|
