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

Commit ab4b4340 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

The i.MX device tree update for 4.8:
 - Add two i.MX23/STMP3780 based MP3 player device support, Creative
   X-Fi3 and SanDisk Sansa Fuze+
 - Add the support of Auvidea H100 device which is a SolidRun MicroSOM
   baseboard
 - Restructure i.MX7Dual DTS files to support i.MX7Solo and add Toradex
   Colibri iMX7S/iMX7D boards
 - Device additions and enabling for various boards: mmc device for
   utilite-pro, IRQ controller and CAN support for TS-4800, display and
   touchscreen support for imx7d-sdb, SAI audio and LCD support for
   imx6ul-14x14-evk, gpio power off support for imx6q-bx50v3, etc.
 - Update the boards from Freescale/NXP to use WDOG_B pin for reset
 - PCI reset polarity correction for imx6qdl-sabresd and imx6q-tbs2910
 - Update i.MX board dts files to use generic uart-has-rtscts DT
   property instead of vendor specific one
 - DTC warning fixing for a few boards which are mostly mismatch between
   unit-address and reg property
 - Remove SION setting from all mux modes on i.MX25

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

: (47 commits)
  ARM: dts: imx7: add Toradex Colibri iMX7S/iMX7D support
  ARM: dts: imx7d: move input header into base device tree
  ARM: dts: imx7d: recreate imx7d.dtsi with i.MX 7Dual specifics
  ARM: dts: imx7d: use imx7s.dtsi as base device tree
  ARM: dts: imx7d-sdb: Add support for touchscreen
  ARM: dts: imx7d-sdb: Add display support
  ARM: dts: imx7d: Add SPI support
  ARM: dts: imx6q-bx50v3: Add gpio power off support
  ARM: dts: imx6ul-pico-hobbit: Fix Ethernet PHY reset GPIO
  ARM: dts: imx6q-tbs2910: fix pcie reset polarity
  ARM: dts: imx6sx-sdb: Use WDOG_B pin reset
  ARM: dts: imx6ul-evk: Use WDOG_B pin reset
  ARM: dts: imx7d-sdb: Use WDOG_B pin reset
  ARM: dts: imx6qdl-sabresd: Use WDOG_B pin reset
  ARM: dts: utilite-pro: add mmc card slot support
  ARM: dts: imx6q-cm-fx6: fix the operation points
  ARM: dts: imx6qdl.dtsi: add "arm,shared-override" for pl310
  ARM: imx25-pinfunc: remove SION from all modes
  ARM: imx25-pinfunc: document SION being important for MX25_PAD_SD1_CMD__SD1_CMD
  ARM: dts: ls1021a: Add dis_rxdet_inp3_quirk property to USB3 node
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 24cf7316 b326629f

arch/arm/boot/dts/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-gw54xx.dtb \

	imx6q-gw551x.dtb \

	imx6q-gw552x.dtb \

	imx6q-h100.dtb \

	imx6q-hummingboard.dtb \

	imx6q-icore-rqs.dtb \

	imx6q-marsboard.dtb \
@@ -383,6 +384,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-tx6q-1110.dtb \

	imx6q-tx6q-11x0-mb7.dtb \

	imx6q-udoo.dtb \

	imx6q-utilite-pro.dtb \

	imx6q-wandboard.dtb \

	imx6q-wandboard-revb1.dtb \

	imx6qp-nitrogen6_max.dtb \
@@ -405,9 +407,11 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 
	imx6ul-tx6ul-mainboard.dtb

dtb-$(CONFIG_SOC_IMX7D) += \

	imx7d-cl-som-imx7.dtb \

	imx7d-colibri-eval-v3.dtb \

	imx7d-nitrogen7.dtb \

	imx7d-sbc-imx7.dtb \

	imx7d-sdb.dtb

	imx7d-sdb.dtb \

	imx7s-colibri-eval-v3.dtb

dtb-$(CONFIG_SOC_LS1021A) += \

	ls1021a-qds.dtb \

	ls1021a-twr.dtb
@@ -422,7 +426,9 @@ dtb-$(CONFIG_SOC_VF610) += \ 
dtb-$(CONFIG_ARCH_MXS) += \

	imx23-evk.dtb \

	imx23-olinuxino.dtb \

	imx23-sansa.dtb \

	imx23-stmp378x_devb.dtb \

	imx23-xfi3.dtb \

	imx28-apf28.dtb \

	imx28-apf28dev.dtb \

	imx28-apx4devkit.dtb \

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

