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

Commit 1fc7210c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-dt-4.10' of... 

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

i.MX device tree updates for 4.10:
 - New boards support: i.MX6SX UDOO Neo, Boundary Devices Nitrogen6_SOM2,
   Engicam i.CoreM6, Grinn i.MX6UL liteSOM/liteBoard, Toradex Colibri
   iMX6 module, i.MX6ULL and EVK board.
 - Remove skeleton.dtsi inclusion from all i.MX SoC dts files, as it's
   been deprecated, since commit 9c0da3cc ("ARM: dts: explicitly
   mark skeleton.dtsi as deprecated").
 - Misc device addition and enabling: OCOTP for Vybrid, MMDC for i.MX6QP,
   TMU for LS1021A, FEC for imx6qdl-icore, DMA for Vybrid DSPI.
 - A few cleanups: use hyphens for node names, fix white spaces, move
   imx-weim parameters into SoC dtsi, replace gpio-key,wakeup with
   wakeup-source, remove pwm-leds from imx6q-apalis-ixora, remove I2C3
   from vf610-zii-dev-rev-b.
 - Other small random changes: calibrate USB PHY for b650v3 board,
   update TX D_CAL for USBPHY, use enable-gpios for backlight on
   imx6qdl-apalis, etc.

* tag 'imx-dt-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

: (38 commits)
  ARM: dts: imx6ull: add imx6ull support
  ARM: dts: imx6q: replace gpio-key,wakeup with wakeup-source for Utilite Pro
  ARM: dts: vfxxx: Enable DMA for DSPI2 and DSPI3
  ARM: dts: imx: Remove skeleton.dtsi
  ARM: dts: imx6q-utilite-pro: i2c1 is muxed
  ARM: dts: add new compatible string for i.MX6QP mmdc
  ARM: dts: imx6sx-udoo: Add board specific compatible strings
  ARM: dts: mx5: Add new M53EVK manufacturer compat
  ARM: dts: mxs: Add new M28EVK manufacturer compat
  ARM: dts: imx6ul-14x14-evk: update TX D_CAL for USBPHY
  ARM: dts: imx6sx-sdb: update TX D_CAL for USBPHY
  ARM: dts: imx6: Add imx-weim parameters to dtsi's
  ARM: dts: imx: Fix "ERROR: code indent should use tabs where possible"
  ARM: dts: imx6qdl-nitrogen6_max: use hyphens for nodes name
  ARM: dts: imx6qdl-nit6xlite: use hyphens for nodes name
  ARM: dts: imx6qdl-nitrogen6x: use hyphens for nodes name
  ARM: dts: imx6qdl-sabrelite: use hyphens for nodes name
  ARM: dts: imx: add Boundary Devices Nitrogen6_SOM2 support
  ARM: dts: imx6qdl-icore: Add FEC support
  ARM: dts: imx6q: Add Engicam i.CoreM6 DualLite/Solo initial support
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f05646c9 c201369d

arch/arm/boot/dts/Makefile

+11 −2
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-aristainetos_7.dtb \

	imx6dl-aristainetos2_4.dtb \

	imx6dl-aristainetos2_7.dtb \

	imx6dl-colibri-eval-v3.dtb \

	imx6dl-cubox-i.dtb \

	imx6dl-dfi-fs700-m60.dtb \

	imx6dl-gw51xx.dtb \
@@ -341,6 +342,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-gw552x.dtb \

	imx6dl-gw553x.dtb \

	imx6dl-hummingboard.dtb \

	imx6dl-icore.dtb \

	imx6dl-nit6xlite.dtb \

	imx6dl-nitrogen6x.dtb \

	imx6dl-phytec-pbab01.dtb \
@@ -382,10 +384,12 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-gw553x.dtb \

	imx6q-h100.dtb \

	imx6q-hummingboard.dtb \

	imx6q-icore.dtb \

	imx6q-icore-rqs.dtb \

	imx6q-marsboard.dtb \

	imx6q-nitrogen6x.dtb \

	imx6q-nitrogen6_max.dtb \

	imx6q-nitrogen6_som2.dtb \

	imx6q-novena.dtb \

	imx6q-phytec-pbab01.dtb \

	imx6q-rex-pro.dtb \
@@ -417,14 +421,19 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ 
	imx6sx-sabreauto.dtb \

	imx6sx-sdb-reva.dtb \

	imx6sx-sdb-sai.dtb \

	imx6sx-sdb.dtb

	imx6sx-sdb.dtb \

	imx6sx-udoo-neo-basic.dtb \

	imx6sx-udoo-neo-extended.dtb \

	imx6sx-udoo-neo-full.dtb

dtb-$(CONFIG_SOC_IMX6UL) += \

	imx6ul-14x14-evk.dtb \

	imx6ul-geam-kit.dtb \

	imx6ul-liteboard.dtb \

	imx6ul-pico-hobbit.dtb \

	imx6ul-tx6ul-0010.dtb \

	imx6ul-tx6ul-0011.dtb \

	imx6ul-tx6ul-mainboard.dtb

	imx6ul-tx6ul-mainboard.dtb \

	imx6ull-14x14-evk.dtb

dtb-$(CONFIG_SOC_IMX7D) += \

	imx7d-cl-som-imx7.dtb \

	imx7d-colibri-eval-v3.dtb \

arch/arm/boot/dts/imx1.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 * http://www.gnu.org/copyleft/gpl.html

 */



#include "skeleton.dtsi"

#include "imx1-pinfunc.h"



#include <dt-bindings/clock/imx1-clock.h>
@@ -17,6 +16,9 @@ 
#include <dt-bindings/interrupt-controller/irq.h>



/ {

	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		gpio0 = &gpio1;

		gpio1 = &gpio2;

arch/arm/boot/dts/imx23.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -9,10 +9,12 @@ 
 * http://www.gnu.org/copyleft/gpl.html

 */



#include "skeleton.dtsi"

#include "imx23-pinfunc.h"



/ {

	#address-cells = <1>;

	#size-cells = <1>;



	interrupt-parent = <&icoll>;



	aliases {

arch/arm/boot/dts/imx25.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -9,10 +9,12 @@ 
 * http://www.gnu.org/copyleft/gpl.html

 */



#include "skeleton.dtsi"

#include "imx25-pinfunc.h"



/ {

	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		ethernet0 = &fec;

		gpio0 = &gpio1;

arch/arm/boot/dts/imx27.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 * http://www.gnu.org/copyleft/gpl.html

 */



#include "skeleton.dtsi"

#include "imx27-pinfunc.h"



#include <dt-bindings/clock/imx27-clock.h>
@@ -18,6 +17,9 @@ 
#include <dt-bindings/interrupt-controller/irq.h>



/ {

	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		ethernet0 = &fec;

		gpio0 = &gpio1;