Skip to content

Commit 896e18f

Browse files
arndbarndb
committed
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: Arnd Bergmann <[email protected]>
2 parents b130b0a + 1248c86 commit 896e18f

File tree

9 files changed

+45
-44
lines changed

9 files changed

+45
-44
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ Required properties:
1010
- compatible :
1111
- "fsl,vf610-edma" for eDMA used similar to that on Vybrid vf610 SoC
1212
- "fsl,imx7ulp-edma" for eDMA2 used similar to that on i.mx7ulp
13-
- "fsl,fsl,ls1028a-edma" for eDMA used similar to that on Vybrid vf610 SoC
13+
- "fsl,ls1028a-edma" followed by "fsl,vf610-edma" for eDMA used on the
14+
LS1028A SoC.
1415
- reg : Specifies base physical address(s) and size of the eDMA registers.
1516
The 1st region is eDMA control register's address and size.
1617
The 2nd and the 3rd regions are programmable channel multiplexing

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
imx27-phycard-s-rdk {
7676
pinctrl_i2c1: i2c1grp {
7777
fsl,pins = <
78-
MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
79-
MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
78+
MX27_PAD_I2C_DATA__I2C_DATA 0x0
79+
MX27_PAD_I2C_CLK__I2C_CLK 0x0
8080
>;
8181
};
8282

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
};
3939

4040
&switch_ports {
41-
/delete-node/ port@2;
41+
/delete-node/ port@3;
4242
};
4343

