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

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

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

i.MX arm device tree update for 5.2:
 - New board support: imx50-kobo-aura, imx53-m53menlo, imx6dl-eckelmann,
   imx7d-mba7, imx7d-zii-rpu2, and vf610-zii-spb4.
 - Add i2c, mmc and spi aliases for SoC i.MX35, i.MX50 and i.MX6SL.
 - Use new 'reset-gpios' property describing CODEC reset pin for board
   mx6qdl-zii-rdu2, imx6qdl-gw5903 and imx6qdl-var-dart.
 - Specify viewport count for PCIE block on SoC imx7d and imx6qdl.
 - Correct 'ipg' clock of SDMA device for i.MX5, i.MX6 and i.MX7 SoCs.
 - Rename MMDC memory controller device to be generic and add MMDC
   device for imx7ulp SoC.
 - Add OCOTP device support for imx7ulp SoC.
 - Improve ZII board DTS by switching to SPDX identifier and using generic
   device node name.
 - A series from Rui Miguel Silva to add various media related devices
   for i.MX7 SoC, and enable ov2680 sensor support for imx7s-warp board.
 - Random small updates on various board support.

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

: (59 commits)
  ARM: dts: imx7s: Specify #io-channel-cells in ADC nodes
  ARM: dts: vf610-zii-dev-rev-b: Specify CS as GPIO_ACTIVE_LOW in spi0
  ARM: dts: vf610-zii-dev: Mark i2c0 SCL as GPIO_OPEN_DRAIN
  ARM: dts: Add support for ZII i.MX7 RPU2 board
  ARM: dts: bugfix tqma7 soft reset issue
  ARM: dts: imx53: Add Menlosystems M53 board
  ARM: dts: imx53: Rename M53 SoM touchscreen node
  ARM: dts: imx6dl-sabreauto: update opp table for auto part
  ARM: dts: imx: Use generic node names for Zii dts
  ARM: dts: imx: Switch Zii dts to SPDX identifier
  ARM: dts: imx6q-logicpd: Shutdown LCD regulator during suspend
  ARM: dts: imx6q-logicpd: Enable Analog audio capture
  ARM: dts: imx6sll: add cooling-cells for cpu-freq cooling device
  ARM: dts: imx50: Add Kobo Aura DTS
  ARM: dts: imx6qdl-var-dart: Use new CODEC reset pin name
  ARM: dts: imx6qdl-gw5903: Use new CODEC reset pin name
  ARM: dts: mx6qdl-zii-rdu2: Use new CODEC reset pin name
  ARM: dts: imx50: Specify IMX5_CLK_IPG as "ahb" clock to SDMA
  ARM: dts: imx51: Specify IMX5_CLK_IPG as "ahb" clock to SDMA
  ARM: dts: imx53: Specify IMX5_CLK_IPG as "ahb" clock to SDMA
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b45da609 4171797f

arch/arm/boot/dts/Makefile

+8 −1
Original line number Diff line number Diff line
@@ -363,7 +363,8 @@ dtb-$(CONFIG_SOC_IMX35) += \ 
	imx35-eukrea-mbimxsd35-baseboard.dtb \

	imx35-pdk.dtb

dtb-$(CONFIG_SOC_IMX50) += \

	imx50-evk.dtb

	imx50-evk.dtb \

	imx50-kobo-aura.dtb

dtb-$(CONFIG_SOC_IMX51) += \

	imx51-apf51.dtb \

	imx51-apf51dev.dtb \
@@ -380,6 +381,7 @@ dtb-$(CONFIG_SOC_IMX53) += \ 
	imx53-kp-ddc.dtb \

	imx53-kp-hsc.dtb \

	imx53-m53evk.dtb \

	imx53-m53menlo.dtb \

	imx53-mba53.dtb \

	imx53-ppd.dtb \

	imx53-qsb.dtb \
