Commit 355d1ef1 authored Oct 23, 2015 by Olof Johansson

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

The i.MX device tree changes for 4.4:
 - Add IOMUXC LPSR (Low Power State Retention) device for i.MX7D.
 - Add a few low power mode related devices and touch controller for
   i.MX6UL.
 - Add a number of devices for i.MX7D SDB board support, USB, Dual FEC,
   and eMMC5.0.
 - i.MX6 Boundary Devices updates: relicense under GPLv2/X11, add Okaya
   LCD, touch and wifi support, add new boards Nitrogen6_Lite and
   Nitrogen6_Max.
 - Enable touch screen and NAND Flash controller for a few Vybrid
   devices.
 - Some random and small updates on LS1021A and MXS support.

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

: (53 commits)
  ARM: dts: ls1021a: Add quirk for Erratum A009116
  ARM: imx6sx-sdb: Fix typo in regulator enable GPIO property
  ARM: dts: imx6: phyFLEX: fix typo in "pinctrl-names"
  ARM: dts: imx6: change the core clock of spdif
  ARM: dts: vf-colibri: enable NAND flash controller
  ARM: dts: vf610twr: add NAND flash controller peripherial
  ARM: dts: imx: add Boundary Devices Nitrogen6_Lite board
  ARM: dts: imx: add Boundary Devices Nitrogen6_Max board
  ARM: dts: imx6dl-nitrogen6x: change manufacturer to Boundary Devices
  ARM: dts: imx6q-nitrogen6x: change manufacturer to Boundary Devices
  of: Add Boundary Devices Inc. vendor prefix
  ARM: dts: imx6qdl-sabrelite: relicense under GPLv2/X11
  ARM: dts: imx6qdl-nitrogen6x: relicense under GPLv2/X11
  ARM: dts: imx6qdl-nitrogen6x: add wifi wl1271 support
  ARM: dts: imx6dql-nitrogen6x: add touchscreen support
  ARM: dts: imx6qdl-sabrelite: add Okaya LCD panel
  ARM: dts: imx6qdl-nitrogen6x: add Okaya LCD panel
  ARM: dts: vf500-colibri: Add device tree node for touchscreen support
  ARM: dts: i.MX35: fix cpu compatible value
  ARM: dts: i.MX31: fix cpu compatible value
  ...

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

parents de0b2a54 607e266c

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -34,6 +34,7 @@ avago Avago Technologies
	avic Shanghai AVIC Optoelectronics Co., Ltd.		avic Shanghai AVIC Optoelectronics Co., Ltd.
	axis Axis Communications AB		axis Axis Communications AB
	bosch Bosch Sensortec GmbH		bosch Bosch Sensortec GmbH
			boundary Boundary Devices Inc.
	brcm Broadcom Corporation		brcm Broadcom Corporation
	buffalo Buffalo, Inc.		buffalo Buffalo, Inc.
	calxeda Calxeda		calxeda Calxeda

arch/arm/boot/dts/Makefile

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -292,6 +292,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
	imx6dl-gw551x.dtb \		imx6dl-gw551x.dtb \
	imx6dl-gw552x.dtb \		imx6dl-gw552x.dtb \
	imx6dl-hummingboard.dtb \		imx6dl-hummingboard.dtb \
			imx6dl-nit6xlite.dtb \
	imx6dl-nitrogen6x.dtb \		imx6dl-nitrogen6x.dtb \
	imx6dl-phytec-pbab01.dtb \		imx6dl-phytec-pbab01.dtb \
	imx6dl-rex-basic.dtb \		imx6dl-rex-basic.dtb \
	@@ -321,6 +322,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
	imx6q-gw552x.dtb \		imx6q-gw552x.dtb \
	imx6q-hummingboard.dtb \		imx6q-hummingboard.dtb \
	imx6q-nitrogen6x.dtb \		imx6q-nitrogen6x.dtb \
			imx6q-nitrogen6_max.dtb \
	imx6q-phytec-pbab01.dtb \		imx6q-phytec-pbab01.dtb \
	imx6q-rex-pro.dtb \		imx6q-rex-pro.dtb \
	imx6q-sabreauto.dtb \		imx6q-sabreauto.dtb \

arch/arm/boot/dts/imx23.dtsi

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -383,9 +383,11 @@ pxp@8002a000 {
	};		};

	ocotp@8002c000 {		ocotp@8002c000 {
	compatible = "fsl,ocotp";		compatible = "fsl,imx23-ocotp", "fsl,ocotp";
			#address-cells = <1>;
			#size-cells = <1>;
	reg = <0x8002c000 0x2000>;		reg = <0x8002c000 0x2000>;
	status = "disabled";		clocks = <&clks 15>;
	};		};

	axi-ahb@8002e000 {		axi-ahb@8002e000 {

arch/arm/boot/dts/imx28-evk.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,7 +57,7 @@ ssp2: ssp@80014000 {
	flash: m25p80@0 {		flash: m25p80@0 {
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <1>;		#size-cells = <1>;
	compatible = "sst,sst25vf016b";		compatible = "sst,sst25vf016b", "jedec,spi-nor";
	spi-max-frequency = <40000000>;		spi-max-frequency = <40000000>;
	reg = <0>;		reg = <0>;
	};		};

arch/arm/boot/dts/imx28-m28evk.dts

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -41,7 +41,7 @@ ssp2: ssp@80014000 {
	flash: m25p80@0 {		flash: m25p80@0 {
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <1>;		#size-cells = <1>;
	compatible = "m25p80";		compatible = "m25p80", "jedec,spi-nor";
	spi-max-frequency = <40000000>;		spi-max-frequency = <40000000>;
	reg = <0>;		reg = <0>;
	};		};