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

Commit 35a647f1 authored by Chris Packham's avatar Chris Packham Committed by Gregory CLEMENT
Browse files

ARM: dts: armada-xp-98dx3236: combine dfx server nodes 



Rather than having a separate node for the dfx server add a reg property
to the parent node. This give some compatibility with the Marvell
supplied SDK.

As no upstream driver currently exists for this block and support for
this SoC is still quite fresh in the kernel it should not be necessary
to retain a backwards compatible binding.

Signed-off-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent a4ee7e18

Documentation/devicetree/bindings/net/marvell,prestera.txt

+5 −8
Original line number Diff line number Diff line
@@ -32,19 +32,16 @@ DFX Server bindings 
-------------------



Required properties:

- compatible: must be "marvell,dfx-server"

- compatible: must be "marvell,dfx-server", "simple-bus"

- ranges: describes the address mapping of a memory-mapped bus.

- reg: address and length of the register set for the device.



Example:



dfx-registers {

	compatible = "simple-bus";

dfx-server {

	compatible = "marvell,dfx-server", "simple-bus";

	#address-cells = <1>;

	#size-cells = <1>;

	ranges = <0 MBUS_ID(0x08, 0x00) 0 0x100000>;



	dfx: dfx@0 {

		compatible = "marvell,dfx-server";

		reg = <0 0x100000>;

	};

	reg = <MBUS_ID(0x08, 0x00) 0 0x100000>;

};

arch/arm/boot/dts/armada-xp-98dx3236.dtsi

+3 −7
Original line number Diff line number Diff line
@@ -195,11 +195,12 @@ 
			};

		};



		dfxr: dfx-registers@ac000000 {

			compatible = "simple-bus";

		dfx: dfx-server@ac000000 {

			compatible = "marvell,dfx-server", "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0 MBUS_ID(0x08, 0x00) 0 0x100000>;

			reg = <MBUS_ID(0x08, 0x00) 0 0x100000>;



			dfx_coredivclk: corediv-clock@f8268 {

				compatible = "marvell,mv98dx3236-corediv-clock";
@@ -208,11 +209,6 @@ 
				clocks = <&mainpll>;

				clock-output-names = "nand";

			};



			dfx: dfx@0 {

				compatible = "marvell,dfx-server";

				reg = <0 0x100000>;

			};

		};



		switch: switch@a8000000 {