Hi Marek, On Wed, 6 Nov 2024 at 04:37, Marek Vasut <[email protected]> wrote: > > Add support for the DH electronics i.MX6DL DHCOM SoM and a PDK2 evaluation > board. The evaluation board features three serial ports, USB OTG, USB host > with an USB hub, Fast or Gigabit ethernet, eMMC, uSD, SD, analog audio, > PCIe and HDMI video output. > > All of the aforementioned features except for mSATA are supported, mSATA > is not available on i.MX6DL and is only available on DHCOM populated with > i.MX6Q SoC which is already supported upstream. > > Backport from linux-next commit > c3f5d76a6e03 ("ARM: dts: imx6dl: Add support for i.MX6DL DHCOM SoM on PDK2 > carrier board") > > Signed-off-by: Marek Vasut <[email protected]> > Reviewed-by: Christoph Niedermaier <[email protected]> > Signed-off-by: Shawn Guo <[email protected]> > --- > Cc: Andreas Geisreiter <[email protected]> > Cc: Christoph Niedermaier <[email protected]> > Cc: Fabio Estevam <[email protected]> > Cc: Peng Fan <[email protected]> > Cc: Sumit Garg <[email protected]> > Cc: Tom Rini <[email protected]> > Cc: [email protected] > Cc: [email protected] > --- > .../src/arm/nxp/imx/imx6dl-dhcom-pdk2.dts | 20 +++++++++++++++++++ > 1 file changed, 20 insertions(+) > create mode 100644 dts/upstream/src/arm/nxp/imx/imx6dl-dhcom-pdk2.dts >
I didn't realize earlier that this patch is directly modifying dts/upstream subtree. Modifying the subtree is likely going to cause conflicts with the next subtree pull. It looks like this board is targeted for v6.13 release. Let's see if we get lucky with automerge being successful for this one but let's try to rather use cherry pick or wait for the board support to land in devicetree-rebasing tree. You can maintain U-Boot DTS for the time being. -Sumit > diff --git a/dts/upstream/src/arm/nxp/imx/imx6dl-dhcom-pdk2.dts > b/dts/upstream/src/arm/nxp/imx/imx6dl-dhcom-pdk2.dts > new file mode 100644 > index 00000000000..38235925257 > --- /dev/null > +++ b/dts/upstream/src/arm/nxp/imx/imx6dl-dhcom-pdk2.dts > @@ -0,0 +1,20 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2024 Marek Vasut <[email protected]> > + * > + * DHCOM iMX6 variant: > + * DHCM-iMX6DL-C080-R102-F0819-E-SD-RTC-T-HS-I-01D2 > + * DHCOM PCB number: 493-400 or newer > + * PDK2 PCB number: 516-400 or newer > + */ > +/dts-v1/; > + > +#include "imx6dl.dtsi" > +#include "imx6qdl-dhcom-som.dtsi" > +#include "imx6qdl-dhcom-pdk2.dtsi" > + > +/ { > + model = "DH electronics i.MX6DL DHCOM on Premium Developer Kit (2)"; > + compatible = "dh,imx6dl-dhcom-pdk2", "dh,imx6dl-dhcom-som", > + "fsl,imx6dl"; > +}; > -- > 2.45.2 >