+2 −2
Original line number Diff line number Diff line
@@ -66,14 +66,14 @@ 
&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart1>;

	fsl,uart-has-rtscts;

	uart-has-rtscts;

	status = "okay";

};



&uart2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart2>;

	fsl,uart-has-rtscts;

	uart-has-rtscts;

	status = "okay";

};

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

+2 −2
Original line number Diff line number Diff line
@@ -34,14 +34,14 @@ 
&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart1>;

	fsl,uart-has-rtscts;

	uart-has-rtscts;

	status = "okay";

};



&uart2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart2>;

	fsl,uart-has-rtscts;

	uart-has-rtscts;

	status = "okay";

};

arch/arm/boot/dts/imx23-sansa.dts

0 → 100644
+207 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013-2016 Marek Vasut <marek.vasut@gmail.com>

 *

 * 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.

 *

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

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

 *     published by the Free Software Foundation; either version 2 of

 *     the License, or (at your option) any later version.

 *

 *     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/;

#include "imx23.dtsi"



/ {

	model = "SanDisk Sansa Fuze+";

	compatible = "sandisk,sansa_fuze_plus", "fsl,imx23";



	memory {

		reg = <0x40000000 0x04000000>;

	};



	apb@80000000 {

		apbh@80000000 {

			ssp0: ssp@80010000 {

				compatible = "fsl,imx23-mmc";

				pinctrl-names = "default";

				pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;

				bus-width = <4>;

				vmmc-supply = <&reg_vddio_sd0>;

				cd-inverted;

				status = "okay";

			};



			ssp1: ssp@80034000 {

				compatible = "fsl,imx23-mmc";

				pinctrl-names = "default";

				pinctrl-0 = <&mmc1_8bit_pins_a>;

				bus-width = <8>;

				vmmc-supply = <&reg_vddio_sd1>;

				non-removable;

				status = "okay";

			};



			pinctrl@80018000 {

				pinctrl-names = "default";

				pinctrl-0 = <&hog_pins_a>;



				hog_pins_a: hog@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						MX23_PAD_GPMI_D08__GPIO_0_8

						MX23_PAD_PWM3__GPIO_1_29

						MX23_PAD_AUART1_RTS__GPIO_0_27

						MX23_PAD_AUART1_CTS__GPIO_0_26

						MX23_PAD_I2C_SCL__I2C_SCL

						MX23_PAD_I2C_SDA__I2C_SDA

						MX23_PAD_LCD_DOTCK__GPIO_1_22

						MX23_PAD_LCD_HSYNC__GPIO_1_24

						MX23_PAD_PWM3__GPIO_1_29

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};

			};

		};



		apbx@80040000 {

			pwm: pwm@80064000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pwm2_pins_a>;

				status = "okay";

			};



			duart: serial@80070000 {

				pinctrl-names = "default";

				pinctrl-0 = <&duart_pins_a>;

				status = "okay";

			};



			usbphy0: usbphy@8007c000 {

				status = "okay";

			};



			lradc@80050000 {

				status = "okay";

			};

		};

	};



	ahb@80080000 {

		usb0: usb@80080000 {

			dr_mode = "peripheral";

			status = "okay";

		};

	};



	reg_vddio_sd0: regulator-vddio-sd0 {

		compatible = "regulator-fixed";

		regulator-name = "vddio-sd0";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio0 8 0>;

	};



	reg_vddio_sd1: regulator-vddio-sd1 {

		compatible = "regulator-fixed";

		regulator-name = "vddio-sd1";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio1 29 0>;

	};



	reg_vdd_touchpad: regulator-vdd-touchpad0 {

		compatible = "regulator-fixed";

		regulator-name = "vdd-touchpad0";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio0 26 0>;

		regulator-always-on;

		enable-active-low;

	};



	reg_vdd_tuner: regulator-vdd-tuner0 {

		compatible = "regulator-fixed";

		regulator-name = "vdd-tuner0";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio0 29 0>;

		regulator-always-on;

		enable-active-low;

	};



	backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm 2 5000000>;

		brightness-levels = <0 4 8 16 32 64 128 255>;

		default-brightness-level = <6>;

	};



	i2c-0 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "i2c-gpio";

		gpios = <

			&gpio1 24 0		/* SDA */

			&gpio1 22 0		/* SCL */

		>;

		i2c-gpio,delay-us = <2>;	/* ~100 kHz */

	};



	i2c-1 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "i2c-gpio";

		gpios = <

			&gpio0 31 0		/* SDA */

			&gpio0 30 0		/* SCL */

		>;

		i2c-gpio,delay-us = <2>;	/* ~100 kHz */



		touch: touch@20 {

			compatible = "synaptics,synaptics_i2c";

			reg = <0x20>;

		};



		eeprom: eeprom@50 {

			compatible = "atmel,24c64";

			reg = <0x50>;

			pagesize = <32>;

		};

	};



};

