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

Commit c3fcab3a authored Jan 29, 2017 by Olof Johansson

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

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

i.MX device tree updates for 4.11:
- New board support: vf610-zii-dev-rev-c, imx6ul-opos6uldev,
imx6ul-isiot, imx6qdl-savageboard, imx6q-mccmon6.
- A patch from Alexandre to correct the mangled license text which
has been copied & pasted all over the i.MX device tree files.
- Update cpu nodes of some i.MX SoCs to make them consistent and match
ePAPR spec.
- Add OCOTP device for i.MX6UL SoC.
- Add security violation interrupt for i.MX25 DryIce.
- Enable USB OTG, WIFI and Bluetooth support for i.MX6SX Udoo Neo
board.
- Enable S/PDIF and 2nd display pipeline support for CompuLab board..
- Add SPI and LTC3676 PMIC support for Gateworks Ventana boards.
- A few random device addition for various boards: TVE DAC regulators
for imx53-qsb, EEPROM for vf610-zii-dev, eMMC and NAND support for
i.MX6UL Engicam boards.
- Cleanups on obsoleted or unused properties.

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

: (32 commits)
ARM: dts: udoo_neo: Add Bluetooth support
ARM: dts: udoo_neo: Add Wifi support
ARM: dts: udoo_neo: Add UDOO Neo USB OTG1 and OTG2 support
ARM: dts: imx6ul: Add Engicam Is.IoT MX6UL NAND initial support
ARM: dts: imx6ul: Add Engicam Is.IoT MX6UL eMMC initial support
ARM: dts: imx6qdl: Fix "ERROR: code indent should use tabs where possible"
ARM: dts: vf610-zii-dev: add EEPROM entry to Rev C
ARM: dts: add Armadeus Systems OPOS6UL and OPOS6ULDEV support
ARM: dts: imx6q-utilite-pro: enable 2nd display pipeline
ARM: dts: vf610-zii-dev: Add .dts file for rev. C
ARM: dts: vf610-zii-dev-rev-b: Remove leftover PWM pingroup
ARM: dts: imx6: Support Savageboard quad
ARM: dts: imx6: Support Savageboard dual
ARM: dts: imx6: Add Savageboard common file
ARM: dts: imx53-qsb: Provide the TVE DAC regulators
ARM: dts: imx6q: Add mccmon6 board support
Doc: devicetree: bindings: Add vendor prefix entry - lwn
ARM: dts: imx/vf: Correct license text
ARM: dts: imx25.dtsi: DryIce security violation interrupt
ARM: dts: imx: Add ocotp node for imx6ul
...

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 0ff3758b 18ba3868

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -165,6 +165,7 @@ lg LG Corporation
		linux Linux-specific binding
		lltc Linear Technology Corporation
		lsi LSI Corp. (LSI Logic)
		lwn Liebherr-Werk Nenzing GmbH
		macnica Macnica Americas
		marvell Marvell Technology Group Ltd.
		maxim Maxim Integrated Products
		@@ -228,6 +229,7 @@ pine64 Pine64
		pixcir PIXCIR MICROELECTRONICS Co., Ltd
		plathome Plat'Home Co., Ltd.
		plda PLDA
		poslab Poslab Technology Co., Ltd.
		powervr PowerVR (deprecated, use img)
		pulsedlight PulsedLight, Inc
		qca Qualcomm Atheros, Inc.

arch/arm/boot/dts/Makefile

+9 −1

Original line number	Diff line number	Diff line
		@@ -354,6 +354,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
		imx6dl-gw553x.dtb \
		imx6dl-hummingboard.dtb \
		imx6dl-icore.dtb \
		imx6dl-icore-rqs.dtb \
		imx6dl-nit6xlite.dtb \
		imx6dl-nitrogen6x.dtb \
		imx6dl-phytec-pbab01.dtb \
		@@ -362,6 +363,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
		imx6dl-sabreauto.dtb \
		imx6dl-sabrelite.dtb \
		imx6dl-sabresd.dtb \
		imx6dl-savageboard.dtb \
		imx6dl-ts4900.dtb \
		imx6dl-tx6dl-comtft.dtb \
		imx6dl-tx6s-8034.dtb \
		@@ -398,6 +400,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
		imx6q-icore.dtb \
		imx6q-icore-rqs.dtb \
		imx6q-marsboard.dtb \
		imx6q-mccmon6.dtb \
		imx6q-nitrogen6x.dtb \
		imx6q-nitrogen6_max.dtb \
		imx6q-nitrogen6_som2.dtb \
		@@ -407,6 +410,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
		imx6q-sabreauto.dtb \
		imx6q-sabrelite.dtb \
		imx6q-sabresd.dtb \
		imx6q-savageboard.dtb \
		imx6q-sbc6x.dtb \
		imx6q-tbs2910.dtb \
		imx6q-ts4900.dtb \
		@@ -439,7 +443,10 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
		dtb-$(CONFIG_SOC_IMX6UL) += \
		imx6ul-14x14-evk.dtb \
		imx6ul-geam-kit.dtb \
		imx6ul-isiot-emmc.dtb \
		imx6ul-isiot-nand.dtb \
		imx6ul-liteboard.dtb \
		imx6ul-opos6uldev.dtb \
		imx6ul-pico-hobbit.dtb \
		imx6ul-tx6ul-0010.dtb \
		imx6ul-tx6ul-0011.dtb \
		@@ -463,7 +470,8 @@ dtb-$(CONFIG_SOC_VF610) += \
		vf610-cosmic.dtb \
		vf610m4-cosmic.dtb \
		vf610-twr.dtb \
		vf610-zii-dev-rev-b.dtb
		vf610-zii-dev-rev-b.dtb \
		vf610-zii-dev-rev-c.dtb
		dtb-$(CONFIG_ARCH_MXS) += \
		imx23-evk.dtb \
		imx23-olinuxino.dtb \

arch/arm/boot/dts/imx1-ads.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@

		&cspi1 {
		pinctrl-0 = <&pinctrl_cspi1>;
		fsl,spi-num-chipselects = <1>;
		cs-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>;
		status = "okay";
		};

arch/arm/boot/dts/imx1.dtsi

+2 −1

Original line number	Diff line number	Diff line
		@@ -43,8 +43,9 @@
		#size-cells = <0>;
		#address-cells = <1>;

		cpu: cpu@0 {
		cpu@0 {
		device_type = "cpu";
		reg = <0>;
		compatible = "arm,arm920t";
		operating-points = <200000 1900000>;
		clock-latency = <62500>;

arch/arm/boot/dts/imx23.dtsi

+3 −2

Original line number	Diff line number	Diff line
		@@ -29,12 +29,13 @@
		};

		cpus {
		#address-cells = <0>;
		#address-cells = <1>;
		#size-cells = <0>;

		cpu {
		cpu@0 {
		compatible = "arm,arm926ej-s";
		device_type = "cpu";
		reg = <0>;
		};
		};