Skip to content

Commit b23b0ea

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull more ARM SoC updates from Olof Johansson: "A few updates that we merged late but are low risk for regressions for other platforms (and a few other straggling patches): - I mis-tagged the 'drivers' branch, and missed 3 patches. Merged in here. They're for a driver for the PL353 SRAM controller and a build fix for the qualcomm scm driver. - A new platform, RDA Micro RDA8810PL (Cortex-A5 w/ integrated Vivante GPU, 256MB RAM, Wifi). This includes some acked platform-specific drivers (serial, etc). This also include DTs for two boards with this SoC, OrangePi 2G and OrangePi i86. - i.MX8 is another new platform (NXP, 4x Cortex-A53 + Cortex-M4, 4K video playback offload). This is the first i.MX 64-bit SoC. - Some minor updates to Samsung boards (adding a few peripherals in DTs). - Small rework for SMP bootup on STi platforms. - A couple of TEE driver fixes. - A couple of new config options (bcm2835 thermal, Uniphier MDMAC) enabled in defconfigs" * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (27 commits) ARM: multi_v7_defconfig: enable CONFIG_UNIPHIER_MDMAC arm64: defconfig: Re-enable bcm2835-thermal driver MAINTAINERS: Add entry for RDA Micro SoC architecture tty: serial: Add RDA8810PL UART driver ARM: dts: rda8810pl: Add interrupt support for UART dt-bindings: serial: Document RDA Micro UART ARM: dts: rda8810pl: Add timer support ARM: dts: Add devicetree for OrangePi i96 board ARM: dts: Add devicetree for OrangePi 2G IoT board ARM: dts: Add devicetree for RDA8810PL SoC ARM: Prepare RDA8810PL SoC dt-bindings: arm: Document RDA8810PL and reference boards dt-bindings: Add RDA Micro vendor prefix ARM: sti: remove pen_release and boot_lock arm64: dts: exynos: Add Bluetooth chip to TM2(e) boards arm64: dts: imx8mq-evk: enable watchdog arm64: dts: imx8mq: add watchdog devices MAINTAINERS: add i.MX8 DT path to i.MX architecture arm64: add support for i.MX8M EVK board arm64: add basic DTS for i.MX8MQ ...
2 parents 078a5a4 + 00f8ccd commit b23b0ea

File tree

37 files changed

+3084
-124
lines changed

37 files changed

+3084
-124
lines changed

‎Documentation/admin-guide/kernel-parameters.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,6 +1028,12 @@
10281028
specified address. The serial port must already be
10291029
setup and configured. Options are not yet supported.
10301030

1031+
rda,<addr>
1032+
Start an early, polled-mode console on a serial port
1033+
of an RDA Micro SoC, such as RDA8810PL, at the
1034+
specified address. The serial port must already be
1035+
setup and configured. Options are not yet supported.
1036+
10311037
smh Use ARM semihosting calls for early console.
10321038

10331039
s3c2410,<addr>

‎Documentation/devicetree/bindings/arm/rda.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
RDA Micro platforms device tree bindings
2+
----------------------------------------
3+
4+
RDA8810PL SoC
5+
=============
6+
7+
Required root node properties:
8+
9+
- compatible : must contain "rda,8810pl"
10+
11+
12+
Boards:
13+
14+
Root node property compatible must contain, depending on board:
15+
16+
- Orange Pi 2G-IoT: "xunlong,orangepi-2g-iot"
17+
- Orange Pi i96: "xunlong,orangepi-i96"

‎Documentation/devicetree/bindings/memory-controllers/pl353-smc.txt‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
Device tree bindings for ARM PL353 static memory controller
2+
3+
PL353 static memory controller supports two kinds of memory
4+
interfaces.i.e NAND and SRAM/NOR interfaces.
5+
The actual devices are instantiated from the child nodes of pl353 smc node.
6+
7+
Required properties:
8+
- compatible : Should be "arm,pl353-smc-r2p1", "arm,primecell".
9+
- reg : Controller registers map and length.
10+
- clock-names : List of input clock names - "memclk", "apb_pclk"
11+
(See clock bindings for details).
12+
- clocks : Clock phandles (see clock bindings for details).
13+
- address-cells : Must be 2.
14+
- size-cells : Must be 1.
15+
16+
Child nodes:
17+
For NAND the "arm,pl353-nand-r2p1" and for NOR the "cfi-flash" drivers are
18+
supported as child nodes.
19+
20+
for NAND partition information please refer the below file
21+
Documentation/devicetree/bindings/mtd/partition.txt
22+
23+
Example:
24+
smcc: memory-controller@e000e000
25+
compatible = "arm,pl353-smc-r2p1", "arm,primecell";
26+
clock-names = "memclk", "apb_pclk";
27+
clocks = <&clkc 11>, <&clkc 44>;
28+
reg = <0xe000e000 0x1000>;
29+
#address-cells = <2>;
30+
#size-cells = <1>;
31+
ranges = <0x0 0x0 0xe1000000 0x1000000 //Nand CS Region
32+
0x1 0x0 0xe2000000 0x2000000 //SRAM/NOR CS Region
33+
0x2 0x0 0xe4000000 0x2000000>; //SRAM/NOR CS Region
34+
nand_0: flash@e1000000 {
35+
compatible = "arm,pl353-nand-r2p1"
36+
reg = <0 0 0x1000000>;
37+
(...)
38+
};
39+
nor0: flash@e2000000 {
40+
compatible = "cfi-flash";
41+
reg = <1 0 0x2000000>;
42+
};
43+
nor1: flash@e4000000 {
44+
compatible = "cfi-flash";
45+
reg = <2 0 0x2000000>;
46+
};
47+
};

