Skip to content

Commit

Permalink
Revert "Merge branch 'mv88e6xxx-dsa-bindings'"
Browse files Browse the repository at this point in the history
This reverts the following commits:

commit 53313ed ("dt-bindings: marvell: Add Marvell MV88E6060 DSA schema")
commit 0f35369 ("dt-bindings: marvell: Rewrite MV88E6xxx in schema")
commit 605a5f5 ("ARM64: dts: marvell: Fix some common switch mistakes")
commit bfedd84 ("ARM: dts: nxp: Fix some common switch mistakes")
commit 2b83557 ("ARM: dts: marvell: Fix some common switch mistakes")
commit ddae07c ("dt-bindings: net: mvusb: Fix up DSA example")
commit b5ef617 ("dt-bindings: net: dsa: Require ports or ethernet-ports")

As repoted by Vladimir, it breaks boot on the Turris MOX board.

Link: https://lore.kernel.org/all/20231025093632.fb2qdtunzaznd73z@skbuf/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Jakub Kicinski committed Oct 25, 2023
1 parent d011044 commit aad36cd
Show file tree
Hide file tree
Showing 26 changed files with 457 additions and 761 deletions.
6 changes: 0 additions & 6 deletions Documentation/devicetree/bindings/net/dsa/dsa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,4 @@ $defs:
$ref: dsa-port.yaml#
unevaluatedProperties: false

oneOf:
- required:
- ports
- required:
- ethernet-ports

...
88 changes: 0 additions & 88 deletions Documentation/devicetree/bindings/net/dsa/marvell,mv88e6060.yaml

This file was deleted.

Loading

0 comments on commit aad36cd

Please sign in to comment.