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

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

i.MX device tree changes for 5.8:

- A series from Anson Huang updating SRC devices to match bindings
  schema definition.
- Correct CPU supply name and add cpu1 supply for i.MX7D.
- Convert thermal device to use nvmem interface to get fuse data
  for imx6qdl and imx6sl.
- A series from Tim Harvey to update imx6qdl-gw devices, adding support
  of LSM9DS1 IIO imu/magn, USB OTG, bcm4330-bt, etc.
- Add input MUX for ENET2 MDIO into IMX7D pin functions.
- Misc random device addition or update.

* tag 'imx-dt-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (22 commits)
  ARM: dts: imx53-cx9020: Group port definitions for the dvi-converter
  ARM: dts: imx5: make src node name generic
  ARM: dts: imx50: Add src node interrupt
  ARM: dts: imx: make src node name generic
  ARM: dts: imx7d-pinfunc: add input mux for ENET2 mdio
  ARM: dts: imx6sl: Use nvmem interface to get fuse data
  ARM: dts: imx6qdl: Use nvmem interface to get fuse data
  ARM: dts: imx6qdl-gw5910: fix wlan regulator
  ARM: dts: imx6qdl-gw5910: add support for bcm4330-bt
  ARM: dts: imx6qdl-gw5904: add lsm9ds1 iio imu/magn support
  ARM: dts: imx6qdl-gw560x: add lsm9ds1 iio imu/magn support
  ARM: dts: imx53: Add src node interrupt
  ARM: dts: imx51: Add src node interrupt
  ARM: dts: imx50: Remove unused iomuxc-gpr node
  ARM: dts: imx6qdl-gw552x: add USB OTG support
  ARM: dts: imx6-sr-som: add ethernet PHY configuration
  arm: dts: ls1021atwr: Add QSPI node properties
  ARM: dts: e60k02: add interrupt for PMIC
  ARM: dts: colibri: introduce device trees with UHS-I support
  ARM: dts: imx7d: Add cpu1 supply
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 48d44c2e 103515d9
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
	imx6dl-aristainetos2_4.dtb \
	imx6dl-aristainetos2_7.dtb \
	imx6dl-colibri-eval-v3.dtb \
	imx6dl-colibri-v1_1-eval-v3.dtb \
	imx6dl-cubox-i.dtb \
	imx6dl-cubox-i-emmc-som-v15.dtb \
	imx6dl-cubox-i-som-v15.dtb \
+2 −0
Original line number Diff line number Diff line
@@ -117,6 +117,8 @@
	ricoh619: pmic@32 {
		compatible = "ricoh,rc5t619";
		reg = <0x32>;
		interrupt-parent = <&gpio5>;
		interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
		system-power-controller;

		regulators {
+2 −6
Original line number Diff line number Diff line
@@ -288,11 +288,6 @@
				reg = <0x53fa8000 0x4000>;
			};

			gpr: iomuxc-gpr@53fa8000 {
				compatible = "fsl,imx50-iomuxc-gpr", "syscon";
				reg = <0x53fa8000 0xc>;
			};

			pwm1: pwm@53fb4000 {
				#pwm-cells = <2>;
				compatible = "fsl,imx50-pwm", "fsl,imx27-pwm";
@@ -333,9 +328,10 @@
				status = "disabled";
			};

			src: src@53fd0000 {
			src: reset-controller@53fd0000 {
				compatible = "fsl,imx50-src", "fsl,imx51-src";
				reg = <0x53fd0000 0x4000>;
				interrupts = <75>;
				#reset-cells = <1>;
			};

+2 −1
Original line number Diff line number Diff line
@@ -439,9 +439,10 @@
				status = "disabled";
			};

			src: src@73fd0000 {
			src: reset-controller@73fd0000 {
				compatible = "fsl,imx51-src";
				reg = <0x73fd0000 0x4000>;
				interrupts = <75>;
				#reset-cells = <1>;
			};

+14 −11
Original line number Diff line number Diff line
@@ -59,9 +59,11 @@
	};

	dvi-converter {
		compatible = "ti,tfp410";

		ports {
			#address-cells = <1>;
			#size-cells = <0>;
		compatible = "ti,tfp410";

			port@0 {
				reg = <0>;
@@ -79,6 +81,7 @@
				};
			};
		};
	};

	leds {
		compatible = "gpio-leds";
Loading