Meson8m2 (32-bit ARM) SoC support

This series adds support for the Meson8m2 SoC. This SoC is mostly compatible with Meson8 while using some peripherals from Meson8b. Patch #4 contains a list of (known) differences between the Meson8 and Meson8m2 SoCs.

The first supported board with Meson8m2 SoC is the "Tronsmart MXIII Plus" where Oleg contributed the initial .dts and heavily tested it (many thanks!). His testing also confirmed that the Meson8m2 SoC uses the same register layout for the Ethernet "glue registers (supported by the dwmac-meson8b driver) as Meson8b.

Martin Blumenstingl (5):
dt-bindings: arm: amlogic: add support for the Meson8m2 SoC
dt-bindings: arm: amlogic: add support for the Tronsmart MXIII Plus
ARM: meson: add support for the Meson8m2 SoCs
ARM: dts: meson: add support for the Meson8m2 SoC
ARM: dts: meson8: add the uart_A pins

Oleg Ivanov (1):
ARM: dts: meson8m2: add support for the Tronsmart MXIII Plus

 .../devicetree/bindings/arm/amlogic.txt       |   6 +
 arch/arm/boot/dts/Makefile                    |   2 +
 arch/arm/boot/dts/meson8.dtsi                 |  16 ++
 arch/arm/boot/dts/meson8m2-mxiii-plus.dts     | 244 ++++++++++++++++++
 arch/arm/boot/dts/meson8m2.dtsi               |  54 ++++
 arch/arm/mach-meson/Kconfig                   |   7 +
 arch/arm/mach-meson/meson.c                   |   1 +
 7 files changed, 330 insertions(+)
 create mode 100644 arch/arm/boot/dts/meson8m2-mxiii-plus.dts
 create mode 100644 arch/arm/boot/dts/meson8m2.dtsi

2.17.0

The Meson8m2 SoC is an updated version of the Meson8 SoC. Some of the peripherals are updated to be register-compatible with Meson8b.

---
 Documentation/devicetree/bindings/arm/amlogic.txt | 4 ++++
 1 file changed, 4 insertions(+)

index f747f47922c5..6c6642c69de3 100644
@@ -25,6 +25,10 @@ Boards with the Amlogic Meson8b SoC shall have the following properties:
   Required root node property:
     compatible: "amlogic,meson8b";
 
+Boards with the Amlogic Meson8m2 SoC shall have the following properties:
+  Required root node property:
+    compatible: "amlogic,meson8m2";
+
 Boards with the Amlogic Meson GXBaby SoC shall have the following properties:
   Required root node property:
     compatible: "amlogic,meson-gxbb";

2.17.0

Applied with tag from Rob,

Kevin

Add the binding documentation for the Tronsmart MXIII Plus which is an Android TV box using the Amlogic S812 (Meson8m2) SoC.

---
 Documentation/devicetree/bindings/arm/amlogic.txt | 2 ++
 1 file changed, 2 insertions(+)

index 6c6642c69de3..69880560c0f0 100644
@@ -58,6 +58,8 @@ Board compatible values (alphabetically, grouped by SoC):
   - "hardkernel,odroid-c1" (Meson8b)
   - "tronfy,mxq" (Meson8b)
 
+  - "tronsmart,mxiii-plus" (Meson8m2)
+
   - "amlogic,p200" (Meson gxbb)
   - "amlogic,p201" (Meson gxbb)
   - "friendlyarm,nanopi-k2" (Meson gxbb)

2.17.0

Applied with tag from Rob,

Kevin

Add a new Kconfig entry as well as the newly introduced compatible string for the Meson8m2 SoC.
The Kconfig entry selects the same drivers as Meson8b because Meson8m2 SoC is mostly compatible with Meson8 (both share the same pinctrl driver, so they also share the same GPIO IRQ settings. also the same Meson6 timer is used on Meson8m2).

---
 arch/arm/mach-meson/Kconfig | 7 +++++++
 arch/arm/mach-meson/meson.c | 1 +
 2 files changed, 8 insertions(+)

index d90f61e6254f..44a489889bc1 100644
@@ -32,4 +32,11 @@ config MACH_MESON8B
 	select COMMON_CLK_MESON8B
 	select MESON_IRQ_GPIO
 
+config MACH_MESON8M2
+	bool "Amlogic Meson8m2 SoCs support"
+	default ARCH_MESON
+	select MESON6_TIMER
+	select COMMON_CLK_MESON8B
+	select MESON_IRQ_GPIO
+
 endif

index 4e2357178625..c8d99df32f9b 100644
@@ -20,6 +20,7 @@ static const char * const meson_common_board_compat[] = {
 	"amlogic,meson6",
 	"amlogic,meson8",
 	"amlogic,meson8b",
+	"amlogic,meson8m2",
 	NULL,
 };
 

2.17.0

Hi Kevin,

sure, no problem - I'll re-send patches 3-6 in the next few days with this fixes

Regards
Martin

