Commit 93beff2c authored by Duc Dang's avatar Duc Dang

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: default avatarDuc Dang <dhdang@apm.com>
parent 8000bc3f
...@@ -476,6 +476,7 @@ serial0: serial@10600000 { ...@@ -476,6 +476,7 @@ serial0: serial@10600000 {
interrupts = <0x0 0x4c 0x4>; interrupts = <0x0 0x4c 0x4>;
}; };
/* Do not change dwusb name, coded for backward compatibility */
usb0: dwusb@19000000 { usb0: dwusb@19000000 {
status = "disabled"; status = "disabled";
compatible = "snps,dwc3"; compatible = "snps,dwc3";
...@@ -575,14 +576,14 @@ mmc0: mmc@1c000000 { ...@@ -575,14 +576,14 @@ mmc0: mmc@1c000000 {
clocks = <&sdioclk 0>, <&ahbclk 0>; clocks = <&sdioclk 0>, <&ahbclk 0>;
}; };
gfcgpio: gfcgpio@1f63c000 { gfcgpio: gpio@1f63c000 {
compatible = "apm,xgene-gpio"; compatible = "apm,xgene-gpio";
reg = <0x0 0x1f63c000 0x0 0x40>; reg = <0x0 0x1f63c000 0x0 0x40>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
}; };
dwgpio: dwgpio@1c024000 { dwgpio: gpio@1c024000 {
compatible = "snps,dw-apb-gpio"; compatible = "snps,dw-apb-gpio";
reg = <0x0 0x1c024000 0x0 0x1000>; reg = <0x0 0x1c024000 0x0 0x1000>;
reg-io-width = <4>; reg-io-width = <4>;
...@@ -597,7 +598,7 @@ porta: gpio-controller@0 { ...@@ -597,7 +598,7 @@ porta: gpio-controller@0 {
}; };
}; };
sbgpio: sbgpio@17001000{ sbgpio: gpio@17001000{
compatible = "apm,xgene-gpio-sb"; compatible = "apm,xgene-gpio-sb";
reg = <0x0 0x17001000 0x0 0x400>; reg = <0x0 0x17001000 0x0 0x400>;
#gpio-cells = <2>; #gpio-cells = <2>;
...@@ -648,7 +649,7 @@ rng: rng@10520000 { ...@@ -648,7 +649,7 @@ rng: rng@10520000 {
clocks = <&rngpkaclk 0>; clocks = <&rngpkaclk 0>;
}; };
i2c1: i2c1@10511000 { i2c1: i2c@10511000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "snps,designware-i2c"; compatible = "snps,designware-i2c";
...@@ -659,7 +660,7 @@ i2c1: i2c1@10511000 { ...@@ -659,7 +660,7 @@ i2c1: i2c1@10511000 {
bus_num = <1>; bus_num = <1>;
}; };
i2c4: i2c4@10640000 { i2c4: i2c@10640000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "snps,designware-i2c"; compatible = "snps,designware-i2c";
......
...@@ -759,14 +759,14 @@ mmc0: mmc@1c000000 { ...@@ -759,14 +759,14 @@ mmc0: mmc@1c000000 {
clocks = <&sdioclk 0>, <&ahbclk 0>; clocks = <&sdioclk 0>, <&ahbclk 0>;
}; };
gfcgpio: gfcgpio0@1701c000 { gfcgpio: gpio0@1701c000 {
compatible = "apm,xgene-gpio"; compatible = "apm,xgene-gpio";
reg = <0x0 0x1701c000 0x0 0x40>; reg = <0x0 0x1701c000 0x0 0x40>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
}; };
dwgpio: dwgpio@1c024000 { dwgpio: gpio@1c024000 {
compatible = "snps,dw-apb-gpio"; compatible = "snps,dw-apb-gpio";
reg = <0x0 0x1c024000 0x0 0x1000>; reg = <0x0 0x1c024000 0x0 0x1000>;
reg-io-width = <4>; reg-io-width = <4>;
...@@ -781,7 +781,7 @@ porta: gpio-controller@0 { ...@@ -781,7 +781,7 @@ porta: gpio-controller@0 {
}; };
}; };
i2c0: i2c0@10512000 { i2c0: i2c@10512000 {
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -886,7 +886,7 @@ usb1: dwusb@19800000 { ...@@ -886,7 +886,7 @@ usb1: dwusb@19800000 {
dr_mode = "host"; dr_mode = "host";
}; };
sbgpio: sbgpio@17001000{ sbgpio: gpio@17001000{
compatible = "apm,xgene-gpio-sb"; compatible = "apm,xgene-gpio-sb";
reg = <0x0 0x17001000 0x0 0x400>; reg = <0x0 0x17001000 0x0 0x400>;
#gpio-cells = <2>; #gpio-cells = <2>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment