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

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@dragonSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b130b0ad 1248c86f
...@@ -10,7 +10,8 @@ Required properties: ...@@ -10,7 +10,8 @@ Required properties:
- compatible : - compatible :
- "fsl,vf610-edma" for eDMA used similar to that on Vybrid vf610 SoC - "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,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. - reg : Specifies base physical address(s) and size of the eDMA registers.
The 1st region is eDMA control register's address and size. The 1st region is eDMA control register's address and size.
The 2nd and the 3rd regions are programmable channel multiplexing The 2nd and the 3rd regions are programmable channel multiplexing
......
...@@ -75,8 +75,8 @@ &iomuxc { ...@@ -75,8 +75,8 @@ &iomuxc {
imx27-phycard-s-rdk { imx27-phycard-s-rdk {
pinctrl_i2c1: i2c1grp { pinctrl_i2c1: i2c1grp {
fsl,pins = < fsl,pins = <
MX27_PAD_I2C2_SDA__I2C2_SDA 0x0 MX27_PAD_I2C_DATA__I2C_DATA 0x0
MX27_PAD_I2C2_SCL__I2C2_SCL 0x0 MX27_PAD_I2C_CLK__I2C_CLK 0x0
>; >;
}; };
......
...@@ -38,7 +38,7 @@ &reg_usb_h1_vbus { ...@@ -38,7 +38,7 @@ &reg_usb_h1_vbus {
}; };
&switch_ports { &switch_ports {
/delete-node/ port@2; /delete-node/ port@3;
}; };
&touchscreen { &touchscreen {
......
...@@ -447,7 +447,7 @@ lpuart5: serial@22b0000 { ...@@ -447,7 +447,7 @@ lpuart5: serial@22b0000 {
edma0: dma-controller@22c0000 { edma0: dma-controller@22c0000 {
#dma-cells = <2>; #dma-cells = <2>;
compatible = "fsl,ls1028a-edma"; compatible = "fsl,ls1028a-edma", "fsl,vf610-edma";
reg = <0x0 0x22c0000 0x0 0x10000>, reg = <0x0 0x22c0000 0x0 0x10000>,
<0x0 0x22d0000 0x0 0x10000>, <0x0 0x22d0000 0x0 0x10000>,
<0x0 0x22e0000 0x0 0x10000>; <0x0 0x22e0000 0x0 0x10000>;
......
...@@ -264,7 +264,7 @@ soc@0 { ...@@ -264,7 +264,7 @@ soc@0 {
aips1: bus@30000000 { aips1: bus@30000000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x301f0000 0x10000>; reg = <0x30000000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x30000000 0x30000000 0x400000>; ranges = <0x30000000 0x30000000 0x400000>;
...@@ -543,7 +543,7 @@ src: reset-controller@30390000 { ...@@ -543,7 +543,7 @@ src: reset-controller@30390000 {
aips2: bus@30400000 { aips2: bus@30400000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x305f0000 0x10000>; reg = <0x30400000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x30400000 0x30400000 0x400000>; ranges = <0x30400000 0x30400000 0x400000>;
...@@ -603,7 +603,7 @@ system_counter: timer@306a0000 { ...@@ -603,7 +603,7 @@ system_counter: timer@306a0000 {
aips3: bus@30800000 { aips3: bus@30800000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x309f0000 0x10000>; reg = <0x30800000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x30800000 0x30800000 0x400000>, ranges = <0x30800000 0x30800000 0x400000>,
...@@ -863,7 +863,7 @@ fec1: ethernet@30be0000 { ...@@ -863,7 +863,7 @@ fec1: ethernet@30be0000 {
aips4: bus@32c00000 { aips4: bus@32c00000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x32df0000 0x10000>; reg = <0x32c00000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x32c00000 0x32c00000 0x400000>; ranges = <0x32c00000 0x32c00000 0x400000>;
......
...@@ -241,7 +241,7 @@ soc@0 { ...@@ -241,7 +241,7 @@ soc@0 {
aips1: bus@30000000 { aips1: bus@30000000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x301f0000 0x10000>; reg = <0x30000000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
...@@ -448,7 +448,7 @@ src: reset-controller@30390000 { ...@@ -448,7 +448,7 @@ src: reset-controller@30390000 {
aips2: bus@30400000 { aips2: bus@30400000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x305f0000 0x10000>; reg = <0x30400000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
...@@ -508,7 +508,7 @@ system_counter: timer@306a0000 { ...@@ -508,7 +508,7 @@ system_counter: timer@306a0000 {
aips3: bus@30800000 { aips3: bus@30800000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x309f0000 0x10000>; reg = <0x30800000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
...@@ -718,7 +718,7 @@ sdma1: dma-controller@30bd0000 { ...@@ -718,7 +718,7 @@ sdma1: dma-controller@30bd0000 {
reg = <0x30bd0000 0x10000>; reg = <0x30bd0000 0x10000>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk IMX8MN_CLK_SDMA1_ROOT>, clocks = <&clk IMX8MN_CLK_SDMA1_ROOT>,
<&clk IMX8MN_CLK_SDMA1_ROOT>; <&clk IMX8MN_CLK_AHB>;
clock-names = "ipg", "ahb"; clock-names = "ipg", "ahb";
#dma-cells = <3>; #dma-cells = <3>;
fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin"; fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
...@@ -754,7 +754,7 @@ fec1: ethernet@30be0000 { ...@@ -754,7 +754,7 @@ fec1: ethernet@30be0000 {
aips4: bus@32c00000 { aips4: bus@32c00000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x32df0000 0x10000>; reg = <0x32c00000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -145,7 +145,7 @@ soc@0 { ...@@ -145,7 +145,7 @@ soc@0 {
aips1: bus@30000000 { aips1: bus@30000000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x301f0000 0x10000>; reg = <0x30000000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
...@@ -318,7 +318,7 @@ src: reset-controller@30390000 { ...@@ -318,7 +318,7 @@ src: reset-controller@30390000 {
aips2: bus@30400000 { aips2: bus@30400000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x305f0000 0x400000>; reg = <0x30400000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
...@@ -378,7 +378,7 @@ system_counter: timer@306a0000 { ...@@ -378,7 +378,7 @@ system_counter: timer@306a0000 {
aips3: bus@30800000 { aips3: bus@30800000 {
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x309f0000 0x400000>; reg = <0x30800000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
......
...@@ -291,7 +291,7 @@ soc@0 { ...@@ -291,7 +291,7 @@ soc@0 {
bus@30000000 { /* AIPS1 */ bus@30000000 { /* AIPS1 */
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x301f0000 0x10000>; reg = <0x30000000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x30000000 0x30000000 0x400000>; ranges = <0x30000000 0x30000000 0x400000>;
...@@ -696,7 +696,7 @@ pgc_pcie2: power-domain@a { ...@@ -696,7 +696,7 @@ pgc_pcie2: power-domain@a {
bus@30400000 { /* AIPS2 */ bus@30400000 { /* AIPS2 */
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x305f0000 0x10000>; reg = <0x30400000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x30400000 0x30400000 0x400000>; ranges = <0x30400000 0x30400000 0x400000>;
...@@ -756,7 +756,7 @@ system_counter: timer@306a0000 { ...@@ -756,7 +756,7 @@ system_counter: timer@306a0000 {
bus@30800000 { /* AIPS3 */ bus@30800000 { /* AIPS3 */
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x309f0000 0x10000>; reg = <0x30800000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x30800000 0x30800000 0x400000>, ranges = <0x30800000 0x30800000 0x400000>,
...@@ -1029,7 +1029,7 @@ fec1: ethernet@30be0000 { ...@@ -1029,7 +1029,7 @@ fec1: ethernet@30be0000 {
bus@32c00000 { /* AIPS4 */ bus@32c00000 { /* AIPS4 */
compatible = "fsl,aips-bus", "simple-bus"; compatible = "fsl,aips-bus", "simple-bus";
reg = <0x32df0000 0x10000>; reg = <0x32c00000 0x400000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x32c00000 0x32c00000 0x400000>; ranges = <0x32c00000 0x32c00000 0x400000>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment