Skip to content

Commit 27795c5

Browse files
arndbarndb
committed
Merge tag 'imx-fixes-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 6.11: - One imx8mp-beacon-kit change from Adam Ford to fix the broken WM8962 audio support - One pinctrl property typo fix for imx8mm-phygate - One layerscape fix from Krzysztof Kozlowski to get thermal nodes correct name length - A couple of imx93-tqma9352 fixes from Markus Niebel, one on CMA alloc-ranges and the other on SD-Card cd-gpios typo - One change from Michal Vokáč to fix imx6dl-yapp43 LED current to match the HW design - A couple of imx95 fixes from Peng Fan, one to correct a55 power domains and the other to correct L3Cache cache-sets - One tqma9352 watchdog reset fix from Sascha Hauer - One imx93 change from Shenwei Wang to fix the default value for STMMAC EQOS snps,clk-csr * tag 'imx-fixes-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: imx8mm-phygate: fix typo pinctrcl-0 arm64: dts: imx95: correct L3Cache cache-sets arm64: dts: imx95: correct a55 power-domains arm64: dts: freescale: imx93-tqma9352-mba93xxla: fix typo arm64: dts: freescale: imx93-tqma9352: fix CMA alloc-ranges ARM: dts: imx6dl-yapp43: Increase LED current to match the yapp4 HW design arm64: dts: imx93: update default value for snps,clk-csr arm64: dts: freescale: tqma9352: Fix watchdog reset arm64: dts: imx8mp-beacon-kit: Fix Stereo Audio on WM8962 arm64: dts: layerscape: fix thermal node names length Link: https://lore.kernel.org/r/ZrtsTO1+jXhJ6GSM@dragon Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 0351a98 + f149be4 commit 27795c5

14 files changed

+33
-34
lines changed

‎arch/arm/boot/dts/nxp/imx/imx6dl-yapp43-common.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,24 +274,24 @@
274274

275275
led@0 {
276276
chan-name = "R";
277-
led-cur = /bits/ 8 <0x20>;
278-
max-cur = /bits/ 8 <0x60>;
277+
led-cur = /bits/ 8 <0x6e>;
278+
max-cur = /bits/ 8 <0xc8>;
279279
reg = <0>;
280280
color = <LED_COLOR_ID_RED>;
281281
};
282282

283283
led@1 {
284284
chan-name = "G";
285-
led-cur = /bits/ 8 <0x20>;
286-
max-cur = /bits/ 8 <0x60>;
285+
led-cur = /bits/ 8 <0xbe>;
286+
max-cur = /bits/ 8 <0xc8>;
287287
reg = <1>;
288288
color = <LED_COLOR_ID_GREEN>;
289289
};
290290

291291
led@2 {
292292
chan-name = "B";
293-
led-cur = /bits/ 8 <0x20>;
294-
max-cur = /bits/ 8 <0x60>;
293+
led-cur = /bits/ 8 <0xbe>;
294+
max-cur = /bits/ 8 <0xc8>;
295295
reg = <2>;
296296
color = <LED_COLOR_ID_BLUE>;
297297
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
};
176176
};
177177

178-
core-cluster-thermal {
178+
cluster-thermal {
179179
polling-delay-passive = <1000>;
180180
polling-delay = <5000>;
181181
thermal-sensors = <&tmu 1>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
};
215215
};
216216

217-
core-cluster-thermal {
217+
cluster-thermal {
218218
polling-delay-passive = <1000>;
219219
polling-delay = <5000>;
220220
thermal-sensors = <&tmu 3>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
};
183183
};
184184

185-
core-cluster-thermal {
185+
cluster-thermal {
186186
polling-delay-passive = <1000>;
187187
polling-delay = <5000>;
188188
thermal-sensors = <&tmu 3>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
};
132132

133133
thermal-zones {
134-
core-cluster-thermal {
134+
cluster-thermal {
135135
polling-delay-passive = <1000>;
136136
polling-delay = <5000>;
137137
thermal-sensors = <&tmu 0>;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
};
123123
};
124124

125-
core-cluster1-thermal {
125+
cluster1-thermal {
126126
polling-delay-passive = <1000>;
127127
polling-delay = <5000>;
128128
thermal-sensors = <&tmu 4>;
@@ -151,7 +151,7 @@
151151
};
152152
};
153153

154-
core-cluster2-thermal {
154+
cluster2-thermal {
155155
polling-delay-passive = <1000>;
156156
polling-delay = <5000>;
157157
thermal-sensors = <&tmu 5>;
@@ -180,7 +180,7 @@
180180
};
181181
};
182182

183-
core-cluster3-thermal {
183+
cluster3-thermal {
184184
polling-delay-passive = <1000>;
185185
polling-delay = <5000>;
186186
thermal-sensors = <&tmu 6>;
@@ -209,7 +209,7 @@
209209
};
210210
};
211211

212-
core-cluster4-thermal {
212+
cluster4-thermal {
213213
polling-delay-passive = <1000>;
214214
polling-delay = <5000>;
215215
thermal-sensors = <&tmu 7>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@
492492
};
493493
};
494494

495-
ddr-cluster5-thermal {
495+
ddr-ctrl5-thermal {
496496
polling-delay-passive = <1000>;
497497
polling-delay = <5000>;
498498
thermal-sensors = <&tmu 1>;

‎arch/arm64/boot/dts/freescale/imx8mm-phygate-tauri-l-rs232-rs232.dtso‎

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

2222
&gpio3 {
2323
pinctrl-names = "default";
24-
pinctrcl-0 = <&pinctrl_gpio3_hog>;
24+
pinctrl-0 = <&pinctrl_gpio3_hog>;
2525

2626
uart4_rs485_en {
2727
gpio-hog;

‎arch/arm64/boot/dts/freescale/imx8mm-phygate-tauri-l-rs232-rs485.dtso‎

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

2323
&gpio3 {
2424
pinctrl-names = "default";
25-
pinctrcl-0 = <&pinctrl_gpio3_hog>;
25+
pinctrl-0 = <&pinctrl_gpio3_hog>;
2626

2727
uart4_rs485_en {
2828
gpio-hog;

‎arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -211,13 +211,12 @@
211211

212212
simple-audio-card,cpu {
213213
sound-dai = <&sai3>;
214+
frame-master;
215+
bitclock-master;
214216
};
215217

216218
simple-audio-card,codec {
217219
sound-dai = <&wm8962>;
218-
clocks = <&clk IMX8MP_CLK_IPP_DO_CLKO1>;
219-
frame-master;
220-
bitclock-master;
221220
};
222221
};
223222
};
@@ -507,10 +506,9 @@
507506
&sai3 {
508507
pinctrl-names = "default";
509508
pinctrl-0 = <&pinctrl_sai3>;
510-
assigned-clocks = <&clk IMX8MP_CLK_SAI3>,
511-
<&clk IMX8MP_AUDIO_PLL2> ;
512-
assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;
513-
assigned-clock-rates = <12288000>, <361267200>;
509+
assigned-clocks = <&clk IMX8MP_CLK_SAI3>;
510+
assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>;
511+
assigned-clock-rates = <12288000>;
514512
fsl,sai-mclk-direction-output;
515513
status = "okay";
516514
};

0 commit comments

Comments
 (0)