lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAL_JsqJ+4BK2KDX5+t6GGEYv3pPDc+crktiMqgu6QTZi7WDrxw@mail.gmail.com> Date: Wed, 21 Oct 2015 20:26:59 -0500 From: Rob Herring <robh+dt@...nel.org> To: yankejian <yankejian@...wei.com> Cc: liguozhu@...wei.com, yisen.zhuang@...wei.com, huangdaode <huangdaode@...ilicon.com>, lipeng321@...wei.com, David Miller <davem@...emloft.net>, Pawel Moll <pawel.moll@....com>, Mark Rutland <mark.rutland@....com>, Ian Campbell <ijc+devicetree@...lion.org.uk>, Kumar Gala <galak@...eaurora.org>, Catalin Marinas <catalin.marinas@....com>, Will Deacon <will.deacon@....com>, "devicetree@...r.kernel.org" <devicetree@...r.kernel.org>, "linux-arm-kernel@...ts.infradead.org" <linux-arm-kernel@...ts.infradead.org>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, linuxarm@...wei.com Subject: Re: [PATCH RESEND net-next] net: updates HNS config and documents On Mon, Oct 19, 2015 at 9:36 PM, yankejian <yankejian@...wei.com> wrote: > updates the bindings documents and dtsi file according to the review > comments from Rob Herring <robh@...nel.org> > > Signed-off-by: yankejian <yankejian@...wei.com> > Signed-off-by: huangdaode <huangdaode@...ilicon.com> Acked-by: Rob Herring <robh@...nel.org> > --- > Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt | 2 +- > arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi | 8 +++----- > 2 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt b/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt > index 9940aa0..9c23fdf 100644 > --- a/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt > +++ b/Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt > @@ -12,7 +12,7 @@ Example: > mdio@...c0000 { > #address-cells = <1>; > #size-cells = <0>; > - compatible = "hisilicon,mdio","hisilicon,hns-mdio"; > + compatible = "hisilicon,hns-mdio","hisilicon,mdio"; > reg = <0x0 0x803c0000 0x0 0x10000>; > > ethernet-phy@0 { > diff --git a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi > index 3500586..606dd5a 100644 > --- a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi > +++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi > @@ -13,14 +13,12 @@ soc0: soc@...000000 { > reg = <0x0 0x803c0000 0x0 0x10000 > 0x0 0x80000000 0x0 0x10000>; > > - soc0_phy4: ethernet-phy@4 { > + soc0_phy0: ethernet-phy@0 { > reg = <0x0>; > - device_type = "ethernet-phy"; > compatible = "ethernet-phy-ieee802.3-c22"; > }; > - soc0_phy5: ethernet-phy@5 { > + soc0_phy1: ethernet-phy@1 { > reg = <0x1>; > - device_type = "ethernet-phy"; > compatible = "ethernet-phy-ieee802.3-c22"; > }; > }; > @@ -37,7 +35,7 @@ soc0: soc@...000000 { > 0x0 0xc7000000 0x0 0x60000 > >; > > - phy-handle = <0 0 0 0 &soc0_phy4 &soc0_phy5 0 0>; > + phy-handle = <0 0 0 0 &soc0_phy0 &soc0_phy1 0 0>; > interrupts = < > /* [14] ge fifo err 8 / xge 6**/ > 149 0x4 150 0x4 151 0x4 152 0x4 > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo@...r.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists