diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-09-23 15:53:49 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-09-23 15:53:50 +0200 |
| commit | 07d0db46b3d2950c0cedb3015bb8f19f90700c4e (patch) | |
| tree | df0edfb25dc745a338f71ff0cd960c53e996ff8e /arch/arm/boot/dts/Makefile | |
| parent | 2b14d7da65009f68c7f31a20e411c2a8d133d825 (diff) | |
| parent | b7fd68ac27200b917ce4494c591858194e584634 (diff) | |
| download | linux-07d0db46b3d2950c0cedb3015bb8f19f90700c4e.tar.gz | |
Merge tag 'imx-dt-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt
i.MX device tree change for 6.1 - A series from Alexander Stein to add missing properties for i.MX6 SRAM. - Drop 'interrupts' property when 'interrupts-extended' is present. This fixes a dtbs_check warning with i.MX6 DT. - Update device trees to use generic name 'dma-controller' for SDMA. - A set of changes from Krzysztof Kozlowski to align SPI, LED and gpio-keys node name with dtschema. - A series of indentation and white-space cleanups from Marcel Ziswiler to address various checkpatch warnings. - Add DDR pinmux defines to VF610 DT header. - A couple of changes from Peng Fan to update clock-names and add IPG clock for i.MX7ULP LPI2C devices. - Improve device tree structure for Kontron i.MX6UL/ULL based boards. - A series of changes from Tim Harvey to add CAN regulator for Gateworks i.MX6QDL boards. - Various small and random board specific updates. * tag 'imx-dt-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (40 commits) ARM: dts: imx6qdl-gw54xx: add CAN regulator ARM: dts: imx6qdl-gw53xx: add CAN regulator ARM: dts: imx6qdl-gw52xx: add CAN regulator ARM: dts: imx: update sdma node name format ARM: dts: imx6: skov: migrate to resistive-adc-touch ARM: dts: imx6sx-udoo-neo: don't use multiple blank lines ARM: dts: imx6sl: use tabs for code indent ARM: dts: imx6sx: add missing properties for sram ARM: dts: imx6sll: add missing properties for sram ARM: dts: imx6sl: add missing properties for sram ARM: dts: imx6qp: add missing properties for sram ARM: dts: imx6dl: add missing properties for sram ARM: dts: imx6q: add missing properties for sram ARM: dts: imx7ulp: Add IPG clock for lpi2c ARM: dts: imx7ulp: update the LPI2C clock-names ARM: dts: vf610: ddr pinmux ARM: dts: imx6qdl-dhcom: Move IPU iomux node from PDK2 to SoM file ARM: dts: imx6ul-kontron: Add imx6ull-kontron-bl to Makefile ARM: dts: imx6ul-kontron: Simplify devicetree structure ARM: dts: vf610: align SPI node name with dtschema ... Link: https://lore.kernel.org/r/20220918092806.2152700-3-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 98ffdf299809..c7d1c8da56c4 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -707,8 +707,8 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-geam.dtb \ imx6ul-isiot-emmc.dtb \ imx6ul-isiot-nand.dtb \ - imx6ul-kontron-n6310-s.dtb \ - imx6ul-kontron-n6310-s-43.dtb \ + imx6ul-kontron-bl.dtb \ + imx6ul-kontron-bl-43.dtb \ imx6ul-liteboard.dtb \ imx6ul-tqma6ul1-mba6ulx.dtb \ imx6ul-tqma6ul2-mba6ulx.dtb \ @@ -737,6 +737,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ull-colibri-wifi-iris.dtb \ imx6ull-colibri-wifi-iris-v2.dtb \ imx6ull-jozacp.dtb \ + imx6ull-kontron-bl.dtb \ imx6ull-myir-mys-6ulx-eval.dtb \ imx6ull-opos6uldev.dtb \ imx6ull-phytec-segin-ff-rdk-nand.dtb \ |