diff mbox

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

Message ID 1445944594-244149-1-git-send-email-huangdaode@hisilicon.com (mailing list archive)
State New, archived
Headers show

Commit Message

huangdaode Oct. 27, 2015, 11:16 a.m. UTC 
From: yankejian <yankejian@huawei.com>

updates the bindings documents and dtsi file according to the review
comments[https://lkml.org/lkml/2015/9/21/670] from Rob Herring <robh@kernel.org>

Acked-by: 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

David Miller Oct. 28, 2015, 3:20 a.m. UTC | #1 
From: huangdaode <huangdaode@hisilicon.com>
Date: Tue, 27 Oct 2015 19:16:34 +0800

> From: yankejian <yankejian@huawei.com>
> 
> updates the bindings documents and dtsi file according to the review
> comments[https://lkml.org/lkml/2015/9/21/670] from Rob Herring <robh@kernel.org>
> 
> Acked-by: Rob Herring <robh@kernel.org>
> Signed-off-by: yankejian <yankejian@huawei.com>
> Signed-off-by: huangdaode <huangdaode@hisilicon.com>

Applied, thanks.
Arnd Bergmann Oct. 30, 2015, 2:20 p.m. UTC | #2 
On Tuesday 27 October 2015 19:16:34 huangdaode wrote:
>           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>;
>  
> 

Does "hisilicon,mdio" actually have a specific meaning? Is that just there
for legacy reasons?

	Arnd
huangdaode Oct. 31, 2015, 1:40 a.m. UTC | #3 
On 2015/10/30 22:20, Arnd Bergmann wrote:
> On Tuesday 27 October 2015 19:16:34 huangdaode wrote:
>>            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>;
>>   
>>
> Does "hisilicon,mdio" actually have a specific meaning? Is that just there
> for legacy reasons?
>
> 	Arnd
>
> .
>
hi Arnd,
"hisilicon,mdio" is  the gernerical configuation compatible  for the 
default hisilicon chip,
We use generic hisilicon since our MDIO/PHY is same across flavour of SoCs.
Salil Mehta Oct. 31, 2015, 2:18 a.m. UTC | #4 
On 10/31/2015 1:40 AM, huangdaode wrote:
> On 2015/10/30 22:20, Arnd Bergmann wrote:
>> On Tuesday 27 October 2015 19:16:34 huangdaode wrote:
>>>            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>;
>>>
>> Does "hisilicon,mdio" actually have a specific meaning? Is that just 
>> there
>> for legacy reasons?
>>
>>     Arnd
>>
>> .
>>
> hi Arnd,
> "hisilicon,mdio" is  the gernerical configuation compatible  for the 
> default hisilicon chip,
> We use generic hisilicon since our MDIO/PHY is same across flavour of 
> SoCs.
>
Hi Arnd,
Yes, "hisilicon,mdio" exists for the legacy reasons to support older SoC 
Hip04.

Best Regards
Salil
Arnd Bergmann Nov. 2, 2015, 10:05 p.m. UTC | #5 
On Saturday 31 October 2015 02:18:19 Salil Mehta wrote:
> On 10/31/2015 1:40 AM, huangdaode wrote:
> > On 2015/10/30 22:20, Arnd Bergmann wrote:
> >> On Tuesday 27 October 2015 19:16:34 huangdaode wrote:
> >>>            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>;
> >>>
> >> Does "hisilicon,mdio" actually have a specific meaning? Is that just 
> >> there
> >> for legacy reasons?
> >>
> >>     Arnd
> >>
> >> .
> >>
> > hi Arnd,
> > "hisilicon,mdio" is  the gernerical configuation compatible  for the 
> > default hisilicon chip,
> > We use generic hisilicon since our MDIO/PHY is same across flavour of 
> > SoCs.
> >
> Hi Arnd,
> Yes, "hisilicon,mdio" exists for the legacy reasons to support older SoC 
> Hip04.

I see. In that case, that compatible string should probably be mentioned
only as 'optional' in the binding, and not used for devices other than
hip04.

	Arnd
huangdaode Nov. 12, 2015, 2:11 a.m. UTC | #6 
On 2015/11/3 6:05, Arnd Bergmann wrote:
> On Saturday 31 October 2015 02:18:19 Salil Mehta wrote:
>> On 10/31/2015 1:40 AM, huangdaode wrote:
>>> On 2015/10/30 22:20, Arnd Bergmann wrote:
>>>> On Tuesday 27 October 2015 19:16:34 huangdaode wrote:
>>>>>             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>;
>>>>>
>>>> Does "hisilicon,mdio" actually have a specific meaning? Is that just
>>>> there
>>>> for legacy reasons?
>>>>
>>>>      Arnd
>>>>
>>>> .
>>>>
>>> hi Arnd,
>>> "hisilicon,mdio" is  the gernerical configuation compatible  for the
>>> default hisilicon chip,
>>> We use generic hisilicon since our MDIO/PHY is same across flavour of
>>> SoCs.
>>>
>> Hi Arnd,
>> Yes, "hisilicon,mdio" exists for the legacy reasons to support older SoC
>> Hip04.
> I see. In that case, that compatible string should probably be mentioned
> only as 'optional' in the binding, and not used for devices other than
> hip04.
>
> 	Arnd
>
> .
>
Hi, Arnd
ok, ill send a patch to specify it, please Ack then.
thanks
Daode.
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