Content-Type: text/plain;
        charset=utf-8
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\))
Subject: Re: [PATCH 4/4] arm64: dts: meson: add support for BananaPi M2-Pro
From:   Christian Hewitt <christianshewitt@gmail.com>
In-Reply-To: <a35f7f09-eb19-6cfc-2053-c6b340f10cbd@linaro.org>
Date:   Fri, 27 Jan 2023 14:19:59 +0400
Cc:     Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Neil Armstrong <neil.armstrong@linaro.org>,
        Kevin Hilman <khilman@baylibre.com>,
        Jerome Brunet <jbrunet@baylibre.com>,
        Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
        devicetree <devicetree@vger.kernel.org>,
        linux-arm-kernel@lists.infradead.org,
        linux-amlogic <linux-amlogic@lists.infradead.org>,
        linux-kernel@vger.kernel.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <356B9EBF-B9C4-4CB0-9F83-9E7A62F93F65@gmail.com>
References: <20230127100236.3385154-1-christianshewitt@gmail.com>
 <20230127100236.3385154-5-christianshewitt@gmail.com>
 <a35f7f09-eb19-6cfc-2053-c6b340f10cbd@linaro.org>
To:     Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Precedence: bulk


> On 27 Jan 2023, at 2:06 pm, Krzysztof Kozlowski =
<krzysztof.kozlowski@linaro.org> wrote:
>=20
> On 27/01/2023 11:02, Christian Hewitt wrote:
>> BPI-M2-PRO is based upon the BPI-M5 design except for a different
>> physical board layout and the following changes:
>>=20
>> - USB 3.0 ports reduced from 4x to 2x
>> - 3.5mm Combined CVBS/Audio Jack removed
>> - RTL8821BU WiFi/BT module (internal USB connected)
>>=20
>> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
>> ---
>> arch/arm64/boot/dts/amlogic/Makefile          |  1 +
>> .../dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 98 =
+++++++++++++++++++
>> 2 files changed, 99 insertions(+)
>> create mode 100644 =
arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts
>>=20
>> diff --git a/arch/arm64/boot/dts/amlogic/Makefile =
b/arch/arm64/boot/dts/amlogic/Makefile
>> index 97b42e2100e0..644451794aca 100644
>> --- a/arch/arm64/boot/dts/amlogic/Makefile
>> +++ b/arch/arm64/boot/dts/amlogic/Makefile
>> @@ -60,6 +60,7 @@ dtb-$(CONFIG_ARCH_MESON) +=3D =
meson-gxm-wetek-core2.dtb
>> dtb-$(CONFIG_ARCH_MESON) +=3D meson-s4-s805x2-aq222.dtb
>> dtb-$(CONFIG_ARCH_MESON) +=3D meson-sm1-a95xf3-air-gbit.dtb
>> dtb-$(CONFIG_ARCH_MESON) +=3D meson-sm1-a95xf3-air.dtb
>> +dtb-$(CONFIG_ARCH_MESON) +=3D meson-sm1-bananapi-m2-pro.dtb
>> dtb-$(CONFIG_ARCH_MESON) +=3D meson-sm1-bananapi-m5.dtb
>> dtb-$(CONFIG_ARCH_MESON) +=3D meson-sm1-h96-max.dtb
>> dtb-$(CONFIG_ARCH_MESON) +=3D meson-sm1-khadas-vim3l.dtb
>> diff --git =
a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts =
b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts
>> new file mode 100644
>> index 000000000000..4890d5d9a4f7
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts
>> @@ -0,0 +1,98 @@
>> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> +/*
>> + * Copyright (c) 2021 BayLibre SAS
>> + * Author: Neil Armstrong <narmstrong@baylibre.com>
>> + */
>> +
>> +/dts-v1/;
>> +
>> +#include "meson-sm1-bananapi.dtsi"
>> +#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
>> +
>> +/ {
>> +	compatible =3D "bananapi,bpi-m2-pro", "amlogic,sm1";
>> +	model =3D "Banana Pi BPI-M2-PRO";
>> +
>> +	sound {
>> +		compatible =3D "amlogic,axg-sound-card";
>> +		model =3D "BPI-M2-PRO";
>> +		audio-aux-devs =3D <&tdmout_b>;
>> +		audio-routing =3D "TDMOUT_B IN 0", "FRDDR_A OUT 1",
>> +				"TDMOUT_B IN 1", "FRDDR_B OUT 1",
>> +				"TDMOUT_B IN 2", "FRDDR_C OUT 1",
>> +				"TDM_B Playback", "TDMOUT_B OUT";
>> +
>> +		assigned-clocks =3D <&clkc CLKID_MPLL2>,
>> +				  <&clkc CLKID_MPLL0>,
>> +				  <&clkc CLKID_MPLL1>;
>> +		assigned-clock-parents =3D <0>, <0>, <0>;
>> +		assigned-clock-rates =3D <294912000>,
>> +				       <270950400>,
>> +				       <393216000>;
>> +		status =3D "okay";
>=20
> It's by default. Did any DTSI disable the sound node?

No. I=E2=80=99m simply transcribing from the original M5 dts (with edits =
to omit
the audio jack bits) and the sound nodes of other Amlogic dts which have
long included the same.=20

Q. Do I need to remove it here? (sounds like a yes)
Q. Do we need to exorcise/cleanup the same from all other meson dts?

Christian