On 13/06/2021 11:16, Matthew Hagan wrote: > MX64 & MX64W Hardware info: > - CPU: Broadcom BCM58625 Cortex A9 @ 1200Mhz > - RAM: 2 GB (4 x 4Gb SK Hynix H5TC4G83CFR) > - Storage: 1 GB (Micron MT29F8G08ABACA) > - Networking: BCM58625 internal switch (5x 1GbE ports) > - USB: 1x USB2.0 > - Serial: Internal header > - WLAN(MX64W only): 2x Broadcom BCM43520KMLG on the PCI bus > > This patch adds the Meraki MX64 series-specific bindings. Since some > devices make use of the older A0 SoC, changes need to be made to > accommodate this case, including removal of coherency options and > modification to the secondary-boot-reg. > > Signed-off-by: Matthew Hagan <mnhagan88@xxxxxxxxx> > --- > arch/arm/boot/dts/Makefile | 4 + > .../boot/dts/bcm958625-meraki-kingpin.dtsi | 165 ++++++++++++++++++ > .../arm/boot/dts/bcm958625-meraki-mx64-a0.dts | 45 +++++ > arch/arm/boot/dts/bcm958625-meraki-mx64.dts | 15 ++ > .../boot/dts/bcm958625-meraki-mx64w-a0.dts | 55 ++++++ > arch/arm/boot/dts/bcm958625-meraki-mx64w.dts | 23 +++ > 6 files changed, 307 insertions(+) > create mode 100644 arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi > create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx64-a0.dts > create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx64.dts > create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx64w-a0.dts > create mode 100644 arch/arm/boot/dts/bcm958625-meraki-mx64w.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index f8f09c5066e7..83560b05f797 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -154,6 +154,10 @@ dtb-$(CONFIG_ARCH_BCM_NSP) += \ > bcm958525xmc.dtb \ > bcm958622hr.dtb \ > bcm958623hr.dtb \ > + bcm958625-meraki-mx64.dtb \ > + bcm958625-meraki-mx64-a0.dtb \ > + bcm958625-meraki-mx64w.dtb \ > + bcm958625-meraki-mx64w-a0.dtb \ > bcm958625hr.dtb \ > bcm988312hr.dtb \ > bcm958625k.dtb > diff --git a/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi b/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi > new file mode 100644 > index 000000000000..107c2167a113 > --- /dev/null > +++ b/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi > @@ -0,0 +1,165 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT > +/* > + * Device Tree Bindings for Cisco Meraki MX64 series (Kingpin). > + * > + * Copyright (C) 2020-2021 Matthew Hagan <mnhagan88@xxxxxxxxx> > + */ > + > +#include "bcm958625-meraki-mx6x-common.dtsi" > +#include <dt-bindings/input/input.h> > +#include <dt-bindings/leds/common.h> dt-bindings/input/input.h should be included in bcm958625-mx6x-common.dtsi. dt-bindings/leds/common.h is already included in bcm958625-mx6x-common.dtsi and isn't required here. Likewise in bcm958625-meraki-alamo.dtsi I will hold off on submitting a v4 until the preparatory SoC patches are sorted out. Matthew
