summaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-12-31 16:50:30 +0100
committerArnd Bergmann <arnd@arndb.de>2015-12-31 16:50:30 +0100
commitd07822a7ed2484908fb0d86f5f1dec27db0da439 (patch)
tree2a507612dba6c158e89ba56b453ba55061be770d /arch/arm64
parentd50a8b4843f7160db6e44844b9d733e866c20a89 (diff)
parent9ebf47bb748c17ebb2f9dde9169ed7a7612c3137 (diff)
downloadop-kernel-dev-d07822a7ed2484908fb0d86f5f1dec27db0da439.zip
op-kernel-dev-d07822a7ed2484908fb0d86f5f1dec27db0da439.tar.gz
Merge tag 'xgene-dts-fixes-for-v4.5' of https://github.com/AppliedMicro/xgene-next into next/dt64
Merge "Fixes for X-Gene DTS for v4.5" from Duc Dang: This patch set fixes the node names of X-Gene I2C, GPIO controller DT nodes; and also removes I2C clock nodes as the same clock is shared between 2 I2C controllers on X-Gene SoC. * tag 'xgene-dts-fixes-for-v4.5' of https://github.com/AppliedMicro/xgene-next: arm64: dts: X-Gene v2: I2C1 clock is always on arm64: dts: X-Gene v1: I2C0 clock is always on arm64: dts: Fix to use standard DT node names for X-Gene 1 and X-Gene 2 platforms
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/boot/dts/apm/apm-shadowcat.dtsi26
-rw-r--r--arch/arm64/boot/dts/apm/apm-storm.dtsi24
2 files changed, 12 insertions, 38 deletions
diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
index c617aa4..5d87a3d 100644
--- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
@@ -334,19 +334,6 @@
clock-output-names = "rngpkaclk";
};
- i2c1clk: i2c1clk@17000000 {
- compatible = "apm,xgene-device-clock";
- #clock-cells = <1>;
- clocks = <&sbapbclk 0>;
- reg = <0x0 0x17000000 0x0 0x2000>;
- reg-names = "csr-reg";
- csr-offset = <0xc>;
- csr-mask = <0x4>;
- enable-offset = <0x10>;
- enable-mask = <0x4>;
- clock-output-names = "i2c1clk";
- };
-
i2c4clk: i2c4clk@1704c000 {
compatible = "apm,xgene-device-clock";
#clock-cells = <1>;
@@ -476,6 +463,7 @@
interrupts = <0x0 0x4c 0x4>;
};
+ /* Do not change dwusb name, coded for backward compatibility */
usb0: dwusb@19000000 {
status = "disabled";
compatible = "snps,dwc3";
@@ -575,14 +563,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 +585,7 @@
};
};
- sbgpio: sbgpio@17001000{
+ sbgpio: gpio@17001000{
compatible = "apm,xgene-gpio-sb";
reg = <0x0 0x17001000 0x0 0x400>;
#gpio-cells = <2>;
@@ -648,18 +636,18 @@
clocks = <&rngpkaclk 0>;
};
- i2c1: i2c1@10511000 {
+ i2c1: i2c@10511000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "snps,designware-i2c";
reg = <0x0 0x10511000 0x0 0x1000>;
interrupts = <0 0x45 0x4>;
#clock-cells = <1>;
- clocks = <&i2c1clk 0>;
+ clocks = <&sbapbclk 0>;
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 a21e08a..fe30f76 100644
--- a/arch/arm64/boot/dts/apm/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi
@@ -437,20 +437,6 @@
reg-names = "csr-reg";
clock-output-names = "dmaclk";
};
-
- i2cclk: i2cclk@17000000 {
- status = "disabled";
- compatible = "apm,xgene-device-clock";
- #clock-cells = <1>;
- clocks = <&ahbclk 0>;
- reg = <0x0 0x17000000 0x0 0x2000>;
- reg-names = "csr-reg";
- csr-offset = <0xc>;
- csr-mask = <0x4>;
- enable-offset = <0x10>;
- enable-mask = <0x4>;
- clock-output-names = "i2cclk";
- };
};
msi: msi@79000000 {
@@ -759,14 +745,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 +767,7 @@
};
};
- i2c0: i2c0@10512000 {
+ i2c0: i2c@10512000 {
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
@@ -789,7 +775,7 @@
reg = <0x0 0x10512000 0x0 0x1000>;
interrupts = <0 0x44 0x4>;
#clock-cells = <1>;
- clocks = <&i2cclk 0>;
+ clocks = <&ahbclk 0>;
bus_num = <0>;
};
@@ -886,7 +872,7 @@
dr_mode = "host";
};
- sbgpio: sbgpio@17001000{
+ sbgpio: gpio@17001000{
compatible = "apm,xgene-gpio-sb";
reg = <0x0 0x17001000 0x0 0x400>;
#gpio-cells = <2>;
OpenPOWER on IntegriCloud