aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/net/marvell-pp2.txt
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2017-11-28 08:12:32 -0800
committerTony Lindgren <tony@atomide.com>2017-11-28 08:12:32 -0800
commitbc686442f8a601bccac1f22506ecdb4b0d62cadd (patch)
treeb224ab4aa2350b233da640f5850f48bc6bfeb2d0 /Documentation/devicetree/bindings/net/marvell-pp2.txt
parentARM: dts: Add remote-wakeup-connected for omap OHCI (diff)
parentARM: dts: am437x-cm-t43: Correct the dmas property of spi0 (diff)
downloadlinux-dev-bc686442f8a601bccac1f22506ecdb4b0d62cadd.tar.xz
linux-dev-bc686442f8a601bccac1f22506ecdb4b0d62cadd.zip
Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt
Diffstat (limited to 'Documentation/devicetree/bindings/net/marvell-pp2.txt')
-rw-r--r--Documentation/devicetree/bindings/net/marvell-pp2.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/net/marvell-pp2.txt b/Documentation/devicetree/bindings/net/marvell-pp2.txt
index 7e2dad08a12e..1814fa13f6ab 100644
--- a/Documentation/devicetree/bindings/net/marvell-pp2.txt
+++ b/Documentation/devicetree/bindings/net/marvell-pp2.txt
@@ -21,8 +21,9 @@ Required properties:
- main controller clock (for both armada-375-pp2 and armada-7k-pp2)
- GOP clock (for both armada-375-pp2 and armada-7k-pp2)
- MG clock (only for armada-7k-pp2)
-- clock-names: names of used clocks, must be "pp_clk", "gop_clk" and
- "mg_clk" (the latter only for armada-7k-pp2).
+ - AXI clock (only for armada-7k-pp2)
+- clock-names: names of used clocks, must be "pp_clk", "gop_clk", "mg_clk"
+ and "axi_clk" (the 2 latter only for armada-7k-pp2).
The ethernet ports are represented by subnodes. At least one port is
required.
@@ -78,8 +79,9 @@ Example for marvell,armada-7k-pp2:
cpm_ethernet: ethernet@0 {
compatible = "marvell,armada-7k-pp22";
reg = <0x0 0x100000>, <0x129000 0xb000>;
- clocks = <&cpm_syscon0 1 3>, <&cpm_syscon0 1 9>, <&cpm_syscon0 1 5>;
- clock-names = "pp_clk", "gop_clk", "gp_clk";
+ clocks = <&cpm_syscon0 1 3>, <&cpm_syscon0 1 9>,
+ <&cpm_syscon0 1 5>, <&cpm_syscon0 1 18>;
+ clock-names = "pp_clk", "gop_clk", "gp_clk", "axi_clk";
eth0: eth0 {
interrupts = <ICU_GRP_NSR 39 IRQ_TYPE_LEVEL_HIGH>,