@@ -400,6 +402,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-cubox-i-emmc-som-v15.dtb \

	imx6dl-cubox-i-som-v15.dtb \

	imx6dl-dfi-fs700-m60.dtb \

	imx6dl-eckelmann-ci4x10.dtb \

	imx6dl-emcon-avari.dtb \

	imx6dl-gw51xx.dtb \

	imx6dl-gw52xx.dtb \
@@ -579,6 +582,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ 
	imx7d-cl-som-imx7.dtb \

	imx7d-colibri-emmc-eval-v3.dtb \

	imx7d-colibri-eval-v3.dtb \

	imx7d-mba7.dtb \

	imx7d-nitrogen7.dtb \

	imx7d-pico-hobbit.dtb \

	imx7d-pico-pi.dtb \
@@ -586,7 +590,9 @@ dtb-$(CONFIG_SOC_IMX7D) += \ 
	imx7d-sdb.dtb \

	imx7d-sdb-reva.dtb \

	imx7d-sdb-sht11.dtb \

	imx7d-zii-rpu2.dtb \

	imx7s-colibri-eval-v3.dtb \

	imx7s-mba7.dtb \

	imx7s-warp.dtb

dtb-$(CONFIG_SOC_IMX7ULP) += \

	imx7ulp-evk.dtb
@@ -606,6 +612,7 @@ dtb-$(CONFIG_SOC_VF610) += \ 
	vf610-zii-dev-rev-b.dtb \

	vf610-zii-dev-rev-c.dtb \

	vf610-zii-scu4-aib.dtb \

	vf610-zii-spb4.dtb \

	vf610-zii-ssmb-dtu.dtb \

	vf610-zii-ssmb-spu3.dtb

dtb-$(CONFIG_ARCH_MXS) += \

arch/arm/boot/dts/imx35.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,12 @@ 
		gpio0 = &gpio1;

		gpio1 = &gpio2;

		gpio2 = &gpio3;

		i2c0 = &i2c1;

		i2c1 = &i2c2;

		i2c2 = &i2c3;

		mmc0 = &esdhc1;

		mmc1 = &esdhc2;

		mmc2 = &esdhc3;

		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

arch/arm/boot/dts/imx50-kobo-aura.dts

0 → 100644
+258 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

// Copyright 2019 Jonathan Neuschäfer

//

// The Kobo Aura e-book reader, model N514. The mainboard is marked as E606F0B.



/dts-v1/;

#include "imx50.dtsi"

#include <dt-bindings/input/input.h>



/ {

	model = "Kobo Aura (N514)";

	compatible = "kobo,aura", "fsl,imx50";



	chosen {

		stdout-path = "serial1:115200n8";

	};



	memory@70000000 {

		device_type = "memory";

		reg = <0x70000000 0x10000000>;

	};



	gpio-leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_leds>;



		on {

			label = "kobo_aura:orange:on";

			gpios = <&gpio6 24 GPIO_ACTIVE_LOW>;

			panic-indicator;

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_gpiokeys>;



		power {

			label = "Power Button";

			gpios = <&gpio4 10 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

		};



		hallsensor {

			label = "Hallsensor";

			gpios = <&gpio5 15 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_RESERVED>;

			linux,input-type = <EV_SW>;

		};



		frontlight {

			label = "Frontlight";

			gpios = <&gpio4 1 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_DISPLAYTOGGLE>;

		};

	};



	sd2_pwrseq: pwrseq {

		compatible = "mmc-pwrseq-simple";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_sd2_reset>;

		reset-gpios = <&gpio4 17 GPIO_ACTIVE_LOW>;

	};



	sd2_vmmc: gpio-regulator {

		compatible = "regulator-gpio";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_sd2_vmmc>;

		regulator-name = "vmmc";

		states = <3300000 0>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		enable-gpio = <&gpio4 12 GPIO_ACTIVE_LOW>;

		startup-delay-us = <100000>;

	};

};



