Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-19 Thread Dongpo Li 


On 2016/12/20 0:04, Rob Herring wrote:
> On Mon, Dec 19, 2016 at 2:14 AM, Dongpo Li  wrote:
>> Hi Rob and David,
>>
>> On 2016/12/12 22:21, Rob Herring wrote:
>>> On Mon, Dec 12, 2016 at 5:16 AM, Dongpo Li  wrote:
 Hi Rob,

 On 2016/12/10 6:35, Rob Herring wrote:
> On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:
> 
> [...]
> 
>> @@ -20,7 +25,7 @@ Required properties:
>>
>>  Example:
>>  gmac0: ethernet@f984 {
>> -compatible = "hisilicon,hix5hd2-gmac";
>> +compatible = "hisilicon,hix5hd2-gemac", 
>> "hisilicon,hisi-gemac-v1";
>
> You can't just change compatible strings.
>
 Okay, maybe I should name all the compatible string with the suffix 
 "-gmac" instead of
 "-gemac". This can keep the compatible strings with the same suffix. Is 
 this okay?
 Can I just add the generic compatible string without changing the SoCs 
 compatible string?
 Like following:
 gmac0: ethernet@f984 {
  -  compatible = "hisilicon,hix5hd2-gmac";
  +  compatible = "hisilicon,hix5hd2-gmac", 
 "hisilicon,hisi-gmac-v1";
>>>
>>> Yes, this is fine.
>>
>> As the patch series have been applied to net-next branch,
>> in which way should I commit this compatible fix?
>> Should I send a new patch fixing this compatible string error with "Fixes: 
>> xxx"?
>> Looking forward to your reply!
> 
> Yes to both.

Okay, thanks for your reply!
I will send the fix patch series as soon as possible.


Regards,
Dongpo

.

Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-19 Thread Dongpo Li 


On 2016/12/20 0:04, Rob Herring wrote:
> On Mon, Dec 19, 2016 at 2:14 AM, Dongpo Li  wrote:
>> Hi Rob and David,
>>
>> On 2016/12/12 22:21, Rob Herring wrote:
>>> On Mon, Dec 12, 2016 at 5:16 AM, Dongpo Li  wrote:
 Hi Rob,

 On 2016/12/10 6:35, Rob Herring wrote:
> On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:
> 
> [...]
> 
>> @@ -20,7 +25,7 @@ Required properties:
>>
>>  Example:
>>  gmac0: ethernet@f984 {
>> -compatible = "hisilicon,hix5hd2-gmac";
>> +compatible = "hisilicon,hix5hd2-gemac", 
>> "hisilicon,hisi-gemac-v1";
>
> You can't just change compatible strings.
>
 Okay, maybe I should name all the compatible string with the suffix 
 "-gmac" instead of
 "-gemac". This can keep the compatible strings with the same suffix. Is 
 this okay?
 Can I just add the generic compatible string without changing the SoCs 
 compatible string?
 Like following:
 gmac0: ethernet@f984 {
  -  compatible = "hisilicon,hix5hd2-gmac";
  +  compatible = "hisilicon,hix5hd2-gmac", 
 "hisilicon,hisi-gmac-v1";
>>>
>>> Yes, this is fine.
>>
>> As the patch series have been applied to net-next branch,
>> in which way should I commit this compatible fix?
>> Should I send a new patch fixing this compatible string error with "Fixes: 
>> xxx"?
>> Looking forward to your reply!
> 
> Yes to both.

Okay, thanks for your reply!
I will send the fix patch series as soon as possible.


Regards,
Dongpo

.

Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-19 Thread Rob Herring 
On Mon, Dec 19, 2016 at 2:14 AM, Dongpo Li  wrote:
> Hi Rob and David,
>
> On 2016/12/12 22:21, Rob Herring wrote:
>> On Mon, Dec 12, 2016 at 5:16 AM, Dongpo Li  wrote:
>>> Hi Rob,
>>>
>>> On 2016/12/10 6:35, Rob Herring wrote:
 On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:

[...]

> @@ -20,7 +25,7 @@ Required properties:
>
>  Example:
>  gmac0: ethernet@f984 {
> -compatible = "hisilicon,hix5hd2-gmac";
> +compatible = "hisilicon,hix5hd2-gemac", 
> "hisilicon,hisi-gemac-v1";

 You can't just change compatible strings.

>>> Okay, maybe I should name all the compatible string with the suffix "-gmac" 
>>> instead of
>>> "-gemac". This can keep the compatible strings with the same suffix. Is 
>>> this okay?
>>> Can I just add the generic compatible string without changing the SoCs 
>>> compatible string?
>>> Like following:
>>> gmac0: ethernet@f984 {
>>>  -  compatible = "hisilicon,hix5hd2-gmac";
>>>  +  compatible = "hisilicon,hix5hd2-gmac", 
>>> "hisilicon,hisi-gmac-v1";
>>
>> Yes, this is fine.
>
> As the patch series have been applied to net-next branch,
> in which way should I commit this compatible fix?
> Should I send a new patch fixing this compatible string error with "Fixes: 
> xxx"?
> Looking forward to your reply!

Yes to both.

Rob

Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-19 Thread Rob Herring 
On Mon, Dec 19, 2016 at 2:14 AM, Dongpo Li  wrote:
> Hi Rob and David,
>
> On 2016/12/12 22:21, Rob Herring wrote:
>> On Mon, Dec 12, 2016 at 5:16 AM, Dongpo Li  wrote:
>>> Hi Rob,
>>>
>>> On 2016/12/10 6:35, Rob Herring wrote:
 On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:

[...]

> @@ -20,7 +25,7 @@ Required properties:
>
>  Example:
>  gmac0: ethernet@f984 {
> -compatible = "hisilicon,hix5hd2-gmac";
> +compatible = "hisilicon,hix5hd2-gemac", 
> "hisilicon,hisi-gemac-v1";

 You can't just change compatible strings.

>>> Okay, maybe I should name all the compatible string with the suffix "-gmac" 
>>> instead of
>>> "-gemac". This can keep the compatible strings with the same suffix. Is 
>>> this okay?
>>> Can I just add the generic compatible string without changing the SoCs 
>>> compatible string?
>>> Like following:
>>> gmac0: ethernet@f984 {
>>>  -  compatible = "hisilicon,hix5hd2-gmac";
>>>  +  compatible = "hisilicon,hix5hd2-gmac", 
>>> "hisilicon,hisi-gmac-v1";
>>
>> Yes, this is fine.
>
> As the patch series have been applied to net-next branch,
> in which way should I commit this compatible fix?
> Should I send a new patch fixing this compatible string error with "Fixes: 
> xxx"?
> Looking forward to your reply!

Yes to both.

Rob

Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-19 Thread Dongpo Li 
Hi Rob and David,

On 2016/12/12 22:21, Rob Herring wrote:
> On Mon, Dec 12, 2016 at 5:16 AM, Dongpo Li  wrote:
>> Hi Rob,
>>
>> On 2016/12/10 6:35, Rob Herring wrote:
>>> On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:
 The "hix5hd2" is SoC name, add the generic ethernet driver name.
 The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds
 the SG/TXCSUM/TSO/UFO features.

 Signed-off-by: Dongpo Li 
 ---
  .../devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt|  9 +++--
  drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 15 
 +++
  2 files changed, 18 insertions(+), 6 deletions(-)

 diff --git 
 a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt 
 b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
 index 75d398b..75920f0 100644
 --- a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
 +++ b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
 @@ -1,7 +1,12 @@
  Hisilicon hix5hd2 gmac controller

  Required properties:
 -- compatible: should be "hisilicon,hix5hd2-gmac".
 +- compatible: should contain one of the following SoC strings:
 +* "hisilicon,hix5hd2-gemac"
 +* "hisilicon,hi3798cv200-gemac"
 +and one of the following version string:
 +* "hisilicon,hisi-gemac-v1"
 +* "hisilicon,hisi-gemac-v2"
>>>
>>> What combinations are valid? I assume both chips don't have both v1 and
>>> v2. 2 SoCs and 2 versions so far, I don't think there is much point to
>>> have the v1 and v2 compatible strings.
>>>
>> The v1 and v2 are generic MAC compatible strings, many HiSilicon SoCs may
>> use the same MAC version. For example,
>> hix5hd2, hi3716cv200 SoCs use the v1 MAC version,
>> hi3798cv200, hi3516a SoCs use the v2 MAC version,
>> and there may be more SoCs added in future.
>> So I think the generic compatible strings are okay here.
>> Should I add the hi3716cv200, hi3516a SoCs compatible here?
> 
> Yes.
> 
>> Do you have any good advice?
>>
  - reg: specifies base physical address(s) and size of the device 
 registers.
The first region is the MAC register base and size.
The second region is external interface control register.
 @@ -20,7 +25,7 @@ Required properties:

  Example:
  gmac0: ethernet@f984 {
 -compatible = "hisilicon,hix5hd2-gmac";
 +compatible = "hisilicon,hix5hd2-gemac", 
 "hisilicon,hisi-gemac-v1";
>>>
>>> You can't just change compatible strings.
>>>
>> Okay, maybe I should name all the compatible string with the suffix "-gmac" 
>> instead of
>> "-gemac". This can keep the compatible strings with the same suffix. Is this 
>> okay?
>> Can I just add the generic compatible string without changing the SoCs 
>> compatible string?
>> Like following:
>> gmac0: ethernet@f984 {
>>  -  compatible = "hisilicon,hix5hd2-gmac";
>>  +  compatible = "hisilicon,hix5hd2-gmac", 
>> "hisilicon,hisi-gmac-v1";
> 
> Yes, this is fine.

As the patch series have been applied to net-next branch,
in which way should I commit this compatible fix?
Should I send a new patch fixing this compatible string error with "Fixes: xxx"?
Looking forward to your reply!


Regards,
Dongpo

.

Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-19 Thread Dongpo Li 
Hi Rob and David,

On 2016/12/12 22:21, Rob Herring wrote:
> On Mon, Dec 12, 2016 at 5:16 AM, Dongpo Li  wrote:
>> Hi Rob,
>>
>> On 2016/12/10 6:35, Rob Herring wrote:
>>> On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:
 The "hix5hd2" is SoC name, add the generic ethernet driver name.
 The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds
 the SG/TXCSUM/TSO/UFO features.

 Signed-off-by: Dongpo Li 
 ---
  .../devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt|  9 +++--
  drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 15 
 +++
  2 files changed, 18 insertions(+), 6 deletions(-)

 diff --git 
 a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt 
 b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
 index 75d398b..75920f0 100644
 --- a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
 +++ b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
 @@ -1,7 +1,12 @@
  Hisilicon hix5hd2 gmac controller

  Required properties:
 -- compatible: should be "hisilicon,hix5hd2-gmac".
 +- compatible: should contain one of the following SoC strings:
 +* "hisilicon,hix5hd2-gemac"
 +* "hisilicon,hi3798cv200-gemac"
 +and one of the following version string:
 +* "hisilicon,hisi-gemac-v1"
 +* "hisilicon,hisi-gemac-v2"
>>>
>>> What combinations are valid? I assume both chips don't have both v1 and
>>> v2. 2 SoCs and 2 versions so far, I don't think there is much point to
>>> have the v1 and v2 compatible strings.
>>>
>> The v1 and v2 are generic MAC compatible strings, many HiSilicon SoCs may
>> use the same MAC version. For example,
>> hix5hd2, hi3716cv200 SoCs use the v1 MAC version,
>> hi3798cv200, hi3516a SoCs use the v2 MAC version,
>> and there may be more SoCs added in future.
>> So I think the generic compatible strings are okay here.
>> Should I add the hi3716cv200, hi3516a SoCs compatible here?
> 
> Yes.
> 
>> Do you have any good advice?
>>
  - reg: specifies base physical address(s) and size of the device 
 registers.
The first region is the MAC register base and size.
The second region is external interface control register.
 @@ -20,7 +25,7 @@ Required properties:

  Example:
  gmac0: ethernet@f984 {
 -compatible = "hisilicon,hix5hd2-gmac";
 +compatible = "hisilicon,hix5hd2-gemac", 
 "hisilicon,hisi-gemac-v1";
>>>
>>> You can't just change compatible strings.
>>>
>> Okay, maybe I should name all the compatible string with the suffix "-gmac" 
>> instead of
>> "-gemac". This can keep the compatible strings with the same suffix. Is this 
>> okay?
>> Can I just add the generic compatible string without changing the SoCs 
>> compatible string?
>> Like following:
>> gmac0: ethernet@f984 {
>>  -  compatible = "hisilicon,hix5hd2-gmac";
>>  +  compatible = "hisilicon,hix5hd2-gmac", 
>> "hisilicon,hisi-gmac-v1";
> 
> Yes, this is fine.

As the patch series have been applied to net-next branch,
in which way should I commit this compatible fix?
Should I send a new patch fixing this compatible string error with "Fixes: xxx"?
Looking forward to your reply!


Regards,
Dongpo

.

Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-12 Thread Dongpo Li 


On 2016/12/12 22:21, Rob Herring wrote:
> On Mon, Dec 12, 2016 at 5:16 AM, Dongpo Li  wrote:
>> Hi Rob,
>>
>> On 2016/12/10 6:35, Rob Herring wrote:
>>> On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:
 The "hix5hd2" is SoC name, add the generic ethernet driver name.
 The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds
 the SG/TXCSUM/TSO/UFO features.

 Signed-off-by: Dongpo Li 
 ---
  .../devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt|  9 +++--
  drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 15 
 +++
  2 files changed, 18 insertions(+), 6 deletions(-)

 diff --git 
 a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt 
 b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
 index 75d398b..75920f0 100644
 --- a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
 +++ b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
 @@ -1,7 +1,12 @@
  Hisilicon hix5hd2 gmac controller

  Required properties:
 -- compatible: should be "hisilicon,hix5hd2-gmac".
 +- compatible: should contain one of the following SoC strings:
 +* "hisilicon,hix5hd2-gemac"
 +* "hisilicon,hi3798cv200-gemac"
 +and one of the following version string:
 +* "hisilicon,hisi-gemac-v1"
 +* "hisilicon,hisi-gemac-v2"
>>>
>>> What combinations are valid? I assume both chips don't have both v1 and
>>> v2. 2 SoCs and 2 versions so far, I don't think there is much point to
>>> have the v1 and v2 compatible strings.
>>>
>> The v1 and v2 are generic MAC compatible strings, many HiSilicon SoCs may
>> use the same MAC version. For example,
>> hix5hd2, hi3716cv200 SoCs use the v1 MAC version,
>> hi3798cv200, hi3516a SoCs use the v2 MAC version,
>> and there may be more SoCs added in future.
>> So I think the generic compatible strings are okay here.
>> Should I add the hi3716cv200, hi3516a SoCs compatible here?
> 
> Yes.
> 
>> Do you have any good advice?
>>
  - reg: specifies base physical address(s) and size of the device 
 registers.
The first region is the MAC register base and size.
The second region is external interface control register.
 @@ -20,7 +25,7 @@ Required properties:

  Example:
  gmac0: ethernet@f984 {
 -compatible = "hisilicon,hix5hd2-gmac";
 +compatible = "hisilicon,hix5hd2-gemac", 
 "hisilicon,hisi-gemac-v1";
>>>
>>> You can't just change compatible strings.
>>>
>> Okay, maybe I should name all the compatible string with the suffix "-gmac" 
>> instead of
>> "-gemac". This can keep the compatible strings with the same suffix. Is this 
>> okay?
>> Can I just add the generic compatible string without changing the SoCs 
>> compatible string?
>> Like following:
>> gmac0: ethernet@f984 {
>>  -  compatible = "hisilicon,hix5hd2-gmac";
>>  +  compatible = "hisilicon,hix5hd2-gmac", 
>> "hisilicon,hisi-gmac-v1";
> 
> Yes, this is fine.
> 
Many thanks for your advice.
As the patch series have been applied to net-next branch,
in which way should I commit this compatible fix?
Should I send a new patch with "Fixes: "?


Regards,
Dongpo

.

Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-12 Thread Dongpo Li 


On 2016/12/12 22:21, Rob Herring wrote:
> On Mon, Dec 12, 2016 at 5:16 AM, Dongpo Li  wrote:
>> Hi Rob,
>>
>> On 2016/12/10 6:35, Rob Herring wrote:
>>> On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:
 The "hix5hd2" is SoC name, add the generic ethernet driver name.
 The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds
 the SG/TXCSUM/TSO/UFO features.

 Signed-off-by: Dongpo Li 
 ---
  .../devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt|  9 +++--
  drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 15 
 +++
  2 files changed, 18 insertions(+), 6 deletions(-)

 diff --git 
 a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt 
 b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
 index 75d398b..75920f0 100644
 --- a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
 +++ b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
 @@ -1,7 +1,12 @@
  Hisilicon hix5hd2 gmac controller

  Required properties:
 -- compatible: should be "hisilicon,hix5hd2-gmac".
 +- compatible: should contain one of the following SoC strings:
 +* "hisilicon,hix5hd2-gemac"
 +* "hisilicon,hi3798cv200-gemac"
 +and one of the following version string:
 +* "hisilicon,hisi-gemac-v1"
 +* "hisilicon,hisi-gemac-v2"
>>>
>>> What combinations are valid? I assume both chips don't have both v1 and
>>> v2. 2 SoCs and 2 versions so far, I don't think there is much point to
>>> have the v1 and v2 compatible strings.
>>>
>> The v1 and v2 are generic MAC compatible strings, many HiSilicon SoCs may
>> use the same MAC version. For example,
>> hix5hd2, hi3716cv200 SoCs use the v1 MAC version,
>> hi3798cv200, hi3516a SoCs use the v2 MAC version,
>> and there may be more SoCs added in future.
>> So I think the generic compatible strings are okay here.
>> Should I add the hi3716cv200, hi3516a SoCs compatible here?
> 
> Yes.
> 
>> Do you have any good advice?
>>
  - reg: specifies base physical address(s) and size of the device 
 registers.
The first region is the MAC register base and size.
The second region is external interface control register.
 @@ -20,7 +25,7 @@ Required properties:

  Example:
  gmac0: ethernet@f984 {
 -compatible = "hisilicon,hix5hd2-gmac";
 +compatible = "hisilicon,hix5hd2-gemac", 
 "hisilicon,hisi-gemac-v1";
>>>
>>> You can't just change compatible strings.
>>>
>> Okay, maybe I should name all the compatible string with the suffix "-gmac" 
>> instead of
>> "-gemac". This can keep the compatible strings with the same suffix. Is this 
>> okay?
>> Can I just add the generic compatible string without changing the SoCs 
>> compatible string?
>> Like following:
>> gmac0: ethernet@f984 {
>>  -  compatible = "hisilicon,hix5hd2-gmac";
>>  +  compatible = "hisilicon,hix5hd2-gmac", 
>> "hisilicon,hisi-gmac-v1";
> 
> Yes, this is fine.
> 
Many thanks for your advice.
As the patch series have been applied to net-next branch,
in which way should I commit this compatible fix?
Should I send a new patch with "Fixes: "?


Regards,
Dongpo

.

Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-12 Thread Rob Herring 
On Mon, Dec 12, 2016 at 5:16 AM, Dongpo Li  wrote:
> Hi Rob,
>
> On 2016/12/10 6:35, Rob Herring wrote:
>> On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:
>>> The "hix5hd2" is SoC name, add the generic ethernet driver name.
>>> The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds
>>> the SG/TXCSUM/TSO/UFO features.
>>>
>>> Signed-off-by: Dongpo Li 
>>> ---
>>>  .../devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt|  9 +++--
>>>  drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 15 
>>> +++
>>>  2 files changed, 18 insertions(+), 6 deletions(-)
>>>
>>> diff --git 
>>> a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt 
>>> b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
>>> index 75d398b..75920f0 100644
>>> --- a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
>>> +++ b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
>>> @@ -1,7 +1,12 @@
>>>  Hisilicon hix5hd2 gmac controller
>>>
>>>  Required properties:
>>> -- compatible: should be "hisilicon,hix5hd2-gmac".
>>> +- compatible: should contain one of the following SoC strings:
>>> +* "hisilicon,hix5hd2-gemac"
>>> +* "hisilicon,hi3798cv200-gemac"
>>> +and one of the following version string:
>>> +* "hisilicon,hisi-gemac-v1"
>>> +* "hisilicon,hisi-gemac-v2"
>>
>> What combinations are valid? I assume both chips don't have both v1 and
>> v2. 2 SoCs and 2 versions so far, I don't think there is much point to
>> have the v1 and v2 compatible strings.
>>
> The v1 and v2 are generic MAC compatible strings, many HiSilicon SoCs may
> use the same MAC version. For example,
> hix5hd2, hi3716cv200 SoCs use the v1 MAC version,
> hi3798cv200, hi3516a SoCs use the v2 MAC version,
> and there may be more SoCs added in future.
> So I think the generic compatible strings are okay here.
> Should I add the hi3716cv200, hi3516a SoCs compatible here?

Yes.

> Do you have any good advice?
>
>>>  - reg: specifies base physical address(s) and size of the device registers.
>>>The first region is the MAC register base and size.
>>>The second region is external interface control register.
>>> @@ -20,7 +25,7 @@ Required properties:
>>>
>>>  Example:
>>>  gmac0: ethernet@f984 {
>>> -compatible = "hisilicon,hix5hd2-gmac";
>>> +compatible = "hisilicon,hix5hd2-gemac", 
>>> "hisilicon,hisi-gemac-v1";
>>
>> You can't just change compatible strings.
>>
> Okay, maybe I should name all the compatible string with the suffix "-gmac" 
> instead of
> "-gemac". This can keep the compatible strings with the same suffix. Is this 
> okay?
> Can I just add the generic compatible string without changing the SoCs 
> compatible string?
> Like following:
> gmac0: ethernet@f984 {
>  -  compatible = "hisilicon,hix5hd2-gmac";
>  +  compatible = "hisilicon,hix5hd2-gmac", 
> "hisilicon,hisi-gmac-v1";

Yes, this is fine.

Rob

Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-12 Thread Rob Herring 
On Mon, Dec 12, 2016 at 5:16 AM, Dongpo Li  wrote:
> Hi Rob,
>
> On 2016/12/10 6:35, Rob Herring wrote:
>> On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:
>>> The "hix5hd2" is SoC name, add the generic ethernet driver name.
>>> The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds
>>> the SG/TXCSUM/TSO/UFO features.
>>>
>>> Signed-off-by: Dongpo Li 
>>> ---
>>>  .../devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt|  9 +++--
>>>  drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 15 
>>> +++
>>>  2 files changed, 18 insertions(+), 6 deletions(-)
>>>
>>> diff --git 
>>> a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt 
>>> b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
>>> index 75d398b..75920f0 100644
>>> --- a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
>>> +++ b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
>>> @@ -1,7 +1,12 @@
>>>  Hisilicon hix5hd2 gmac controller
>>>
>>>  Required properties:
>>> -- compatible: should be "hisilicon,hix5hd2-gmac".
>>> +- compatible: should contain one of the following SoC strings:
>>> +* "hisilicon,hix5hd2-gemac"
>>> +* "hisilicon,hi3798cv200-gemac"
>>> +and one of the following version string:
>>> +* "hisilicon,hisi-gemac-v1"
>>> +* "hisilicon,hisi-gemac-v2"
>>
>> What combinations are valid? I assume both chips don't have both v1 and
>> v2. 2 SoCs and 2 versions so far, I don't think there is much point to
>> have the v1 and v2 compatible strings.
>>
> The v1 and v2 are generic MAC compatible strings, many HiSilicon SoCs may
> use the same MAC version. For example,
> hix5hd2, hi3716cv200 SoCs use the v1 MAC version,
> hi3798cv200, hi3516a SoCs use the v2 MAC version,
> and there may be more SoCs added in future.
> So I think the generic compatible strings are okay here.
> Should I add the hi3716cv200, hi3516a SoCs compatible here?

Yes.

> Do you have any good advice?
>
>>>  - reg: specifies base physical address(s) and size of the device registers.
>>>The first region is the MAC register base and size.
>>>The second region is external interface control register.
>>> @@ -20,7 +25,7 @@ Required properties:
>>>
>>>  Example:
>>>  gmac0: ethernet@f984 {
>>> -compatible = "hisilicon,hix5hd2-gmac";
>>> +compatible = "hisilicon,hix5hd2-gemac", 
>>> "hisilicon,hisi-gemac-v1";
>>
>> You can't just change compatible strings.
>>
> Okay, maybe I should name all the compatible string with the suffix "-gmac" 
> instead of
> "-gemac". This can keep the compatible strings with the same suffix. Is this 
> okay?
> Can I just add the generic compatible string without changing the SoCs 
> compatible string?
> Like following:
> gmac0: ethernet@f984 {
>  -  compatible = "hisilicon,hix5hd2-gmac";
>  +  compatible = "hisilicon,hix5hd2-gmac", 
> "hisilicon,hisi-gmac-v1";

Yes, this is fine.

Rob

Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-12 Thread Dongpo Li 
Hi Rob,

On 2016/12/10 6:35, Rob Herring wrote:
> On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:
>> The "hix5hd2" is SoC name, add the generic ethernet driver name.
>> The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds
>> the SG/TXCSUM/TSO/UFO features.
>>
>> Signed-off-by: Dongpo Li 
>> ---
>>  .../devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt|  9 +++--
>>  drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 15 
>> +++
>>  2 files changed, 18 insertions(+), 6 deletions(-)
>>
>> diff --git 
>> a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt 
>> b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
>> index 75d398b..75920f0 100644
>> --- a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
>> +++ b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
>> @@ -1,7 +1,12 @@
>>  Hisilicon hix5hd2 gmac controller
>>  
>>  Required properties:
>> -- compatible: should be "hisilicon,hix5hd2-gmac".
>> +- compatible: should contain one of the following SoC strings:
>> +* "hisilicon,hix5hd2-gemac"
>> +* "hisilicon,hi3798cv200-gemac"
>> +and one of the following version string:
>> +* "hisilicon,hisi-gemac-v1"
>> +* "hisilicon,hisi-gemac-v2"
> 
> What combinations are valid? I assume both chips don't have both v1 and 
> v2. 2 SoCs and 2 versions so far, I don't think there is much point to 
> have the v1 and v2 compatible strings.
> 
The v1 and v2 are generic MAC compatible strings, many HiSilicon SoCs may
use the same MAC version. For example,
hix5hd2, hi3716cv200 SoCs use the v1 MAC version,
hi3798cv200, hi3516a SoCs use the v2 MAC version,
and there may be more SoCs added in future.
So I think the generic compatible strings are okay here.
Should I add the hi3716cv200, hi3516a SoCs compatible here?
Do you have any good advice?

>>  - reg: specifies base physical address(s) and size of the device registers.
>>The first region is the MAC register base and size.
>>The second region is external interface control register.
>> @@ -20,7 +25,7 @@ Required properties:
>>  
>>  Example:
>>  gmac0: ethernet@f984 {
>> -compatible = "hisilicon,hix5hd2-gmac";
>> +compatible = "hisilicon,hix5hd2-gemac", 
>> "hisilicon,hisi-gemac-v1";
> 
> You can't just change compatible strings.
> 
Okay, maybe I should name all the compatible string with the suffix "-gmac" 
instead of
"-gemac". This can keep the compatible strings with the same suffix. Is this 
okay?
Can I just add the generic compatible string without changing the SoCs 
compatible string?
Like following:
gmac0: ethernet@f984 {
 -  compatible = "hisilicon,hix5hd2-gmac";
 +  compatible = "hisilicon,hix5hd2-gmac", "hisilicon,hisi-gmac-v1";

>>  reg = <0xf984 0x1000>,<0xf984300c 0x4>;
>>  interrupts = <0 71 4>;
>>  #address-cells = <1>;
> 
> .
> 


Regards,
Dongpo

.

Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-12 Thread Dongpo Li 
Hi Rob,

On 2016/12/10 6:35, Rob Herring wrote:
> On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:
>> The "hix5hd2" is SoC name, add the generic ethernet driver name.
>> The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds
>> the SG/TXCSUM/TSO/UFO features.
>>
>> Signed-off-by: Dongpo Li 
>> ---
>>  .../devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt|  9 +++--
>>  drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 15 
>> +++
>>  2 files changed, 18 insertions(+), 6 deletions(-)
>>
>> diff --git 
>> a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt 
>> b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
>> index 75d398b..75920f0 100644
>> --- a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
>> +++ b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
>> @@ -1,7 +1,12 @@
>>  Hisilicon hix5hd2 gmac controller
>>  
>>  Required properties:
>> -- compatible: should be "hisilicon,hix5hd2-gmac".
>> +- compatible: should contain one of the following SoC strings:
>> +* "hisilicon,hix5hd2-gemac"
>> +* "hisilicon,hi3798cv200-gemac"
>> +and one of the following version string:
>> +* "hisilicon,hisi-gemac-v1"
>> +* "hisilicon,hisi-gemac-v2"
> 
> What combinations are valid? I assume both chips don't have both v1 and 
> v2. 2 SoCs and 2 versions so far, I don't think there is much point to 
> have the v1 and v2 compatible strings.
> 
The v1 and v2 are generic MAC compatible strings, many HiSilicon SoCs may
use the same MAC version. For example,
hix5hd2, hi3716cv200 SoCs use the v1 MAC version,
hi3798cv200, hi3516a SoCs use the v2 MAC version,
and there may be more SoCs added in future.
So I think the generic compatible strings are okay here.
Should I add the hi3716cv200, hi3516a SoCs compatible here?
Do you have any good advice?

>>  - reg: specifies base physical address(s) and size of the device registers.
>>The first region is the MAC register base and size.
>>The second region is external interface control register.
>> @@ -20,7 +25,7 @@ Required properties:
>>  
>>  Example:
>>  gmac0: ethernet@f984 {
>> -compatible = "hisilicon,hix5hd2-gmac";
>> +compatible = "hisilicon,hix5hd2-gemac", 
>> "hisilicon,hisi-gemac-v1";
> 
> You can't just change compatible strings.
> 
Okay, maybe I should name all the compatible string with the suffix "-gmac" 
instead of
"-gemac". This can keep the compatible strings with the same suffix. Is this 
okay?
Can I just add the generic compatible string without changing the SoCs 
compatible string?
Like following:
gmac0: ethernet@f984 {
 -  compatible = "hisilicon,hix5hd2-gmac";
 +  compatible = "hisilicon,hix5hd2-gmac", "hisilicon,hisi-gmac-v1";

>>  reg = <0xf984 0x1000>,<0xf984300c 0x4>;
>>  interrupts = <0 71 4>;
>>  #address-cells = <1>;
> 
> .
> 


Regards,
Dongpo

.

Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-09 Thread Rob Herring 
On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:
> The "hix5hd2" is SoC name, add the generic ethernet driver name.
> The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds
> the SG/TXCSUM/TSO/UFO features.
> 
> Signed-off-by: Dongpo Li 
> ---
>  .../devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt|  9 +++--
>  drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 15 
> +++
>  2 files changed, 18 insertions(+), 6 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt 
> b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
> index 75d398b..75920f0 100644
> --- a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
> +++ b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
> @@ -1,7 +1,12 @@
>  Hisilicon hix5hd2 gmac controller
>  
>  Required properties:
> -- compatible: should be "hisilicon,hix5hd2-gmac".
> +- compatible: should contain one of the following SoC strings:
> + * "hisilicon,hix5hd2-gemac"
> + * "hisilicon,hi3798cv200-gemac"
> + and one of the following version string:
> + * "hisilicon,hisi-gemac-v1"
> + * "hisilicon,hisi-gemac-v2"

What combinations are valid? I assume both chips don't have both v1 and 
v2. 2 SoCs and 2 versions so far, I don't think there is much point to 
have the v1 and v2 compatible strings.

>  - reg: specifies base physical address(s) and size of the device registers.
>The first region is the MAC register base and size.
>The second region is external interface control register.
> @@ -20,7 +25,7 @@ Required properties:
>  
>  Example:
>   gmac0: ethernet@f984 {
> - compatible = "hisilicon,hix5hd2-gmac";
> + compatible = "hisilicon,hix5hd2-gemac", 
> "hisilicon,hisi-gemac-v1";

You can't just change compatible strings.

>   reg = <0xf984 0x1000>,<0xf984300c 0x4>;
>   interrupts = <0 71 4>;
>   #address-cells = <1>;

Re: [PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-09 Thread Rob Herring 
On Mon, Dec 05, 2016 at 09:27:58PM +0800, Dongpo Li wrote:
> The "hix5hd2" is SoC name, add the generic ethernet driver name.
> The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds
> the SG/TXCSUM/TSO/UFO features.
> 
> Signed-off-by: Dongpo Li 
> ---
>  .../devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt|  9 +++--
>  drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 15 
> +++
>  2 files changed, 18 insertions(+), 6 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt 
> b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
> index 75d398b..75920f0 100644
> --- a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
> +++ b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
> @@ -1,7 +1,12 @@
>  Hisilicon hix5hd2 gmac controller
>  
>  Required properties:
> -- compatible: should be "hisilicon,hix5hd2-gmac".
> +- compatible: should contain one of the following SoC strings:
> + * "hisilicon,hix5hd2-gemac"
> + * "hisilicon,hi3798cv200-gemac"
> + and one of the following version string:
> + * "hisilicon,hisi-gemac-v1"
> + * "hisilicon,hisi-gemac-v2"

What combinations are valid? I assume both chips don't have both v1 and 
v2. 2 SoCs and 2 versions so far, I don't think there is much point to 
have the v1 and v2 compatible strings.

>  - reg: specifies base physical address(s) and size of the device registers.
>The first region is the MAC register base and size.
>The second region is external interface control register.
> @@ -20,7 +25,7 @@ Required properties:
>  
>  Example:
>   gmac0: ethernet@f984 {
> - compatible = "hisilicon,hix5hd2-gmac";
> + compatible = "hisilicon,hix5hd2-gemac", 
> "hisilicon,hisi-gemac-v1";

You can't just change compatible strings.

>   reg = <0xf984 0x1000>,<0xf984300c 0x4>;
>   interrupts = <0 71 4>;
>   #address-cells = <1>;

[PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-05 Thread Dongpo Li 
The "hix5hd2" is SoC name, add the generic ethernet driver name.
The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds
the SG/TXCSUM/TSO/UFO features.

Signed-off-by: Dongpo Li 
---
 .../devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt|  9 +++--
 drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 15 +++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt 
b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
index 75d398b..75920f0 100644
--- a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
+++ b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
@@ -1,7 +1,12 @@
 Hisilicon hix5hd2 gmac controller
 
 Required properties:
-- compatible: should be "hisilicon,hix5hd2-gmac".
+- compatible: should contain one of the following SoC strings:
+   * "hisilicon,hix5hd2-gemac"
+   * "hisilicon,hi3798cv200-gemac"
+   and one of the following version string:
+   * "hisilicon,hisi-gemac-v1"
+   * "hisilicon,hisi-gemac-v2"
 - reg: specifies base physical address(s) and size of the device registers.
   The first region is the MAC register base and size.
   The second region is external interface control register.
@@ -20,7 +25,7 @@ Required properties:
 
 Example:
gmac0: ethernet@f984 {
-   compatible = "hisilicon,hix5hd2-gmac";
+   compatible = "hisilicon,hix5hd2-gemac", 
"hisilicon,hisi-gemac-v1";
reg = <0xf984 0x1000>,<0xf984300c 0x4>;
interrupts = <0 71 4>;
#address-cells = <1>;
diff --git a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c 
b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
index e69a6be..27cb2e6 100644
--- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
+++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
@@ -189,6 +189,10 @@
 #define dma_cnt(n) ((n) >> 5)
 #define dma_byte(n)((n) << 5)
 
+#define HW_CAP_TSO BIT(0)
+#define GEMAC_V1   0
+#define GEMAC_V2   (GEMAC_V1 | HW_CAP_TSO)
+
 struct hix5hd2_desc {
__le32 buff_addr;
__le32 cmd;
@@ -1021,7 +1025,10 @@ static int hix5hd2_dev_remove(struct platform_device 
*pdev)
 }
 
 static const struct of_device_id hix5hd2_of_match[] = {
-   {.compatible = "hisilicon,hix5hd2-gmac",},
+   { .compatible = "hisilicon,hisi-gemac-v1", .data = (void *)GEMAC_V1 },
+   { .compatible = "hisilicon,hisi-gemac-v2", .data = (void *)GEMAC_V2 },
+   { .compatible = "hisilicon,hix5hd2-gemac", .data = (void *)GEMAC_V1 },
+   { .compatible = "hisilicon,hi3798cv200-gemac", .data = (void *)GEMAC_V2 
},
{},
 };
 
@@ -1029,7 +1036,7 @@ MODULE_DEVICE_TABLE(of, hix5hd2_of_match);
 
 static struct platform_driver hix5hd2_dev_driver = {
.driver = {
-   .name = "hix5hd2-gmac",
+   .name = "hisi-gemac",
.of_match_table = hix5hd2_of_match,
},
.probe = hix5hd2_dev_probe,
@@ -1038,6 +1045,6 @@ static struct platform_driver hix5hd2_dev_driver = {
 
 module_platform_driver(hix5hd2_dev_driver);
 
-MODULE_DESCRIPTION("HISILICON HIX5HD2 Ethernet driver");
+MODULE_DESCRIPTION("HISILICON Gigabit Ethernet MAC driver");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:hix5hd2-gmac");
+MODULE_ALIAS("platform:hisi-gemac");
-- 
2.8.2

[PATCH v2 1/4] net: hix5hd2_gmac: add generic compatible string

2016-12-05 Thread Dongpo Li 
The "hix5hd2" is SoC name, add the generic ethernet driver name.
The "hisi-gemac-v1" is the basic version and "hisi-gemac-v2" adds
the SG/TXCSUM/TSO/UFO features.

Signed-off-by: Dongpo Li 
---
 .../devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt|  9 +++--
 drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 15 +++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt 
b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
index 75d398b..75920f0 100644
--- a/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
+++ b/Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
@@ -1,7 +1,12 @@
 Hisilicon hix5hd2 gmac controller
 
 Required properties:
-- compatible: should be "hisilicon,hix5hd2-gmac".
+- compatible: should contain one of the following SoC strings:
+   * "hisilicon,hix5hd2-gemac"
+   * "hisilicon,hi3798cv200-gemac"
+   and one of the following version string:
+   * "hisilicon,hisi-gemac-v1"
+   * "hisilicon,hisi-gemac-v2"
 - reg: specifies base physical address(s) and size of the device registers.
   The first region is the MAC register base and size.
   The second region is external interface control register.
@@ -20,7 +25,7 @@ Required properties:
 
 Example:
gmac0: ethernet@f984 {
-   compatible = "hisilicon,hix5hd2-gmac";
+   compatible = "hisilicon,hix5hd2-gemac", 
"hisilicon,hisi-gemac-v1";
reg = <0xf984 0x1000>,<0xf984300c 0x4>;
interrupts = <0 71 4>;
#address-cells = <1>;
diff --git a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c 
b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
index e69a6be..27cb2e6 100644
--- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
+++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
@@ -189,6 +189,10 @@
 #define dma_cnt(n) ((n) >> 5)
 #define dma_byte(n)((n) << 5)
 
+#define HW_CAP_TSO BIT(0)
+#define GEMAC_V1   0
+#define GEMAC_V2   (GEMAC_V1 | HW_CAP_TSO)
+
 struct hix5hd2_desc {
__le32 buff_addr;
__le32 cmd;
@@ -1021,7 +1025,10 @@ static int hix5hd2_dev_remove(struct platform_device 
*pdev)
 }
 
 static const struct of_device_id hix5hd2_of_match[] = {
-   {.compatible = "hisilicon,hix5hd2-gmac",},
+   { .compatible = "hisilicon,hisi-gemac-v1", .data = (void *)GEMAC_V1 },
+   { .compatible = "hisilicon,hisi-gemac-v2", .data = (void *)GEMAC_V2 },
+   { .compatible = "hisilicon,hix5hd2-gemac", .data = (void *)GEMAC_V1 },
+   { .compatible = "hisilicon,hi3798cv200-gemac", .data = (void *)GEMAC_V2 
},
{},
 };
 
@@ -1029,7 +1036,7 @@ MODULE_DEVICE_TABLE(of, hix5hd2_of_match);
 
 static struct platform_driver hix5hd2_dev_driver = {
.driver = {
-   .name = "hix5hd2-gmac",
+   .name = "hisi-gemac",
.of_match_table = hix5hd2_of_match,
},
.probe = hix5hd2_dev_probe,
@@ -1038,6 +1045,6 @@ static struct platform_driver hix5hd2_dev_driver = {
 
 module_platform_driver(hix5hd2_dev_driver);
 
-MODULE_DESCRIPTION("HISILICON HIX5HD2 Ethernet driver");
+MODULE_DESCRIPTION("HISILICON Gigabit Ethernet MAC driver");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:hix5hd2-gmac");
+MODULE_ALIAS("platform:hisi-gemac");
-- 
2.8.2