| Message ID | 20190808101110.21912-3-peng.fan@nxp.com |
|---|---|
| State | Accepted |
| Commit | 939a9644f0d02f63756dd92b7503f752919d6140 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot,v2,1/5] arm: dts: sync dts for i.MX6UL | expand |
> Import kernel dts for i.MX6ULZ from > commit <0a8ad0ffa4d8> ("Merge tag 'for-linus-5.3-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux") > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- > > V2: > None > > arch/arm/dts/Makefile | 3 ++- > arch/arm/dts/imx6ulz.dtsi | 37 +++++++++++++++++++++++++++++++++++++ > 2 files changed, 39 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/dts/imx6ulz.dtsi > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index ad4d2357bb..2088acdc60 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -599,7 +599,8 @@ dtb-$(CONFIG_MX6ULL) += \ > imx6ull-14x14-evk.dtb \ > imx6ull-colibri.dtb \ > imx6ull-phycore-segin.dtb \ > - imx6ull-dart-6ul.dtb > + imx6ull-dart-6ul.dtb \ > + imx6ulz-14x14-evk.dtb > > dtb-$(CONFIG_ARCH_MX6) += \ > imx6-apalis.dtb \ > diff --git a/arch/arm/dts/imx6ulz.dtsi b/arch/arm/dts/imx6ulz.dtsi > new file mode 100644 > index 0000000000..aeb2ddc540 > --- /dev/null > +++ b/arch/arm/dts/imx6ulz.dtsi > @@ -0,0 +1,37 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT) > +// > +// Copyright 2018 NXP. > + > +#include "imx6ull.dtsi" > + > +/ { > + aliases { > + /delete-property/ ethernet0; > + /delete-property/ ethernet1; > + /delete-property/ i2c2; > + /delete-property/ i2c3; > + /delete-property/ serial4; > + /delete-property/ serial5; > + /delete-property/ serial6; > + /delete-property/ serial7; > + /delete-property/ spi2; > + /delete-property/ spi3; > + /delete-property/ spi4; > + }; > +}; > + > +/delete-node/ &adc1; > +/delete-node/ &ecspi3; > +/delete-node/ &ecspi4; > +/delete-node/ &epit2; > +/delete-node/ &gpt2; > +/delete-node/ &i2c3; > +/delete-node/ &i2c4; > +/delete-node/ &pwm5; > +/delete-node/ &pwm6; > +/delete-node/ &pwm7; > +/delete-node/ &pwm8; > +/delete-node/ &uart5; > +/delete-node/ &uart6; > +/delete-node/ &uart7; > +/delete-node/ &uart8; > Reviewed-by: Ye Li <ye.li@nxp.com> Best regards, Ye Li
On Thu, Aug 8, 2019 at 6:55 AM Peng Fan <peng.fan@nxp.com> wrote: > > Import kernel dts for i.MX6ULZ from > commit <0a8ad0ffa4d8> ("Merge tag 'for-linus-5.3-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux") > > Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index ad4d2357bb..2088acdc60 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -599,7 +599,8 @@ dtb-$(CONFIG_MX6ULL) += \ imx6ull-14x14-evk.dtb \ imx6ull-colibri.dtb \ imx6ull-phycore-segin.dtb \ - imx6ull-dart-6ul.dtb + imx6ull-dart-6ul.dtb \ + imx6ulz-14x14-evk.dtb dtb-$(CONFIG_ARCH_MX6) += \ imx6-apalis.dtb \ diff --git a/arch/arm/dts/imx6ulz.dtsi b/arch/arm/dts/imx6ulz.dtsi new file mode 100644 index 0000000000..aeb2ddc540 --- /dev/null +++ b/arch/arm/dts/imx6ulz.dtsi @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +// +// Copyright 2018 NXP. + +#include "imx6ull.dtsi" + +/ { + aliases { + /delete-property/ ethernet0; + /delete-property/ ethernet1; + /delete-property/ i2c2; + /delete-property/ i2c3; + /delete-property/ serial4; + /delete-property/ serial5; + /delete-property/ serial6; + /delete-property/ serial7; + /delete-property/ spi2; + /delete-property/ spi3; + /delete-property/ spi4; + }; +}; + +/delete-node/ &adc1; +/delete-node/ &ecspi3; +/delete-node/ &ecspi4; +/delete-node/ &epit2; +/delete-node/ &gpt2; +/delete-node/ &i2c3; +/delete-node/ &i2c4; +/delete-node/ &pwm5; +/delete-node/ &pwm6; +/delete-node/ &pwm7; +/delete-node/ &pwm8; +/delete-node/ &uart5; +/delete-node/ &uart6; +/delete-node/ &uart7; +/delete-node/ &uart8;
Import kernel dts for i.MX6ULZ from commit <0a8ad0ffa4d8> ("Merge tag 'for-linus-5.3-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux") Signed-off-by: Peng Fan <peng.fan@nxp.com> --- V2: None arch/arm/dts/Makefile | 3 ++- arch/arm/dts/imx6ulz.dtsi | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imx6ulz.dtsi