diff options
| author | Tom Rini <[email protected]> | 2026-04-20 09:31:12 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-04-20 11:43:11 -0600 |
| commit | 5d401bfbdf1da9eb34575b0b15e18757f2b38ca0 (patch) | |
| tree | ef0be8a0a30c5d6b987f193bd6cd551428024725 /dts/upstream/src/mips | |
| parent | e3405917a1806971d9e72a94186b299f05581e1a (diff) | |
| parent | b427decccfe983eda4f815ddcf5dcbe733cd04f6 (diff) | |
Subtree merge tag 'v7.0-dts' of dts repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git
- Remove netc_timerX nodes from arch/arm/dts/imx943-u-boot.dtsi as they
are now upstream
- Move dts/upstream/include/dt-bindings/reset/bcm6318-reset.h to
include/dt-bindings/reset/bcm6318-reset.h as upstream has removed this
file as unused (but we use it).
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'dts/upstream/src/mips')
| -rw-r--r-- | dts/upstream/src/mips/loongson/ls7a-pch.dtsi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dts/upstream/src/mips/loongson/ls7a-pch.dtsi b/dts/upstream/src/mips/loongson/ls7a-pch.dtsi index ee71045883e..6dee85909f5 100644 --- a/dts/upstream/src/mips/loongson/ls7a-pch.dtsi +++ b/dts/upstream/src/mips/loongson/ls7a-pch.dtsi @@ -199,7 +199,8 @@ <13 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "macirq", "eth_lpi"; interrupt-parent = <&pic>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; + phy-handle = <&phy0>; mdio { #address-cells = <1>; #size-cells = <0>; @@ -222,7 +223,8 @@ <15 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "macirq", "eth_lpi"; interrupt-parent = <&pic>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; + phy-handle = <&phy1>; mdio { #address-cells = <1>; #size-cells = <0>; |