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

Commit 0df88121 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt64-4.8-1' of git://git.infradead.org/linux-mvebu into next/dt64 

Merge "mvebu dt64 for 4.8 (part 1)" from Gregory CLEMENT:

- update dt with mv-xor-v2 found in the Armada 7K/8K SoCs
- update dt with the clocks found in the Armada 3700 SoCs

* tag 'mvebu-dt64-4.8-1' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: add peripherals clocks for Armada 37xx
  arm64: dts: marvell: add tbg clocks for Armada 37xx
  arm64: dts: marvell: Add xtal clock support for Armada 3700
  arm64: dts: marvell: add XOR engine description for Armada 7K/8K CP
  arm64: dts: marvell: adjust to the latest mv-xor-v2 DT binding
parents c8a12c06 5f4beef6

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

+35 −0
Original line number Diff line number Diff line
@@ -105,6 +105,41 @@ 
				status = "disabled";

			};



			nb_perih_clk: nb-periph-clk@13000{

				compatible = "marvell,armada-3700-periph-clock-nb";

				reg = <0x13000 0x100>;

				clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>,

				<&tbg 3>, <&xtalclk>;

				#clock-cells = <1>;

			};



			sb_perih_clk: sb-periph-clk@18000{

				compatible = "marvell,armada-3700-periph-clock-sb";

				reg = <0x18000 0x100>;

				clocks = <&tbg 0>, <&tbg 1>, <&tbg 2>,

				<&tbg 3>, <&xtalclk>;

				#clock-cells = <1>;

			};



			tbg: tbg@13200 {

				compatible = "marvell,armada-3700-tbg-clock";

				reg = <0x13200 0x100>;

				clocks = <&xtalclk>;

				#clock-cells = <1>;

			};



			gpio1: gpio@13800 {

				compatible = "marvell,mvebu-gpio-3700",

				"syscon", "simple-mfd";

				reg = <0x13800 0x500>;



				xtalclk: xtal-clk {

					compatible = "marvell,armada-3700-xtal-clock";

					clock-output-names = "xtal";

					#clock-cells = <0>;

				};

			};



			usb3: usb@58000 {

				compatible = "marvell,armada3700-xhci",

				"generic-xhci";

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

+4 −4
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ 
			};



			xor@400000 {

				compatible = "marvell,mv-xor-v2";

				compatible = "marvell,armada-7k-xor", "marvell,xor-v2";

				reg = <0x400000 0x1000>,

				      <0x410000 0x1000>;

				msi-parent = <&gic_v2m0>;
@@ -149,7 +149,7 @@ 
			};



			xor@420000 {

				compatible = "marvell,mv-xor-v2";

				compatible = "marvell,armada-7k-xor", "marvell,xor-v2";

				reg = <0x420000 0x1000>,

				      <0x430000 0x1000>;

				msi-parent = <&gic_v2m0>;
@@ -157,7 +157,7 @@ 
			};



			xor@440000 {

				compatible = "marvell,mv-xor-v2";

				compatible = "marvell,armada-7k-xor", "marvell,xor-v2";

				reg = <0x440000 0x1000>,

				      <0x450000 0x1000>;

				msi-parent = <&gic_v2m0>;
@@ -165,7 +165,7 @@ 
			};



			xor@460000 {

				compatible = "marvell,mv-xor-v2";

				compatible = "marvell,armada-7k-xor", "marvell,xor-v2";

				reg = <0x460000 0x1000>,

				      <0x470000 0x1000>;

				msi-parent = <&gic_v2m0>;

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

+18 −0
Original line number Diff line number Diff line
@@ -107,6 +107,24 @@ 
				status = "disabled";

			};



			cpm_xor0: xor@6a0000 {

				compatible = "marvell,armada-7k-xor", "marvell,xor-v2";

				reg = <0x6a0000 0x1000>,

				      <0x6b0000 0x1000>;

				dma-coherent;

				msi-parent = <&gic_v2m0>;

				clocks = <&cpm_syscon0 1 8>;

			};



			cpm_xor1: xor@6c0000 {

				compatible = "marvell,armada-7k-xor", "marvell,xor-v2";

				reg = <0x6c0000 0x1000>,

				      <0x6d0000 0x1000>;

				dma-coherent;

				msi-parent = <&gic_v2m0>;

				clocks = <&cpm_syscon0 1 7>;

			};



			cpm_spi0: spi@700600 {

				compatible = "marvell,armada-380-spi";

				reg = <0x700600 0x50>;