Re: [PATCH 4/4] arm64: dts: meson: add support for BananaPi M2-Pro

[Neil Armstrong]

On 27/01/2023 11:06, Krzysztof Kozlowski wrote:
> 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:
> >
> > - USB 3.0 ports reduced from 4x to 2x
> > - 3.5mm Combined CVBS/Audio Jack removed
> > - RTL8821BU WiFi/BT module (internal USB connected)
> >
> > Signed-off-by: Christian Hewitt <christianshewitt@xxxxxxxxx>
> > ---
> >   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
> >
> > 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) += meson-gxm-wetek-core2.dtb
> >   dtb-$(CONFIG_ARCH_MESON) += meson-s4-s805x2-aq222.dtb
> >   dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-gbit.dtb
> >   dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air.dtb
> > +dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m2-pro.dtb
> >   dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb
> >   dtb-$(CONFIG_ARCH_MESON) += meson-sm1-h96-max.dtb
> >   dtb-$(CONFIG_ARCH_MESON) += 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@xxxxxxxxxxxx>
> > + */
> > +
> > +/dts-v1/;
> > +
> > +#include "meson-sm1-bananapi.dtsi"
> > +#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
> > +
> > +/ {
> > +	compatible = "bananapi,bpi-m2-pro", "amlogic,sm1";
> > +	model = "Banana Pi BPI-M2-PRO";
> > +
> > +	sound {
> > +		compatible = "amlogic,axg-sound-card";
> > +		model = "BPI-M2-PRO";
> > +		audio-aux-devs = <&tdmout_b>;
> > +		audio-routing = "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 = <&clkc CLKID_MPLL2>,
> > +				  <&clkc CLKID_MPLL0>,
> > +				  <&clkc CLKID_MPLL1>;
> > +		assigned-clock-parents = <0>, <0>, <0>;
> > +		assigned-clock-rates = <294912000>,
> > +				       <270950400>,
> > +				       <393216000>;
> > +		status = "okay";
>
> It's by default. Did any DTSI disable the sound node?

It's a leftover we keep copying onto new boards, I'll send a patch top remove all those.

Neil

> Best regards,
> Krzysztof