Commit 3f2b5941 authored Jan 10, 2020 by Olof Johansson

Merge tag 'imx-fixes-5.5-2' of...

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

i.MX fixes for 5.5, round 2:

 - Fix i.MX8MM SDMA1 AHB clock setting to remove a "Timeout waiting for CH0"
   error seen with UART1.
 - Correct compatible of RV3029 RTC device on imx6q-dhcom board.
 - Correct interrupt trigger type for magnetometer on board
   imx8mq-librem5-devkit.
 - A series from Anson Huang to fix vdd3p0 power supplier for a few NXP
   development board.
 - Fix imx6q-icore-mipi board to use 1.5 version of i.Core MX6DL, so
   that Ethernet interface on the board works properly.
 - Fix Toradex Colibri board to get NAND flash support back.
 - Fix SGTL5000 VDDIO regulator connection for imx6q-dhcom, which
   is connected to PMIC SW2 output rather than a fixed 3V3 rail.
 - Fix 'reg' of CPU node on imx7ulp to get rid of a warning given by
   kernel.
 - Fix endian setting for DCFG on LS1028A SoC, so that register access
   of DCFG becomes correct.

* tag 'imx-fixes-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx7: Fix Toradex Colibri iMX7S 256MB NAND flash support
  ARM: dts: imx6sll-evk: Remove incorrect power supply assignment
  ARM: dts: imx6sl-evk: Remove incorrect power supply assignment
  ARM: dts: imx6sx-sdb: Remove incorrect power supply assignment
  ARM: dts: imx6qdl-sabresd: Remove incorrect power supply assignment
  ARM: dts: imx6q-icore-mipi: Use 1.5 version of i.Core MX6DL
  arm64: dts: imx8mq-librem5-devkit: use correct interrupt for the magnetometer
  ARM: dts: imx6q-dhcom: Fix SGTL5000 VDDIO regulator connection
  ARM: dts: imx7ulp: fix reg of cpu node
  arm64: dts: imx8mm: Change SDMA1 ahb clock for imx8mm
  arm64: dts: ls1028a: fix endian setting for dcfg
  ARM: dts: imx6q-dhcom: fix rtc compatible

Link: https://lore.kernel.org/r/20200110011836.GW4456@T480


Signed-off-by: Olof Johansson <olof@lixom.net>

parents dc64f487 4b0b97e6

arch/arm/boot/dts/imx6dl-icore-mipi.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@
		/dts-v1/;

		#include "imx6dl.dtsi"
		#include "imx6qdl-icore.dtsi"
		#include "imx6qdl-icore-1.5.dtsi"

		/ {
		model = "Engicam i.CoreM6 DualLite/Solo MIPI Starter Kit";

arch/arm/boot/dts/imx6q-dhcom-pdk2.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@
		#sound-dai-cells = <0>;
		clocks = <&clk_ext_audio_codec>;
		VDDA-supply = <&reg_3p3v>;
		VDDIO-supply = <&reg_3p3v>;
		VDDIO-supply = <&sw2_reg>;
		};
		};

arch/arm/boot/dts/imx6q-dhcom-som.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,7 @@
		};

		rtc@56 {
		compatible = "rv3029c2";
		compatible = "microcrystal,rv3029";
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_rtc_hw300>;
		reg = <0x56>;

arch/arm/boot/dts/imx6qdl-sabresd.dtsi

+0 −4

Original line number	Diff line number	Diff line
		@@ -749,10 +749,6 @@
		vin-supply = <&vgen5_reg>;
		};

		&reg_vdd3p0 {
		vin-supply = <&sw2_reg>;
		};

		&reg_vdd2p5 {
		vin-supply = <&vgen5_reg>;
		};

arch/arm/boot/dts/imx6sl-evk.dts

+0 −4

Original line number	Diff line number	Diff line
		@@ -584,10 +584,6 @@
		vin-supply = <&sw2_reg>;
		};

		&reg_vdd3p0 {
		vin-supply = <&sw2_reg>;
		};

		&reg_vdd2p5 {
		vin-supply = <&sw2_reg>;
		};

Admin message