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

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

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

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

Pull "i.MX device tree updates for 4.15" from Shawn Guo:

 - New board support: i.MX51 ZII RDU1, i.MX53 GE Healthcare PPD, i.MX6
   TX modules for MB7 from  Ka-Ro Electronics, i.MX6 Wandboard revd1
   variants, i.MX6 LWN DISPLAY5 board, Pistachio i.MX6Q board, i.MX6SX
   Vining-2000 board.
 - Use the 'vpcie-supply' property for PCIe device for boards
   imx6qdl-sabresd, imx6q-novena and imx6q-cm-fx6.
 - A series from Jagan Teki to update imx6qdl-icore board with audio,
   touch and CAN support.
 - Switch to nvmem for accessing OCOTP from tempmon for i.MX6SX and add
   tempmon support for i.MX6UL.
 - A bunch of patches from Lothar Waßmann updating Ka-Ro i.MX28, i.MX53
   and i.MX6 TX modules.
 - Fix DTC warnings in i.MX device trees, dropping leading zeros from
   unit address, correcting display nodes notation and display port
   names, fixing nodes with unit name and no reg property.
 - Other random device updates for various board support.

* tag 'imx-dt-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (63 commits)
  ARM: dts: imx53-tx53: fix interrupt flags
  ARM: dts: imx28-tx28: fix interrupt flags
  ARM: dts: display5: Device tree description of LWN's DISPLAY5 board
  ARM: dts: imx53-qsb-common: Fix 'led_gpio7_7@0' node with unit name and no reg property
  ARM: dts: imx53-m53evk: Fix 'led_gpio@0' node with unit name and no reg property
  ARM: dts: imx53: Fix 'usbphy@x' node with unit name and no reg property
  ARM: dts: imx51-ts4800: Fix 'port@0' node with unit name and no reg property
  ARM: dts: imx51-apf51dev: Fix 'backlight@bl1' node with unit name and no reg property
  ARM: dts: imx: add ZII RDU1 board
  ARM: dts: imx: add support for TX6 modules on MB7 baseboard
  ARM: dts: imx: add support for TX6QP
  ARM: dts: imx6-tx6: add a .dtsi file for the MB7 baseboard
  ARM: dts: imx6-tx6: move display configuration to .dtsi file
  ARM: dts: imx6-tx6: add support for I2C bus recovery
  ARM: dts: imx6-tx6: convert to using simple-audio-card
  ARM: dts: imx6-tx6: specify ethernet phy reset post-delay
  ARM: dts: imx6-tx6: improve ethernet related pinctrl setup
  ARM: dts: imx6-tx6: add trickle-charge config for DS1339
  ARM: dts: imx6-tx6: remove obsolete ipu1 alias
  ARM: dts: imx6-tx6: remove obsolete eeti,egalax_ts
  ...

[arnd: made sure we have no new leading zeroes in unit address during merge]
parents 0292f8a8 27e1acb7

Documentation/devicetree/bindings/misc/ge-achc.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
* GE Healthcare USB Management Controller



A device which handles data aquisition from compatible USB based peripherals.

SPI is used for device management.



Note: This device does not expose the peripherals as USB devices.



Required properties:



- compatible : Should be "ge,achc"



Required SPI properties:



- reg : Should be address of the device chip select within

  the controller.



- spi-max-frequency : Maximum SPI clocking speed of device in Hz, should be

  1MHz for the GE ACHC.



Example:



spidev0: spi@0 {

	compatible = "ge,achc";

	reg = <0>;

	spi-max-frequency = <1000000>;

};

arch/arm/boot/dts/Makefile

+19 −1
Original line number Diff line number Diff line
@@ -348,12 +348,14 @@ dtb-$(CONFIG_SOC_IMX51) += \ 
	imx51-babbage.dtb \

	imx51-digi-connectcore-jsk.dtb \

	imx51-eukrea-mbimxsd51-baseboard.dtb \

	imx51-ts4800.dtb

	imx51-ts4800.dtb \

	imx51-zii-rdu1.dtb

dtb-$(CONFIG_SOC_IMX53) += \

	imx53-ard.dtb \

	imx53-cx9020.dtb \

	imx53-m53evk.dtb \

	imx53-mba53.dtb \

	imx53-ppd.dtb \

	imx53-qsb.dtb \

	imx53-qsrb.dtb \

	imx53-smd.dtb \
@@ -395,14 +397,19 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-ts4900.dtb \

	imx6dl-tx6dl-comtft.dtb \

	imx6dl-tx6s-8034.dtb \

	imx6dl-tx6s-8034-mb7.dtb \

	imx6dl-tx6s-8035.dtb \

	imx6dl-tx6s-8035-mb7.dtb \

	imx6dl-tx6u-801x.dtb \

	imx6dl-tx6u-80xx-mb7.dtb \

	imx6dl-tx6u-8033.dtb \

	imx6dl-tx6u-8033-mb7.dtb \

	imx6dl-tx6u-811x.dtb \

	imx6dl-tx6u-81xx-mb7.dtb \

	imx6dl-udoo.dtb \

	imx6dl-wandboard.dtb \

	imx6dl-wandboard-revb1.dtb \

	imx6dl-wandboard-revd1.dtb \

	imx6q-apalis-eval.dtb \

	imx6q-apalis-ixora.dtb \

	imx6q-apalis-ixora-v1.1.dtb \
@@ -414,6 +421,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-cm-fx6.dtb \

	imx6q-cubox-i.dtb \

	imx6q-dfi-fs700-m60.dtb \

	imx6q-display5-tianma-tm070-1280x768.dtb \

	imx6q-dmo-edmqmx6.dtb \

	imx6q-evi.dtb \

	imx6q-gk802.dtb \
