diff mbox

[RESEND,net-next] net: updates HNS config and documents

Message ID 1445308604-95860-1-git-send-email-yankejian@huawei.com (mailing list archive)
State New, archived
Headers show

Commit Message

yankejian Oct. 20, 2015, 2:36 a.m. UTC 
updates the bindings documents and dtsi file according to the review
comments from Rob Herring <robh@kernel.org>

Signed-off-by: yankejian <yankejian@huawei.com>
Signed-off-by: huangdaode <huangdaode@hisilicon.com>
---
 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(-)

Comments

Rob Herring Oct. 22, 2015, 1:26 a.m. UTC | #1 
On Mon, Oct 19, 2015 at 9:36 PM, yankejian <yankejian@huawei.com> wrote:
> updates the bindings documents and dtsi file according to the review
> comments from Rob Herring <robh@kernel.org>
>
> Signed-off-by: yankejian <yankejian@huawei.com>
> Signed-off-by: huangdaode <huangdaode@hisilicon.com>

Acked-by: Rob Herring <robh@kernel.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@803c0000 {
>                     #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@000000000 {
>                 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@000000000 {
>                        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@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
yankejian Oct. 22, 2015, 2:51 a.m. UTC | #2 
? 2015/10/22 9:26, Rob Herring ??:
> On Mon, Oct 19, 2015 at 9:36 PM, yankejian <yankejian@huawei.com> wrote:
>> updates the bindings documents and dtsi file according to the review
>> comments from Rob Herring <robh@kernel.org>
>>
>> Signed-off-by: yankejian <yankejian@huawei.com>
>> Signed-off-by: huangdaode <huangdaode@hisilicon.com>
> 
> Acked-by: Rob Herring <robh@kernel.org>
> 

Thanks!

>> ---
>>  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@803c0000 {
>>                     #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@000000000 {
>>                 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@000000000 {
>>                        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@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> .
>
diff mbox

Patch

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@803c0000 {
                    #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@000000000 {
 		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@000000000 {
 		       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