From: Olof Johansson <olof@lixom.net>
Date: Mon, 22 Jul 2019 03:04:01 +0000 (-0700)
Subject: Merge tag 'soc-fsl-next-v5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~5561^2~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=deb0df1a994db40c179aebedeebb21bba0e22fa0;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'soc-fsl-next-v5.3-2' of git://git./linux/kernel/git/leo/linux into arm/drivers

NXP/FSL SoC driver updates for v5.3 (take 2)

DPAA2 Console driver
- Add driver to export two char devices to dump logs for MC and
  AIOP

DPAA2 DPIO driver
- Add support for memory backed QBMan portals
- Increase the timeout period to prevent false error
- Add APIs to retrieve QBMan portal probing status

DPAA Qman driver
- Only make liodn fixup on powerpc SoCs with PAMU iommu

QUICC Engine
- Add support for importing qe-snums through device tree
- Some cleanups and foot print optimzation

* tag 'soc-fsl-next-v5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux:
  soc: fsl: qe: fold qe_get_num_of_snums into qe_snums_init
  soc: fsl: qe: support fsl,qe-snums property
  dt-bindings: soc: fsl: qe: document new fsl,qe-snums binding
  soc: fsl: qe: introduce qe_get_device_node helper
  soc: fsl: qe: reduce static memory footprint by 1.7K
  soc: fsl: qe: drop useless static qualifier
  soc: fsl: fix spelling mistake "Firmaware" -> "Firmware"

Link: https://lore.kernel.org/r/20190605194511.12127-1-leoyang.li@nxp.com
Signed-off-by: Olof Johansson <olof@lixom.net>
---

deb0df1a994db40c179aebedeebb21bba0e22fa0
diff --cc drivers/soc/fsl/qe/qe.c
index 62c6ba1,852060c..ba38c4b
--- a/drivers/soc/fsl/qe/qe.c
+++ b/drivers/soc/fsl/qe/qe.c
@@@ -9,7 -8,13 +9,8 @@@
   * Description:
   * General Purpose functions for the global management of the
   * QUICC Engine (QE).
 - *
 - * This program is free software; you can redistribute  it and/or modify it
 - * under  the terms of  the GNU General  Public License as published by the
 - * Free Software Foundation;  either version 2 of the  License, or (at your
 - * option) any later version.
   */
+ #include <linux/bitmap.h>
  #include <linux/errno.h>
  #include <linux/sched.h>
  #include <linux/kernel.h>