Skip to content

Commit 32b5f4b

Browse files
xdarklightkhilman
authored andcommitted
arm64: dts: amlogic: Add the Ethernet "timing-adjustment" clock
Add the "timing-adjustment" clock now that we know how it is connected to the PRG_ETHERNET registers. It is used internally to generate the RGMII RX delay on the MAC side (if needed). Signed-off-by: Martin Blumenstingl <[email protected]> Signed-off-by: Kevin Hilman <[email protected]> Reviewed-by: Neil Armstrong <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 5273d6c commit 32b5f4b

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,10 @@
181181
interrupt-names = "macirq";
182182
clocks = <&clkc CLKID_ETH>,
183183
<&clkc CLKID_FCLK_DIV2>,
184-
<&clkc CLKID_MPLL2>;
185-
clock-names = "stmmaceth", "clkin0", "clkin1";
184+
<&clkc CLKID_MPLL2>,
185+
<&clkc CLKID_FCLK_DIV2>;
186+
clock-names = "stmmaceth", "clkin0", "clkin1",
187+
"timing-adjustment";
186188
rx-fifo-depth = <4096>;
187189
tx-fifo-depth = <2048>;
188190
status = "disabled";

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,10 @@
185185
interrupt-names = "macirq";
186186
clocks = <&clkc CLKID_ETH>,
187187
<&clkc CLKID_FCLK_DIV2>,
188-
<&clkc CLKID_MPLL2>;
189-
clock-names = "stmmaceth", "clkin0", "clkin1";
188+
<&clkc CLKID_MPLL2>,
189+
<&clkc CLKID_FCLK_DIV2>;
190+
clock-names = "stmmaceth", "clkin0", "clkin1",
191+
"timing-adjustment";
190192
rx-fifo-depth = <4096>;
191193
tx-fifo-depth = <2048>;
192194
status = "disabled";

arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,9 @@
333333
&ethmac {
334334
clocks = <&clkc CLKID_ETH>,
335335
<&clkc CLKID_FCLK_DIV2>,
336-
<&clkc CLKID_MPLL2>;
337-
clock-names = "stmmaceth", "clkin0", "clkin1";
336+
<&clkc CLKID_MPLL2>,
337+
<&clkc CLKID_FCLK_DIV2>;
338+
clock-names = "stmmaceth", "clkin0", "clkin1", "timing-adjustment";
338339
};
339340

340341
&gpio_intc {

arch/arm64/boot/dts/amlogic/meson-gxl.dtsi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,9 @@
131131
&ethmac {
132132
clocks = <&clkc CLKID_ETH>,
133133
<&clkc CLKID_FCLK_DIV2>,
134-
<&clkc CLKID_MPLL2>;
135-
clock-names = "stmmaceth", "clkin0", "clkin1";
134+
<&clkc CLKID_MPLL2>,
135+
<&clkc CLKID_FCLK_DIV2>;
136+
clock-names = "stmmaceth", "clkin0", "clkin1", "timing-adjustment";
136137

137138
mdio0: mdio {
138139
#address-cells = <1>;

0 commit comments

Comments
 (0)