&esdhc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sd1>;

	max-frequency = <50000000>;

	bus-width = <4>;

	cd-gpios = <&gpio5 17 GPIO_ACTIVE_LOW>;

	disable-wp;

	status = "okay";



	/* External µSD card */

};



&esdhc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sd2>;

	bus-width = <4>;

	max-frequency = <50000000>;

	disable-wp;

	mmc-pwrseq = <&sd2_pwrseq>;

	vmmc-supply = <&sd2_vmmc>;

	status = "okay";



	/* CyberTan WC121 SDIO WiFi (BCM43362) */

};



&esdhc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sd3>;

	bus-width = <8>;

	non-removable;

	max-frequency = <50000000>;

	disable-wp;

	status = "okay";



	/* Internal eMMC */

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c1>;

	status = "okay";



	/* TODO: ektf2132 touch controller at 0x15 */

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";



	/* TODO: TPS65185 PMIC for E Ink at 0x68 */

};



&i2c3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c3>;

	status = "okay";



	/* TODO: embedded controller at 0x43 */

};



&iomuxc {

	pinctrl_gpiokeys: gpiokeys {

		fsl,pins = <

			MX50_PAD_CSPI_MISO__GPIO4_10		0x0

			MX50_PAD_SD2_D7__GPIO5_15		0x0

			MX50_PAD_KEY_ROW0__GPIO4_1		0x0

		>;

	};



	pinctrl_i2c1: i2c1 {

		fsl,pins = <

			MX50_PAD_I2C1_SCL__I2C1_SCL		0x400001fd

			MX50_PAD_I2C1_SDA__I2C1_SDA		0x400001fd

		>;

	};



	pinctrl_i2c2: i2c2 {

		fsl,pins = <

			MX50_PAD_I2C2_SCL__I2C2_SCL		0x400001fd

			MX50_PAD_I2C2_SDA__I2C2_SDA		0x400001fd

		>;

	};



	pinctrl_i2c3: i2c3 {

		fsl,pins = <

			MX50_PAD_I2C3_SCL__I2C3_SCL		0x400001fd

			MX50_PAD_I2C3_SDA__I2C3_SDA		0x400001fd

		>;

	};



	pinctrl_leds: leds {

		fsl,pins = <

			MX50_PAD_PWM1__GPIO6_24			0x0

		>;

	};



	pinctrl_sd1: sd1 {

		fsl,pins = <

			MX50_PAD_SD1_CMD__ESDHC1_CMD		0x1e4

			MX50_PAD_SD1_CLK__ESDHC1_CLK		0xd4

			MX50_PAD_SD1_D0__ESDHC1_DAT0		0x1d4

			MX50_PAD_SD1_D1__ESDHC1_DAT1		0x1d4

			MX50_PAD_SD1_D2__ESDHC1_DAT2		0x1d4

			MX50_PAD_SD1_D3__ESDHC1_DAT3		0x1d4



			MX50_PAD_SD2_CD__GPIO5_17		0x0

		>;

	};



	pinctrl_sd2: sd2 {

		fsl,pins = <

			MX50_PAD_SD2_CMD__ESDHC2_CMD		0x1e4

			MX50_PAD_SD2_CLK__ESDHC2_CLK		0xd4

			MX50_PAD_SD2_D0__ESDHC2_DAT0		0x1d4

			MX50_PAD_SD2_D1__ESDHC2_DAT1		0x1d4

			MX50_PAD_SD2_D2__ESDHC2_DAT2		0x1d4

			MX50_PAD_SD2_D3__ESDHC2_DAT3		0x1d4

		>;

	};



	pinctrl_sd2_reset: sd2-reset {

		fsl,pins = <

			MX50_PAD_ECSPI2_MOSI__GPIO4_17		0x0

		>;

	};



	pinctrl_sd2_vmmc: sd2-vmmc {

		fsl,pins = <

			MX50_PAD_ECSPI1_SCLK__GPIO4_12		0x0

		>;

	};



	pinctrl_sd3: sd3 {

		fsl,pins = <

			MX50_PAD_SD3_CMD__ESDHC3_CMD		0x1e4

			MX50_PAD_SD3_CLK__ESDHC3_CLK		0xd4

			MX50_PAD_SD3_D0__ESDHC3_DAT0		0x1d4

			MX50_PAD_SD3_D1__ESDHC3_DAT1		0x1d4

			MX50_PAD_SD3_D2__ESDHC3_DAT2		0x1d4

			MX50_PAD_SD3_D3__ESDHC3_DAT3		0x1d4

			MX50_PAD_SD3_D4__ESDHC3_DAT4		0x1d4

			MX50_PAD_SD3_D5__ESDHC3_DAT5		0x1d4

			MX50_PAD_SD3_D6__ESDHC3_DAT6		0x1d4

			MX50_PAD_SD3_D7__ESDHC3_DAT7		0x1d4

		>;

	};



	pinctrl_uart2: uart2 {

		fsl,pins = <

			MX50_PAD_UART2_TXD__UART2_TXD_MUX	0x1e4

			MX50_PAD_UART2_RXD__UART2_RXD_MUX	0x1e4

		>;

	};



	pinctrl_usbphy: usbphy {

		fsl,pins = <

			MX50_PAD_ECSPI2_SS0__GPIO4_19		0x0

		>;

	};

};



