[PATCH dev-4.7] net/faraday: Switch to use-ncsi device node property

[PATCH dev-4.7] net/faraday: Switch to use-ncsi device node property

[Gavin Shan]

This uses "use-ncsi" device node property to enable NCSI interface
as we do in upstream kernel. No functional change introduced.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
 arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts   | 2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts    | 2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts    | 2 +-
 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 +-
 drivers/net/ethernet/faraday/ftgmac100.c         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
index 41ee12a..310a4ef 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
@@ -71,7 +71,7 @@
 &mac0 {
 	status = "okay";
 
-	use-nc-si;
+	use-ncsi;
 };
 
 &i2c0 {
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
index 63b039c..d97f216 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
@@ -56,7 +56,7 @@
 &mac0 {
 	status = "okay";
 
-	use-nc-si;
+	use-ncsi;
 };
 
 &i2c4 {
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
index 1ae3983..bd76100 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
@@ -70,7 +70,7 @@
 &mac0 {
 	status = "okay";
 
-	use-nc-si;
+	use-ncsi;
 	no-hw-checksum;
 };
 
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
index bb5ec59..d5b9af9 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
@@ -28,7 +28,7 @@
 &mac0 {
 	status = "okay";
 
-	use-nc-si;
+	use-ncsi;
 	no-hw-checksum;
 };
 
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index fc2852f..c67b670 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1352,7 +1352,7 @@ static int ftgmac100_probe(struct platform_device *pdev)
 	priv = netdev_priv(netdev);
 	SET_NETDEV_DEV(netdev, &pdev->dev);
 	if (pdev->dev.of_node &&
-	    of_get_property(pdev->dev.of_node, "use-nc-si", NULL)) {
+	    of_get_property(pdev->dev.of_node, "use-ncsi", NULL)) {
 		dev_info(&pdev->dev, "Using NCSI interface\n");
 		netdev->phydev = NULL;
 		priv->use_ncsi = true;
-- 
2.1.0

Re: [PATCH dev-4.7] net/faraday: Switch to use-ncsi device node property

[Joel Stanley]

On Thu, 2016-07-28 at 12:37 +1000, Gavin Shan wrote:
> This uses "use-ncsi" device node property to enable NCSI interface
> as we do in upstream kernel. No functional change introduced.

Thanks. I've applied a version of this to my rebased dev-4.7 tree that
I will push out soon.

Cheers,

Joel

> 
> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
> ---
>  arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts   | 2 +-
>  arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts    | 2 +-
>  arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts    | 2 +-
>  arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 +-
>  drivers/net/ethernet/faraday/ftgmac100.c         | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
> b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
> index 41ee12a..310a4ef 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
> @@ -71,7 +71,7 @@
>  &mac0 {
>  	status = "okay";
>  
> -	use-nc-si;
> +	use-ncsi;
>  };
>  
>  &i2c0 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
> b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
> index 63b039c..d97f216 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
> @@ -56,7 +56,7 @@
>  &mac0 {
>  	status = "okay";
>  
> -	use-nc-si;
> +	use-ncsi;
>  };
>  
>  &i2c4 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> index 1ae3983..bd76100 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> @@ -70,7 +70,7 @@
>  &mac0 {
>  	status = "okay";
>  
> -	use-nc-si;
> +	use-ncsi;
>  	no-hw-checksum;
>  };
>  
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> index bb5ec59..d5b9af9 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> @@ -28,7 +28,7 @@
>  &mac0 {
>  	status = "okay";
>  
> -	use-nc-si;
> +	use-ncsi;
>  	no-hw-checksum;
>  };
>  
> diff --git a/drivers/net/ethernet/faraday/ftgmac100.c
> b/drivers/net/ethernet/faraday/ftgmac100.c
> index fc2852f..c67b670 100644
> --- a/drivers/net/ethernet/faraday/ftgmac100.c
> +++ b/drivers/net/ethernet/faraday/ftgmac100.c
> @@ -1352,7 +1352,7 @@ static int ftgmac100_probe(struct
> platform_device *pdev)
>  	priv = netdev_priv(netdev);
>  	SET_NETDEV_DEV(netdev, &pdev->dev);
>  	if (pdev->dev.of_node &&
> -	    of_get_property(pdev->dev.of_node, "use-nc-si", NULL)) {
> +	    of_get_property(pdev->dev.of_node, "use-ncsi", NULL)) {
>  		dev_info(&pdev->dev, "Using NCSI interface\n");
>  		netdev->phydev = NULL;
>  		priv->use_ncsi = true;