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 /arch | |
| 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 'arch')
| -rw-r--r-- | arch/arm/dts/imx943-u-boot.dtsi | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/dts/imx943-u-boot.dtsi b/arch/arm/dts/imx943-u-boot.dtsi index 3457442a3b0..8a7a6f11158 100644 --- a/arch/arm/dts/imx943-u-boot.dtsi +++ b/arch/arm/dts/imx943-u-boot.dtsi @@ -339,12 +339,6 @@ }; }; - netc_timer0: ethernet@0,1 { - compatible = "pci1131,ee02"; - reg = <0x100 0 0 0 0>; - status = "disabled"; - }; - netc_switch: ethernet-switch@0,2 { compatible = "pci1131,eef2", "nxp,imx943-netc-switch"; reg = <0x200 0 0 0 0>; @@ -408,12 +402,6 @@ status = "disabled"; }; - netc_timer1: ethernet@0,1 { - compatible = "pci1131,ee02"; - reg = <0x10100 0 0 0 0>; - status = "disabled"; - }; - enetc1: ethernet@8,0 { compatible = "pci1131,e101"; reg = <0x14000 0 0 0 0>; @@ -426,12 +414,6 @@ status = "disabled"; }; - netc_timer2: ethernet@10,1 { - compatible = "pci1131,ee02"; - reg = <0x18100 0 0 0 0>; - status = "disabled"; - }; - netc_emdio: mdio@18,0 { compatible = "pci1131,ee00"; reg = <0x1c000 0 0 0 0>; |