ARM: Initial RTD1195 and MeLE X1000 support
Subsystems (5)
v2 cover ARM: Initial RTD1195 and MeLE X1000 support
Hello,
This series adds initial support for Realtek RTD1195 SoC and adds a Device Tree for the MeLE X1000 TV set-top-box.
v2 cleans up memory reservations and enables the arch timer.
More details at:
https://en.opensuse.org/HCL:Mele_X1000
Latest experimental patches at:
https://github.com/afaerber/linux/commits/rtd1295-next
Have a lot of fun!
Cheers,
Andreas
v1 -> v2:
* Do not redundantly select COMMON_CLK (Arnd)
* Drop further unneeded selects
* Clean up memory reservations (Rob)
* Enable arch timer
Andreas Färber (4):
dt-bindings: arm: realtek: Add RTD1195 and MeLE X1000
ARM: Prepare Realtek RTD1195
ARM: dts: Prepare Realtek RTD1195 and MeLE X1000
ARM: realtek: Enable RTD1195 arch timer
Documentation/devicetree/bindings/arm/realtek.yaml | 6 + arch/arm/Kconfig | 2 + arch/arm/Makefile | 3 + arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/rtd1195-mele-x1000.dts | 31 +++++ arch/arm/boot/dts/rtd1195.dtsi | 127 +++++++++++++++++++++ arch/arm/mach-realtek/Kconfig | 11 ++ arch/arm/mach-realtek/Makefile | 2 + arch/arm/mach-realtek/rtd1195.c | 53 +++++++++ 9 files changed, 237 insertions(+) create mode 100644 arch/arm/boot/dts/rtd1195-mele-x1000.dts create mode 100644 arch/arm/boot/dts/rtd1195.dtsi create mode 100644 arch/arm/mach-realtek/Kconfig create mode 100644 arch/arm/mach-realtek/Makefile create mode 100644 arch/arm/mach-realtek/rtd1195.c
Signature · 1 line
2.16.4
PATCH v2 1/4 dt-bindings: arm: realtek: Add RTD1195 and MeLE X1000
Add bindings for Realtek RTD1195 SoC and MeLE X1000 TV box.
---
v1 -> v2: Unchanged
* Added Reviewed-by
Documentation/devicetree/bindings/arm/realtek.yaml | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/arm/realtek.yaml +6 -0
@@ -14,6 +14,12 @@ properties: const: '/' compatible: oneOf: + # RTD1195 SoC based boards + - items: + - enum: + - mele,x1000 # MeLE X1000 + - const: realtek,rtd1195 + # RTD1293 SoC based boards - items: - enum:
Signature · 1 line
2.16.4
PATCH v2 2/4 ARM: Prepare Realtek RTD1195
In reply to Andreas FärberIntroduce ARCH_REALTEK Kconfig option also for 32-bit Arm.
Override the text offset to cope with boot ROM occupying first 0xa800 bytes and further reservations up to 0xf4000 (compare Device Tree).
Add a custom machine_desc to enforce memory carveout for I/O registers.
---
v1 -> v2:
* Dropped selection of COMMON_CLK (Arnd)
* Dropped selection of AMBA, SCU, TWD
* Added comment about text offset to distinguish from HTC comment above
* Added machine_desc with .reserve to exclude peripheral spaces (Rob)
arch/arm/Kconfig | 2 ++ arch/arm/Makefile | 3 +++ arch/arm/mach-realtek/Kconfig | 11 +++++++++++ arch/arm/mach-realtek/Makefile | 2 ++ arch/arm/mach-realtek/rtd1195.c | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 55 insertions(+) create mode 100644 arch/arm/mach-realtek/Kconfig create mode 100644 arch/arm/mach-realtek/Makefile create mode 100644 arch/arm/mach-realtek/rtd1195.c
arch/arm/Kconfig +2 -0
@@ -700,6 +700,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"
arch/arm/Makefile +3 -0
@@ -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
@@ -207,6 +209,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
arch/arm/mach-realtek/Kconfig new file +11 -0
@@ -0,0 +1,11 @@ +# 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.
arch/arm/mach-realtek/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +obj-y += rtd1195.o
arch/arm/mach-realtek/rtd1195.c new file +37 -0
@@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Realtek RTD1195 +* +* Copyright (c) 2017-2019 Andreas Färber +*/ + +#include <linux/memblock.h> +#include <asm/mach/arch.h> + +static void __init rtd1195_memblock_remove (phys_addr_t base,phys_addr_t size) +{ +int ret; + + ret =memblock_remove (base, size); +if (ret) +pr_err ("Failed to remove memblock %pa (%d)\n" , &base, ret); +} + +static void __init rtd1195_reserve (void ) +{ +/* Exclude peripheral register spaces from RAM */ +rtd1195_memblock_remove (0x18000000 ,0x00100000 ); +rtd1195_memblock_remove (0x18100000 ,0x01000000 ); +} + +static const char *const rtd1195_dt_compat[]__initconst = { +"realtek,rtd1195" , +NULL +}; + +DT_MACHINE_START (rtd1195,"Realtek RTD1195" ) + .dt_compat = rtd1195_dt_compat, + .reserve = rtd1195_reserve, + .l2c_aux_val = 0x0, + .l2c_aux_mask = ~0x0 , +MACHINE_END
Signature · 1 line
2.16.4
PATCH v2 3/4 ARM: dts: Prepare Realtek RTD1195 and MeLE X1000
In reply to Andreas FärberAdd Device Trees for Realtek RTD1195 SoC and MeLE X1000 TV box.
Reuse the existing RTD1295 watchdog compatible for now.
---
v1 -> v2:
* Dropped /memreserve/ and reserved-memory nodes for peripherals and NOR (Rob)
* Carved them out from memory reg instead (Rob)
* Converted some /memreserve/s to reserved-memory nodes
arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/rtd1195-mele-x1000.dts | 31 ++++++++ arch/arm/boot/dts/rtd1195.dtsi | 127 +++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+) create mode 100644 arch/arm/boot/dts/rtd1195-mele-x1000.dts create mode 100644 arch/arm/boot/dts/rtd1195.dtsi
arch/arm/boot/dts/Makefile +2 -0
@@ -864,6 +864,8 @@ dtb-$(CONFIG_ARCH_QCOM) += \ dtb-$(CONFIG_ARCH_RDA) += \ rda8810pl-orangepi-2g-iot.dtb \ rda8810pl-orangepi-i96.dtb +dtb-$(CONFIG_ARCH_REALTEK) += \ + rtd1195-mele-x1000.dtb dtb-$(CONFIG_ARCH_REALVIEW) += \ arm-realview-pb1176.dtb \ arm-realview-pb11mp.dtb \
arch/arm/boot/dts/rtd1195-mele-x1000.dts new file +31 -0
@@ -0,0 +1,31 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) +/* + * Copyright (c) 2017-2019 Andreas Färber + */ + +/dts-v1/; + +#include "rtd1195.dtsi" + +/ { + compatible = "mele,x1000", "realtek,rtd1195"; + model = "MeLE X1000"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x18000000>, + <0x19100000 0x26f00000>; + }; +}; + +&uart0 { + status = "okay"; +};
arch/arm/boot/dts/rtd1195.dtsi new file +127 -0
127 lines not on this page · raw message
Signature · 1 line
2.16.4
Re: [PATCH v2 3/4] ARM: dts: Prepare Realtek RTD1195 and MeLE X1000
Quoted 12 lines · Andreas Färber
Add Device Trees for Realtek RTD1195 SoC and MeLE X1000 TV box.
Reuse the existing RTD1295 watchdog compatible for now.
Signed-off-by Andreas Färber <[email protected]>---
v1 -> v2:
* Dropped /memreserve/ and reserved-memory nodes for peripherals and NOR (Rob)
* Carved them out from memory reg instead (Rob)
* Converted some /memreserve/s to reserved-memory nodes
Quoted 6 lines
arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/rtd1195-mele-x1000.dts | 31 ++++++++ arch/arm/boot/dts/rtd1195.dtsi | 127 +++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+) create mode 100644 arch/arm/boot/dts/rtd1195-mele-x1000.dts create mode 100644 arch/arm/boot/dts/rtd1195.dtsi
PATCH v2 4/4 ARM: realtek: Enable RTD1195 arch timer
In reply to Andreas FärberWithout this magic write the timer doesn't work and boot gets stuck.
---
v2: New
arch/arm/mach-realtek/rtd1195.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/arm/mach-realtek/rtd1195.c +16 -0
@@ -5,6 +5,9 @@* Copyright (c) 2017-2019 Andreas Färber */ +#include <linux/clk-provider.h> +#include <linux/clocksource.h> +#include <linux/io.h> #include <linux/memblock.h> #include <asm/mach/arch.h>
@@ -24,6 +27,18 @@ static void __init rtd1195_reserve(void)rtd1195_memblock_remove (0x18100000 ,0x01000000 ); } +static void __init rtd1195_init_time (void ) +{ +void __iomem *base; + + base =ioremap (0xff018000 ,4 ); +writel (0x1 , base); +iounmap (base); + +of_clk_init (NULL ); +timer_probe (); +} +static const char *const rtd1195_dt_compat[]__initconst = {"realtek,rtd1195" ,NULL
@@ -31,6 +46,7 @@ static const char *const rtd1195_dt_compat[] __initconst = {DT_MACHINE_START (rtd1195,"Realtek RTD1195" ) .dt_compat = rtd1195_dt_compat, + .init_time = rtd1195_init_time, .reserve = rtd1195_reserve, .l2c_aux_val = 0x0, .l2c_aux_mask = ~0x0,
Signature · 1 line
2.16.4