‎Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
RDA Micro UART
2+
3+
Required properties:
4+
- compatible : "rda,8810pl-uart" for RDA8810PL SoCs.
5+
- reg : Offset and length of the register set for the device.
6+
- interrupts : Should contain UART interrupt.
7+
- clocks : Phandle to the input clock.
8+
9+
10+
Example:
11+
12+
uart2: serial@20a90000 {
13+
compatible = "rda,8810pl-uart";
14+
reg = <0x20a90000 0x1000>;
15+
interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
16+
clocks = <&uart_clk>;
17+
};

‎Documentation/devicetree/bindings/vendor-prefixes.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ ralink Mediatek/Ralink Technology Corp.
325325
ramtron Ramtron International
326326
raspberrypi Raspberry Pi Foundation
327327
raydium Raydium Semiconductor Corp.
328+
rda Unisoc Communications, Inc.
328329
realtek Realtek Semiconductor Corp.
329330
renesas Renesas Electronics Corporation
330331
richtek Richtek Technology Corporation

‎MAINTAINERS‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,6 +1540,7 @@ F: arch/arm/mach-imx/
15401540
F: arch/arm/mach-mxs/
15411541
F: arch/arm/boot/dts/imx*
15421542
F: arch/arm/configs/imx*_defconfig
1543+
F: arch/arm64/boot/dts/freescale/imx*
15431544
F: drivers/clk/imx/
15441545
F: drivers/firmware/imx/
15451546
F: drivers/soc/imx/
@@ -1967,6 +1968,20 @@ M: Lennert Buytenhek <kernel@wantstofly.org>
19671968
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
19681969
S: Maintained
19691970

1971+
ARM/RDA MICRO ARCHITECTURE
1972+
M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
1973+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1974+
L: linux-unisoc@lists.infradead.org (moderated for non-subscribers)
1975+
S: Maintained
1976+
F: arch/arm/boot/dts/rda8810pl-*
1977+
F: drivers/clocksource/timer-rda.c
1978+
F: drivers/irqchip/irq-rda-intc.c
1979+
F: drivers/tty/serial/rda-uart.c
1980+
F: Documentation/devicetree/bindings/arm/rda.txt
1981+
F: Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
1982+
F: Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt
1983+
F: Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
1984+
19701985
ARM/REALTEK ARCHITECTURE
19711986
M: Andreas Färber <afaerber@suse.de>
19721987
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

‎arch/arm/Kconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,8 @@ source "arch/arm/plat-pxa/Kconfig"
787787

788788
source "arch/arm/mach-qcom/Kconfig"
789789

790+
source "arch/arm/mach-rda/Kconfig"
791+
790792
source "arch/arm/mach-realview/Kconfig"
791793

792794
source "arch/arm/mach-rockchip/Kconfig"

‎arch/arm/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ machine-$(CONFIG_ARCH_ORION5X) += orion5x
202202
machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell
203203
machine-$(CONFIG_ARCH_PXA) += pxa
204204
machine-$(CONFIG_ARCH_QCOM) += qcom
205+
machine-$(CONFIG_ARCH_RDA) += rda
205206
machine-$(CONFIG_ARCH_REALVIEW) += realview
206207
machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip
207208
machine-$(CONFIG_ARCH_RPC) += rpc

‎arch/arm/boot/dts/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,9 @@ dtb-$(CONFIG_ARCH_QCOM) += \
822822
qcom-msm8974-sony-xperia-castor.dtb \
823823
qcom-msm8974-sony-xperia-honami.dtb \
824824
qcom-mdm9615-wp8548-mangoh-green.dtb
825+
dtb-$(CONFIG_ARCH_RDA) += \
826+
rda8810pl-orangepi-2g-iot.dtb \
827+
rda8810pl-orangepi-i96.dtb
825828
dtb-$(CONFIG_ARCH_REALVIEW) += \
826829
arm-realview-pb1176.dtb \
827830
arm-realview-pb11mp.dtb \

‎arch/arm/boot/dts/rda8810pl-orangepi-2g-iot.dts‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (c) 2017 Andreas Färber
4+
* Copyright (c) 2018 Manivannan Sadhasivam
5+
*/
6+
7+
/dts-v1/;
8+
9+
#include "rda8810pl.dtsi"
10+
11+
/ {
12+
compatible = "xunlong,orangepi-2g-iot", "rda,8810pl";
13+
model = "Orange Pi 2G-IoT";
14+
15+
aliases {
16+
serial0 = &uart1;
17+
serial1 = &uart2;
18+
serial2 = &uart3;
19+
};
20+
21+
chosen {
22+
stdout-path = "serial2:921600n8";
23+
};
24+
25+
memory@80000000 {
26+
device_type = "memory";
27+
reg = <0x80000000 0x10000000>;
28+
};
29+
30+
uart_clk: uart-clk {
31+
compatible = "fixed-clock";
32+
clock-frequency = <921600>;
33+
#clock-cells = <0>;
34+
};
35+
};
36+
37+
&uart1 {
38+
status = "okay";
39+
clocks = <&uart_clk>;
40+
};
41+
42+
&uart2 {
43+
status = "okay";
44+
clocks = <&uart_clk>;
45+
};
46+
47+
&uart3 {
48+
status = "okay";
49+
clocks = <&uart_clk>;
50+
};

0 commit comments

Comments
 (0)