@@ -441,6 +449,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-nitrogen6_som2.dtb \

	imx6q-novena.dtb \

	imx6q-phytec-pbab01.dtb \

	imx6q-pistachio.dtb \

	imx6q-rex-pro.dtb \

	imx6q-sabreauto.dtb \

	imx6q-sabrelite.dtb \
@@ -454,17 +463,25 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-tx6q-1020.dtb \

	imx6q-tx6q-1020-comtft.dtb \

	imx6q-tx6q-1036.dtb \

	imx6q-tx6q-1036-mb7.dtb \

	imx6q-tx6q-10x0-mb7.dtb \

	imx6q-tx6q-1110.dtb \

	imx6q-tx6q-11x0-mb7.dtb \

	imx6q-udoo.dtb \

	imx6q-utilite-pro.dtb \

	imx6q-wandboard.dtb \

	imx6q-wandboard-revb1.dtb \

	imx6q-wandboard-revd1.dtb \

	imx6q-zii-rdu2.dtb \

	imx6qp-nitrogen6_max.dtb \

	imx6qp-nitrogen6_som2.dtb \

	imx6qp-sabreauto.dtb \

	imx6qp-sabresd.dtb \

	imx6qp-tx6qp-8037.dtb \

	imx6qp-tx6qp-8037-mb7.dtb \

	imx6qp-tx6qp-8137.dtb \

	imx6qp-tx6qp-8137-mb7.dtb \

	imx6qp-wandboard-revd1.dtb \

	imx6qp-zii-rdu2.dtb

dtb-$(CONFIG_SOC_IMX6SL) += \

	imx6sl-evk.dtb \
@@ -475,6 +492,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ 
	imx6sx-sdb-reva.dtb \

	imx6sx-sdb-sai.dtb \

	imx6sx-sdb.dtb \

	imx6sx-softing-vining-2000.dtb \

	imx6sx-udoo-neo-basic.dtb \

	imx6sx-udoo-neo-extended.dtb \

	imx6sx-udoo-neo-full.dtb

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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
&esdhc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_esdhc1>;

	cd-gpios = <&gpio1 20>;

	cd-gpios = <&gpio1 20 GPIO_ACTIVE_LOW>;

	status = "okay";

};

arch/arm/boot/dts/imx25-pdk.dts

+8 −0
Original line number Diff line number Diff line
@@ -295,6 +295,14 @@ 
	status = "okay";

};



&tsc {

	status = "okay";

};



&tscadc {

	status = "okay";

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart1>;

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

+97 −78
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Shawn Guo <shawn.guo@linaro.org>

 * Copyright 2013 Lothar Waßmann <LW@KARO-electronics.de>

 * Copyright 2013-2017 Lothar Waßmann <LW@KARO-electronics.de>

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 at the following locations:

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 *  a) This file is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License

 *     version 2 as published by the Free Software Foundation.

 *

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */



/dts-v1/;
@@ -45,14 +75,8 @@ 
		status = "disabled";

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_usb0_vbus: regulator@0 {

	reg_usb0_vbus: regulator-usb0-vbus {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "usb0_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -60,9 +84,8 @@ 
		enable-active-high;

	};



		reg_usb1_vbus: regulator@1 {

	reg_usb1_vbus: regulator-usb1-vbus {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "usb1_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -70,27 +93,24 @@ 
		enable-active-high;

	};



		reg_2p5v: regulator@2 {

	reg_2p5v: regulator-2p5v {

		compatible = "regulator-fixed";

			reg = <2>;

		regulator-name = "2P5V";

		regulator-min-microvolt = <2500000>;

		regulator-max-microvolt = <2500000>;

		regulator-always-on;

	};



		reg_3p3v: regulator@3 {

	reg_3p3v: regulator-3p3v {

		compatible = "regulator-fixed";

			reg = <3>;

		regulator-name = "3P3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

	};



		reg_can_xcvr: regulator@4 {

	reg_can_xcvr: regulator-can-xcvr {

		compatible = "regulator-fixed";

			reg = <4>;

		regulator-name = "CAN XCVR";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -99,9 +119,8 @@ 
		pinctrl-0 = <&tx28_flexcan_xcvr_pins>;

	};



		reg_lcd: regulator@5 {

	reg_lcd: regulator-lcd-power {

		compatible = "regulator-fixed";

			reg = <5>;

		regulator-name = "LCD POWER";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -109,9 +128,8 @@ 
		enable-active-high;

	};



		reg_lcd_reset: regulator@6 {

	reg_lcd_reset: regulator-lcd-reset {

		compatible = "regulator-fixed";

			reg = <6>;

		regulator-name = "LCD RESET";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -121,7 +139,6 @@ 
		regulator-always-on;

		regulator-boot-on;

	};

	};



	clocks {

		#address-cells = <1>;
@@ -312,7 +329,7 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&tx28_pca9554_pins>;

		interrupt-parent = <&gpio3>;

		interrupts = <28 0>;

		interrupts = <28 IRQ_TYPE_NONE>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;
@@ -336,7 +353,7 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&tx28_tsc2007_pins>;

		interrupt-parent = <&gpio3>;

		interrupts = <20 0>;

		interrupts = <20 IRQ_TYPE_EDGE_FALLING>;

		pendown-gpio = <&gpio3 20 GPIO_ACTIVE_LOW>;

		ti,x-plate-ohms = /bits/ 16 <660>;

	};
@@ -344,6 +361,8 @@ 
	ds1339: rtc@68 {

		compatible = "mxim,ds1339";

		reg = <0x68>;

		trickle-resistor-ohms = <250>;

		trickle-diode-disable;

	};

};