From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6766AC43334 for ; Fri, 8 Jul 2022 09:49:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237828AbiGHJtC (ORCPT ); Fri, 8 Jul 2022 05:49:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237827AbiGHJtB (ORCPT ); Fri, 8 Jul 2022 05:49:01 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 795927E022; Fri, 8 Jul 2022 02:49:00 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A1EB7106F; Fri, 8 Jul 2022 02:49:00 -0700 (PDT) Received: from donnerap.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 062BB3F66F; Fri, 8 Jul 2022 02:48:58 -0700 (PDT) Date: Fri, 8 Jul 2022 10:48:56 +0100 From: Andre Przywara To: Samuel Holland Cc: Chen-Yu Tsai , Jernej Skrabec , Rob Herring , Krzysztof Kozlowski , Linus Walleij , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: Re: [PATCH v12 7/7] arm64: dts: allwinner: h616: Add X96 Mate TV box support Message-ID: <20220708104856.70a40730@donnerap.cambridge.arm.com> In-Reply-To: <22aa3412-2dc2-4d7e-1c61-c5d35b25fe6d@sholland.org> References: <20220701112453.2310722-1-andre.przywara@arm.com> <20220701112453.2310722-8-andre.przywara@arm.com> <22aa3412-2dc2-4d7e-1c61-c5d35b25fe6d@sholland.org> Organization: ARM X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.32; aarch64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Mon, 4 Jul 2022 20:29:45 -0500 Samuel Holland wrote: Hi, > On 7/1/22 6:24 AM, Andre Przywara wrote: > > The X96 Mate is an Allwinner H616 based TV box, featuring: > > - Four ARM Cortex-A53 cores, Mali-G31 MP2 GPU > > - 2GiB/4GiB RAM (fully usable!) > > - 16/32/64GiB eMMC > > - 100Mbps Ethernet (via embedded AC200 EPHY, not yet supported) > > - Unsupported Allwinner WiFi chip > > - 2 x USB 2.0 host ports > > - HDMI port > > - IR receiver > > - 5V/2A DC power supply via barrel plug > > > > Add a basic devicetree for it, with SD card and eMMC working, as > > well as serial and the essential peripherals, like the AXP PMIC. > > > > This DT is somewhat minimal, and should work on many other similar TV > > boxes with the Allwinner H616 chip. > > > > Signed-off-by: Andre Przywara > > Looks good to me, with one question below. > > Reviewed-by: Samuel Holland Thanks! > > --- > > arch/arm64/boot/dts/allwinner/Makefile | 1 + > > .../dts/allwinner/sun50i-h616-x96-mate.dts | 177 ++++++++++++++++++ > > 2 files changed, 178 insertions(+) > > create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts > > > > diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile > > index df2214e6d946a..6a96494a2e0a3 100644 > > --- a/arch/arm64/boot/dts/allwinner/Makefile > > +++ b/arch/arm64/boot/dts/allwinner/Makefile > > @@ -39,3 +39,4 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64-model-b.dtb > > dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6.dtb > > dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6-mini.dtb > > dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb > > +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-x96-mate.dtb > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts > > new file mode 100644 > > index 0000000000000..30b76140b9c8a > > --- /dev/null > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts > > @@ -0,0 +1,177 @@ > > +// SPDX-License-Identifier: (GPL-2.0+ or MIT) > > +/* > > + * Copyright (C) 2021 Arm Ltd. > > + */ > > + > > +/dts-v1/; > > + > > +#include "sun50i-h616.dtsi" > > + > > +#include > > +#include > > + > > +/ { > > + model = "X96 Mate"; > > + compatible = "hechuang,x96-mate", "allwinner,sun50i-h616"; > > + > > + aliases { > > + serial0 = &uart0; > > + }; > > + > > + chosen { > > + stdout-path = "serial0:115200n8"; > > + }; > > + > > + reg_vcc5v: vcc5v { > > + /* board wide 5V supply directly from the DC input */ > > + compatible = "regulator-fixed"; > > + regulator-name = "vcc-5v"; > > + regulator-min-microvolt = <5000000>; > > + regulator-max-microvolt = <5000000>; > > + regulator-always-on; > > + }; > > +}; > > + > > +&ir { > > + status = "okay"; > > +}; > > + > > +&mmc0 { > > + vmmc-supply = <®_dcdce>; > > + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ > > + bus-width = <4>; > > + status = "okay"; > > +}; > > + > > +&mmc2 { > > + vmmc-supply = <®_dcdce>; > > + vqmmc-supply = <®_bldo1>; > > + bus-width = <8>; > > + non-removable; > > + cap-mmc-hw-reset; > > + mmc-ddr-1_8v; > > + mmc-hs200-1_8v; > > + status = "okay"; > > +}; > > + > > +&r_rsb { > > + status = "okay"; > > + > > + axp305: pmic@745 { > > + compatible = "x-powers,axp305", "x-powers,axp805", > > + "x-powers,axp806"; > > + interrupt-controller; > > + #interrupt-cells = <1>; > > + reg = <0x745>; > > + > > + x-powers,self-working-mode; > > + vina-supply = <®_vcc5v>; > > + vinb-supply = <®_vcc5v>; > > + vinc-supply = <®_vcc5v>; > > + vind-supply = <®_vcc5v>; > > + vine-supply = <®_vcc5v>; > > + aldoin-supply = <®_vcc5v>; > > + bldoin-supply = <®_vcc5v>; > > + cldoin-supply = <®_vcc5v>; > > + > > + regulators { > > + reg_aldo1: aldo1 { > > + regulator-always-on; > > + regulator-min-microvolt = <3300000>; > > + regulator-max-microvolt = <3300000>; > > + regulator-name = "vcc-sys"; > > + }; > > + > > + /* Enabled by the Android BSP */ > > + reg_aldo2: aldo2 { > > + regulator-min-microvolt = <3300000>; > > + regulator-max-microvolt = <3300000>; > > + regulator-name = "vcc3v3-ext"; > > + status = "disabled"; > > If you disable these nodes, the regulator core will ignore them and not apply > the voltages. Is that what you want? It's what works ;-) ALDO2 was enabled and set to 3.3V by Android, also set in their DTB. However I figured it's not needed for our operation, at least not with the peripherals we support (including USB): turning it on or off didn't change anything. I just kept this in as documentation and a guide for future enablement, as this may drive *something*. Cheers, Andre > > Regards, > Samuel > > > + }; > > + > > + /* Enabled by the Android BSP */ > > + reg_aldo3: aldo3 { > > + regulator-min-microvolt = <3300000>; > > + regulator-max-microvolt = <3300000>; > > + regulator-name = "vcc3v3-ext2"; > > + status = "disabled"; > > + }; > > + > > + reg_bldo1: bldo1 { > > + regulator-always-on; > > + regulator-min-microvolt = <1800000>; > > + regulator-max-microvolt = <1800000>; > > + regulator-name = "vcc1v8"; > > + }; > > + > > + /* Enabled by the Android BSP */ > > + reg_bldo2: bldo2 { > > + regulator-min-microvolt = <1800000>; > > + regulator-max-microvolt = <1800000>; > > + regulator-name = "vcc1v8-2"; > > + status = "disabled"; > > + }; > > + > > + bldo3 { > > + /* unused */ > > + }; > > + > > + bldo4 { > > + /* unused */ > > + }; > > + > > + cldo1 { > > + regulator-min-microvolt = <2500000>; > > + regulator-max-microvolt = <2500000>; > > + regulator-name = "vcc2v5"; > > + }; > > + > > + cldo2 { > > + /* unused */ > > + }; > > + > > + cldo3 { > > + /* unused */ > > + }; > > + > > + reg_dcdca: dcdca { > > + regulator-always-on; > > + regulator-min-microvolt = <810000>; > > + regulator-max-microvolt = <1080000>; > > + regulator-name = "vdd-cpu"; > > + }; > > + > > + reg_dcdcc: dcdcc { > > + regulator-always-on; > > + regulator-min-microvolt = <810000>; > > + regulator-max-microvolt = <1080000>; > > + regulator-name = "vdd-gpu-sys"; > > + }; > > + > > + reg_dcdcd: dcdcd { > > + regulator-always-on; > > + regulator-min-microvolt = <1360000>; > > + regulator-max-microvolt = <1360000>; > > + regulator-name = "vdd-dram"; > > + }; > > + > > + reg_dcdce: dcdce { > > + regulator-always-on; > > + regulator-min-microvolt = <3300000>; > > + regulator-max-microvolt = <3300000>; > > + regulator-name = "vcc-eth-mmc"; > > + }; > > + > > + sw { > > + /* unused */ > > + }; > > + }; > > + }; > > +}; > > + > > +&uart0 { > > + pinctrl-names = "default"; > > + pinctrl-0 = <&uart0_ph_pins>; > > + status = "okay"; > > +}; > > >