Skip to contentSkip to conversation

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

PATCH Superseded Christian Hewitt 3 participants 7 messages Aug 24, 2019 – Aug 26, 2019

Subsystems (2)

v2 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

v2 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

Christian Hewitt (3):
dt-bindings: arm: amlogic: Add support for the Ugoos AM6
dt-bindings: Add vendor prefix for Ugoos
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      | 567 +++++++++++++++++++++
 4 files changed, 571 insertions(+)
 create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts
Signature · 1 line
2.7.4
#1 lore raw

PATCH v2 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
#3 lore raw

PATCH v2 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
Acked-by on v2 2/3
#4 lore raw

Re: [PATCH v2,2/3] dt-bindings: arm: amlogic: Add support for the Ugoos AM6

Quoted 8 lines · 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(+)
#5 lore raw

PATCH v2 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 laregly 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      | 567 +++++++++++++++++++++
 2 files changed, 568 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 +567 -0

567 lines not on this page · raw message

Signature · 1 line
2.7.4
#6 lore raw

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

Hi Christian,

Quoted 16 lines · 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

Quoted 1 line

The device-tree is laregly based on meson-g12b-odroid-n2 but with audio

typo -> largely

[...]

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

Quoted 9 lines
arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts new file +9 -0
+       tflash_vdd: regulator-tflash_vdd {
+               compatible = "regulator-fixed";
+
+               regulator-name = "TFLASH_VDD";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+
+               gpio = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;
+               enable-active-high;

do we need regulator-always-on here as well, see [0]?

[...]

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

Quoted 11 lines
arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts new file +11 -0
+       usb_pwr_en: regulator-usb_pwr_en {
+               compatible = "regulator-fixed";
+               regulator-name = "USB_PWR_EN";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               vin-supply = <&vcc_5v>;
+
+               /* Connected to the microUSB port power enable */
+               gpio = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };

the photos I found don't show a micro USB port (but 3x USB A 2.0 and 1x USB A 3.0 - just like you mentioned in the patch description) does this regulator exist?

[...]

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

Quoted 8 lines

+&ethmac {

arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts new file +7 -0
+       pinctrl-0 = <&eth_pins>, <&eth_rgmii_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+       phy-mode = "rgmii";
+       phy-handle = <&external_phy>;
+       amlogic,tx-delay-ns = <2>;
+};

is the PHY reset GPIO not wired to GPIOZ_15 like on Odroid-N2 and X96 Max?

Martin

[0] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts?id=dc7f2cb218b5ef65ab3d455a0e62d27e44075203