Commit 125e0762 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'realtek-soc-for-5.8' of...

Merge tag 'realtek-soc-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek into arm/soc

Realtek Arm based SoC for v5.8

Introduce ARCH_REALTEK also for 32-bit arm, and update MAINTAINERS.

* tag 'realtek-soc-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek:
  MAINTAINERS: Add Realtek arm DT files
  ARM: Prepare Realtek RTD1195

Link: https://lore.kernel.org/r/20200510232158.18477-1-afaerber@suse.de


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b5bb6317 ed25e516
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -2273,6 +2273,8 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L:	linux-realtek-soc@lists.infradead.org (moderated for non-subscribers)
S:	Maintained
F:	Documentation/devicetree/bindings/arm/realtek.yaml
F:	arch/arm/boot/dts/rtd*
F:	arch/arm/mach-realtek/
F:	arch/arm64/boot/dts/realtek/
ARM/RENESAS ARM64 ARCHITECTURE
+2 −0
Original line number Diff line number Diff line
@@ -698,6 +698,8 @@ source "arch/arm/mach-qcom/Kconfig"

source "arch/arm/mach-rda/Kconfig"

source "arch/arm/mach-realtek/Kconfig"

source "arch/arm/mach-realview/Kconfig"

source "arch/arm/mach-rockchip/Kconfig"
+3 −0
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@ head-y := arch/arm/kernel/head$(MMUEXT).o
textofs-y	:= 0x00008000
# We don't want the htc bootloader to corrupt kernel during resume
textofs-$(CONFIG_PM_H1940)      := 0x00108000
# RTD1195 has Boot ROM at start of address space
textofs-$(CONFIG_ARCH_REALTEK)  := 0x00108000
# SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory
ifeq ($(CONFIG_ARCH_SA1100),y)
textofs-$(CONFIG_SA1111) := 0x00208000
@@ -208,6 +210,7 @@ machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell
machine-$(CONFIG_ARCH_PXA)		+= pxa
machine-$(CONFIG_ARCH_QCOM)		+= qcom
machine-$(CONFIG_ARCH_RDA)		+= rda
machine-$(CONFIG_ARCH_REALTEK)		+= realtek
machine-$(CONFIG_ARCH_REALVIEW)		+= realview
machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip
machine-$(CONFIG_ARCH_RPC)		+= rpc
+11 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0-or-later
menuconfig ARCH_REALTEK
	bool "Realtek SoCs"
	depends on ARCH_MULTI_V7
	select ARM_GIC
	select ARM_GLOBAL_TIMER
	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
	select GENERIC_IRQ_CHIP
	select RESET_CONTROLLER
	help
	  This enables support for the Realtek RTD1195 SoC family.
+2 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0-or-later
obj-y += rtd1195.o
Loading