apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

net: hix5hd2_gmac: fix compatible strings name

Browse Source 
The SoC hix5hd2 compatible string has the suffix "-gmac" and
we should not change its compatible string.
So we should name all the compatible string with the suffix "-gmac".
Creating a new name suffix "-gemac" is unnecessary.

We also add another SoC compatible string in dt binding documentation
and describe which generic version the SoC belongs to.

Fixes: d0fb6ba75d ("net: hix5hd2_gmac: add generic compatible string")
Signed-off-by: Dongpo Li <lidongpo@hisilicon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dongpo Li
2016-12-20 10:09:28 +08:00
committed by David S. Miller
parent 87e159c59d
commit f7ca8e3b94
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt
+8 -5
View File
@@ -2,11 +2,14 @@ Hisilicon hix5hd2 gmac controller
Required properties: Required properties:
- compatible: should contain one of the following SoC strings: - compatible: should contain one of the following SoC strings:
* "hisilicon,hix5hd2-gemac" * "hisilicon,hix5hd2-gmac"
* "hisilicon,hi3798cv200-gemac" * "hisilicon,hi3798cv200-gmac"
* "hisilicon,hi3516a-gmac"
and one of the following version string: and one of the following version string:
* "hisilicon,hisi-gemac-v1" * "hisilicon,hisi-gmac-v1"
* "hisilicon,hisi-gemac-v2" * "hisilicon,hisi-gmac-v2"
The version v1 includes SoCs hix5hd2.
The version v2 includes SoCs hi3798cv200, hi3516a.
- reg: specifies base physical address(s) and size of the device registers. - reg: specifies base physical address(s) and size of the device registers.
The first region is the MAC register base and size. The first region is the MAC register base and size.
The second region is external interface control register. The second region is external interface control register.
@@ -35,7 +38,7 @@ Required properties:
Example: Example:
gmac0: ethernet@f9840000 { gmac0: ethernet@f9840000 {
compatible = "hisilicon,hi3798cv200-gemac", "hisilicon,hisi-gemac-v2"; compatible = "hisilicon,hi3798cv200-gmac", "hisilicon,hisi-gmac-v2";
reg = <0xf9840000 0x1000>,<0xf984300c 0x4>; reg = <0xf9840000 0x1000>,<0xf984300c 0x4>;
interrupts = <0 71 4>; interrupts = <0 71 4>;
#address-cells = <1>; #address-cells = <1>;
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
+7 -6
View File
@@ -1316,10 +1316,11 @@ static int hix5hd2_dev_remove(struct platform_device *pdev)
} }
static const struct of_device_id hix5hd2_of_match[] = { static const struct of_device_id hix5hd2_of_match[] = {
{ .compatible = "hisilicon,hisi-gemac-v1", .data = (void *)GEMAC_V1 }, { .compatible = "hisilicon,hisi-gmac-v1", .data = (void *)GEMAC_V1 },
{ .compatible = "hisilicon,hisi-gemac-v2", .data = (void *)GEMAC_V2 }, { .compatible = "hisilicon,hisi-gmac-v2", .data = (void *)GEMAC_V2 },
{ .compatible = "hisilicon,hix5hd2-gemac", .data = (void *)GEMAC_V1 }, { .compatible = "hisilicon,hix5hd2-gmac", .data = (void *)GEMAC_V1 },
{ .compatible = "hisilicon,hi3798cv200-gemac", .data = (void *)GEMAC_V2 }, { .compatible = "hisilicon,hi3798cv200-gmac", .data = (void *)GEMAC_V2 },
{ .compatible = "hisilicon,hi3516a-gmac", .data = (void *)GEMAC_V2 },
{}, {},
}; };
@@ -1327,7 +1328,7 @@ MODULE_DEVICE_TABLE(of, hix5hd2_of_match);
static struct platform_driver hix5hd2_dev_driver = { static struct platform_driver hix5hd2_dev_driver = {
.driver = { .driver = {
.name = "hisi-gemac", .name = "hisi-gmac",
.of_match_table = hix5hd2_of_match, .of_match_table = hix5hd2_of_match,
}, },
.probe = hix5hd2_dev_probe, .probe = hix5hd2_dev_probe,
@@ -1338,4 +1339,4 @@ module_platform_driver(hix5hd2_dev_driver);
MODULE_DESCRIPTION("HISILICON Gigabit Ethernet MAC driver"); MODULE_DESCRIPTION("HISILICON Gigabit Ethernet MAC driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_ALIAS("platform:hisi-gemac"); MODULE_ALIAS("platform:hisi-gmac");