4444
&touchscreen {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@
447447

448448
edma0: dma-controller@22c0000 {
449449
#dma-cells = <2>;
450-
compatible = "fsl,ls1028a-edma";
450+
compatible = "fsl,ls1028a-edma", "fsl,vf610-edma";
451451
reg = <0x0 0x22c0000 0x0 0x10000>,
452452
<0x0 0x22d0000 0x0 0x10000>,
453453
<0x0 0x22e0000 0x0 0x10000>;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@
264264

265265
aips1: bus@30000000 {
266266
compatible = "fsl,aips-bus", "simple-bus";
267-
reg = <0x301f0000 0x10000>;
267+
reg = <0x30000000 0x400000>;
268268
#address-cells = <1>;
269269
#size-cells = <1>;
270270
ranges = <0x30000000 0x30000000 0x400000>;
@@ -543,7 +543,7 @@
543543

544544
aips2: bus@30400000 {
545545
compatible = "fsl,aips-bus", "simple-bus";
546-
reg = <0x305f0000 0x10000>;
546+
reg = <0x30400000 0x400000>;
547547
#address-cells = <1>;
548548
#size-cells = <1>;
549549
ranges = <0x30400000 0x30400000 0x400000>;
@@ -603,7 +603,7 @@
603603

604604
aips3: bus@30800000 {
605605
compatible = "fsl,aips-bus", "simple-bus";
606-
reg = <0x309f0000 0x10000>;
606+
reg = <0x30800000 0x400000>;
607607
#address-cells = <1>;
608608
#size-cells = <1>;
609609
ranges = <0x30800000 0x30800000 0x400000>,
@@ -863,7 +863,7 @@
863863

864864
aips4: bus@32c00000 {
865865
compatible = "fsl,aips-bus", "simple-bus";
866-
reg = <0x32df0000 0x10000>;
866+
reg = <0x32c00000 0x400000>;
867867
#address-cells = <1>;
868868
#size-cells = <1>;
869869
ranges = <0x32c00000 0x32c00000 0x400000>;

‎arch/arm64/boot/dts/freescale/imx8mn.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241

242242
aips1: bus@30000000 {
243243
compatible = "fsl,aips-bus", "simple-bus";
244-
reg = <0x301f0000 0x10000>;
244+
reg = <0x30000000 0x400000>;
245245
#address-cells = <1>;
246246
#size-cells = <1>;
247247
ranges;
@@ -448,7 +448,7 @@
448448

449449
aips2: bus@30400000 {
450450
compatible = "fsl,aips-bus", "simple-bus";
451-
reg = <0x305f0000 0x10000>;
451+
reg = <0x30400000 0x400000>;
452452
#address-cells = <1>;
453453
#size-cells = <1>;
454454
ranges;
@@ -508,7 +508,7 @@
508508

509509
aips3: bus@30800000 {
510510
compatible = "fsl,aips-bus", "simple-bus";
511-
reg = <0x309f0000 0x10000>;
511+
reg = <0x30800000 0x400000>;
512512
#address-cells = <1>;
513513
#size-cells = <1>;
514514
ranges;
@@ -718,7 +718,7 @@
718718
reg = <0x30bd0000 0x10000>;
719719
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
720720
clocks = <&clk IMX8MN_CLK_SDMA1_ROOT>,
721-
<&clk IMX8MN_CLK_SDMA1_ROOT>;
721+
<&clk IMX8MN_CLK_AHB>;
722722
clock-names = "ipg", "ahb";
723723
#dma-cells = <3>;
724724
fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
@@ -754,7 +754,7 @@
754754

755755
aips4: bus@32c00000 {
756756
compatible = "fsl,aips-bus", "simple-bus";
757-
reg = <0x32df0000 0x10000>;
757+
reg = <0x32c00000 0x400000>;
758758
#address-cells = <1>;
759759
#size-cells = <1>;
760760
ranges;

‎arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h

Lines changed: 23 additions & 23 deletions
Large diffs are not rendered by default.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145

146146
aips1: bus@30000000 {
147147
compatible = "fsl,aips-bus", "simple-bus";
148-
reg = <0x301f0000 0x10000>;
148+
reg = <0x30000000 0x400000>;
149149
#address-cells = <1>;
150150
#size-cells = <1>;
151151
ranges;
@@ -318,7 +318,7 @@
318318

319319
aips2: bus@30400000 {
320320
compatible = "fsl,aips-bus", "simple-bus";
321-
reg = <0x305f0000 0x400000>;
321+
reg = <0x30400000 0x400000>;
322322
#address-cells = <1>;
323323
#size-cells = <1>;
324324
ranges;
@@ -378,7 +378,7 @@
378378

379379
aips3: bus@30800000 {
380380
compatible = "fsl,aips-bus", "simple-bus";
381-
reg = <0x309f0000 0x400000>;
381+
reg = <0x30800000 0x400000>;
382382
#address-cells = <1>;
383383
#size-cells = <1>;
384384
ranges;

‎arch/arm64/boot/dts/freescale/imx8mq.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@
291291

292292
bus@30000000 { /* AIPS1 */
293293
compatible = "fsl,aips-bus", "simple-bus";
294-
reg = <0x301f0000 0x10000>;
294+
reg = <0x30000000 0x400000>;
295295
#address-cells = <1>;
296296
#size-cells = <1>;
297297
ranges = <0x30000000 0x30000000 0x400000>;
@@ -696,7 +696,7 @@
696696

697697
bus@30400000 { /* AIPS2 */
698698
compatible = "fsl,aips-bus", "simple-bus";
699-
reg = <0x305f0000 0x10000>;
699+
reg = <0x30400000 0x400000>;
700700
#address-cells = <1>;
701701
#size-cells = <1>;
702702
ranges = <0x30400000 0x30400000 0x400000>;
@@ -756,7 +756,7 @@
756756

757757
bus@30800000 { /* AIPS3 */
758758
compatible = "fsl,aips-bus", "simple-bus";
759-
reg = <0x309f0000 0x10000>;
759+
reg = <0x30800000 0x400000>;
760760
#address-cells = <1>;
761761
#size-cells = <1>;
762762
ranges = <0x30800000 0x30800000 0x400000>,
@@ -1029,7 +1029,7 @@
10291029

10301030
bus@32c00000 { /* AIPS4 */
10311031
compatible = "fsl,aips-bus", "simple-bus";
1032-
reg = <0x32df0000 0x10000>;
1032+
reg = <0x32c00000 0x400000>;
10331033
#address-cells = <1>;
10341034
#size-cells = <1>;
10351035
ranges = <0x32c00000 0x32c00000 0x400000>;

0 commit comments

Comments
 (0)