Commit 405b7b27 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

i.MX device tree changes for 5.5:
 - New board support: Netronix E60K02 and Kobo Clara HD, Kontron N6311
   and N6411, OPOS6UL and OPOS6ULDev.
 - Correct speed grading fuse settings and add opp-suspend property for
   i.MX7D device tree.
 - Move usdhc clocks assignment from SoC to board level DTS for imx7ulp,
   and use APLL_PFD1 as usdhc's clock source on imx7ulp-evk board.
 - Add missing cooling device properties for CPUs for i.MX6/7 SoCs.
 - Add sensor GPIO regulator and assign power supplies for magnetometer
   for imx6ul-14x14-evk board.
 - Replace "simple-bus" with "simple-mfd" for ANATOP device for i.MX6/7
   SoCs.
 - Fix DTC W=1 warnings by not using simple-audio-card,dai-link on
   imx6qdl-gw551x and imx6q-gw54xx board.
 - Move to use DRM bindings for the Seiko 43WVF1G panel on imx53-qsb.
 - A series from Frieder Schrempf to support more i.MX6UL/ULL-based SoMs
   and boards from Kontron Electronics GmbH.
 - A few patches from Michal Vokáč to enable more devices support on
   imx6dl-yapp4 board.
 - A patch series from Philippe Schenker to improve i.MX6/7 Apalis and
   Colibri board support.
 - A patch series from Sébastien Szymanski to update i.MX6 APF6/APF6Dev
   device tree with more devices added and adopting DRM bindings for
   display.
 - Random improvements, clean-up and device additions on various boards.

* tag 'imx-dt-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (68 commits)
  ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation
  ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes
  ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path'
  ARM: dts: Add support for two more Kontron evalkit boards 'N6311 S' and 'N6411 S'
  ARM: dts: imx6ul-kontron-n6310-s: Move common nodes to a separate file
  ARM: dts: imx6ul-kontron-n6310-s: Disable the snvs-poweroff driver
  ARM: dts: Add support for two more Kontron SoMs N6311 and N6411
  ARM: dts: imx6ul-kontron-n6310: Move common SoM nodes to a separate file
  ARM: dts: imx7ulp-evk: Use APLL_PFD1 as usdhc's clock source
  ARM: dts: imx: add devicetree for Kobo Clara HD
  ARM: dts: add Netronix E60K02 board common file
  ARM: dts: vf-colibri: fix typo in top-level module compatible
  ARM: dts: imx53-qsb: Use DRM bindings for the Seiko 43WVF1G panel
  ARM: dts: imx53: Spelling s/configration/configuration/
  ARM: dts: imx6ul-14x14-evk: Assign power supplies for magnetometer
  ARM: dts: imx6ul-14x14-evk: Fix the magnetometer node name
  ARM: dts: imx6ul-14x14-evk: Add sensors' GPIO regulator
  ARM: dts: imx6ul: Disable gpt2 by default
  ARM: dts: imx7d: Add missing cooling device properties for CPUs
  ARM: dts: imx6dl: Add missing cooling device properties for CPUs
  ...

Link: https://lore.kernel.org/r/20191105150315.15477-4-shawnguo@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 51535d88 cc55c85d

arch/arm/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -555,7 +555,8 @@ dtb-$(CONFIG_SOC_IMX6SL) += \ 
	imx6sl-evk.dtb \

	imx6sl-warp.dtb

dtb-$(CONFIG_SOC_IMX6SLL) += \

	imx6sll-evk.dtb

	imx6sll-evk.dtb \

	imx6sll-kobo-clarahd.dtb

dtb-$(CONFIG_SOC_IMX6SX) += \

	imx6sx-nitrogen6sx.dtb \

	imx6sx-sabreauto.dtb \
@@ -586,6 +587,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ 
	imx6ull-14x14-evk.dtb \

	imx6ull-colibri-eval-v3.dtb \

	imx6ull-colibri-wifi-eval-v3.dtb \

	imx6ull-opos6uldev.dtb \

	imx6ull-phytec-segin-ff-rdk-nand.dtb \

	imx6ull-phytec-segin-ff-rdk-emmc.dtb \

	imx6ull-phytec-segin-lc-rdk-nand.dtb \

arch/arm/boot/dts/e60k02.dtsi

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

/*

 * Copyright 2019 Andreas Kemnade

 * based on works

 * Copyright 2016 Freescale Semiconductor, Inc.

 * and

 * Copyright (C) 2014 Ricoh Electronic Devices Co., Ltd

 *

 * Netronix E60K02 board common.

 * This board is equipped with different SoCs and

 * found in ebook-readers like the Kobo Clara HD (with i.MX6SLL) and

 * the Tolino Shine 3 (with i.MX6SL)

 */

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



/ {



	chosen {

		stdout-path = &uart1;

	};



	gpio_keys: gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "Power";

			gpios = <&gpio5 8 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			wakeup-source;

		};



		cover {

			label = "Cover";

			gpios = <&gpio5 12 GPIO_ACTIVE_LOW>;

			linux,code = <SW_LID>;

			linux,input-type = <EV_SW>;

			wakeup-source;

		};

	};



	leds: leds {

		compatible = "gpio-leds";



		on {

			label = "e60k02:white:on";

			gpios = <&gpio5 7 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "timer";

		};

	};



	memory {

		reg = <0x80000000 0x20000000>;

	};



	reg_wifi: regulator-wifi {

		compatible = "regulator-fixed";

		regulator-name = "SD3_SPWR";

		regulator-min-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

		gpio = <&gpio4 29 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	wifi_pwrseq: wifi_pwrseq {

		compatible = "mmc-pwrseq-simple";

		post-power-on-delay-ms = <20>;

		reset-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;

	};

};





&i2c1 {

	clock-frequency = <100000>;

	status = "okay";



	lm3630a: backlight@36 {

		reg = <0x36>;

		compatible = "ti,lm3630a";

		enable-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>;



		#address-cells = <1>;

		#size-cells = <0>;



		led@0 {

			reg = <0>;

			led-sources = <0>;

			label = "backlight_warm";

			default-brightness = <0>;

			max-brightness = <255>;

		};



		led@1 {

			reg = <1>;

			led-sources = <1>;

			label = "backlight_cold";

			default-brightness = <0>;

			max-brightness = <255>;

		};

	};

};



&i2c2 {

	clock-frequency = <100000>;

	status = "okay";



	/* TODO: CYTTSP5 touch controller at 0x24 */



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



};



&i2c3 {

	clock-frequency = <100000>;

	status = "okay";



	ricoh619: pmic@32 {

		compatible = "ricoh,rc5t619";

		reg = <0x32>;

		system-power-controller;



		regulators {

			dcdc1_reg: DCDC1 {

				regulator-name = "DCDC1";

				regulator-min-microvolt = <300000>;

				regulator-max-microvolt = <1875000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-max-microvolt = <900000>;

					regulator-suspend-min-microvolt = <900000>;

				};

			};



			/* Core3_3V3 */

			dcdc2_reg: DCDC2 {

				regulator-name = "DCDC2";

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-max-microvolt = <3300000>;

					regulator-suspend-min-microvolt = <3300000>;

				};

			};



			dcdc3_reg: DCDC3 {

				regulator-name = "DCDC3";

				regulator-min-microvolt = <300000>;

				regulator-max-microvolt = <1875000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-max-microvolt = <1140000>;

					regulator-suspend-min-microvolt = <1140000>;

				};

			};



			/* Core4_1V2 */

			dcdc4_reg: DCDC4 {

				regulator-name = "DCDC4";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1200000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-max-microvolt = <1140000>;

					regulator-suspend-min-microvolt = <1140000>;

				};

			};



			/* Core4_1V8 */

			dcdc5_reg: DCDC5 {

				regulator-name = "DCDC5";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-max-microvolt = <1700000>;

					regulator-suspend-min-microvolt = <1700000>;

				};

			};



			/* IR_3V3 */

			ldo1_reg: LDO1  {

				regulator-name = "LDO1";

				regulator-boot-on;

			};



			/* Core1_3V3 */

			ldo2_reg: LDO2  {

				regulator-name = "LDO2";

				regulator-always-on;

				regulator-boot-on;



				regulator-state-mem {

					regulator-on-in-suspend;

					regulator-suspend-max-microvolt = <3000000>;

					regulator-suspend-min-microvolt = <3000000>;

				};

			};



			/* Core5_1V2 */

			ldo3_reg: LDO3  {

				regulator-name = "LDO3";

				regulator-always-on;

				regulator-boot-on;

			};



			ldo4_reg: LDO4 {

				regulator-name = "LDO4";

				regulator-boot-on;

			};



			/* SPD_3V3 */

			ldo5_reg: LDO5 {

				regulator-name = "LDO5";

				regulator-always-on;

				regulator-boot-on;

			};



			/* DDR_0V6 */

			ldo6_reg: LDO6 {

				regulator-name = "LDO6";

				regulator-always-on;

				regulator-boot-on;

			};



			/* VDD_PWM */

			ldo7_reg: LDO7 {

				regulator-name = "LDO7";

				regulator-always-on;

				regulator-boot-on;

			};



			/* ldo_1v8 */

			ldo8_reg: LDO8 {

				regulator-name = "LDO8";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-boot-on;

			};



			ldo9_reg: LDO9 {

				regulator-name = "LDO9";

				regulator-boot-on;

			};



			ldo10_reg: LDO10 {

				regulator-name = "LDO10";

				regulator-boot-on;

			};



			ldortc1_reg: LDORTC1  {

				regulator-name = "LDORTC1";

				regulator-boot-on;

			};



			ldortc2_reg: LDORTC2 {

				regulator-name = "LDORTC2";

				regulator-boot-on;

			};

		};

	};

};



&snvs_rtc {

	/* we are using the rtc in the pmic, not disabled in imx6sll.dtsi */

	status = "disabled";

};



&uart1 {

	status = "okay";

};



&usdhc2 {

	non-removable;

	status = "okay";

};



&usdhc3 {

	vmmc-supply = <&reg_wifi>;

	mmc-pwrseq = <&wifi_pwrseq>;

	cap-power-off-card;

	non-removable;

	status = "okay";

};



&usbotg1 {

	pinctrl-names = "default";

	disable-over-current;

	srp-disable;

	hnp-disable;

	adp-disable;

	status = "okay";

};

arch/arm/boot/dts/imx27.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ 
			status = "disabled";

		};



		iram: iram@ffff4c00 {

		iram: sram@ffff4c00 {

			compatible = "mmio-sram";

			reg = <0xffff4c00 0xb400>;

		};

arch/arm/boot/dts/imx31.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
		interrupt-parent = <&avic>;

		ranges;



		iram: iram@1fffc000 {

		iram: sram@1fffc000 {

			compatible = "mmio-sram";

			reg = <0x1fffc000 0x4000>;

			#address-cells = <1>;

arch/arm/boot/dts/imx51.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
		interrupt-parent = <&tzic>;

		ranges;



		iram: iram@1ffe0000 {

		iram: sram@1ffe0000 {

			compatible = "mmio-sram";

			reg = <0x1ffe0000 0x20000>;

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE