a6611b0b12a5f9627c5eb89e24682ab9eac7cede
[openwrt/staging/hauke.git] /
1 From b3e78e4a087922566bc18171190e2eed8a9b7797 Mon Sep 17 00:00:00 2001
2 From: Alison Wang <alison.wang@nxp.com>
3 Date: Thu, 12 Dec 2019 15:35:32 +0800
4 Subject: [PATCH] LF-403 ARM64: dts: fsl: Add clock-names mclk0 for SAI nodes
5
6 This patch adds clock-names "mclk0" to match with the current SAI
7 driver.
8
9 Signed-off-by: Alison Wang <alison.wang@nxp.com>
10 ---
11 arch/arm/boot/dts/ls1021a.dtsi | 10 ++++++----
12 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 10 ++++++----
13 arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 15 +++++++++------
14 3 files changed, 21 insertions(+), 14 deletions(-)
15
16 --- a/arch/arm/boot/dts/ls1021a.dtsi
17 +++ b/arch/arm/boot/dts/ls1021a.dtsi
18 @@ -682,8 +682,9 @@
19 reg = <0x0 0x2b50000 0x0 0x10000>;
20 interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
21 clocks = <&clockgen 4 1>, <&clockgen 4 1>,
22 - <&clockgen 4 1>, <&clockgen 4 1>;
23 - clock-names = "bus", "mclk1", "mclk2", "mclk3";
24 + <&clockgen 4 1>, <&clockgen 4 1>,
25 + <&clockgen 4 1>;
26 + clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
27 dma-names = "tx", "rx";
28 dmas = <&edma0 1 47>,
29 <&edma0 1 46>;
30 @@ -696,8 +697,9 @@
31 reg = <0x0 0x2b60000 0x0 0x10000>;
32 interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
33 clocks = <&clockgen 4 1>, <&clockgen 4 1>,
34 - <&clockgen 4 1>, <&clockgen 4 1>;
35 - clock-names = "bus", "mclk1", "mclk2", "mclk3";
36 + <&clockgen 4 1>, <&clockgen 4 1>,
37 + <&clockgen 4 1>;
38 + clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
39 dma-names = "tx", "rx";
40 dmas = <&edma0 1 45>,
41 <&edma0 1 44>;
42 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
43 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
44 @@ -405,8 +405,9 @@
45 reg = <0x0 0x2b50000 0x0 0x10000>;
46 interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
47 clocks = <&clockgen 4 3>, <&clockgen 4 3>,
48 - <&clockgen 4 3>, <&clockgen 4 3>;
49 - clock-names = "bus", "mclk1", "mclk2", "mclk3";
50 + <&clockgen 4 3>, <&clockgen 4 3>,
51 + <&clockgen 4 3>;
52 + clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
53 dma-names = "tx", "rx";
54 dmas = <&edma0 1 47>,
55 <&edma0 1 46>;
56 @@ -419,8 +420,9 @@
57 reg = <0x0 0x2b60000 0x0 0x10000>;
58 interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
59 clocks = <&clockgen 4 3>, <&clockgen 4 3>,
60 - <&clockgen 4 3>, <&clockgen 4 3>;
61 - clock-names = "bus", "mclk1", "mclk2", "mclk3";
62 + <&clockgen 4 3>, <&clockgen 4 3>,
63 + <&clockgen 4 3>;
64 + clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
65 dma-names = "tx", "rx";
66 dmas = <&edma0 1 45>,
67 <&edma0 1 44>;
68 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
69 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
70 @@ -542,8 +542,9 @@
71 reg = <0x0 0xf100000 0x0 0x10000>;
72 interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
73 clocks = <&clockgen 4 1>, <&clockgen 4 1>,
74 - <&clockgen 4 1>, <&clockgen 4 1>;
75 - clock-names = "bus", "mclk1", "mclk2", "mclk3";
76 + <&clockgen 4 1>, <&clockgen 4 1>,
77 + <&clockgen 4 1>;
78 + clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
79 dma-names = "tx", "rx";
80 dmas = <&edma0 1 4>,
81 <&edma0 1 3>;
82 @@ -556,8 +557,9 @@
83 reg = <0x0 0xf110000 0x0 0x10000>;
84 interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
85 clocks = <&clockgen 4 1>, <&clockgen 4 1>,
86 - <&clockgen 4 1>, <&clockgen 4 1>;
87 - clock-names = "bus", "mclk1", "mclk2", "mclk3";
88 + <&clockgen 4 1>, <&clockgen 4 1>,
89 + <&clockgen 4 1>;
90 + clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
91 dma-names = "tx", "rx";
92 dmas = <&edma0 1 6>,
93 <&edma0 1 5>;
94 @@ -570,8 +572,9 @@
95 reg = <0x0 0xf130000 0x0 0x10000>;
96 interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
97 clocks = <&clockgen 4 1>, <&clockgen 4 1>,
98 - <&clockgen 4 1>, <&clockgen 4 1>;
99 - clock-names = "bus", "mclk1", "mclk2", "mclk3";
100 + <&clockgen 4 1>, <&clockgen 4 1>,
101 + <&clockgen 4 1>;
102 + clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
103 dma-names = "tx", "rx";
104 dmas = <&edma0 1 10>,
105 <&edma0 1 9>;