Merge tag 'tegra-for-4.10-bus' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra...

bus: Add Tegra GMI support

This provides a driver to enable the use of the Generic Memory Interface
found on Tegra SoCs that can host various types of high-speed devices.

* tag 'tegra-for-4.10-bus' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  bus: Add support for Tegra Generic Memory Interface
  dt/bindings: Add bindings for Tegra GMI controller

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc drivers/bus/Kconfig
Simple merge

diff --cc drivers/bus/Makefile
index 2adb5401ff0a804bdc6917be734187c323b4d757,a679d00fc4eba914ad35301fe82c638983213918..cc6364bec05402e8834b2982ec8e801fe4fb2118
--- 1/drivers/bus/Makefile
--- 2/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@@ -19,7 -19,6 +19,8 @@@ obj-$(CONFIG_QCOM_EBI2)               += qcom-ebi2.
  obj-$(CONFIG_SUNXI_RSB)               += sunxi-rsb.o
  obj-$(CONFIG_SIMPLE_PM_BUS)   += simple-pm-bus.o
  obj-$(CONFIG_TEGRA_ACONNECT)  += tegra-aconnect.o
+ obj-$(CONFIG_TEGRA_GMI)               += tegra-gmi.o
  obj-$(CONFIG_UNIPHIER_SYSTEM_BUS)     += uniphier-system-bus.o
  obj-$(CONFIG_VEXPRESS_CONFIG) += vexpress-config.o
 +
 +obj-$(CONFIG_DA8XX_MSTPRI)    += da8xx-mstpri.o