Skip to content

Commit 5e7230a

Browse files
committed
Merge tag 'at91-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes
AT91 fixes for 5.19 #2 It contains 2 DT fixes: - one for SAMA5D2 to fix the i2s1 assigned-clock-parents property - one for kswitch-d10 (LAN966 based) enforcing proper settings on GPIO pins * tag 'at91-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: dts: at91: sama5d2: Fix typo in i2s1 node ARM: dts: kswitch-d10: use open drain mode for coma-mode pins Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 2dc94f0 + 2fdf15b commit 5e7230a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

arch/arm/boot/dts/lan966x-kontron-kswitch-d10-mmt.dtsi

+4-4
Original file line numberDiff line numberDiff line change
@@ -87,22 +87,22 @@
8787

8888
phy4: ethernet-phy@5 {
8989
reg = <5>;
90-
coma-mode-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
90+
coma-mode-gpios = <&gpio 37 GPIO_OPEN_DRAIN>;
9191
};
9292

9393
phy5: ethernet-phy@6 {
9494
reg = <6>;
95-
coma-mode-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
95+
coma-mode-gpios = <&gpio 37 GPIO_OPEN_DRAIN>;
9696
};
9797

9898
phy6: ethernet-phy@7 {
9999
reg = <7>;
100-
coma-mode-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
100+
coma-mode-gpios = <&gpio 37 GPIO_OPEN_DRAIN>;
101101
};
102102

103103
phy7: ethernet-phy@8 {
104104
reg = <8>;
105-
coma-mode-gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
105+
coma-mode-gpios = <&gpio 37 GPIO_OPEN_DRAIN>;
106106
};
107107
};
108108

arch/arm/boot/dts/sama5d2.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1124,7 +1124,7 @@
11241124
clocks = <&pmc PMC_TYPE_PERIPHERAL 55>, <&pmc PMC_TYPE_GCK 55>;
11251125
clock-names = "pclk", "gclk";
11261126
assigned-clocks = <&pmc PMC_TYPE_CORE PMC_I2S1_MUX>;
1127-
assigned-parrents = <&pmc PMC_TYPE_GCK 55>;
1127+
assigned-clock-parents = <&pmc PMC_TYPE_GCK 55>;
11281128
status = "disabled";
11291129
};
11301130

0 commit comments

Comments
 (0)