&uart2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart2>;

	status = "okay";

};



&usbotg {

	phy_type = "utmi_wide";

	dr_mode = "peripheral";

	status = "okay";

};



&usbphy0 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usbphy>;

	vbus-detect-gpio = <&gpio4 19 GPIO_ACTIVE_LOW>;

};

arch/arm/boot/dts/imx50.dtsi

+21 −2
Original line number Diff line number Diff line
@@ -26,11 +26,21 @@ 
		gpio3 = &gpio4;

		gpio4 = &gpio5;

		gpio5 = &gpio6;

		i2c0 = &i2c1;

		i2c1 = &i2c2;

		i2c2 = &i2c3;

		mmc0 = &esdhc1;

		mmc1 = &esdhc2;

		mmc2 = &esdhc3;

		mmc3 = &esdhc4;

		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

		serial3 = &uart4;

		serial4 = &uart5;

		spi0 = &ecspi1;

		spi1 = &ecspi2;

		spi2 = &cspi;

	};



	cpus {
@@ -76,6 +86,14 @@ 
		};

	};



	usbphy0: usbphy-0 {

		compatible = "usb-nop-xceiv";

		clocks = <&clks IMX5_CLK_USB_PHY1_GATE>;

		clock-names = "main_clk";

		#phy-cells = <0>;

		status = "okay";

	};



	soc {

		#address-cells = <1>;

		#size-cells = <1>;
@@ -187,7 +205,8 @@ 
				compatible = "fsl,imx50-usb", "fsl,imx27-usb";

				reg = <0x53f80000 0x0200>;

				interrupts = <18>;

				clocks = <&clks IMX5_CLK_USB_PHY1_GATE>;

				clocks = <&clks IMX5_CLK_USBOH3_GATE>;

				fsl,usbphy = <&usbphy0>;

				status = "disabled";

			};
@@ -411,7 +430,7 @@ 
				reg = <0x63fb0000 0x4000>;

				interrupts = <6>;

				clocks = <&clks IMX5_CLK_SDMA_GATE>,

					 <&clks IMX5_CLK_SDMA_GATE>;

					 <&clks IMX5_CLK_AHB>;

				clock-names = "ipg", "ahb";

				#dma-cells = <3>;

				fsl,sdma-ram-script-name = "imx/sdma/sdma-imx50.bin";

arch/arm/boot/dts/imx51-zii-rdu1.dts

+1 −37
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

/*

 * Copyright (C) 2017 Zodiac Inflight Innovations

 *

 * 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

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