| Message ID | E1gMBMs-00089t-Fd@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
| Series | Armada 38x comphy driver to support 2.5Gbps networking | expand |
On Mon, Nov 12, 2018 at 12:31:02PM +0000, Russell King wrote: > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Needs a better subject and a commit msg. > --- > Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt > index bedcfd5a52cd..691f886cfc4a 100644 > --- a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt > +++ b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt > @@ -19,7 +19,7 @@ > "marvell,armada-370-neta" and 9800B for others. > - clock-names: List of names corresponding to clocks property; shall be > "core" for core clock and "bus" for the optional bus clock. > - > +- phys: comphy for the ethernet port, see ../phy/phy-bindings.txt > > Optional properties (valid only for Armada XP/38x): > > -- > 2.7.4 >
On Mon, Dec 03, 2018 at 05:54:55PM -0600, Rob Herring wrote: > On Mon, Nov 12, 2018 at 12:31:02PM +0000, Russell King wrote: > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> > > Needs a better subject and a commit msg. Hmm, not sure why it didn't contain: "dt-bindings: net: mvneta: add phys property Add an optional phys property to the mvneta binding documentation for the common phy. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>" as the commit message. With the correct commit message, are you happy with it? > > > --- > > Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt > > index bedcfd5a52cd..691f886cfc4a 100644 > > --- a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt > > +++ b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt > > @@ -19,7 +19,7 @@ > > "marvell,armada-370-neta" and 9800B for others. > > - clock-names: List of names corresponding to clocks property; shall be > > "core" for core clock and "bus" for the optional bus clock. > > - > > +- phys: comphy for the ethernet port, see ../phy/phy-bindings.txt > > > > Optional properties (valid only for Armada XP/38x): > > > > -- > > 2.7.4 > >
On Wed, Dec 5, 2018 at 5:00 AM Russell King - ARM Linux <linux@armlinux.org.uk> wrote: > > On Mon, Dec 03, 2018 at 05:54:55PM -0600, Rob Herring wrote: > > On Mon, Nov 12, 2018 at 12:31:02PM +0000, Russell King wrote: > > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> > > > > Needs a better subject and a commit msg. > > Hmm, not sure why it didn't contain: > > "dt-bindings: net: mvneta: add phys property > > Add an optional phys property to the mvneta binding documentation for > the common phy. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>" > > as the commit message. With the correct commit message, are you happy > with it? Yes. Reviewed-by: Rob Herring <robh@kernel.org>
Hi Russell, On 05/12/18 9:00 PM, Rob Herring wrote: > On Wed, Dec 5, 2018 at 5:00 AM Russell King - ARM Linux > <linux@armlinux.org.uk> wrote: >> >> On Mon, Dec 03, 2018 at 05:54:55PM -0600, Rob Herring wrote: >>> On Mon, Nov 12, 2018 at 12:31:02PM +0000, Russell King wrote: >>>> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> >>> >>> Needs a better subject and a commit msg. >> >> Hmm, not sure why it didn't contain: >> >> "dt-bindings: net: mvneta: add phys property >> >> Add an optional phys property to the mvneta binding documentation for >> the common phy. >> >> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>" >> >> as the commit message. With the correct commit message, are you happy >> with it? > > Yes. > > Reviewed-by: Rob Herring <robh@kernel.org> Are you planning to resend this series? Thanks Kishon
On Fri, Dec 07, 2018 at 09:37:54AM +0530, Kishon Vijay Abraham I wrote: > Hi Russell, > > On 05/12/18 9:00 PM, Rob Herring wrote: > > On Wed, Dec 5, 2018 at 5:00 AM Russell King - ARM Linux > > <linux@armlinux.org.uk> wrote: > >> > >> On Mon, Dec 03, 2018 at 05:54:55PM -0600, Rob Herring wrote: > >>> On Mon, Nov 12, 2018 at 12:31:02PM +0000, Russell King wrote: > >>>> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> > >>> > >>> Needs a better subject and a commit msg. > >> > >> Hmm, not sure why it didn't contain: > >> > >> "dt-bindings: net: mvneta: add phys property > >> > >> Add an optional phys property to the mvneta binding documentation for > >> the common phy. > >> > >> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>" > >> > >> as the commit message. With the correct commit message, are you happy > >> with it? > > > > Yes. > > > > Reviewed-by: Rob Herring <robh@kernel.org> > > Are you planning to resend this series? I'm not - you said previously that you had merged the first three patches into the phy tree, which are fine. The next two could be merged via netdev. However, we must avoid merging the last patch with patch 5 if the patches are going via different trees or mvneta will break.
Russell, On 07/12/18 4:11 PM, Russell King - ARM Linux wrote: > On Fri, Dec 07, 2018 at 09:37:54AM +0530, Kishon Vijay Abraham I wrote: >> Hi Russell, >> >> On 05/12/18 9:00 PM, Rob Herring wrote: >>> On Wed, Dec 5, 2018 at 5:00 AM Russell King - ARM Linux >>> <linux@armlinux.org.uk> wrote: >>>> >>>> On Mon, Dec 03, 2018 at 05:54:55PM -0600, Rob Herring wrote: >>>>> On Mon, Nov 12, 2018 at 12:31:02PM +0000, Russell King wrote: >>>>>> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> >>>>> >>>>> Needs a better subject and a commit msg. >>>> >>>> Hmm, not sure why it didn't contain: >>>> >>>> "dt-bindings: net: mvneta: add phys property >>>> >>>> Add an optional phys property to the mvneta binding documentation for >>>> the common phy. >>>> >>>> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>" >>>> >>>> as the commit message. With the correct commit message, are you happy >>>> with it? >>> >>> Yes. >>> >>> Reviewed-by: Rob Herring <robh@kernel.org> >> >> Are you planning to resend this series? > > I'm not - you said previously that you had merged the first three > patches into the phy tree, which are fine. The next two could be No, I haven't merged patches from this series. That would have failed compilation since Grygorii modified enum phy_mode which is used in this series. You have also noted this in your cover letter. Thanks Kishon
On Fri, Dec 07, 2018 at 04:43:27PM +0530, Kishon Vijay Abraham I wrote: > Russell, > > No, I haven't merged patches from this series. That would have failed > compilation since Grygorii modified enum phy_mode which is used in this series. > You have also noted this in your cover letter. Ok, but in any case, given the complexities of modifying the patch and properly testing it, I think I'll wait until those changes have hit mainline before re-spinning this series. Alternatively, if you're happy to take just build-tested version, I could re-spin with that so at least we can get the phy bits queued for the merge window. In any case, I'm busy trying to get to the bottom of several OMAP4 bugs while ill, so this isn't something I want to do at the moment.
Hi, On 07/12/18 5:03 PM, Russell King - ARM Linux wrote: > On Fri, Dec 07, 2018 at 04:43:27PM +0530, Kishon Vijay Abraham I wrote: >> Russell, >> >> No, I haven't merged patches from this series. That would have failed >> compilation since Grygorii modified enum phy_mode which is used in this series. >> You have also noted this in your cover letter. > > Ok, but in any case, given the complexities of modifying the patch > and properly testing it, I think I'll wait until those changes have > hit mainline before re-spinning this series. Alternatively, if > you're happy to take just build-tested version, I could re-spin > with that so at least we can get the phy bits queued for the merge > window. I'd prefer we test it before merging. > > In any case, I'm busy trying to get to the bottom of several OMAP4 > bugs while ill, so this isn't something I want to do at the moment. Take care! Thanks Kishon >
On Fri, Dec 07, 2018 at 05:30:52PM +0530, Kishon Vijay Abraham I wrote: > Hi, > > On 07/12/18 5:03 PM, Russell King - ARM Linux wrote: > > On Fri, Dec 07, 2018 at 04:43:27PM +0530, Kishon Vijay Abraham I wrote: > >> Russell, > >> > >> No, I haven't merged patches from this series. That would have failed > >> compilation since Grygorii modified enum phy_mode which is used in this series. > >> You have also noted this in your cover letter. > > > > Ok, but in any case, given the complexities of modifying the patch > > and properly testing it, I think I'll wait until those changes have > > hit mainline before re-spinning this series. Alternatively, if > > you're happy to take just build-tested version, I could re-spin > > with that so at least we can get the phy bits queued for the merge > > window. > > I'd prefer we test it before merging. Okay, expect it sometime after Christmas. In any case, waiting for the upheaval in the phy API to hit mainline will need to happen to that netdev is in sync with the revised phy API.
diff --git a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt index bedcfd5a52cd..691f886cfc4a 100644 --- a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt +++ b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt @@ -19,7 +19,7 @@ "marvell,armada-370-neta" and 9800B for others. - clock-names: List of names corresponding to clocks property; shall be "core" for core clock and "bus" for the optional bus clock. - +- phys: comphy for the ethernet port, see ../phy/phy-bindings.txt Optional properties (valid only for Armada XP/38x):
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)