From nobody Fri Oct 10 17:41:14 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB10F18DB2A; Fri, 13 Jun 2025 13:39:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749821958; cv=none; b=YTzzCRSFVimKMdjpnoYvbQ7sQLp8MuyqP1j2zVJFgau531DnoNyBhwsS0sA6ZFnUdMIvzF3lVh6QU0D9Q7TSZzPuEuJxHSPn31ITYFVH1Hb26lQIH0KL/N0KB+DJyQ4iRR7Xs27MeXmFNuQJ0l58WI6lQZu5Ia13Qd2xKhW5PJY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749821958; c=relaxed/simple; bh=TH0hgxyh5i3gv/6kqXf5Rz6s4iXGUSUXb14mkxEA5pc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Y125S2HhzFwYDb3cWzoNkE1NM5pxAJWZGGqlt96mvgmGGz2mtHjXmv+kec8xHHOeM8h1lqFdgClZOLqm17EJA3RcOU8wCSRouiELJpP9azbBjm7rCx9tQ85gAoUrdgQZ488mxxeO9ISPH9thDIpDm7WzexvY/YSD6bRcxgBpxyg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SgFY64J2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SgFY64J2" Received: by smtp.kernel.org (Postfix) with ESMTPS id 90679C4CEEF; Fri, 13 Jun 2025 13:39:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1749821957; bh=TH0hgxyh5i3gv/6kqXf5Rz6s4iXGUSUXb14mkxEA5pc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=SgFY64J2G7OvEznEUgDW5TKPZBLxZxJIOtNPq38iXO+cYayvQvhUCz1VqkicWLscZ zltE3AgMrlyMGGjTpMpInqpTcK9VBVUOxsfLN4JI/t9m2QxGeQKZNZyBo5q+/38ovF M6mpxDTc2xNSMIJIijdgQchI2rvC8Oh5rcy/dOkhTG0mlj6cacJfmLzYYxFrlh+45b lj1f0h/J972WYKwqh8RfZRBM89yzHvHrjkFCJ6SqEY12mActDWAOTu2lvyHRLAIHKf pJNnRSDD9AkulyRmZdXWA0anIgpwxYlRhxZ1oxuHel1bBmdTWIj7GG+Mds18ojquA5 kttIMW+8YTuAQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8185DC71151; Fri, 13 Jun 2025 13:39:17 +0000 (UTC) From: =?utf-8?q?J=2E_Neusch=C3=A4fer_via_B4_Relay?= Date: Fri, 13 Jun 2025 15:39:14 +0200 Subject: [PATCH v3 2/2] arm64: dts: amlogic: Add Ugoos AM3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250613-ugoos-am3-v3-2-f8a43e6bbfdb@posteo.net> References: <20250613-ugoos-am3-v3-0-f8a43e6bbfdb@posteo.net> In-Reply-To: <20250613-ugoos-am3-v3-0-f8a43e6bbfdb@posteo.net> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Martin Blumenstingl , Jerome Brunet , Kevin Hilman Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, =?utf-8?q?J=2E_Neusch=C3=A4fer?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1749821956; l=4767; i=j.ne@posteo.net; s=20240329; h=from:subject:message-id; bh=eeJa1pnKTo6xuMFOpShBZIU9ngPVs1Np32jvFt+1klM=; b=YFPM/fT/9mGlgV5aDi8wMRvX9l0IZXutthl2o4gOiuo7TL+9G+quyg78GmlyMbevHzbHknBk1 ElPxI6fEwMTC3drHI4+kccHZMJ7ombo7DLCIs4NFBHtTZYdSe6J3hrO X-Developer-Key: i=j.ne@posteo.net; a=ed25519; pk=NIe0bK42wNaX/C4bi6ezm7NJK0IQE+8MKBm7igFMIS4= X-Endpoint-Received: by B4 Relay for j.ne@posteo.net/20240329 with auth_id=156 X-Original-From: =?utf-8?q?J=2E_Neusch=C3=A4fer?= Reply-To: j.ne@posteo.net From: "J. Neusch=C3=A4fer" The Ugoos AM3 is a small set-top box based on the Amlogic S912 SoC, with a board design that is very close to the Q20x development boards. The MMC max-frequency properties are copied from the downstream device tree. https://ugoos.com/ugoos-am3-16g The following functionality has been tested and is known to work: - debug serial port - "update" button inside the case - USB host mode, on all three ports - HDMI video/audio output - eMMC, MicroSD, and SDIO WLAN - S/PDIF audio output - Ethernet - Infrared remote control input The following functionality doesn't seem to work: - USB role switching and device mode on the "OTG" port - case LED Reviewed-by: Martin Blumenstingl Reviewed-by: Neil Armstrong Signed-off-by: J. Neusch=C3=A4fer --- V3: - Add Martin's and Neil's R-b tags V2: - Fix vendor name in patch subject - Remove incorrect override of SDIO pwrseq reset line --- arch/arm64/boot/dts/amlogic/Makefile | 1 + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 +- .../arm64/boot/dts/amlogic/meson-gxm-ugoos-am3.dts | 91 ++++++++++++++++++= ++++ 3 files changed, 93 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/aml= ogic/Makefile index 15e7901c126876964b858d2afaaaa5a5c86f1c22..619dce79b0204d286d1f45443fd= 681c9b58e7f2d 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -80,6 +80,7 @@ dtb-$(CONFIG_ARCH_MESON) +=3D meson-gxm-q200.dtb dtb-$(CONFIG_ARCH_MESON) +=3D meson-gxm-q201.dtb dtb-$(CONFIG_ARCH_MESON) +=3D meson-gxm-rbox-pro.dtb dtb-$(CONFIG_ARCH_MESON) +=3D meson-gxm-s912-libretech-pc.dtb +dtb-$(CONFIG_ARCH_MESON) +=3D meson-gxm-ugoos-am3.dtb dtb-$(CONFIG_ARCH_MESON) +=3D meson-gxm-vega-s96.dtb dtb-$(CONFIG_ARCH_MESON) +=3D meson-gxm-wetek-core2.dtb dtb-$(CONFIG_ARCH_MESON) +=3D meson-s4-s805x2-aq222.dtb diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm= 64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi index 6da1316d97c60c8445477375bddb161fc0c6a7f4..b4f88ed6273b8f0db956d163451= ea6855c45fe48 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi @@ -97,7 +97,7 @@ sdio_pwrseq: sdio-pwrseq { clock-names =3D "ext_clock"; }; =20 - cvbs-connector { + cvbs_connector: cvbs-connector { compatible =3D "composite-video-connector"; =20 port { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-ugoos-am3.dts b/arch/arm= 64/boot/dts/amlogic/meson-gxm-ugoos-am3.dts new file mode 100644 index 0000000000000000000000000000000000000000..ba871f3f53bb99b47b325bae228= b59b722c5123b --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-ugoos-am3.dts @@ -0,0 +1,91 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2025 J. Neusch=C3=A4fer + * + * Debug UART (3.3V, 115200 baud) at the corner of the board: + * (4) (3) (2) [1] + * Vcc RXD TXD GND + */ + +/dts-v1/; + +#include +#include + +#include "meson-gxm.dtsi" +#include "meson-gx-p23x-q20x.dtsi" + +/ { + compatible =3D "ugoos,am3", "amlogic,s912", "amlogic,meson-gxm"; + model =3D "Ugoos AM3"; + + adc-keys { + compatible =3D "adc-keys"; + io-channels =3D <&saradc 0>; + io-channel-names =3D "buttons"; + keyup-threshold-microvolt =3D <1710000>; + + button-function { + label =3D "Update"; + linux,code =3D ; + press-threshold-microvolt =3D <10000>; + }; + }; +}; + +&cvbs_connector { + /* Not used on this board */ + status =3D "disabled"; +}; + +ðmac { + pinctrl-0 =3D <ð_pins>; + pinctrl-names =3D "default"; + + /* Select external PHY by default */ + phy-handle =3D <&external_phy>; + + amlogic,tx-delay-ns =3D <2>; + + /* External PHY is in RGMII */ + phy-mode =3D "rgmii"; + + status =3D "okay"; +}; + +&external_mdio { + external_phy: ethernet-phy@0 { + /* Realtek RTL8211F (0x001cc916) */ + reg =3D <0>; + + reset-assert-us =3D <10000>; + reset-deassert-us =3D <80000>; + reset-gpios =3D <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>; + + interrupt-parent =3D <&gpio_intc>; + /* MAC_INTR on GPIOZ_15 */ + interrupts =3D <25 IRQ_TYPE_LEVEL_LOW>; + }; +}; + +&i2c_B { + status =3D "okay"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c_b_pins>; + + rtc: rtc@51 { + compatible =3D "haoyu,hym8563"; + reg =3D <0x51>; + #clock-cells =3D <0>; + }; +}; + +/* WLAN: Atheros 10k (QCA9377) */ +&sd_emmc_a { + max-frequency =3D <200000000>; +}; + +/* eMMC */ +&sd_emmc_c { + max-frequency =3D <100000000>; +}; --=20 2.48.0.rc1.219.gb6b6757d772