aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-06-01 20:28:11 -0400
committerOlof Johansson <olof@lixom.net>2017-06-01 20:28:11 -0400
commit88e98d3b32752c0bb30930f28d302196e2625342 (patch)
tree714b6133b1ccca2656c534c70437f0d4c49bb3f5
parentf85a543e5373eebad2aa43785d58f6727e4203a3 (diff)
parentde9aa5308247160950a3ab6420de79014a040699 (diff)
Merge tag 'realtek-arm64-soc-for-4.12' of git://github.com/afaerber/linux into next/arm64
Realtek ARM64 SoC for v4.12 This adds a Kconfig symbol for DTs being added, plus a MAINTAINERS entry. * tag 'realtek-arm64-soc-for-4.12' of git://github.com/afaerber/linux: MAINTAINERS: Add Realtek section ARM64: Prepare Realtek RTD1295 Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--MAINTAINERS7
-rw-r--r--arch/arm64/Kconfig.platforms6
2 files changed, 13 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 053c3bdd1fe5..0bf9f2d3cba4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1677,6 +1677,13 @@ M: Lennert Buytenhek <kernel@wantstofly.org>
1677L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1677L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1678S: Maintained 1678S: Maintained
1679 1679
1680ARM/REALTEK ARCHITECTURE
1681M: Andreas Färber <afaerber@suse.de>
1682L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1683S: Maintained
1684F: arch/arm64/boot/dts/realtek/
1685F: Documentation/devicetree/bindings/arm/realtek.txt
1686
1680ARM/RENESAS ARM64 ARCHITECTURE 1687ARM/RENESAS ARM64 ARCHITECTURE
1681M: Simon Horman <horms@verge.net.au> 1688M: Simon Horman <horms@verge.net.au>
1682M: Magnus Damm <magnus.damm@gmail.com> 1689M: Magnus Damm <magnus.damm@gmail.com>
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index fa3715cb2024..f3ba4f42519a 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -126,6 +126,12 @@ config ARCH_QCOM
126 help 126 help
127 This enables support for the ARMv8 based Qualcomm chipsets. 127 This enables support for the ARMv8 based Qualcomm chipsets.
128 128
129config ARCH_REALTEK
130 bool "Realtek Platforms"
131 help
132 This enables support for the ARMv8 based Realtek chipsets,
133 like the RTD1295.
134
129config ARCH_ROCKCHIP 135config ARCH_ROCKCHIP
130 bool "Rockchip Platforms" 136 bool "Rockchip Platforms"
131 select ARCH_HAS_RESET_CONTROLLER 137 select ARCH_HAS_RESET_CONTROLLER