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

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

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

i.MX fixes for 5.11, round 2:

- Fix pcf2127 reset for imx7d-flex-concentrator board.
- Fix i.MX6 suspend with Thumb-2 kernel.
- Fix ethernet-phy address issue on imx6qdl-sr-som board.
- Fix GPIO3 `gpio-ranges` on i.MX8MP.
- Select SOC_BUS for IMX_SCU driver to fix build issue.

* tag 'imx-fixes-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  firmware: imx: select SOC_BUS to fix firmware build
  arm64: dts: imx8mp: Correct the gpio ranges of gpio3
  ARM: dts: imx6qdl-sr-som: fix some cubox-i platforms
  ARM: imx: build suspend-imx6.S with arm instruction set
  ARM: dts: imx7d-flex-concentrator: fix pcf2127 reset

Link: https://lore.kernel.org/r/20210119091949.GD4356@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 68e89bc8 82c08278

arch/arm/boot/dts/imx6qdl-sr-som.dtsi

+10 −2
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 
&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;

	phy-handle = <&phy>;

	phy-mode = "rgmii-id";

	phy-reset-duration = <2>;

	phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
@@ -63,10 +62,19 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		phy: ethernet-phy@0 {

		/*

		 * The PHY can appear at either address 0 or 4 due to the

		 * configuration (LED) pin not being pulled sufficiently.

		 */

		ethernet-phy@0 {

			reg = <0>;

			qca,clk-out-frequency = <125000000>;

		};



		ethernet-phy@4 {

			reg = <4>;

			qca,clk-out-frequency = <125000000>;

		};

	};

};

arch/arm/boot/dts/imx7d-flex-concentrator.dts

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
		compatible = "nxp,pcf2127";

		reg = <0>;

		spi-max-frequency = <2000000>;

		reset-source;

	};

};

arch/arm/mach-imx/suspend-imx6.S

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#define MX6Q_CCM_CCR	0x0



	.align 3

	.arm



	.macro  sync_l2_cache

arch/arm64/boot/dts/freescale/imx8mp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ 
				#gpio-cells = <2>;

				interrupt-controller;

				#interrupt-cells = <2>;

				gpio-ranges = <&iomuxc 0 56 26>, <&iomuxc 0 144 4>;

				gpio-ranges = <&iomuxc 0 56 26>, <&iomuxc 26 144 4>;

			};



			gpio4: gpio@30230000 {

drivers/firmware/imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config IMX_DSP 
config IMX_SCU

	bool "IMX SCU Protocol driver"

	depends on IMX_MBOX

	select SOC_BUS

	help

	  The System Controller Firmware (SCFW) is a low-level system function

	  which runs on a dedicated Cortex-M core to provide power, clock, and