Skip to content

Commit b9ebd16

Browse files
frank-wAngeloGioacchino Del Regno
authored andcommitted
arm64: dts: mediatek: mt7988: move uart0 and spi1 pins to soc dtsi
In order to use uart0 or spi1 there is only 1 possible pin definition so move them to soc dtsi to reuse them in other boards and avoiding conflict if defined twice. Suggested-by: Daniel Golle <[email protected]> Signed-off-by: Frank Wunderlich <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
1 parent bf7c2ce commit b9ebd16

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -328,13 +328,6 @@
328328
};
329329
};
330330

331-
uart0_pins: uart0-pins {
332-
mux {
333-
function = "uart";
334-
groups = "uart0";
335-
};
336-
};
337-
338331
snfi_pins: snfi-pins {
339332
mux {
340333
function = "flash";
@@ -356,13 +349,6 @@
356349
};
357350
};
358351

359-
spi1_pins: spi1-pins {
360-
mux {
361-
function = "spi";
362-
groups = "spi1";
363-
};
364-
};
365-
366352
spi2_pins: spi2-pins {
367353
mux {
368354
function = "spi";

arch/arm64/boot/dts/mediatek/mt7988a.dtsi

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,20 @@
209209
"pcie_wake_n3_0";
210210
};
211211
};
212+
213+
spi1_pins: spi1-pins {
214+
mux {
215+
function = "spi";
216+
groups = "spi1";
217+
};
218+
};
219+
220+
uart0_pins: uart0-pins {
221+
mux {
222+
function = "uart";
223+
groups = "uart0";
224+
};
225+
};
212226
};
213227

214228
pwm: pwm@10048000 {
@@ -244,6 +258,8 @@
244258
clocks = <&topckgen CLK_TOP_UART_SEL>,
245259
<&infracfg CLK_INFRA_52M_UART0_CK>;
246260
clock-names = "baud", "bus";
261+
pinctrl-names = "default";
262+
pinctrl-0 = <&uart0_pins>;
247263
status = "disabled";
248264
};
249265

@@ -338,6 +354,8 @@
338354
"hclk";
339355
#address-cells = <1>;
340356
#size-cells = <0>;
357+
pinctrl-names = "default";
358+
pinctrl-0 = <&spi1_pins>;
341359
status = "disabled";
342360
};
343361

0 commit comments

Comments
 (0)