android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Chris Packham <chris.packham@alliedtelesis.co.nz>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
This commit is contained in:
Chris Packham 2017-02-16 21:50:36 +13:00 committed by Gregory CLEMENT
parent a4ee7e18d8
commit 35a647f12c
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/devicetree/bindings/net/marvell,prestera.txt
View File

@ -32,19 +32,16 @@ DFX Server bindings
------------------- -------------------
Required properties: 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. - reg: address and length of the register set for the device.
Example: Example:
dfx-registers { dfx-server {
compatible = "simple-bus"; compatible = "marvell,dfx-server", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 MBUS_ID(0x08, 0x00) 0 0x100000>; ranges = <0 MBUS_ID(0x08, 0x00) 0 0x100000>;
reg = <MBUS_ID(0x08, 0x00) 0 0x100000>;
dfx: dfx@0 {
compatible = "marvell,dfx-server";
reg = <0 0x100000>;
};
}; };

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

@ -195,11 +195,12 @@
}; };
}; };
dfxr: dfx-registers@ac000000 { dfx: dfx-server@ac000000 {
compatible = "simple-bus"; compatible = "marvell,dfx-server", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 MBUS_ID(0x08, 0x00) 0 0x100000>; ranges = <0 MBUS_ID(0x08, 0x00) 0 0x100000>;
reg = <MBUS_ID(0x08, 0x00) 0 0x100000>;
dfx_coredivclk: corediv-clock@f8268 { dfx_coredivclk: corediv-clock@f8268 {
compatible = "marvell,mv98dx3236-corediv-clock"; compatible = "marvell,mv98dx3236-corediv-clock";
@ -208,11 +209,6 @@
clocks = <&mainpll>; clocks = <&mainpll>;
clock-output-names = "nand"; clock-output-names = "nand";
}; };
dfx: dfx@0 {
compatible = "marvell,dfx-server";
reg = <0 0x100000>;
};
}; };
switch: switch@a8000000 { switch: switch@a8000000 {