Commit 3a2d3ae0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes-5.13' of... 

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

i.MX fixes for 5.13:

- Fix missing-prototypes warning of 'imx27_pm_init' in i.MX27 platform
  pm code.
- A couple of patches from Fabio Estevam to fix 'tuning-step' property
  in imx7d-meerkat96 and imx7d-pico DT.
- Fix '#gpio-cells' of nxp,pca8574 device in imx6qdl-emcon-avari DT.
- A couple of patches from Lucas Stach to fix regulator and voltage for
  imx8mq-zii-ultra board.
- Add missing regulators for imx6q-dhcom to avoid possible instability
  issues.
- Fix memory-controller settings for fsl-ls1028a DT.
- Fix RGMII clock and voltage for a couple of fsl-ls1028a-kontron-sl28
  boards.
- Fix RGMII connection to QCA8334 switch for imx6dl-yapp4 board.

* tag 'imx-fixes-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx: emcon-avari: Fix nxp,pca8574 #gpio-cells
  ARM: dts: imx7d-pico: Fix the 'tuning-step' property
  ARM: dts: imx7d-meerkat96: Fix the 'tuning-step' property
  arm64: dts: freescale: sl28: var1: fix RGMII clock and voltage
  arm64: dts: freescale: sl28: var4: fix RGMII clock and voltage
  ARM: imx: pm-imx27: Include "common.h"
  arm64: dts: zii-ultra: fix 12V_MAIN voltage
  arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance
  arm64: dts: ls1028a: fix memory node
  ARM: dts: imx6q-dhcom: Add PU,VDD1P1,VDD2P5 regulators
  ARM: dts: imx6dl-yapp4: Fix RGMII connection to QCA8334 switch

Link: https://lore.kernel.org/r/20210527011758.GD8194@dragon


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c4681547 b73eb6b3

arch/arm/boot/dts/imx6dl-yapp4-common.dtsi

+5 −1
Original line number Diff line number Diff line
@@ -105,9 +105,13 @@ 
	phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;

	phy-reset-duration = <20>;

	phy-supply = <&sw2_reg>;

	phy-handle = <&ethphy0>;

	status = "okay";



	fixed-link {

		speed = <1000>;

		full-duplex;

	};



	mdio {

		#address-cells = <1>;

		#size-cells = <0>;

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

+12 −0
Original line number Diff line number Diff line
@@ -406,6 +406,18 @@ 
	vin-supply = <&sw1_reg>;

};



&reg_pu {

	vin-supply = <&sw1_reg>;

};



&reg_vdd1p1 {

	vin-supply = <&sw2_reg>;

};



&reg_vdd2p5 {

	vin-supply = <&sw2_reg>;

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart1>;

arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ 
		compatible = "nxp,pca8574";

		reg = <0x3a>;

		gpio-controller;

		#gpio-cells = <1>;

		#gpio-cells = <2>;

	};

};

arch/arm/boot/dts/imx7d-meerkat96.dts

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc1>;

	keep-power-in-suspend;

	tuning-step = <2>;

	fsl,tuning-step = <2>;

	vmmc-supply = <&reg_3p3v>;

	no-1-8-v;

	broken-cd;

arch/arm/boot/dts/imx7d-pico.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ 
	pinctrl-2 = <&pinctrl_usdhc1_200mhz>;

	cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;

	bus-width = <4>;

	tuning-step = <2>;

	fsl,tuning-step = <2>;

	vmmc-supply = <&reg_3p3v>;

	wakeup-source;

	no-1-8-v;