Commit 7bd9d465 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

i.MX fixes for 5.3:
 - Fix i.MX8MM SAI3 RXC/TXFS pinmux configuration.
 - Fix i.MX7ULP usb-phy unit address to drop extra '0x' notation.
 - Fix typo of clock frequency property name in a few i.MX6UL board
   I2C buses.
 - Drop "fsl,imx6sx-sai" from i.MX8M SAI device, as it's not compatible
   with i.MX6SX SAI.

* tag 'imx-fixes-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: imx8mq: fix SAI compatible
  arm64: dts: imx8mm: Correct SAI3 RXC/TXFS pin's mux option #1
  ARM: dts: imx6ul: fix clock frequency property name of I2C buses
  ARM: dts: imx7ulp: Fix usb-phy unit address format

Link: https://lore.kernel.org/r/20190723090827.GU15632@dragon


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 02a02425 8d014847

arch/arm/boot/dts/imx6ul-14x14-evk.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
};



&i2c2 {

	clock_frequency = <100000>;

	clock-frequency = <100000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";

arch/arm/boot/dts/imx6ul-geam.dts

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ 
};



&i2c2 {

	clock_frequency = <100000>;

	clock-frequency = <100000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";

arch/arm/boot/dts/imx6ul-isiot.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ 
};



&i2c2 {

	clock_frequency = <100000>;

	clock-frequency = <100000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";

arch/arm/boot/dts/imx6ul-pico-hobbit.dts

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
};



&i2c2 {

	clock_frequency = <100000>;

	clock-frequency = <100000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";

arch/arm/boot/dts/imx6ul-pico-pi.dts

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
};



&i2c2 {

	clock_frequency = <100000>;

	clock-frequency = <100000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";
@@ -58,7 +58,7 @@ 
};



&i2c3 {

	clock_frequency = <100000>;

	clock-frequency = <100000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_i2c3>;

	status = "okay";

CRA Git | Maintained and supported by SUSTech CRA and CCSE