Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0a4c25f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-dt-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt 

i.MX arm32 device tree changes for 5.4:
 - New board support: ZII i.MX7 RMU2, Kontron i.MX6UL N6310, and
   PHYTEC phyBOARD-Segin based on i.MX6ULL.
 - A series from Andrey Smirnov to update vf610-zii boards on I2C
   pinmux, switch watchdog, GPIO expander IRQ.
 - Move GIC node into soc node for i.MX6 SoCs.
 - Add OV5645 camera support for imx6qdl-wandboard board.
 - Drop unneeded snvs_pwrkey node for imx7d-zii-rpu2 and imx7-colibri.
 - Use simple-mfd instead of simple-bus for i.MX6 ANATOP.
 - Move the native-mode property inside the display-timings node for
   various i.MX25 and i.MX27 boards.
 - Add EDMA devices for i.MX7ULP SoC.
 - A series from Stefan Riedmueller to update imx6ul-phytec-segin board
   on various devices.
 - Use OF graph to describe the display for opos6uldev board.
 - Misc random updates on i.MX7/6 boards.

* tag 'imx-dt-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (53 commits)
  ARM: dts: vf610-zii-scu4-aib: Configure IRQ line for GPIO expander
  ARM: dts: imx6ul-kontron-n6310: Add Kontron i.MX6UL N6310 SoM and boards
  ARM: dts: vf610-zii-cfu1: Slow I2C0 down to 100 kHz
  ARM: dts: pbab01: correct rtc vendor
  ARM: vf610-zii-cfu1: Add node for switch watchdog
  ARM: dts: imx6: drop gpmi-nand address and size cells
  ARM: dts: imx6: replace simple-bus by simple-mfd for anatop
  ARM: dts: imx6qdl-colibri: add phy to fec
  ARM: dts: imx7-colibri: add recovery for I2C for iMX7
  ARM: dts: imx7-colibri: Add sleep pinctrl to ethernet
  ARM: dts: imx7-colibri: prepare module device tree for FlexCAN
  ARM: dts: imx7-colibri: disable HS400
  ARM: dts: imx7-colibri: make sure module supplies are always on
  ARM: dts: imx7d: cl-som-imx7: add compatible for phy
  ARM: dts: imx7d: cl-som-imx7: make ethernet work again
  ARM: dts: imx6ul: Add csi node
  ARM: dts: imx25: mbimxsd25: native-mode is part of display-timings
  ARM: dts: apf27dev: native-mode is part of display-timings
  ARM: dts: edb7211: native-mode is part of display-timings
  ARM: dts: imx27-phytec-phycore-rdk: native-mode is part of display-timings
  ...

Link: https://lore.kernel.org/r/20190825153237.28829-5-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 89e4acf7 b04f537c

arch/arm/boot/dts/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -569,17 +569,22 @@ 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-liteboard.dtb \

	imx6ul-opos6uldev.dtb \

	imx6ul-pico-hobbit.dtb \

	imx6ul-pico-pi.dtb \

	imx6ul-phytec-phyboard-segin-full.dtb \

	imx6ul-phytec-segin-ff-rdk-nand.dtb \

	imx6ul-tx6ul-0010.dtb \

	imx6ul-tx6ul-0011.dtb \

	imx6ul-tx6ul-mainboard.dtb \

	imx6ull-14x14-evk.dtb \

	imx6ull-colibri-eval-v3.dtb \

	imx6ull-colibri-wifi-eval-v3.dtb \

	imx6ull-phytec-segin-ff-rdk-nand.dtb \

	imx6ull-phytec-segin-ff-rdk-emmc.dtb \

	imx6ull-phytec-segin-lc-rdk-nand.dtb \

	imx6ulz-14x14-evk.dtb

dtb-$(CONFIG_SOC_IMX7D) += \

	imx7d-cl-som-imx7.dtb \
@@ -594,6 +599,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ 
	imx7d-sdb.dtb \

	imx7d-sdb-reva.dtb \

	imx7d-sdb-sht11.dtb \

	imx7d-zii-rmu2.dtb \

	imx7d-zii-rpu2.dtb \

	imx7s-colibri-eval-v3.dtb \

	imx7s-mba7.dtb \

arch/arm/boot/dts/ep7211-edb7211.dts

+1 −1
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ 


	display: display {

		model = "320x240x4";

		native-mode = <&timing0>;

		bits-per-pixel = <4>;

		ac-prescale = <17>;



		display-timings {

			native-mode = <&timing0>;

			timing0: 320x240 {

				hactive = <320>;

				hback-porch = <0>;

arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts

+1 −1
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
		bits-per-pixel = <16>;

		fsl,pcr = <0xcad08b80>;

		bus-width = <18>;

		native-mode = <&qvga_timings>;

		display-timings {

			native-mode = <&qvga_timings>;

			qvga_timings: 320x240 {

				clock-frequency = <6500000>;

				hactive = <320>;

arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts

+1 −1
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
		bits-per-pixel = <16>;

		fsl,pcr = <0xfa208b80>;

		bus-width = <18>;

		native-mode = <&dvi_svga_timings>;

		display-timings {

			native-mode = <&dvi_svga_timings>;

			dvi_svga_timings: 800x600 {

				clock-frequency = <40000000>;

				hactive = <800>;

arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts

+1 −1
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
		bits-per-pixel = <16>;

		fsl,pcr = <0xfa208b80>;

		bus-width = <18>;

		native-mode = <&dvi_vga_timings>;

		display-timings {

			native-mode = <&dvi_vga_timings>;

			dvi_vga_timings: 640x480 {

				clock-frequency = <31250000>;

				hactive = <640>;