Skip to contentSkip to conversation

arm64: meson-g12b: Add support for the Ugoos AM6

PATCH RESEND Superseded Christian Hewitt 2 participants 5 messages Sep 6, 2019 – Sep 14, 2019

Subsystems (2)

v3 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

v3 cover arm64: meson-g12b: Add support for the Ugoos AM6

This patchset adds support for the Ugoos AM6, an Android STB based on the Amlogic W400 reference design with the S922X chipset.

v2: correction of minor nits

v3: address regulator and GPIO corrections from Neil Armstrong (using schematic excerpts from Ugoos) and related v2 comments from Martin Blumenstingle. Add acks on patches 1/2 from Rob Herring.

Christian Hewitt (3):
dt-bindings: Add vendor prefix for Ugoos
dt-bindings: arm: amlogic: Add support for the Ugoos AM6
arm64: dts: meson-g12b-ugoos-am6: add initial device-tree

 Documentation/devicetree/bindings/arm/amlogic.yaml |   1 +
 .../devicetree/bindings/vendor-prefixes.yaml       |   2 +
 arch/arm64/boot/dts/amlogic/Makefile               |   1 +
 .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts      | 557 +++++++++++++++++++++
 4 files changed, 561 insertions(+)
 create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts
Signature · 1 line
2.7.4
#1 lore raw

PATCH RESEND v3 1/3 dt-bindings: Add vendor prefix for Ugoos

Ugoos Industrial Co., Ltd. are a manufacturer of ARM based TV Boxes/Dongles, Digital Signage and Advertisement Solutions [0].

[0] (https://ugoos.com)

---
 Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/vendor-prefixes.yaml +2 -0
index 6992bbb..d962be9 100644
@@ -965,6 +965,8 @@ patternProperties:
     description: Ubiquiti Networks
   "^udoo,.*":
     description: Udoo
+  "^ugoos,.*":
+    description: Ugoos Industrial Co., Ltd.
   "^uniwest,.*":
     description: United Western Technologies Corp (UniWest)
   "^upisemi,.*":
Signature · 1 line
2.7.4
#2 lore raw

PATCH RESEND v3 2/3 dt-bindings: arm: amlogic: Add support for the Ugoos AM6

In reply to Christian Hewitt

The Ugoos AM6 is based on the Amlogic W400 (G12B) reference design using the S922X chipset.

---
 Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/arm/amlogic.yaml +1 -0
index 325c6fd..2ded61d 100644
@@ -139,6 +139,7 @@ properties:
         items:
           - enum:
               - hardkernel,odroid-n2
+              - ugoos,am6
           - const: amlogic,g12b
 
 ...
Signature · 1 line
2.7.4
#3 lore raw

PATCH RESEND v3 3/3 arm64: dts: meson-g12b-ugoos-am6: add initial device-tree

In reply to Christian Hewitt

The Ugoos AM6 is based on the Amlogic W400 (G12B) reference design using the S922X chipset. Hardware specifications:

- 2GB LPDDR4 RAM
- 16GB eMMC storage
- 10/100/1000 Base-T Ethernet using External RGMII PHY
- 802.11 a/b/g/b/ac + BT 5.0 sdio wireless (Ampak 6398S)
- HDMI 2.0 (4k@60p) video
- Composite video + 2-channel audio output on 3.5mm jack
- S/PDIF audio output
- Aux input
- 1x USB 3.0
- 3x USB 2.0
- 1x micro SD card slot

The device-tree is largely based on meson-g12b-odroid-n2 but with audio and USB config copied from meson-g12a-x96-max.

---
 arch/arm64/boot/dts/amlogic/Makefile               |   1 +
 .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts      | 557 +++++++++++++++++++++
 2 files changed, 558 insertions(+)
 create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts
arch/arm64/boot/dts/amlogic/Makefile +1 -0
index 07b861f..21e2810 100644
@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb
arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts new file +557 -0

557 lines not on this page · raw message

Signature · 1 line
2.7.4
#4 lore raw

Re: [RESEND PATCH v3 3/3] arm64: dts: meson-g12b-ugoos-am6: add initial device-tree

Hi Christian,

my nit-picks below

On Fri, Sep 6, 2019 at 4:34 PM Christian Hewitt
<[email protected]> wrote:
[...]

arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts line 30

Quoted 6 lines
arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts new file +6 -0
+       spdif_dit: audio-codec-1 {
+               #sound-dai-cells = <0>;
+               compatible = "linux,spdif-dit";
+               status = "okay";
+               sound-name-prefix = "DIT";
+       };

please move it below sdio_pwrseq (or at least somewhere below the memory node)

[...]

arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts line 97

Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts new file +8 -0
+       vcc_3v3: regulator-vcc_3v3 {
+               compatible = "regulator-fixed";
+               regulator-name = "VCC_3V3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               vin-supply = <&vddao_3v3>;
+               regulator-always-on;
+               /* FIXME: actually controlled by VDDCPU_B_EN */

can we add the enable GPIO here now that we know how to describe the VDDCPU_B regulator?

[...]

Quoted 1 line

+ usb1_pow: regulator-usb1_pow {

for consistency with the regulators above: regulator-usb1-pow

[...]

Quoted 1 line

+ usb_pwr_en: regulator-usb_pwr_en {

for consistency with the regulators above: regulator-usb-pwr-en

[...]

Quoted 1 line

+ vddao_1v8: regulator-vddao_1v8 {

for consistency with the regulators above: regulator-vddao-1v8

[...

Quoted 1 line

+ vddao_3v3: regulator-vddao_3v3 {

for consistency with the regulators above: regulator-vddao-3v3

[...]

Quoted 31 lines

+&cpu0 {

arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts new file +30 -0
+       cpu-supply = <&vddcpu_b>;
+       operating-points-v2 = <&cpu_opp_table_0>;
+       clocks = <&clkc CLKID_CPU_CLK>;
+       clock-latency = <50000>;
+};
+
+&cpu1 {
+       cpu-supply = <&vddcpu_b>;
+       operating-points-v2 = <&cpu_opp_table_0>;
+       clocks = <&clkc CLKID_CPU_CLK>;
+       clock-latency = <50000>;
+};
+
+&cpu100 {
+       cpu-supply = <&vddcpu_a>;
+       operating-points-v2 = <&cpub_opp_table_1>;
+       clocks = <&clkc CLKID_CPUB_CLK>;
+       clock-latency = <50000>;
+};
+
+&cpu101 {
+       cpu-supply = <&vddcpu_a>;
+       operating-points-v2 = <&cpub_opp_table_1>;
+       clocks = <&clkc CLKID_CPUB_CLK>;
+       clock-latency = <50000>;
+};
+
+&cpu102 {
+       cpu-supply = <&vddcpu_a>;
+       operating-points-v2 = <&cpub_opp_table_1>;

arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts line 351

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts new file +10 -0
+       clocks = <&clkc CLKID_CPUB_CLK>;
+       clock-latency = <50000>;
+};
+
+&cpu103 {
+       cpu-supply = <&vddcpu_a>;
+       operating-points-v2 = <&cpub_opp_table_1>;
+       clocks = <&clkc CLKID_CPUB_CLK>;
+       clock-latency = <50000>;
+};

(not limited to this patch: there's a lot of redundancy with the CPU nodes across the G12B .dts)

[...]

Quoted 1 line

+&sd_emmc_a {

all nodes starting here should use alphabetical sorting

Martin