diff mbox

[6/7,trusty,SRU] (upstream) dtb: change binding name to match with newer firmware DT

Message ID 1432327761-10496-7-git-send-email-craig.magina@canonical.com
State New
Headers show

Commit Message

Craig Magina May 22, 2015, 8:49 p.m. UTC 
From: Iyappan Subramanian <isubramanian@apm.com>

This patch fixes the backward compatibility of the older driver with the
newer firmware by making the binding unique so that the older driver won't
recognize the non-supported interfaces.

The new bindings are in sync with the newer firmware.

BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1458042

Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 2a91eb72e630e512e87bed746d7db47810773d58)
Signed-off-by: Phong Vo <pvo@apm.com>
Signed-off-by: Craig Magina <craig.magina@canonical.com>

Conflicts:
	arch/arm64/boot/dts/apm/apm-storm.dtsi
---
 arch/arm64/boot/dts/apm-storm.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
index 0020726..5807101 100644
--- a/arch/arm64/boot/dts/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
@@ -642,7 +642,7 @@ 
 		};
 
 		sgenet0: ethernet@1f210000 {
-			compatible = "apm,xgene-enet";
+			compatible = "apm,xgene1-sgenet";
 			status = "disabled";
 			reg = <0x0 0x1f210000 0x0 0xd100>,
 			      <0x0 0x1f200000 0x0 0Xc300>,
@@ -656,7 +656,7 @@ 
 		};
 
 		xgenet: ethernet@1f610000 {
-			compatible = "apm,xgene-enet";
+			compatible = "apm,xgene1-xgenet";
 			status = "disabled";
 			reg = <0x0 0x1f610000 0x0 0xd100>,
 			      <0x0 0x1f600000 0x0 0Xc300>,