From: Olof Johansson Date: Sat, 19 Nov 2016 02:32:57 +0000 (-0800) Subject: Merge tag 'tegra-for-4.10-bus' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra... X-Git-Tag: v4.10-rc1~80^2~11 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=84f1f0c199fdbdf11eddb8da07d8cd9dcfdaeeb4;p=linux.git Merge tag 'tegra-for-4.10-bus' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers 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 --- 84f1f0c199fdbdf11eddb8da07d8cd9dcfdaeeb4 diff --cc drivers/bus/Makefile index 2adb5401ff0a,a679d00fc4eb..cc6364bec054 --- a/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