Re: [PATCH v2 16/16] arm64: dts: apple: t8112: Initial t8112 (M2) device trees

From: Sven Peter
Date: Sun Feb 19 2023 - 08:24:14 EST




On Sun, Feb 19, 2023, at 14:22, Janne Grunau wrote:
> On 2023-02-19 13:36:22 +0100, Sven Peter wrote:
>> Hi,
>>
>>
>> On Tue, Feb 14, 2023, at 12:03, Janne Grunau wrote:
>> > From: Hector Martin <marcan@xxxxxxxxx>
>> >
>> > This adds device trees for the following devices:
>> > - Macbook Air (M2, 2022)
>> > - Macbook Pro 13" (M2, 2022)
>> > - Mac mini (M2, 2023)
>> >
>> > Signed-off-by: Hector Martin <marcan@xxxxxxxxx>
>> > Co-developed-by: Janne Grunau <j@xxxxxxxxxx>
>> > Signed-off-by: Janne Grunau <j@xxxxxxxxxx>
>> > ---
>> > arch/arm64/boot/dts/apple/Makefile | 3 +
>> > arch/arm64/boot/dts/apple/t8112-j413.dts | 63 ++
>> > arch/arm64/boot/dts/apple/t8112-j473.dts | 54 ++
>> > arch/arm64/boot/dts/apple/t8112-j493.dts | 52 ++
>> > arch/arm64/boot/dts/apple/t8112-jxxx.dtsi | 81 ++
>> > arch/arm64/boot/dts/apple/t8112-pmgr.dtsi | 1141 +++++++++++++++++++++++++++++
>> > arch/arm64/boot/dts/apple/t8112.dtsi | 912 +++++++++++++++++++++++
>> > 7 files changed, 2306 insertions(+)
>> >
>> > diff --git a/arch/arm64/boot/dts/apple/Makefile
>> > b/arch/arm64/boot/dts/apple/Makefile
>> > index 5a7506ff5ea3..aec5e29cdfb7 100644
>> > --- a/arch/arm64/boot/dts/apple/Makefile
>> > +++ b/arch/arm64/boot/dts/apple/Makefile
>> > @@ -10,3 +10,6 @@ dtb-$(CONFIG_ARCH_APPLE) += t6000-j316s.dtb
>> > dtb-$(CONFIG_ARCH_APPLE) += t6001-j316c.dtb
>> > dtb-$(CONFIG_ARCH_APPLE) += t6001-j375c.dtb
>> > dtb-$(CONFIG_ARCH_APPLE) += t6002-j375d.dtb
>> > +dtb-$(CONFIG_ARCH_APPLE) += t8112-j413.dtb
>> > +dtb-$(CONFIG_ARCH_APPLE) += t8112-j473.dtb
>> > +dtb-$(CONFIG_ARCH_APPLE) += t8112-j493.dtb
>> > diff --git a/arch/arm64/boot/dts/apple/t8112-j413.dts
>> > b/arch/arm64/boot/dts/apple/t8112-j413.dts
>> > new file mode 100644
>> > index 000000000000..9e758edeaa82
>> > --- /dev/null
>> > +++ b/arch/arm64/boot/dts/apple/t8112-j413.dts
>> > @@ -0,0 +1,63 @@
>> > +// SPDX-License-Identifier: GPL-2.0+ OR MIT
>> > +/*
>> > + * Apple MacBook Air (M2, 2022)
>> > + *
>> > + * target-type: J413
>> > + *
>> > + * Copyright The Asahi Linux Contributors
>> > + */
>> > +
>> > +/dts-v1/;
>> > +
>> > +#include "t8112.dtsi"
>> > +#include "t8112-jxxx.dtsi"
>> > +
>> > +/ {
>> > + compatible = "apple,j413", "apple,t8112", "apple,arm-platform";
>> > + model = "Apple MacBook Air (13-inch, M2, 2022)";
>> > +
>> > + aliases {
>> > + bluetooth0 = &bluetooth0;
>> > + wifi0 = &wifi0;
>> > + };
>> > +};
>> > +
>> > +/*
>> > + * Force the bus number assignments so that we can declare some of the
>> > + * on-board devices and properties that are populated by the bootloader
>> > + * (such as MAC addresses).
>> > + */
>> > +&port00 {
>> > + bus-range = <1 1>;
>> > + wifi0: wifi@0,0 {
>> > + compatible = "pci14e4,4433";
>>
>> I'm not sure how these pci compatibles are usually handled. Do they have to
>> be added to the dt-bindings Documentation as well or is it fine to just have them
>> here since they're not really used to match anything?
>
> I suppose they have to be added (at least for dtb validation) but
> "pci14e4,4433" is already in net/wireless/brcm,bcm4329-fmac.yaml. Added
> via e2e37224e8b3 ("dt-bindings: net: bcm4329-fmac: Add Apple properties
> & chips").

Oh, true, I somehow missed that.

Best,

Sven