layerscape: update patches-4.9 to LSDK1712

[openwrt/staging/lynxis.git] / target / linux / layerscape / patches-4.9 / 808-guts-support-layerscape.patch

diff --git a/target/linux/layerscape/patches-4.9/808-guts-support-layerscape.patch b/target/linux/layerscape/patches-4.9/808-guts-support-layerscape.patch
index ffda8a6cf823fa6ba55a841cb7812dcabef9d132..0999832a1621ae63a8e202ba033020bdaacc376a 100644 (file)
--- a/target/linux/layerscape/patches-4.9/808-guts-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/808-guts-support-layerscape.patch
@@ -1,51 +1,20 @@
-From d51e307e4ecf51832c9e3bc30acb5dbd559d5f4d Mon Sep 17 00:00:00 2001
+From 45b0e1589b25ea3106a8c8d18bf653fde95baa9f Mon Sep 17 00:00:00 2001
 From: Yangbo Lu <yangbo.lu@nxp.com>
-Date: Mon, 25 Sep 2017 12:19:34 +0800
-Subject: [PATCH] guts: support layerscape
+Date: Wed, 17 Jan 2018 15:34:22 +0800
+Subject: [PATCH 20/30] guts: support layerscape
 
-This is a integrated patch for layerscape guts support.
+This is an integrated patch for layerscape guts support.
 
 Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
 Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
 Signed-off-by: Amrita Kumari <amrita.kumari@nxp.com>
 Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
 ---
- drivers/base/soc.c       |  12 ++-
  drivers/soc/fsl/guts.c   | 238 +++++++++++++++++++++++++++++++++++++++++++++++
  include/linux/fsl/guts.h | 125 +++++++++++++++----------
- 3 files changed, 323 insertions(+), 52 deletions(-)
+ 2 files changed, 315 insertions(+), 48 deletions(-)
  create mode 100644 drivers/soc/fsl/guts.c
 
---- a/drivers/base/soc.c
-+++ b/drivers/base/soc.c
-@@ -167,19 +167,23 @@ static int soc_device_match_one(struct d
-       const struct soc_device_attribute *match = arg;
- 
-       if (match->machine &&
--          !glob_match(match->machine, soc_dev->attr->machine))
-+          (!soc_dev->attr->machine ||
-+           !glob_match(match->machine, soc_dev->attr->machine)))
-               return 0;
- 
-       if (match->family &&
--          !glob_match(match->family, soc_dev->attr->family))
-+          (!soc_dev->attr->family ||
-+           !glob_match(match->family, soc_dev->attr->family)))
-               return 0;
- 
-       if (match->revision &&
--          !glob_match(match->revision, soc_dev->attr->revision))
-+          (!soc_dev->attr->revision ||
-+           !glob_match(match->revision, soc_dev->attr->revision)))
-               return 0;
- 
-       if (match->soc_id &&
--          !glob_match(match->soc_id, soc_dev->attr->soc_id))
-+          (!soc_dev->attr->soc_id ||
-+           !glob_match(match->soc_id, soc_dev->attr->soc_id)))
-               return 0;
- 
-       return 1;
 --- /dev/null
 +++ b/drivers/soc/fsl/guts.c
 @@ -0,0 +1,238 @@