Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92f95322 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hix5hd2_gmac-compatible-string' 



Dongpo Li says:

====================
net: hix5hd2_gmac: keep the compatible string not changed

This patch series fix the patch:
d0fb6ba7 ("net: hix5hd2_gmac: add generic compatible string")

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.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 87e159c5 48fed73a

Documentation/devicetree/bindings/net/hisilicon-hix5hd2-gmac.txt

+8 −5
Original line number Diff line number Diff line
@@ -2,11 +2,14 @@ Hisilicon hix5hd2 gmac controller 


Required properties:

- compatible: should contain one of the following SoC strings:

	* "hisilicon,hix5hd2-gemac"

	* "hisilicon,hi3798cv200-gemac"

	* "hisilicon,hix5hd2-gmac"

	* "hisilicon,hi3798cv200-gmac"

	* "hisilicon,hi3516a-gmac"

	and one of the following version string:

	* "hisilicon,hisi-gemac-v1"

	* "hisilicon,hisi-gemac-v2"

	* "hisilicon,hisi-gmac-v1"

	* "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.

  The first region is the MAC register base and size.

  The second region is external interface control register.
@@ -35,7 +38,7 @@ Required properties: 


Example:

	gmac0: ethernet@f9840000 {

		compatible = "hisilicon,hi3798cv200-gemac", "hisilicon,hisi-gemac-v2";

		compatible = "hisilicon,hi3798cv200-gmac", "hisilicon,hisi-gmac-v2";

		reg = <0xf9840000 0x1000>,<0xf984300c 0x4>;

		interrupts = <0 71 4>;

		#address-cells = <1>;

arch/arm/boot/dts/hisi-x5hd2.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ 
		};



		gmac0: ethernet@1840000 {

			compatible = "hisilicon,hix5hd2-gemac", "hisilicon,hisi-gemac-v1";

			compatible = "hisilicon,hix5hd2-gmac", "hisilicon,hisi-gmac-v1";

			reg = <0x1840000 0x1000>,<0x184300c 0x4>;

			interrupts = <0 71 4>;

			clocks = <&clock HIX5HD2_MAC0_CLK>;
@@ -447,7 +447,7 @@ 
		};



		gmac1: ethernet@1841000 {

			compatible = "hisilicon,hix5hd2-gemac", "hisilicon,hisi-gemac-v1";

			compatible = "hisilicon,hix5hd2-gmac", "hisilicon,hisi-gmac-v1";

			reg = <0x1841000 0x1000>,<0x1843010 0x4>;

			interrupts = <0 72 4>;

			clocks = <&clock HIX5HD2_MAC1_CLK>;

drivers/net/ethernet/hisilicon/hix5hd2_gmac.c

+7 −6
Original line number Diff line number Diff line
@@ -1316,10 +1316,11 @@ static int hix5hd2_dev_remove(struct platform_device *pdev) 
}



static const struct of_device_id hix5hd2_of_match[] = {

	{ .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 },

	{ .compatible = "hisilicon,hisi-gmac-v1", .data = (void *)GEMAC_V1 },

	{ .compatible = "hisilicon,hisi-gmac-v2", .data = (void *)GEMAC_V2 },

	{ .compatible = "hisilicon,hix5hd2-gmac", .data = (void *)GEMAC_V1 },

	{ .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 = {

	.driver = {

		.name = "hisi-gemac",

		.name = "hisi-gmac",

		.of_match_table = hix5hd2_of_match,

	},

	.probe = hix5hd2_dev_probe,
@@ -1338,4 +1339,4 @@ module_platform_driver(hix5hd2_dev_driver); 


MODULE_DESCRIPTION("HISILICON Gigabit Ethernet MAC driver");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:hisi-gemac");
 
MODULE_ALIAS("platform:hisi-gmac");