| Message ID | 20170607083810.30922-10-antoine.tenart@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Dave, On mer., juin 07 2017, Antoine Tenart <antoine.tenart@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.tenart@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 >
From: Gregory CLEMENT <gregory.clement@free-electrons.com> Date: Wed, 07 Jun 2017 10:43:49 +0200 > 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. Ok, I will elide this patch when/if I apply the series to net-next. Thanks.
Hi Gregory, On Wed, Jun 07, 2017 at 10:38:10AM +0200, Antoine Tenart wrote: > 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>; > + }; > + Russell pointed out on IRC the mdio/xmdio interfaces aren't wired to anything on the mcbin. We could either disable these interfaces by default, or add explicit disables in the mcbin device tree. What's your thoughts on this? Thanks! Antoine
On Thu, Jun 08, 2017 at 10:45:15AM +0200, Antoine Tenart wrote: > On Wed, Jun 07, 2017 at 10:38:10AM +0200, Antoine Tenart wrote: > > 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>; > > + }; > > + > > Russell pointed out on IRC the mdio/xmdio interfaces aren't wired to > anything on the mcbin. The ones found in the cp110 slave * Antoine
Hi Antoine, On jeu., juin 08 2017, Antoine Tenart <antoine.tenart@free-electrons.com> wrote: > Hi Gregory, > > On Wed, Jun 07, 2017 at 10:38:10AM +0200, Antoine Tenart wrote: >> 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>; >> + }; >> + > > Russell pointed out on IRC the mdio/xmdio interfaces aren't wired to > anything on the mcbin. We could either disable these interfaces by > default, or add explicit disables in the mcbin device tree. > > What's your thoughts on this? I prefer that we disable it by default and only enable it on the boards using it. Thanks, Gregory > > Thanks! > Antoine > > -- > Antoine Ténart, Free Electrons > Embedded Linux and Kernel engineering > http://free-electrons.com
Hi Gregory, On Thu, Jun 08, 2017 at 10:55:01AM +0200, Gregory CLEMENT wrote: > On jeu., juin 08 2017, Antoine Tenart <antoine.tenart@free-electrons.com> wrote: > > On Wed, Jun 07, 2017 at 10:38:10AM +0200, Antoine Tenart wrote: > >> 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>; > >> + }; > >> + > > > > Russell pointed out on IRC the mdio/xmdio interfaces aren't wired to > > anything on the mcbin. We could either disable these interfaces by > > default, or add explicit disables in the mcbin device tree. > > > > What's your thoughts on this? > > I prefer that we disable it by default and only enable it on the boards > using it. OK. I'll add a disabled status property in this patch, and I'll make another series to fix the existing mdio nodes. Thanks! Antoine
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>;
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. Signed-off-by: Antoine Tenart <antoine.tenart@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(+)