Skip to content

L
linux
Commit 85f8f593 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'xgene-dts-for-v4.9' of https://github.com/AppliedMicro/xgene-next into next/dt64 

Pull "X-gene DTS changes queued for v4.9" from Duc Dang:

This change set includes:
+ DTS entry to enable SoC PMU for X-Gene v1 SoC
+ DTS entry to enable SoC PMU for X-Gene v2 SoC
+ PCIe legacy interrupt polarity fix for X-Gene
+ X-Gene SoC hwmon DTS entry
+ DTS entries for X-Gene v2 CPU clock

* tag 'xgene-dts-for-v4.9' of https://github.com/AppliedMicro/xgene-next:
  arm64: dts: apm: Add DT node for APM X-Gene 2 CPU clocks
  arm64: dts: apm: Add X-Gene SoC hwmon to device tree
  arm64: dts: apm: Fix interrupt polarity for X-Gene PCIe legacy interrupts
  arm64: dts: apm: Add APM X-Gene v2 SoC PMU DTS entries
  arm64: dts: apm: Add APM X-Gene SoC PMU DTS entries
parents 473326a8 39936ae1
Hide whitespace changes
Inline Side-by-side
Showing with 210 additions and 28 deletions
arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
View file @ 85f8f593
...@@ -26,6 +26,8 @@ cpu@000 { ...@@ -26,6 +26,8 @@ cpu@000 {
enable-method = "spin-table"; enable-method = "spin-table";
cpu-release-addr = <0x1 0x0000fff8>; cpu-release-addr = <0x1 0x0000fff8>;
next-level-cache = <&xgene_L2_0>; next-level-cache = <&xgene_L2_0>;
#clock-cells = <1>;
clocks = <&pmd0clk 0>;
}; };
cpu@001 { cpu@001 {
device_type = "cpu"; device_type = "cpu";
...@@ -34,6 +36,8 @@ cpu@001 { ...@@ -34,6 +36,8 @@ cpu@001 {
enable-method = "spin-table"; enable-method = "spin-table";
cpu-release-addr = <0x1 0x0000fff8>; cpu-release-addr = <0x1 0x0000fff8>;
next-level-cache = <&xgene_L2_0>; next-level-cache = <&xgene_L2_0>;
#clock-cells = <1>;
clocks = <&pmd0clk 0>;
}; };
cpu@100 { cpu@100 {
device_type = "cpu"; device_type = "cpu";
...@@ -42,6 +46,8 @@ cpu@100 { ...@@ -42,6 +46,8 @@ cpu@100 {
enable-method = "spin-table"; enable-method = "spin-table";
cpu-release-addr = <0x1 0x0000fff8>; cpu-release-addr = <0x1 0x0000fff8>;
next-level-cache = <&xgene_L2_1>; next-level-cache = <&xgene_L2_1>;
#clock-cells = <1>;
clocks = <&pmd1clk 0>;
}; };
cpu@101 { cpu@101 {
device_type = "cpu"; device_type = "cpu";
...@@ -50,6 +56,8 @@ cpu@101 { ...@@ -50,6 +56,8 @@ cpu@101 {
enable-method = "spin-table"; enable-method = "spin-table";
cpu-release-addr = <0x1 0x0000fff8>; cpu-release-addr = <0x1 0x0000fff8>;
next-level-cache = <&xgene_L2_1>; next-level-cache = <&xgene_L2_1>;
#clock-cells = <1>;
clocks = <&pmd1clk 0>;
}; };
cpu@200 { cpu@200 {
device_type = "cpu"; device_type = "cpu";
...@@ -58,6 +66,8 @@ cpu@200 { ...@@ -58,6 +66,8 @@ cpu@200 {
enable-method = "spin-table"; enable-method = "spin-table";
cpu-release-addr = <0x1 0x0000fff8>; cpu-release-addr = <0x1 0x0000fff8>;
next-level-cache = <&xgene_L2_2>; next-level-cache = <&xgene_L2_2>;
#clock-cells = <1>;
clocks = <&pmd2clk 0>;
}; };
cpu@201 { cpu@201 {
device_type = "cpu"; device_type = "cpu";
...@@ -66,6 +76,8 @@ cpu@201 { ...@@ -66,6 +76,8 @@ cpu@201 {
enable-method = "spin-table"; enable-method = "spin-table";
cpu-release-addr = <0x1 0x0000fff8>; cpu-release-addr = <0x1 0x0000fff8>;
next-level-cache = <&xgene_L2_2>; next-level-cache = <&xgene_L2_2>;
#clock-cells = <1>;
clocks = <&pmd2clk 0>;
}; };
cpu@300 { cpu@300 {
device_type = "cpu"; device_type = "cpu";
...@@ -74,6 +86,8 @@ cpu@300 { ...@@ -74,6 +86,8 @@ cpu@300 {
enable-method = "spin-table"; enable-method = "spin-table";
cpu-release-addr = <0x1 0x0000fff8>; cpu-release-addr = <0x1 0x0000fff8>;
next-level-cache = <&xgene_L2_3>; next-level-cache = <&xgene_L2_3>;
#clock-cells = <1>;
clocks = <&pmd3clk 0>;
}; };
cpu@301 { cpu@301 {
device_type = "cpu"; device_type = "cpu";
...@@ -82,6 +96,8 @@ cpu@301 { ...@@ -82,6 +96,8 @@ cpu@301 {
enable-method = "spin-table"; enable-method = "spin-table";
cpu-release-addr = <0x1 0x0000fff8>; cpu-release-addr = <0x1 0x0000fff8>;
next-level-cache = <&xgene_L2_3>; next-level-cache = <&xgene_L2_3>;
#clock-cells = <1>;
clocks = <&pmd3clk 0>;
}; };
xgene_L2_0: l2-cache-0 { xgene_L2_0: l2-cache-0 {
compatible = "cache"; compatible = "cache";
...@@ -223,6 +239,46 @@ refclk: refclk { ...@@ -223,6 +239,46 @@ refclk: refclk {
clock-output-names = "refclk"; clock-output-names = "refclk";
}; };
pmdpll: pmdpll@170000f0 {
compatible = "apm,xgene-pcppll-v2-clock";
#clock-cells = <1>;
clocks = <&refclk 0>;
reg = <0x0 0x170000f0 0x0 0x10>;
clock-output-names = "pmdpll";
};
pmd0clk: pmd0clk@7e200200 {
compatible = "apm,xgene-pmd-clock";
#clock-cells = <1>;
clocks = <&pmdpll 0>;
reg = <0x0 0x7e200200 0x0 0x10>;
clock-output-names = "pmd0clk";
};
pmd1clk: pmd1clk@7e200210 {
compatible = "apm,xgene-pmd-clock";
#clock-cells = <1>;
clocks = <&pmdpll 0>;
reg = <0x0 0x7e200210 0x0 0x10>;
clock-output-names = "pmd1clk";
};
pmd2clk: pmd2clk@7e200220 {
compatible = "apm,xgene-pmd-clock";
#clock-cells = <1>;
clocks = <&pmdpll 0>;
reg = <0x0 0x7e200220 0x0 0x10>;
clock-output-names = "pmd2clk";
};
pmd3clk: pmd3clk@7e200230 {
compatible = "apm,xgene-pmd-clock";
#clock-cells = <1>;
clocks = <&pmdpll 0>;
reg = <0x0 0x7e200230 0x0 0x10>;
clock-output-names = "pmd3clk";
};
socpll: socpll@17000120 { socpll: socpll@17000120 {
compatible = "apm,xgene-socpll-v2-clock"; compatible = "apm,xgene-socpll-v2-clock";
#clock-cells = <1>; #clock-cells = <1>;
...@@ -453,6 +509,64 @@ edacsoc@7e930000 { ...@@ -453,6 +509,64 @@ edacsoc@7e930000 {
}; };
}; };
pmu: pmu@78810000 {
compatible = "apm,xgene-pmu-v2";
#address-cells = <2>;
#size-cells = <2>;
ranges;
regmap-csw = <&csw>;
regmap-mcba = <&mcba>;
regmap-mcbb = <&mcbb>;
reg = <0x0 0x78810000 0x0 0x1000>;
interrupts = <0x0 0x22 0x4>;
pmul3c@7e610000 {
compatible = "apm,xgene-pmu-l3c";
reg = <0x0 0x7e610000 0x0 0x1000>;
};
pmuiob@7e940000 {
compatible = "apm,xgene-pmu-iob";
reg = <0x0 0x7e940000 0x0 0x1000>;
};
pmucmcb@7e710000 {
compatible = "apm,xgene-pmu-mcb";
reg = <0x0 0x7e710000 0x0 0x1000>;
enable-bit-index = <0>;
};
pmucmcb@7e730000 {
compatible = "apm,xgene-pmu-mcb";
reg = <0x0 0x7e730000 0x0 0x1000>;
enable-bit-index = <1>;
};
pmucmc@7e810000 {
compatible = "apm,xgene-pmu-mc";
reg = <0x0 0x7e810000 0x0 0x1000>;
enable-bit-index = <0>;
};
pmucmc@7e850000 {
compatible = "apm,xgene-pmu-mc";
reg = <0x0 0x7e850000 0x0 0x1000>;
enable-bit-index = <1>;
};
pmucmc@7e890000 {
compatible = "apm,xgene-pmu-mc";
reg = <0x0 0x7e890000 0x0 0x1000>;
enable-bit-index = <2>;
};
pmucmc@7e8d0000 {
compatible = "apm,xgene-pmu-mc";
reg = <0x0 0x7e8d0000 0x0 0x1000>;
enable-bit-index = <3>;
};
};
mailbox: mailbox@10540000 { mailbox: mailbox@10540000 {
compatible = "apm,xgene-slimpro-mbox"; compatible = "apm,xgene-slimpro-mbox";
reg = <0x0 0x10540000 0x0 0x8000>; reg = <0x0 0x10540000 0x0 0x8000>;
...@@ -472,6 +586,11 @@ i2cslimpro { ...@@ -472,6 +586,11 @@ i2cslimpro {
mboxes = <&mailbox 0>; mboxes = <&mailbox 0>;
}; };
hwmonslimpro {
compatible = "apm,xgene-slimpro-hwmon";
mboxes = <&mailbox 7>;
};
serial0: serial@10600000 { serial0: serial@10600000 {
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
...@@ -508,10 +627,10 @@ pcie0: pcie@1f2b0000 { ...@@ -508,10 +627,10 @@ pcie0: pcie@1f2b0000 {
dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
interrupt-map-mask = <0x0 0x0 0x0 0x7>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0x0 0x0 0x10 0x1 interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0x0 0x0 0x10 0x4
0x0 0x0 0x0 0x2 &gic 0x0 0x0 0x0 0x11 0x1 0x0 0x0 0x0 0x2 &gic 0x0 0x0 0x0 0x11 0x4
0x0 0x0 0x0 0x3 &gic 0x0 0x0 0x0 0x12 0x1 0x0 0x0 0x0 0x3 &gic 0x0 0x0 0x0 0x12 0x4
0x0 0x0 0x0 0x4 &gic 0x0 0x0 0x0 0x13 0x1>; 0x0 0x0 0x0 0x4 &gic 0x0 0x0 0x0 0x13 0x4>;
dma-coherent; dma-coherent;
clocks = <&pcie0clk 0>; clocks = <&pcie0clk 0>;
msi-parent = <&v2m0>; msi-parent = <&v2m0>;
...@@ -533,10 +652,10 @@ pcie1: pcie@1f2c0000 { ...@@ -533,10 +652,10 @@ pcie1: pcie@1f2c0000 {
dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
interrupt-map-mask = <0x0 0x0 0x0 0x7>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0x0 0x0 0x16 0x1 interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0x0 0x0 0x16 0x4
0x0 0x0 0x0 0x2 &gic 0x0 0x0 0x0 0x17 0x1 0x0 0x0 0x0 0x2 &gic 0x0 0x0 0x0 0x17 0x4
0x0 0x0 0x0 0x3 &gic 0x0 0x0 0x0 0x18 0x1 0x0 0x0 0x0 0x3 &gic 0x0 0x0 0x0 0x18 0x4
0x0 0x0 0x0 0x4 &gic 0x0 0x0 0x0 0x19 0x1>; 0x0 0x0 0x0 0x4 &gic 0x0 0x0 0x0 0x19 0x4>;
dma-coherent; dma-coherent;
clocks = <&pcie1clk 0>; clocks = <&pcie1clk 0>;
msi-parent = <&v2m0>; msi-parent = <&v2m0>;
......
arch/arm64/boot/dts/apm/apm-storm.dtsi
View file @ 85f8f593
...@@ -553,6 +553,64 @@ edacsoc@7e930000 { ...@@ -553,6 +553,64 @@ edacsoc@7e930000 {
}; };
}; };
pmu: pmu@78810000 {
compatible = "apm,xgene-pmu-v2";
#address-cells = <2>;
#size-cells = <2>;
ranges;
regmap-csw = <&csw>;
regmap-mcba = <&mcba>;
regmap-mcbb = <&mcbb>;
reg = <0x0 0x78810000 0x0 0x1000>;
interrupts = <0x0 0x22 0x4>;
pmul3c@7e610000 {
compatible = "apm,xgene-pmu-l3c";
reg = <0x0 0x7e610000 0x0 0x1000>;
};
pmuiob@7e940000 {
compatible = "apm,xgene-pmu-iob";
reg = <0x0 0x7e940000 0x0 0x1000>;
};
pmucmcb@7e710000 {
compatible = "apm,xgene-pmu-mcb";
reg = <0x0 0x7e710000 0x0 0x1000>;
enable-bit-index = <0>;
};
pmucmcb@7e730000 {
compatible = "apm,xgene-pmu-mcb";
reg = <0x0 0x7e730000 0x0 0x1000>;
enable-bit-index = <1>;
};
pmucmc@7e810000 {
compatible = "apm,xgene-pmu-mc";
reg = <0x0 0x7e810000 0x0 0x1000>;
enable-bit-index = <0>;
};
pmucmc@7e850000 {
compatible = "apm,xgene-pmu-mc";
reg = <0x0 0x7e850000 0x0 0x1000>;
enable-bit-index = <1>;
};
pmucmc@7e890000 {
compatible = "apm,xgene-pmu-mc";
reg = <0x0 0x7e890000 0x0 0x1000>;
enable-bit-index = <2>;
};
pmucmc@7e8d0000 {
compatible = "apm,xgene-pmu-mc";
reg = <0x0 0x7e8d0000 0x0 0x1000>;
enable-bit-index = <3>;
};
};
pcie0: pcie@1f2b0000 { pcie0: pcie@1f2b0000 {
status = "disabled"; status = "disabled";
device_type = "pci"; device_type = "pci";
...@@ -569,10 +627,10 @@ pcie0: pcie@1f2b0000 { ...@@ -569,10 +627,10 @@ pcie0: pcie@1f2b0000 {
dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
interrupt-map-mask = <0x0 0x0 0x0 0x7>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xc2 0x1 interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xc2 0x4
0x0 0x0 0x0 0x2 &gic 0x0 0xc3 0x1 0x0 0x0 0x0 0x2 &gic 0x0 0xc3 0x4
0x0 0x0 0x0 0x3 &gic 0x0 0xc4 0x1 0x0 0x0 0x0 0x3 &gic 0x0 0xc4 0x4
0x0 0x0 0x0 0x4 &gic 0x0 0xc5 0x1>; 0x0 0x0 0x0 0x4 &gic 0x0 0xc5 0x4>;
dma-coherent; dma-coherent;
clocks = <&pcie0clk 0>; clocks = <&pcie0clk 0>;
msi-parent = <&msi>; msi-parent = <&msi>;
...@@ -594,10 +652,10 @@ pcie1: pcie@1f2c0000 { ...@@ -594,10 +652,10 @@ pcie1: pcie@1f2c0000 {
dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
interrupt-map-mask = <0x0 0x0 0x0 0x7>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xc8 0x1 interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xc8 0x4
0x0 0x0 0x0 0x2 &gic 0x0 0xc9 0x1 0x0 0x0 0x0 0x2 &gic 0x0 0xc9 0x4
0x0 0x0 0x0 0x3 &gic 0x0 0xca 0x1 0x0 0x0 0x0 0x3 &gic 0x0 0xca 0x4
0x0 0x0 0x0 0x4 &gic 0x0 0xcb 0x1>; 0x0 0x0 0x0 0x4 &gic 0x0 0xcb 0x4>;
dma-coherent; dma-coherent;
clocks = <&pcie1clk 0>; clocks = <&pcie1clk 0>;
msi-parent = <&msi>; msi-parent = <&msi>;
...@@ -619,10 +677,10 @@ pcie2: pcie@1f2d0000 { ...@@ -619,10 +677,10 @@ pcie2: pcie@1f2d0000 {
dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
interrupt-map-mask = <0x0 0x0 0x0 0x7>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xce 0x1 interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xce 0x4
0x0 0x0 0x0 0x2 &gic 0x0 0xcf 0x1 0x0 0x0 0x0 0x2 &gic 0x0 0xcf 0x4
0x0 0x0 0x0 0x3 &gic 0x0 0xd0 0x1 0x0 0x0 0x0 0x3 &gic 0x0 0xd0 0x4
0x0 0x0 0x0 0x4 &gic 0x0 0xd1 0x1>; 0x0 0x0 0x0 0x4 &gic 0x0 0xd1 0x4>;
dma-coherent; dma-coherent;
clocks = <&pcie2clk 0>; clocks = <&pcie2clk 0>;
msi-parent = <&msi>; msi-parent = <&msi>;
...@@ -644,10 +702,10 @@ pcie3: pcie@1f500000 { ...@@ -644,10 +702,10 @@ pcie3: pcie@1f500000 {
dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
interrupt-map-mask = <0x0 0x0 0x0 0x7>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xd4 0x1 interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xd4 0x4
0x0 0x0 0x0 0x2 &gic 0x0 0xd5 0x1 0x0 0x0 0x0 0x2 &gic 0x0 0xd5 0x4
0x0 0x0 0x0 0x3 &gic 0x0 0xd6 0x1 0x0 0x0 0x0 0x3 &gic 0x0 0xd6 0x4
0x0 0x0 0x0 0x4 &gic 0x0 0xd7 0x1>; 0x0 0x0 0x0 0x4 &gic 0x0 0xd7 0x4>;
dma-coherent; dma-coherent;
clocks = <&pcie3clk 0>; clocks = <&pcie3clk 0>;
msi-parent = <&msi>; msi-parent = <&msi>;
...@@ -669,10 +727,10 @@ pcie4: pcie@1f510000 { ...@@ -669,10 +727,10 @@ pcie4: pcie@1f510000 {
dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000 dma-ranges = <0x42000000 0x80 0x00000000 0x80 0x00000000 0x00 0x80000000
0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>; 0x42000000 0x00 0x00000000 0x00 0x00000000 0x80 0x00000000>;
interrupt-map-mask = <0x0 0x0 0x0 0x7>; interrupt-map-mask = <0x0 0x0 0x0 0x7>;
interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xda 0x1 interrupt-map = <0x0 0x0 0x0 0x1 &gic 0x0 0xda 0x4
0x0 0x0 0x0 0x2 &gic 0x0 0xdb 0x1 0x0 0x0 0x0 0x2 &gic 0x0 0xdb 0x4
0x0 0x0 0x0 0x3 &gic 0x0 0xdc 0x1 0x0 0x0 0x0 0x3 &gic 0x0 0xdc 0x4
0x0 0x0 0x0 0x4 &gic 0x0 0xdd 0x1>; 0x0 0x0 0x0 0x4 &gic 0x0 0xdd 0x4>;
dma-coherent; dma-coherent;
clocks = <&pcie4clk 0>; clocks = <&pcie4clk 0>;
msi-parent = <&msi>; msi-parent = <&msi>;
...@@ -697,6 +755,11 @@ i2cslimpro { ...@@ -697,6 +755,11 @@ i2cslimpro {
mboxes = <&mailbox 0>; mboxes = <&mailbox 0>;
}; };
hwmonslimpro {
compatible = "apm,xgene-slimpro-hwmon";
mboxes = <&mailbox 7>;
};
serial0: serial@1c020000 { serial0: serial@1c020000 {
status = "disabled"; status = "disabled";
device_type = "serial"; device_type = "serial";
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7