Commit 896e18f4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 5.7:

 - Set correct AHB clock for i.MX8MN SDMA1 device to fix a "Timeout
   waiting for CH0" error.
 - Fix a linker error for i.MX6 configurations that have ARM_CPU_SUSPEND=n,
   which can happen if neither CONFIG_PM, CONFIG_CPU_IDLE, nor ARM_PSCI_FW
   are selected.
 - Fix I2C1 pinctrl configuration for i.MX27 phytec-phycard board.
 - Fix i.MX8M  AIPS 'reg' properties to remove DTC simple_bus_reg
   warnings.
 - Add missing compatible "fsl,vf610-edma" for LS1028A EDMA device, so
   that bootloader can fix up the IOMMU entries there.  Otherwise, EDMA
   just doesn't work on LS1028A with shipped bootloader.
 - Fix imx6dl-yapp4-ursa board Ethernet connection.
 - Fix input_val for AUDIOMIX_BIT_STREAM pinctrl defines on i.MX8MP
   according to Reference Manual.

* tag 'imx-fixes-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: freescale: imx8mp: update input_val for AUDIOMIX_BIT_STREAM
  arm64: dts: imx8m: Fix AIPS reg properties
  arm64: dts: imx8mn: Change SDMA1 ahb clock for imx8mn
  ARM: dts: imx27-phytec-phycard-s-rdk: Fix the I2C1 pinctrl entries
  ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y
  ARM: dts: imx6dl-yapp4: Fix Ursa board Ethernet connection
  arm64: dts: ls1028a: add "fsl,vf610-edma" compatible
  dt-bindings: dma: fsl-edma: fix ls1028a-edma compatible

Link: https://lore.kernel.org/r/20200429063226.GT32592@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b130b0ad 1248c86f

Documentation/devicetree/bindings/dma/fsl-edma.txt

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ Required properties: 
- compatible :

	- "fsl,vf610-edma" for eDMA used similar to that on Vybrid vf610 SoC

	- "fsl,imx7ulp-edma" for eDMA2 used similar to that on i.mx7ulp

	- "fsl,fsl,ls1028a-edma" for eDMA used similar to that on Vybrid vf610 SoC

	- "fsl,ls1028a-edma" followed by "fsl,vf610-edma" for eDMA used on the

	  LS1028A SoC.

- reg : Specifies base physical address(s) and size of the eDMA registers.

	The 1st region is eDMA control register's address and size.

	The 2nd and the 3rd regions are programmable channel multiplexing

arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts

+2 −2
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ 
	imx27-phycard-s-rdk {

		pinctrl_i2c1: i2c1grp {

			fsl,pins = <

				MX27_PAD_I2C2_SDA__I2C2_SDA 0x0

				MX27_PAD_I2C2_SCL__I2C2_SCL 0x0

				MX27_PAD_I2C_DATA__I2C_DATA 0x0

				MX27_PAD_I2C_CLK__I2C_CLK 0x0

			>;

		};

arch/arm/boot/dts/imx6dl-yapp4-ursa.dts

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



&switch_ports {

	/delete-node/ port@2;

	/delete-node/ port@3;

};



&touchscreen {

arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ 


		edma0: dma-controller@22c0000 {

			#dma-cells = <2>;

			compatible = "fsl,ls1028a-edma";

			compatible = "fsl,ls1028a-edma", "fsl,vf610-edma";

			reg = <0x0 0x22c0000 0x0 0x10000>,

			      <0x0 0x22d0000 0x0 0x10000>,

			      <0x0 0x22e0000 0x0 0x10000>;

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

+4 −4
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ 


		aips1: bus@30000000 {

			compatible = "fsl,aips-bus", "simple-bus";

			reg = <0x301f0000 0x10000>;

			reg = <0x30000000 0x400000>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x30000000 0x30000000 0x400000>;
@@ -543,7 +543,7 @@ 


		aips2: bus@30400000 {

			compatible = "fsl,aips-bus", "simple-bus";

			reg = <0x305f0000 0x10000>;

			reg = <0x30400000 0x400000>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x30400000 0x30400000 0x400000>;
@@ -603,7 +603,7 @@ 


		aips3: bus@30800000 {

			compatible = "fsl,aips-bus", "simple-bus";

			reg = <0x309f0000 0x10000>;

			reg = <0x30800000 0x400000>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x30800000 0x30800000 0x400000>,
@@ -863,7 +863,7 @@ 


		aips4: bus@32c00000 {

			compatible = "fsl,aips-bus", "simple-bus";

			reg = <0x32df0000 0x10000>;

			reg = <0x32c00000 0x400000>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x32c00000 0x32c00000 0x400000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE