Hi Dave, On mer., juin 07 2017, Antoine Tenart <antoine.ten...@free-electrons.com> wrote:
> Add the description of the xMDIO bus for the Marvell Armada 7k and > Marvell Armada 8k; for both CP110 slave and master. This bus is found > on Marvell Ethernet controllers and provides an interface with the > xMDIO bus. > If you agrees with this series please don't apply this patch. I will take care of it. We have many changes in the dt directory for the next release and I want that all the change are in the same place to take care of the merge conflict. Thanks, Gregory > Signed-off-by: Antoine Tenart <antoine.ten...@free-electrons.com> > --- > arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 7 +++++++ > arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 7 +++++++ > 2 files changed, 14 insertions(+) > > diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi > b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi > index 037ed30d75a7..95953743455e 100644 > --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi > @@ -98,6 +98,13 @@ > clocks = <&cpm_syscon0 1 9>, <&cpm_syscon0 1 5>; > }; > > + cpm_xmdio: mdio@12a600 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "marvell,xmdio"; > + reg = <0x12a600 0x10>; > + }; > + > cpm_icu: interrupt-controller@1e0000 { > compatible = "marvell,cp110-icu"; > reg = <0x1e0000 0x10>; > diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi > b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi > index 2a99ff8fca2a..594356243ddb 100644 > --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi > @@ -103,6 +103,13 @@ > clocks = <&cps_syscon0 1 9>, <&cps_syscon0 1 5>; > }; > > + cps_xmdio: mdio@12a600 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "marvell,xmdio"; > + reg = <0x12a600 0x10>; > + }; > + > cps_icu: interrupt-controller@1e0000 { > compatible = "marvell,cp110-icu"; > reg = <0x1e0000 0x10>; > -- > 2.9.4 > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com