From 93beff2c1455497f35c21c561d475be1101dbdc2 Mon Sep 17 00:00:00 2001
From: Duc Dang <dhdang@apm.com>
Date: Tue, 29 Dec 2015 15:20:10 -0800
Subject: [PATCH] arm64: dts: Fix to use standard DT node names for X-Gene 1
 and X-Gene 2 platforms

Use devicetree standard node name for I2C (i2c@...),
GFC GPIO (gpio@...), DW GPIO (gpio@...), Standby GPIO (gpio@...).

The DT node name of USB (dwusb@...) still needs to be kept to
maintain backward compatibility with old firmware.

Signed-off-by: Duc Dang <dhdang@apm.com>
---
 arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 11 ++++++-----
 arch/arm64/boot/dts/apm/apm-storm.dtsi     |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
index c617aa4972ab..4b3837bda5a6 100644
--- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
@@ -476,6 +476,7 @@
 			interrupts = <0x0 0x4c 0x4>;
 		};
 
+		/* Do not change dwusb name, coded for backward compatibility */
 		usb0: dwusb@19000000 {
 			status = "disabled";
 			compatible = "snps,dwc3";
@@ -575,14 +576,14 @@
 			clocks = <&sdioclk 0>, <&ahbclk 0>;
 		};
 
-		gfcgpio: gfcgpio@1f63c000 {
+		gfcgpio: gpio@1f63c000 {
 			compatible = "apm,xgene-gpio";
 			reg = <0x0 0x1f63c000 0x0 0x40>;
 			gpio-controller;
 			#gpio-cells = <2>;
 		};
 
-		dwgpio: dwgpio@1c024000 {
+		dwgpio: gpio@1c024000 {
 			compatible = "snps,dw-apb-gpio";
 			reg = <0x0 0x1c024000 0x0 0x1000>;
 			reg-io-width = <4>;
@@ -597,7 +598,7 @@
 			};
 		};
 
-		sbgpio: sbgpio@17001000{
+		sbgpio: gpio@17001000{
 			compatible = "apm,xgene-gpio-sb";
 			reg = <0x0 0x17001000 0x0 0x400>;
 			#gpio-cells = <2>;
@@ -648,7 +649,7 @@
 			clocks = <&rngpkaclk 0>;
 		};
 
-		i2c1: i2c1@10511000 {
+		i2c1: i2c@10511000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			compatible = "snps,designware-i2c";
@@ -659,7 +660,7 @@
 			bus_num = <1>;
 		};
 
-		i2c4: i2c4@10640000 {
+		i2c4: i2c@10640000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			compatible = "snps,designware-i2c";
diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi
index a21e08a88991..17f5dc265975 100644
--- a/arch/arm64/boot/dts/apm/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi
@@ -759,14 +759,14 @@
 			clocks = <&sdioclk 0>, <&ahbclk 0>;
 		};
 
-		gfcgpio: gfcgpio0@1701c000 {
+		gfcgpio: gpio0@1701c000 {
 			compatible = "apm,xgene-gpio";
 			reg = <0x0 0x1701c000 0x0 0x40>;
 			gpio-controller;
 			#gpio-cells = <2>;
 		};
 
-		dwgpio: dwgpio@1c024000 {
+		dwgpio: gpio@1c024000 {
 			compatible = "snps,dw-apb-gpio";
 			reg = <0x0 0x1c024000 0x0 0x1000>;
 			reg-io-width = <4>;
@@ -781,7 +781,7 @@
 			};
 		};
 
-		i2c0: i2c0@10512000 {
+		i2c0: i2c@10512000 {
 			status = "disabled";
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -886,7 +886,7 @@
 			dr_mode = "host";
 		};
 
-		sbgpio: sbgpio@17001000{
+		sbgpio: gpio@17001000{
 			compatible = "apm,xgene-gpio-sb";
 			reg = <0x0 0x17001000 0x0 0x400>;
 			#gpio-cells = <2>;