aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.4/7176-staging-fsl-mc-add-dpmcp-version-check.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/layerscape/patches-4.4/7176-staging-fsl-mc-add-dpmcp-version-check.patch')
-rw-r--r--target/linux/layerscape/patches-4.4/7176-staging-fsl-mc-add-dpmcp-version-check.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/target/linux/layerscape/patches-4.4/7176-staging-fsl-mc-add-dpmcp-version-check.patch b/target/linux/layerscape/patches-4.4/7176-staging-fsl-mc-add-dpmcp-version-check.patch
deleted file mode 100644
index 148a724c03..0000000000
--- a/target/linux/layerscape/patches-4.4/7176-staging-fsl-mc-add-dpmcp-version-check.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 035789ffb3b89b9764d7cc79d209a5795c18fa93 Mon Sep 17 00:00:00 2001
-From: Itai Katz <itai.katz@nxp.com>
-Date: Mon, 11 Apr 2016 11:56:11 -0500
-Subject: [PATCH 176/226] staging: fsl-mc: add dpmcp version check
-
-The dpmcp driver supports dpmcp version 3.0 and above.
-This patch adds the code to check the version.
-
-Signed-off-by: Itai Katz <itai.katz@nxp.com>
-Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
-Acked-by: German Rivera <german.rivera@nxp.com>
-
- drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 6 +++---
- drivers/staging/fsl-mc/bus/mc-allocator.c | 11 +++++++++++
- 2 files changed, 14 insertions(+), 3 deletions(-)
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 6 +++---
- drivers/staging/fsl-mc/bus/mc-allocator.c | 11 +++++++++++
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
---- a/drivers/staging/fsl-mc/bus/dpmcp-cmd.h
-+++ b/drivers/staging/fsl-mc/bus/dpmcp-cmd.h
-@@ -32,9 +32,9 @@
- #ifndef _FSL_DPMCP_CMD_H
- #define _FSL_DPMCP_CMD_H
-
--/* DPMCP Version */
--#define DPMCP_VER_MAJOR 3
--#define DPMCP_VER_MINOR 0
-+/* Minimal supported DPMCP Version */
-+#define DPMCP_MIN_VER_MAJOR 3
-+#define DPMCP_MIN_VER_MINOR 0
-
- /* Command IDs */
- #define DPMCP_CMDID_CLOSE 0x800
---- a/drivers/staging/fsl-mc/bus/mc-allocator.c
-+++ b/drivers/staging/fsl-mc/bus/mc-allocator.c
-@@ -297,6 +297,17 @@ int __must_check fsl_mc_portal_allocate(
- if (WARN_ON(!dpmcp_dev))
- goto error_cleanup_resource;
-
-+ if (dpmcp_dev->obj_desc.ver_major < DPMCP_MIN_VER_MAJOR ||
-+ (dpmcp_dev->obj_desc.ver_major == DPMCP_MIN_VER_MAJOR &&
-+ dpmcp_dev->obj_desc.ver_minor < DPMCP_MIN_VER_MINOR)) {
-+ dev_err(&dpmcp_dev->dev,
-+ "ERROR: Version %d.%d of DPMCP not supported.\n",
-+ dpmcp_dev->obj_desc.ver_major,
-+ dpmcp_dev->obj_desc.ver_minor);
-+ error = -ENOTSUPP;
-+ goto error_cleanup_resource;
-+ }
-+
- if (WARN_ON(dpmcp_dev->obj_desc.region_count == 0))
- goto error_cleanup_resource;
-