diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 16:49:22 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 16:49:22 +0100 |
commit | bc28ba81db8e4c20b92c08ebec2405fcb87ae120 (patch) | |
tree | da9e72c46a9df0cd40cfd6a7a443d5a632865721 /arch/arm | |
parent | ae1d0a466ef76e1ff5058e2b316c14f46af83675 (diff) | |
parent | 8d6799a9ba23acd675f3243580ee6f1756fb4381 (diff) | |
download | linux-stable-bc28ba81db8e4c20b92c08ebec2405fcb87ae120.tar.gz linux-stable-bc28ba81db8e4c20b92c08ebec2405fcb87ae120.tar.bz2 linux-stable-bc28ba81db8e4c20b92c08ebec2405fcb87ae120.zip |
Merge tag 'renesas-soc-match-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers
Merge "Renesas ARM Based SoC Match Updates for v4.10" from Simon Horman:
* Identify SoC and register with the SoC bus
* tag 'renesas-soc-match-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
soc: renesas: Identify SoC and register with the SoC bus
ARM: shmobile: Document DT bindings for Product Register
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 09817bae4558..ebab13e8afa1 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -40,6 +40,7 @@ menuconfig ARCH_RENESAS select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE select NO_IOPORT_MAP select PINCTRL + select SOC_BUS select GPIOLIB select ZONE_DMA if ARM_LPAE |