arch/arm/boot/dts/imx23-xfi3.dts

0 → 100644
+179 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013-2016 Marek Vasut <marek.vasut@gmail.com>

 *

 * 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.

 *

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

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

 *     published by the Free Software Foundation; either version 2 of

 *     the License, or (at your option) any later version.

 *

 *     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/;

#include "imx23.dtsi"



/ {

	model = "Creative ZEN X-Fi3";

	compatible = "creative,x-fi3", "fsl,imx23";



	memory {

		reg = <0x40000000 0x04000000>;

	};



	apb@80000000 {

		apbh@80000000 {

			ssp0: ssp@80010000 {

				compatible = "fsl,imx23-mmc";

				pinctrl-names = "default";

				pinctrl-0 = <&mmc0_4bit_pins_a &mmc0_pins_fixup>;

				bus-width = <4>;

				vmmc-supply = <&reg_vddio_sd0>;

				cd-inverted;

				status = "okay";

			};



			ssp1: ssp@80034000 {

				compatible = "fsl,imx23-mmc";

				pinctrl-names = "default";

				pinctrl-0 = <&mmc1_4bit_pins_a>;

				bus-width = <4>;

				non-removable;

				status = "okay";

			};



			pinctrl@80018000 {

				pinctrl-names = "default";

				pinctrl-0 = <&hog_pins_a>;



				hog_pins_a: hog@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						MX23_PAD_GPMI_D07__GPIO_0_7

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <0>;

				};



				key_pins_a: keys@0 {

					reg = <0>;

					fsl,pinmux-ids = <

						MX23_PAD_ROTARYA__GPIO_2_7

						MX23_PAD_ROTARYB__GPIO_2_8

					>;

					fsl,drive-strength = <0>;

					fsl,voltage = <1>;

					fsl,pull-up = <1>;

				};

			};

		};



		apbx@80040000 {

			i2c: i2c@80058000 {

				pinctrl-names = "default";

				pinctrl-0 = <&i2c_pins_a>;

				status = "okay";

			};



			pwm: pwm@80064000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pwm2_pins_a>;

				status = "okay";

			};



			duart: serial@80070000 {

				pinctrl-names = "default";

				pinctrl-0 = <&duart_pins_a>;

				status = "okay";

			};



			auart1: serial@8006e000 {

				pinctrl-names = "default";

				pinctrl-0 = <&auart1_2pins_a>;

				status = "okay";

			};



			usbphy0: usbphy@8007c000 {

				status = "okay";

			};



			lradc@80050000 {

				status = "okay";

			};

		};

	};



	ahb@80080000 {

		usb0: usb@80080000 {

			dr_mode = "peripheral";

			status = "okay";

		};

	};



	reg_vddio_sd0: regulator-vddio-sd0 {

		compatible = "regulator-fixed";

		regulator-name = "vddio-sd0";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		gpio = <&gpio0 7 0>;

	};



	backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm 2 5000000>;

		brightness-levels = <0 4 8 16 32 64 128 255>;

		default-brightness-level = <6>;

	};



	gpio_keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&key_pins_a>;



		voldown {

			label = "volume-down";

			linux,code = <114>;

			gpios = <&gpio2 7 0>;

			debounce-interval = <20>;

		};



		volup {

			label = "volume-up";

			linux,code = <115>;

			gpios = <&gpio2 8 0>;

			debounce-interval = <20>;

		};

	};

};