[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-256-gcb4af8d
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-256-gcb4af8d
|
From: Julien B a. A. <ar...@us...> - 2012-04-05 10:50:08
|
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 cb4af8dbd7c08a530c4b1421586d0ecffa22899b (commit)
via 0f6455d49c35d0d6a318fcb69abf147b154a944b (commit)
from 05034c28d496c85dd96d01874958bda96cbeccd0 (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 cb4af8dbd7c08a530c4b1421586d0ecffa22899b
Merge: 0f6455d 05034c2
Author: Julien Boibessot <jul...@ar...>
Date: Thu Apr 5 12:49:41 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 0f6455d49c35d0d6a318fcb69abf147b154a944b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Apr 5 12:49:02 2012 +0200
[BUILDROOT] Let gst-fsl-plugin compile vpu_enc plugin too, by adding ipu stuff (\!?) from latest imx-lib, which required some linux headers updates...
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/174-imx-lib-add_package.patch | 47 +++-
.../2012.02/185-gst-fsl-plugin-add_package.patch | 12 +-
...26692-3-add_mx23_mx25_mx28_security_stuff.patch | 30 +-
...0-add_scc2_and_sahara_drivers_without_rng.patch | 343 +++++++++++---------
4 files changed, 246 insertions(+), 186 deletions(-)
diff --git a/patches/buildroot/2012.02/174-imx-lib-add_package.patch b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
index 802396a..9ea4304 100644
--- a/patches/buildroot/2012.02/174-imx-lib-add_package.patch
+++ b/patches/buildroot/2012.02/174-imx-lib-add_package.patch
@@ -3,7 +3,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/imx-lib/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/Config.in 2012-04-03 10:31:23.000000000 +0200
++++ buildroot/package/imx-lib/Config.in 2012-04-05 12:05:39.000000000 +0200
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_IMX_LIB
+ bool "imx-lib"
@@ -12,14 +12,14 @@ Index: buildroot/package/imx-lib/Config.in
Index: buildroot/package/imx-lib/imx-lib.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/imx-lib/imx-lib.mk 2012-04-03 12:24:19.000000000 +0200
-@@ -0,0 +1,46 @@
++++ buildroot/package/imx-lib/imx-lib.mk 2012-04-05 12:41:02.000000000 +0200
+@@ -0,0 +1,56 @@
+#############################################################
+#
+# imx-lib (helpers librairies from Freescale BSP)
+#
+#############################################################
-+IMX_LIB_VERSION = 10.11.01
++IMX_LIB_VERSION = 11.09.01
+IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz
+IMX_LIB_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
+IMX_LIB_INSTALL_STAGING = YES
@@ -30,11 +30,16 @@ Index: buildroot/package/imx-lib/imx-lib.mk
+BUILD_PLATFORM = IMX51
+endif
+
++IMX_LIB_SUBDIRS += sahara2
++IMX_LIB_SUBDIRS += vpu
++IMX_LIB_SUBDIRS += ipu
++
+define IMX_LIB_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" \
+ PLATFORM=$(BUILD_PLATFORM) \
-+ DIRS="sahara2 vpu" \
-+ CFLAGS="-fPIC -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include" \
++ DIRS="$(IMX_LIB_SUBDIRS)" \
++ CFLAGS="-fPIC -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include -I$(LINUX_DIR)/include" \
++ INCLUDE="-I$(LINUX_DIR)/include" \
+ -C $(@D)
+endef
+
@@ -44,15 +49,20 @@ Index: buildroot/package/imx-lib/imx-lib.mk
+ install -D -m 755 $(@D)/vpu/vpu_lib.h $(STAGING_DIR)/usr/include
+ install -D -m 755 $(@D)/sahara2/libsahara.so $(STAGING_DIR)/usr/lib
+ install -D -m 755 $(@D)/ipu/mxc_ipu_hl_lib.h $(STAGING_DIR)/usr/include
++ install -D -m 755 $(@D)/ipu/ipu.h $(STAGING_DIR)/usr/include
++ install -D -m 755 $(@D)/ipu/libipu.so $(STAGING_DIR)/usr/lib
+endef
+
+define IMX_LIB_INSTALL_TARGET_CMDS
+ install -D -m 755 $(@D)/vpu/libvpu.so $(TARGET_DIR)/usr/lib
+ install -D -m 755 $(@D)/sahara2/libsahara.so $(TARGET_DIR)/usr/lib
++ install -D -m 755 $(@D)/ipu/libipu.so $(TARGET_DIR)/usr/lib
+endef
+
+define IMX_LIB_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/lib/libvpu.so
++ rm -f $(TARGET_DIR)/usr/lib/libsahara.so
++ rm -f $(TARGET_DIR)/usr/lib/libipu.so
+endef
+
+define IMX_LIB_CLEAN_CMDS
@@ -62,8 +72,8 @@ Index: buildroot/package/imx-lib/imx-lib.mk
+$(eval $(call GENTARGETS))
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-04-03 10:31:23.000000000 +0200
-+++ buildroot/package/Config.in 2012-04-03 18:01:02.000000000 +0200
+--- buildroot.orig/package/Config.in 2012-04-05 12:05:39.000000000 +0200
++++ buildroot/package/Config.in 2012-04-05 12:42:07.000000000 +0200
@@ -349,6 +349,7 @@
endmenu
@@ -72,3 +82,24 @@ Index: buildroot/package/Config.in
source "package/libaio/Config.in"
source "package/libraw1394/Config.in"
source "package/tslib/Config.in"
+Index: buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch 2012-04-05 12:35:42.000000000 +0200
+@@ -0,0 +1,16 @@
++linux/videodev.h include doesn't exist anymore on V4L2 only (=recent kernels).
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN -X linux-2.6.38.8/Documentation/dontdiff imx-lib-11.09.01/ipu/mxc_ipu_hl_lib.c imx-lib-11.09.01.mod/ipu/mxc_ipu_hl_lib.c
++--- imx-lib-11.09.01/ipu/mxc_ipu_hl_lib.c 2012-04-05 12:24:55.000000000 +0200
+++++ imx-lib-11.09.01.mod/ipu/mxc_ipu_hl_lib.c 2011-09-09 16:10:11.000000000 +0200
++@@ -41,7 +41,7 @@
++ #include <sys/mman.h>
++ #include <sys/types.h>
++ #include <sys/stat.h>
++-#include <linux/videodev.h>
+++#include <linux/videodev2.h>
++ #include "mxc_ipu_hl_lib.h"
++
++ #define DBG_DEBUG 3
diff --git a/patches/buildroot/2012.02/185-gst-fsl-plugin-add_package.patch b/patches/buildroot/2012.02/185-gst-fsl-plugin-add_package.patch
index 6d13023..ef6267c 100644
--- a/patches/buildroot/2012.02/185-gst-fsl-plugin-add_package.patch
+++ b/patches/buildroot/2012.02/185-gst-fsl-plugin-add_package.patch
@@ -3,7 +3,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin.mk 2012-04-03 17:42:39.000000000 +0200
++++ buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin.mk 2012-04-05 12:37:49.000000000 +0200
@@ -0,0 +1,41 @@
+#############################################################
+#
@@ -43,13 +43,13 @@ Index: buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin.mk
+define GST_FSL_PLUGIN_NO_IPU_HOOK
+ $(SED) 's/$$(IPUDIRS)//' $(@D)/Makefile
+endef
-+GST_FSL_PLUGIN_POST_CONFIGURE_HOOKS += GST_FSL_PLUGIN_NO_IPU_HOOK
++#GST_FSL_PLUGIN_POST_CONFIGURE_HOOKS += GST_FSL_PLUGIN_NO_IPU_HOOK
+
+$(eval $(call AUTOTARGETS))
Index: buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin-gst_snapshot_stdio.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin-gst_snapshot_stdio.patch 2012-04-03 17:34:37.000000000 +0200
++++ buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin-gst_snapshot_stdio.patch 2012-04-05 12:36:53.000000000 +0200
@@ -0,0 +1,19 @@
+Otherwise build fails with:
+
@@ -73,7 +73,7 @@ Index: buildroot/package/multimedia/gst-fsl-plugin/gst-fsl-plugin-gst_snapshot_s
Index: buildroot/package/multimedia/gst-fsl-plugin/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/multimedia/gst-fsl-plugin/Config.in 2012-04-03 17:58:51.000000000 +0200
++++ buildroot/package/multimedia/gst-fsl-plugin/Config.in 2012-04-05 12:36:53.000000000 +0200
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_GST_FSL_PLUGIN
+ bool "gst-fsl-plugin"
@@ -85,8 +85,8 @@ Index: buildroot/package/multimedia/gst-fsl-plugin/Config.in
+ Freescale's i.MX specific gstreamer plugins.
Index: buildroot/package/multimedia/Config.in
===================================================================
---- buildroot.orig/package/multimedia/Config.in 2012-04-03 17:54:48.000000000 +0200
-+++ buildroot/package/multimedia/Config.in 2012-04-03 17:55:22.000000000 +0200
+--- buildroot.orig/package/multimedia/Config.in 2012-04-05 12:36:28.000000000 +0200
++++ buildroot/package/multimedia/Config.in 2012-04-05 12:36:53.000000000 +0200
@@ -8,6 +8,7 @@
source "package/multimedia/ffmpeg/Config.in"
source "package/multimedia/gstreamer/Config.in"
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 6c9dd38..18773a8 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
@@ -14,8 +14,8 @@ Signed-off-by: Dinh Nguyen <Din...@fr...>
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
+--- linux-2.6.38.8.orig/drivers/crypto/Kconfig 2012-04-03 16:57:51.000000000 +0200
++++ linux-2.6.38.8/drivers/crypto/Kconfig 2012-04-03 16:58:28.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.
@@ -35,8 +35,8 @@ Index: linux-2.6.38.8/drivers/crypto/Kconfig
endif # CRYPTO_HW
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
+--- linux-2.6.38.8.orig/drivers/crypto/Makefile 2012-04-03 16:57:51.000000000 +0200
++++ linux-2.6.38.8/drivers/crypto/Makefile 2012-04-03 16:58:28.000000000 +0200
@@ -10,4 +10,5 @@
obj-$(CONFIG_CRYPTO_DEV_PPC4XX) += amcc/
obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += omap-sham.o
@@ -46,7 +46,7 @@ Index: linux-2.6.38.8/drivers/crypto/Makefile
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
++++ linux-2.6.38.8/drivers/crypto/dcp.c 2012-04-03 16:58:28.000000000 +0200
@@ -0,0 +1,1697 @@
+/*
+ * Copyright (C) 2008-2010 Freescale Semiconductor, Inc.
@@ -1748,7 +1748,7 @@ Index: linux-2.6.38.8/drivers/crypto/dcp.c
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
++++ linux-2.6.38.8/drivers/crypto/dcp.h 2012-04-03 16:58:28.000000000 +0200
@@ -0,0 +1,717 @@
+/*
+ * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -2470,7 +2470,7 @@ Index: linux-2.6.38.8/drivers/crypto/dcp.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
++++ linux-2.6.38.8/drivers/crypto/dcp_bootstream_ioctl.h 2012-04-03 16:58:28.000000000 +0200
@@ -0,0 +1,32 @@
+/*
+ * Freescale DCP driver for bootstream update. Only handles the OTP KEY
@@ -2507,7 +2507,7 @@ Index: linux-2.6.38.8/drivers/crypto/dcp_bootstream_ioctl.h
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
++++ linux-2.6.38.8/drivers/mxc/security/Kconfig 2012-04-05 11:44:18.000000000 +0200
@@ -0,0 +1,11 @@
+menu "MXC Security Drivers"
+
@@ -2523,16 +2523,16 @@ Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
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
++++ linux-2.6.38.8/drivers/mxc/security/Makefile 2012-04-05 11:44:18.000000000 +0200
@@ -0,0 +1 @@
+obj-$(CONFIG_MXC_DRYICE) += dryice.o
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
++++ linux-2.6.38.8/drivers/mxc/security/dryice-regs.h 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,207 @@
+/*
-+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -2741,10 +2741,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/dryice-regs.h
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
++++ linux-2.6.38.8/drivers/mxc/security/dryice.c 2012-04-05 11:41:05.000000000 +0200
@@ -0,0 +1,1123 @@
+/*
-+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -3869,10 +3869,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/dryice.c
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
++++ linux-2.6.38.8/drivers/mxc/security/dryice.h 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,287 @@
+/*
-+ * Copyright 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
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 b741baf..be4d4f3 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
@@ -11,6 +11,7 @@ Signed-off-by: Anish Trivedi <an...@fr...>
---
Modifications done by Armadeus systems:
- removal of RNG stuff
+ - updated to L2.6.35.11.09.01 + 201112 patches
- compatibility with 2.6.38
drivers/mxc/security/Kconfig | 53 +
@@ -42,7 +43,6 @@ Signed-off-by: Anish Trivedi <an...@fr...>
.../security/sahara2/include/sah_memory_mapper.h | 79 +
.../security/sahara2/include/sah_queue_manager.h | 63 +
.../security/sahara2/include/sah_status_manager.h | 228 ++
- drivers/mxc/security/sahara2/include/sahara.h | 2265 +++++++++++++++
.../mxc/security/sahara2/include/sahara2_kernel.h | 49 +
drivers/mxc/security/sahara2/include/sf_util.h | 466 +++
drivers/mxc/security/sahara2/km_adaptor.c | 849 ++++++
@@ -56,12 +56,13 @@ Signed-off-by: Anish Trivedi <an...@fr...>
drivers/mxc/security/sahara2/sf_util.c | 1390 +++++++++
drivers/mxc/security/scc2_driver.c | 2393 ++++++++++++++++
drivers/mxc/security/scc2_internals.h | 519 ++++
+ linux/include/mxc_sahara.h | 2265 +++++++++++++++
67 files changed, 40654 insertions(+), 3 deletions(-)
Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/security/Kconfig 2012-03-28 10:01:28.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/security/Kconfig 2012-03-28 10:01:36.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/security/Kconfig 2012-04-03 16:58:28.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/Kconfig 2012-04-03 16:58:29.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.
@@ -122,8 +123,8 @@ Index: linux-2.6.38.8/drivers/mxc/security/Kconfig
endmenu
Index: linux-2.6.38.8/drivers/mxc/security/Makefile
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/security/Makefile 2012-03-28 10:01:28.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/security/Makefile 2012-03-28 10:01:36.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/security/Makefile 2012-04-03 16:58:29.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/Makefile 2012-04-03 16:58:29.000000000 +0200
@@ -1 +1,11 @@
obj-$(CONFIG_MXC_DRYICE) += dryice.o
+# Makefile for the Linux MXC Security API
@@ -139,7 +140,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/mxc_scc.c 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,2386 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -2530,7 +2531,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/mxc_scc_internals.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,498 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -3033,7 +3034,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/Kconfig 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,35 @@
+menu "SAHARA2 Security Hardware Support"
+
@@ -3073,7 +3074,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/Makefile 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,47 @@
+# Makefile for the Linux Sahara2 driver
+#
@@ -3125,10 +3126,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,706 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -3146,7 +3147,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_auth.c
+ * functions. For now, only AES-CCM is supported.
+ */
+
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
+#include "adaptor.h"
+#include "sf_util.h"
+
@@ -3836,10 +3837,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,186 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -3858,7 +3859,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hash.c
+ * for Sahara. This does not include HMAC.
+ */
+
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
+#include "sf_util.h"
+
+#ifdef LINUX_KERNEL
@@ -4027,10 +4028,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,266 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -4049,7 +4050,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_hmac.c
+ * SHW API for Sahara.
+ */
+
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
+#include "sf_util.h"
+
+#ifdef __KERNEL__
@@ -4298,7 +4299,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_keystore.c 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,837 @@
+/*
+ * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -5140,10 +5141,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,96 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -5162,7 +5163,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_rand.c
+ * for Sahara.
+ */
+
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
+#include "sf_util.h"
+
+#ifdef __KERNEL__
@@ -5241,10 +5242,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,281 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -5263,7 +5264,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_sym.c
+ * Sahara. This does not include CCM.
+ */
+
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
+#include "fsl_platform.h"
+
+#include "sf_util.h"
@@ -5527,10 +5528,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,137 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -5548,7 +5549,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_user.c
+ * This file implements user and platform capabilities functions of the FSL SHW
+ * API for Sahara
+ */
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
+#include <adaptor.h>
+#include <sf_util.h>
+
@@ -5669,10 +5670,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,967 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -5737,7 +5738,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/fsl_shw_wrap.c
+
+ */
+
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
+#include "fsl_platform.h"
+#include "fsl_shw_keystore.h"
+
@@ -6641,10 +6642,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,113 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -6668,7 +6669,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/adaptor.h
+#ifndef ADAPTOR_H
+#define ADAPTOR_H
+
-+#include <sahara.h>
++#include <linux/mxc_sahara.h>
+
+/*!
+ * Structure passed during user ioctl() call to submit request.
@@ -6759,7 +6760,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/diagnostic.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -6880,7 +6881,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_platform.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -7046,10 +7047,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,2515 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -7334,7 +7335,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw.h
+
+#if defined(FSL_HAVE_SAHARA2) || defined(FSL_HAVE_SAHARA4)
+
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
+
+#else
+
@@ -9566,7 +9567,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/fsl_shw_keystore.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,475 @@
+/*
+ * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -10046,7 +10047,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,1829 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -11826,7 +11827,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h
+{ \
+ void *s = (void*)start; \
+ void *e = s + len; \
-+ clean_dcache_area(s, len); \
++ dmac_map_area(s, len, DMA_TO_DEVICE); \
+ outer_clean_range(__pa(s), __pa(e)); \
+}
+#endif
@@ -11847,7 +11848,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/linux_port.h
+{ \
+ void *s = (void*)start; \
+ void *e = s + len; \
-+ invalidate_kernel_vmap_range(s, len); \
++ dmac_unmap_area(s, len, DMA_FROM_DEVICE); \
+ outer_inv_range(__pa(s), __pa(e)); \
+}
+#endif
@@ -11880,7 +11881,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/platform_abstractions.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2005-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -11900,7 +11901,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/portable_os.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,1453 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13358,10 +13359,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,102 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -13384,7 +13385,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_driver_common.h
+#define SAH_DRIVER_COMMON_H
+
+#include "fsl_platform.h"
-+#include <sahara.h>
++#include <linux/mxc_sahara.h>
+#include <adaptor.h>
+
+/** This specifies the permissions for the device file. It is equivalent to
@@ -13465,7 +13466,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_hardware_interface.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13569,7 +13570,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_interrupt_handler.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13616,7 +13617,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_kernel.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13734,7 +13735,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_memory_mapper.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13818,7 +13819,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_queue_manager.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -13886,10 +13887,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,228 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -13913,7 +13914,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h
+#ifndef STATUS_MANAGER_H
+#define STATUS_MANAGER_H
+#include "sah_driver_common.h"
-+#include "sahara.h"
++#include <linux/mxc_sahara.h>
+
+
+/******************************************************************************
@@ -14116,10 +14117,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sah_status_manager.h
+
+
+#endif /* STATUS_MANAGER_H */
-Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h
+Index: linux-2.6.38.8/include/linux/mxc_sahara.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara.h 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/include/linux/mxc_sahara.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,2265 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -16389,7 +16390,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sahara2_kernel.h 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -16443,10 +16444,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h 2012-04-05 11:41:06.000000000 +0200
@@ -0,0 +1,466 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -16467,7 +16468,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/include/sf_util.h
+#define SF_UTIL_H
+
+#include <fsl_platform.h>
-+#include <sahara.h>
++#include <linux/mxc_sahara.h>
+
+/*! Header value for Sahara Descriptor 1 */
+#define SAH_HDR_SKHA_SET_MODE_IV_KEY 0x10880000
@@ -16914,7 +16915,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/km_adaptor.c 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,849 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -17768,10 +17769,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
-@@ -0,0 +1,2185 @@
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c 2012-04-05 11:41:06.000000000 +0200
+@@ -0,0 +1,2191 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -17820,6 +17821,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
+#define interruptible_sleep_on(x) sah_Handle_Interrupt()
+#endif
+
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Freescale Semiconductor");
++MODULE_DESCRIPTION("Device Driver for SAHARA2 crypto hw block");
++
+#define TEST_MODE_OFF 1
+#define TEST_MODE_ON 2
+
@@ -17963,7 +17968,9 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
+#else
+ {
+ sah_clk = clk_get(NULL, "sahara_clk");
-+ if (sah_clk != ERR_PTR(ENOENT))
++ if (IS_ERR(sah_clk))
++ os_error_code = PTR_ERR(sah_clk);
++ else
+ clk_enable(sah_clk);
+ }
+#endif
@@ -18153,7 +18160,9 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
+ mxc_clks_disable(SAHARA2_CLK);
+#else
+ {
-+ if (sah_clk != ERR_PTR(ENOENT))
++ if (IS_ERR(sah_clk))
++ os_error_code = PTR_ERR(sah_clk);
++ else
+ clk_disable(sah_clk);
+ }
+#endif
@@ -18220,13 +18229,15 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
+ mxc_clks_disable(SAHARA2_CLK);
+#else
+ {
-+ if (sah_clk != ERR_PTR(ENOENT))
++ if (IS_ERR(sah_clk))
++ ret_val = PTR_ERR(sah_clk);
++ else
+ clk_disable(sah_clk);
+ clk_put(sah_clk);
+ }
+#endif
+
-+ os_dev_shutdown_return(OS_ERROR_OK_S);
++ os_dev_shutdown_return(ret_val);
+}
+
+/*!
@@ -19950,15 +19961,11 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_driver_interface.c
+
+#endif /* ifndef SAHARA_POLL_MODE */
+
-+MODULE_DESCRIPTION("i.MX27?/i.MX51 Security Engine (SAHARA) driver");
-+MODULE_AUTHOR("Freescale");
-+MODULE_LICENSE("GPL");
-+
+/* End of 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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_hardware_interface.c 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,808 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -20771,7 +20778,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_interrupt_handler.c 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -20992,10 +20999,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
-@@ -0,0 +1,2356 @@
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c 2012-04-05 11:41:06.000000000 +0200
+@@ -0,0 +1,2367 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -21746,6 +21753,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c
+sah_Link *sah_Physicalise_Links(sah_Link * first_link)
+{
+ sah_Link *link = first_link;
++ struct page *pg;
+
+ while (link != NULL) {
+#ifdef DO_DBG
@@ -21810,8 +21818,18 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_memory_mapper.c
+ if (!(link->flags & SAH_PREPHYS_DATA)) {
+ link->original_data = link->data;
+
-+ /* All pointers are virtual right now */
-+ link->data = (void *)os_pa(link->data);
++ /* if the data buffer is not in kernel direct-
++ * mapped region, find the physical addr
++ * via other means.
++ */
++ if (!virt_addr_valid(link->data)) {
++ pg = vmalloc_to_page(link->data);
++ link->data = (uint8_t *) (
++ page_to_phys(pg) +
++ (((unsigned int) link->data) &
++ ~PAGE_MASK));
++ } else
++ link->data = (void *)os_pa(link->data);
+#ifdef DO_DBG
+ os_printk("%sput: %p (%d)\n",
+ (link->
@@ -23353,7 +23371,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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue.c 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,249 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -23607,10 +23625,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
-@@ -0,0 +1,1050 @@
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c 2012-04-05 11:41:06.000000000 +0200
+@@ -0,0 +1,1076 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -23965,7 +23983,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
+#else
+ {
+ struct clk *clk = clk_get(NULL, "sahara_clk");
-+ if (clk != ERR_PTR(ENOENT))
++ if (!IS_ERR(clk))
+ clk_enable(clk);
+ clk_put(clk);
+ }
@@ -24037,7 +24055,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
+ desc_head->result =
+ sah_convert_error_status(desc_head->error_status);
+#ifdef DIAG_DRV_STATUS
-+ sah_Log_Error(desc_head->current_dar, desc_head->error_status,
++ sah_Log_Error(desc_head->desc.dma_addr, desc_head->error_status,
+ desc_head->fault_address);
+#endif
+ }
@@ -24070,6 +24088,34 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
+void sah_postprocess_queue(unsigned long reset_flag)
+{
+
++ sah_Head_Desc *first_entry;
++ os_lock_context_t lock_flags;
++
++ /* Disabling Sahara Clock only if the hardware is in idle state and
++ the DAR queue is empty.*/
++ os_lock_save_context(desc_queue_lock, lock_flags);
++ first_entry = sah_Find_With_State(SAH_STATE_ON_SAHARA);
++ os_unlock_restore_context(desc_queue_lock, lock_flags);
++
++ if ((first_entry == NULL) && (sah_HW_Read_Status() == SAH_EXEC_IDLE)) {
++
++#ifdef DIAG_DRV_IF
++ LOG_KDIAG("SAHARA : Disabling the clocks\n")
++#endif /* DIAG_DRV_IF */
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
++ mxc_clks_disable(SAHARA2_CLK);
++#else
++ {
++ struct clk *clk = clk_get(NULL, "sahara_clk");
++ if (!IS_ERR(clk))
++ clk_disable(clk);
++ clk_put(clk);
++ }
++#endif
++
++ }
++
++
+ /* if SAHARA needs to be reset, do it here. This starts a descriptor chain
+ * if one is ready also */
+ if (reset_flag) {
@@ -24078,8 +24124,6 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_queue_manager.c
+
+ /* now handle the descriptor chain(s) that has/have completed */
+ do {
-+ sah_Head_Desc *first_entry;
-+ os_lock_context_t lock_flags;
+
+ os_lock_save_context(desc_queue_lock, lock_flags);
+
@@ -24662,10 +24706,10 @@ 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 2012-03-28 10:01:36.000000000 +0200
-@@ -0,0 +1,734 @@
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c 2012-04-05 11:41:06.000000000 +0200
+@@ -0,0 +1,714 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -24994,30 +25038,6 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
+ /* Keep going while further status is available. */
+ } while (state == SAH_EXEC_ERROR1);
+
-+ /* Disabling Sahara Clock only if the hardware is in idle state and
-+ the DAR queue is empty.*/
-+ os_lock_save_context(desc_queue_lock, lock_flags);
-+ current_entry = sah_Find_With_State(SAH_STATE_ON_SAHARA);
-+ os_unlock_restore_context(desc_queue_lock, lock_flags);
-+
-+ if ((current_entry == NULL) && (state == SAH_EXEC_IDLE)) {
-+
-+#ifdef DIAG_DRV_IF
-+ LOG_KDIAG("SAHARA : Disabling the clocks\n")
-+#endif /* DIAG_DRV_IF */
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
-+ mxc_clks_disable(SAHARA2_CLK);
-+#else
-+ {
-+ struct clk *clk = clk_get(NULL, "sahara_clk");
-+ if (clk != ERR_PTR(ENOENT))
-+ clk_disable(clk);
-+ clk_put(clk);
-+ }
-+#endif
-+
-+ }
-+
+ return reset_flag;
+}
+
@@ -25271,6 +25291,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
+{
+ sah_Head_Desc *entry = NULL;
+ os_lock_context_t lock_flags;
++ int error_code = 0;
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
+ switch (level) {
@@ -25318,13 +25339,14 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
+ * any power */
+ {
+ struct clk *clk = clk_get(NULL, "sahara_clk");
-+ if (clk != ERR_PTR(ENOENT)) {
++ if (IS_ERR(clk))
++ error_code = PTR_ERR(clk);
++ else
+ clk_disable(clk);
-+ }
+ }
+#endif
+
-+ return 0;
++ return error_code;
+}
+
+/*!
@@ -25350,6 +25372,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
+{
+ sah_Head_Desc *entry = NULL;
+ os_lock_context_t lock_flags;
++ int error_code = 0;
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
+ switch (level) {
@@ -25380,9 +25403,10 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
+ /* enable Sahara's clock */
+ struct clk *clk = clk_get(NULL, "sahara_clk");
+
-+ if (clk != ERR_PTR(ENOENT)) {
-+ clk_enable(clk);
-+ }
++ if (IS_ERR(clk))
++ error_code = PTR_ERR(clk);
++ else
++ clk_disable(clk);
+ }
+ sah_dpm_flag = FALSE;
+
@@ -25394,14 +25418,14 @@ Index: linux-2.6.38.8/drivers/mxc/security/sahara2/sah_status_manager.c
+ }
+ os_unlock_restore_context(desc_queue_lock, lock_flags);
+#endif
-+ return 0;
++ return error_code;
+}
+
+#endif /* SAHARA_POWER_MANAGEMENT */
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 2012-03-28 10:01:36.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/security/sahara2/sf_util.c 2012-04-03 16:58:29.000000000 +0200
@@ -0,0 +1,1390 @@
+/*
+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
@@ -26796,10 +26820,10 @@ 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 2012-03-28 10:01:37.000000000 +0200
-@@ -0,0 +1,2395 @@
++++ linux-2.6.38.8/drivers/mxc/security/scc2_driver.c 2012-04-05 11:41:06.000000000 +0200
+@@ -0,0 +1,2398 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -27215,7 +27239,6 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
+ break;
+ }
+}
-+EXPORT_SYMBOL(scc_partition_status);
+
+/**
+ * Calculate the physical address from the kernel virtual address.
@@ -27228,7 +27251,6 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
+ return (uint32_t) address - (uint32_t) scm_ram_base
+ + (uint32_t) scm_ram_phys_base;
+}
-+EXPORT_SYMBOL(scc_virt_to_phys);
+
+/**
+ * Engage partition of secure memory
@@ -27323,9 +27345,11 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
+ mxc_clks_enable(SCC_CLK);
+#else
-+ if (scc_clk != ERR_PTR(ENOENT)) {
++ if (IS_ERR(scc_clk)) {
++ return_value = PTR_ERR(scc_clk);
++ goto out;
++ } else
+ clk_enable(scc_clk);
-+ }
+#endif
+
+ /* Set up the hardware access locks */
@@ -27371,9 +27395,6 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
+ goto out;
+ }
+
-+ if (mx51_revision() != IMX_CHIP_REVISION_2_0)
-+ scm_ram_phys_base += 0x8000;
-+
+ scm_ram_base = (void *)ioremap_nocache(scm_ram_phys_base,
+ scc_configuration.
+ partition_count *
@@ -27455,7 +27476,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
+ mxc_clks_disable(SCC_CLK);
+#else
-+ if (scc_clk != ERR_PTR(ENOENT))
++ if (!IS_ERR(scc_clk))
+ clk_disable(scc_clk);
+#endif
+
@@ -27534,7 +27555,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
+ mxc_clks_disable(SCC_CLK);
+#else
-+ if (scc_clk != ERR_PTR(ENOENT))
++ if (!IS_ERR(scc_clk))
+ clk_disable(scc_clk);
+ clk_put(scc_clk);
+#endif
@@ -28157,8 +28178,11 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
+ mxc_clks_enable(SCC_CLK);
+#else
-+ if (scc_clk != ERR_PTR(ENOENT))
-+ clk_enable(scc_clk);
++ if (IS_ERR(scc_clk)) {
++ status = SCC_RET_FAIL;
++ goto out;
++ } else
++ clk_enable(scc_clk);
+#endif
+
+ scm_command = ((offset_blocks << SCM_CCMD_OFFSET_SHIFT) |
@@ -28217,7 +28241,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
+ mxc_clks_disable(SCC_CLK);
+#else
-+ if (scc_clk != ERR_PTR(ENOENT))
++ if (!IS_ERR(scc_clk))
+ clk_disable(scc_clk);
+#endif
+
@@ -28252,8 +28276,11 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
+ mxc_clks_enable(SCC_CLK);
+#else
-+ if (scc_clk != ERR_PTR(ENOENT))
-+ clk_enable(scc_clk);
++ if (IS_ERR(scc_clk)) {
++ status = SCC_RET_FAIL;
++ goto out;
++ } else
++ clk_enable(scc_clk);
+#endif
+ scm_command = ((offset_blocks << SCM_CCMD_OFFSET_SHIFT) |
+ (SCM_PART_NUMBER(part_base) << SCM_CCMD_PART_SHIFT));
@@ -28309,7 +28336,7 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_driver.c
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
+ mxc_clks_disable(SCC_CLK);
+#else
-+ if (scc_clk != ERR_PTR(ENOENT))
++ if (!IS_ERR(scc_clk))
+ clk_disable(scc_clk);
+#endif
+ return status;
@@ -29196,10 +29223,10 @@ 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 2012-03-28 10:01:37.000000000 +0200
-@@ -0,0 +1,519 @@
++++ linux-2.6.38.8/drivers/mxc/security/scc2_internals.h 2012-04-05 11:41:06.000000000 +0200
+@@ -0,0 +1,521 @@
+/*
-+ * Copyright (C) 2004-2010 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright (C) 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ */
+
+/*
@@ -29707,6 +29734,8 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_internals.h
+EXPORT_SYMBOL(scc_diminish_permissions);
+EXPORT_SYMBOL(scc_encrypt_region);
+EXPORT_SYMBOL(scc_decrypt_region);
++EXPORT_SYMBOL(scc_partition_status);
++EXPORT_SYMBOL(scc_virt_to_phys);
+/*EXPORT_SYMBOL(make_vpu_partition);*/
+
+
@@ -29719,8 +29748,8 @@ Index: linux-2.6.38.8/drivers/mxc/security/scc2_internals.h
+#endif /* SCC_INTERNALS_H */
Index: linux-2.6.38.8/drivers/mxc/Kconfig
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Kconfig 2012-03-28 10:01:12.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/Kconfig 2012-03-28 10:01:37.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/Kconfig 2012-04-03 16:58:28.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Kconfig 2012-04-05 11:33:36.000000000 +0200
@@ -6,6 +6,7 @@
source "drivers/mxc/hw_event/Kconfig"
@@ -29731,8 +29760,8 @@ Index: linux-2.6.38.8/drivers/mxc/Kconfig
Index: linux-2.6.38.8/drivers/mxc/Makefile
===================================================================
---- linux-2.6.38.8.orig/drivers/mxc/Makefile 2012-03-28 10:01:12.000000000 +0200
-+++ linux-2.6.38.8/drivers/mxc/Makefile 2012-03-28 10:01:37.000000000 +0200
+--- linux-2.6.38.8.orig/drivers/mxc/Makefile 2012-04-03 16:58:28.000000000 +0200
++++ linux-2.6.38.8/drivers/mxc/Makefile 2012-04-05 11:33:36.000000000 +0200
@@ -1,2 +1,3 @@
obj-$(CONFIG_MXC_VPU) += vpu/
obj-$(CONFIG_MXC_HWEVENT) += hw_event/
@@ -29740,7 +29769,7 @@ Index: linux-2.6.38.8/drivers/mxc/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 2012-03-28 10:01:37.000000000 +0200
++++ linux-2.6....
[truncated message content] |
