summaryrefslogtreecommitdiff
path: root/drivers/soc/fsl/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-06-17 14:38:06 +0300
committerOlof Johansson <olof@lixom.net>2019-06-17 14:38:06 +0300
commit112603739338346eb2f34f3d3ab94b04731ab83d (patch)
tree0346312de6502fcd2882d5373c1018a4eee15267 /drivers/soc/fsl/Makefile
parent9e0babf2c06c73cda2c0cd37a1653d823adb40ec (diff)
parent5d1d046e2868fc876a69231eb2f24f000b521f1c (diff)
downloadlinux-112603739338346eb2f34f3d3ab94b04731ab83d.tar.xz
Merge tag 'soc-fsl-next-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/drivers
NXP/FSL SoC driver updates for v5.3 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 * tag 'soc-fsl-next-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux: soc: fsl: qbman_portals: add APIs to retrieve the probing status soc: fsl: qman: fixup liodns only on ppc targets soc: fsl: dpio: Add support for memory backed QBMan portals bus: mc-bus: Add support for mapping shareable portals soc: fsl: dpio: Increase timeout for QBMan Management Commands soc: fsl: add DPAA2 console support Documentation: DT: Add entry for DPAA2 console soc: fsl: guts: Add definition for LX2160A Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/soc/fsl/Makefile')
-rw-r--r--drivers/soc/fsl/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile
index 158541a83d26..71dee8d0d1f0 100644
--- a/drivers/soc/fsl/Makefile
+++ b/drivers/soc/fsl/Makefile
@@ -8,3 +8,4 @@ obj-$(CONFIG_QUICC_ENGINE) += qe/
obj-$(CONFIG_CPM) += qe/
obj-$(CONFIG_FSL_GUTS) += guts.o
obj-$(CONFIG_FSL_MC_DPIO) += dpio/
+obj-$(CONFIG_DPAA2_CONSOLE) += dpaa2-console.o