projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
imx6qdl.dtsi
diff --git
a/arch/arm/boot/dts/imx6qdl.dtsi
b/arch/arm/boot/dts/imx6qdl.dtsi
index
82e01ce
..
89c342f
100644
(file)
--- a/
arch/arm/boot/dts/imx6qdl.dtsi
+++ b/
arch/arm/boot/dts/imx6qdl.dtsi
@@
-334,7
+334,7
@@
clocks = <&clks IMX6QDL_CLK_ECSPI1>,
<&clks IMX6QDL_CLK_ECSPI1>;
clock-names = "ipg", "per";
clocks = <&clks IMX6QDL_CLK_ECSPI1>,
<&clks IMX6QDL_CLK_ECSPI1>;
clock-names = "ipg", "per";
- dmas = <&sdma 3
8 1>, <&sdma 4 8
2>;
+ dmas = <&sdma 3
7 1>, <&sdma 4 7
2>;
dma-names = "rx", "tx";
status = "disabled";
};
dma-names = "rx", "tx";
status = "disabled";
};
@@
-348,7
+348,7
@@
clocks = <&clks IMX6QDL_CLK_ECSPI2>,
<&clks IMX6QDL_CLK_ECSPI2>;
clock-names = "ipg", "per";
clocks = <&clks IMX6QDL_CLK_ECSPI2>,
<&clks IMX6QDL_CLK_ECSPI2>;
clock-names = "ipg", "per";
- dmas = <&sdma 5
8 1>, <&sdma 6 8
2>;
+ dmas = <&sdma 5
7 1>, <&sdma 6 7
2>;
dma-names = "rx", "tx";
status = "disabled";
};
dma-names = "rx", "tx";
status = "disabled";
};
@@
-362,7
+362,7
@@
clocks = <&clks IMX6QDL_CLK_ECSPI3>,
<&clks IMX6QDL_CLK_ECSPI3>;
clock-names = "ipg", "per";
clocks = <&clks IMX6QDL_CLK_ECSPI3>,
<&clks IMX6QDL_CLK_ECSPI3>;
clock-names = "ipg", "per";
- dmas = <&sdma 7
8 1>, <&sdma 8 8
2>;
+ dmas = <&sdma 7
7 1>, <&sdma 8 7
2>;
dma-names = "rx", "tx";
status = "disabled";
};
dma-names = "rx", "tx";
status = "disabled";
};
@@
-376,7
+376,7
@@
clocks = <&clks IMX6QDL_CLK_ECSPI4>,
<&clks IMX6QDL_CLK_ECSPI4>;
clock-names = "ipg", "per";
clocks = <&clks IMX6QDL_CLK_ECSPI4>,
<&clks IMX6QDL_CLK_ECSPI4>;
clock-names = "ipg", "per";
- dmas = <&sdma 9
8 1>, <&sdma 10 8
2>;
+ dmas = <&sdma 9
7 1>, <&sdma 10 7
2>;
dma-names = "rx", "tx";
status = "disabled";
};
dma-names = "rx", "tx";
status = "disabled";
};