Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99ffa8b0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-fixes-4.17-1' of git://git.infradead.org/linux-mvebu into fixes 

mvebu fixes for 4.17 (part 1)

Declare missing clocks needed for network on Armada 8040 base boards
(such as the McBin)

* tag 'mvebu-fixes-4.17-1' of git://git.infradead.org/linux-mvebu

:
  ARM64: dts: marvell: armada-cp110: Add mg_core_clk for ethernet node
  ARM64: dts: marvell: armada-cp110: Add clocks for the xmdio node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9954b80b f43194c1

Documentation/devicetree/bindings/net/marvell-pp2.txt

+5 −4
Original line number Diff line number Diff line
@@ -21,9 +21,10 @@ 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)

	- MG Core clock (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).

- clock-names: names of used clocks, must be "pp_clk", "gop_clk", "mg_clk",

  "mg_core_clk" and "axi_clk" (the 3 latter only for armada-7k-pp2).



The ethernet ports are represented by subnodes. At least one port is

required.
@@ -80,8 +81,8 @@ 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>, <&cpm_syscon0 1 18>;

	clock-names = "pp_clk", "gop_clk", "gp_clk", "axi_clk";

		 <&cpm_syscon0 1 5>, <&cpm_syscon0 1 6>, <&cpm_syscon0 1 18>;

	clock-names = "pp_clk", "gop_clk", "mg_clk", "mg_core_clk", "axi_clk";



	eth0: eth0 {

		interrupts = <ICU_GRP_NSR 39 IRQ_TYPE_LEVEL_HIGH>,

arch/arm64/boot/dts/marvell/armada-cp110.dtsi

+5 −2
Original line number Diff line number Diff line
@@ -38,9 +38,10 @@ 
			compatible = "marvell,armada-7k-pp22";

			reg = <0x0 0x100000>, <0x129000 0xb000>;

			clocks = <&CP110_LABEL(clk) 1 3>, <&CP110_LABEL(clk) 1 9>,

				 <&CP110_LABEL(clk) 1 5>, <&CP110_LABEL(clk) 1 18>;

				 <&CP110_LABEL(clk) 1 5>, <&CP110_LABEL(clk) 1 6>,

				 <&CP110_LABEL(clk) 1 18>;

			clock-names = "pp_clk", "gop_clk",

				      "mg_clk", "axi_clk";

				      "mg_clk", "mg_core_clk", "axi_clk";

			marvell,system-controller = <&CP110_LABEL(syscon0)>;

			status = "disabled";

			dma-coherent;
@@ -141,6 +142,8 @@ 
			#size-cells = <0>;

			compatible = "marvell,xmdio";

			reg = <0x12a600 0x10>;

			clocks = <&CP110_LABEL(clk) 1 5>,

				 <&CP110_LABEL(clk) 1 6>, <&CP110_LABEL(clk) 1 18>;

			status = "disabled";

		};