This adds a meson8m2.dtsi which simply inherits meson8.dtsi as both SoCs share most peripherals.
The known differences are:
- Meson8m2's hardware video decoder additionally supports H.265 decoding
- Meson8m2 has the same Gigabit MAC as Meson8b (instead of the 10/100M MAC that Meson8 uses)
- Meson8m2 uses the same watchdog register layout/bits as Meson8b (using the Meson8 watchdog compatible leads to an infinite hang when rebooting the machine)
- Meson8m2 uses the same SAR ADC register layout/bits as Meson8b. However, it uses the temperature sensor calibration formula (and registers) Meson8b which differ from Meson8. This however is currently not supported by the meson-saradc driver yet.
- the pin controller is mostly compatible with Meson8, Meson8m2 has an additional function on eight pins and removes the "VGA" function. So there's a total of 10 pins which are slightly changed, which is why there's a separate compatible for the pin controller
- a separate compatible for the clock controller is used because at least the Mali clock tree (not supported yet) is the same as on GXBB while Meson8 and Meson8b have a reduced/older version of the Mali clock tree.

---
 arch/arm/boot/dts/meson8m2.dtsi | 54 +++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 arch/arm/boot/dts/meson8m2.dtsi

new file mode 100644
index 000000000000..3e1f92273d7b
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2017 Martin Blumenstingl <[email protected]>.
+ */
+
+#include "meson8.dtsi"
+
+/ {
+	model = "Amlogic Meson8m2 SoC";
+	compatible = "amlogic,meson8m2";
+}; /* end of / */
+
+&clkc {
+	compatible = "amlogic,meson8m2-clkc", "amlogic,meson8-clkc";
+};
+
+&ethmac {
+	compatible = "amlogic,meson8m2-dwmac", "snps,dwmac";
+	reg = <0xc9410000 0x10000
+		0xc1108140 0x8>;
+	clocks = <&clkc CLKID_ETH>,
+		 <&clkc CLKID_MPLL2>,
+		 <&clkc CLKID_MPLL2>;
+	clock-names = "stmmaceth", "clkin0", "clkin1";
+	resets = <&reset RESET_ETHERNET>;
+	reset-names = "stmmaceth";
+};
+
+&pinctrl_aobus {
+	compatible = "amlogic,meson8m2-aobus-pinctrl",
+		     "amlogic,meson8-aobus-pinctrl";
+};
+
+&pinctrl_cbus {
+	compatible = "amlogic,meson8m2-cbus-pinctrl",
+		     "amlogic,meson8-cbus-pinctrl";
+
+	eth_rgmii_pins: ethernet {
+		mux {
+			groups = "eth_tx_clk_50m", "eth_tx_en",
+				 "eth_txd3", "eth_txd2",
+				 "eth_txd1", "eth_txd0",
+				 "eth_rx_clk_in", "eth_rx_dv",
+				 "eth_rxd3", "eth_rxd2",
+				 "eth_rxd1", "eth_rxd0",
+				 "eth_mdio", "eth_mdc";
+			function = "ethernet";
+		};
+	};
+};
+
+&wdt {
+	compatible = "amlogic,meson8m2-wdt", "amlogic,meson8b-wdt";
+};

2.17.0

This adds the pins for uart_A, which is used to connect to the Bluetooth module on some devices.

---
 arch/arm/boot/dts/meson8.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

index 7b16ea61e914..d77dcf890cfc 100644
@@ -281,6 +281,22 @@
 				function = "pwm_e";
 			};
 		};
+
+		uart_a1_pins: uart-a1 {
+			mux {
+				groups = "uart_tx_a1",
+				       "uart_rx_a1";
+				function = "uart_a";
+			};
+		};
+
+		uart_a1_cts_rts_pins: uart-a1-cts-rts {
+			mux {
+				groups = "uart_cts_a1",
+				       "uart_rts_a1";
+				function = "uart_a";
+			};
+		};
 	};
 };
 

2.17.0

From: Oleg Ivanov <[email protected]>

The Tronsmart MXIII Plus is an Android TV box which uses the Amlogic S812 (Meson8m2) SoC. It uses a Realtek RTL8211F RGMII Ethernet PHY as well as a Ricoh RN5T618 system power controller. It also comes with an Ampak AP6330 SDIO wifi/Bluetooth combo chip (support for wifi and Bluetooth is currently not added because the Linux drivers currently only support one MMC controller and that is used for the SD card).

---
 arch/arm/boot/dts/Makefile                |   2 +
 arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 244 ++++++++++++++++++++++
 2 files changed, 246 insertions(+)
 create mode 100644 arch/arm/boot/dts/meson8m2-mxiii-plus.dts

index 7e2424957809..b6d4fea16f50 100644
@@ -320,6 +320,8 @@ dtb-$(CONFIG_ARCH_MMP) += \
 dtb-$(CONFIG_MACH_MESON8B) += \
 	meson8b-mxq.dtb \
 	meson8b-odroidc1.dtb
+dtb-$(CONFIG_MACH_MESON8M2) += \
+	meson8m2-mxiii-plus.dtb
 dtb-$(CONFIG_ARCH_MPS2) += \
 	mps2-an385.dtb \
 	mps2-an399.dtb

2.17.0