AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-25 05:38:29 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

arm64: dts: juno: Update entries to match latest coresight bindings

Browse Source 
Switch to updated coresight bindings for Juno platforms.

Cc: Liviu Dudau <liviu.dudau@arm.com>
Acked-by: Liviu Dudau <liviu.dudau@arm.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
[sudeep.holla: minor modifications to patch title]
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
This commit is contained in:
Suzuki K Poulose 2018-07-27 11:15:37 +01:00 committed by Sudeep Holla
parent 5b394b2ddf
commit 41af6cbfa1
3 changed files with 107 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
arch/arm64/boot/dts/arm/juno-base.dtsi
View File

@ -115,22 +115,17 @@ etf@20010000 { /* etf0 */
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
/* input port */ in-ports {
port@0 { port {
reg = <0>;
etf0_in_port: endpoint { etf0_in_port: endpoint {
slave-mode;
remote-endpoint = <&main_funnel_out_port>; remote-endpoint = <&main_funnel_out_port>;
}; };
}; };
};
/* output port */ out-ports {
port@1 { port {
reg = <0>;
etf0_out_port: endpoint { etf0_out_port: endpoint {
}; };
}; };
@ -144,13 +139,14 @@ tpiu@20030000 {
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
in-ports {
port { port {
tpiu_in_port: endpoint { tpiu_in_port: endpoint {
slave-mode;
remote-endpoint = <&replicator_out_port0>; remote-endpoint = <&replicator_out_port0>;
}; };
}; };
}; };
};
/* main funnel on Juno r0, cssys0 funnel on Juno r1/r2 as per TRM*/ /* main funnel on Juno r0, cssys0 funnel on Juno r1/r2 as per TRM*/
main_funnel: funnel@20040000 { main_funnel: funnel@20040000 {
@ -160,31 +156,29 @@ main_funnel: funnel@20040000 {
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
/* output port */ out-ports {
port@0 { port {
reg = <0>;
main_funnel_out_port: endpoint { main_funnel_out_port: endpoint {
remote-endpoint = <&etf0_in_port>; remote-endpoint = <&etf0_in_port>;
}; };
}; };
};
/* input ports */ main_funnel_in_ports: in-ports {
port@1 { #address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>; reg = <0>;
main_funnel_in_port0: endpoint { main_funnel_in_port0: endpoint {
slave-mode;
remote-endpoint = <&cluster0_funnel_out_port>; remote-endpoint = <&cluster0_funnel_out_port>;
}; };
}; };
port@2 { port@1 {
reg = <1>; reg = <1>;
main_funnel_in_port1: endpoint { main_funnel_in_port1: endpoint {
slave-mode;
remote-endpoint = <&cluster1_funnel_out_port>; remote-endpoint = <&cluster1_funnel_out_port>;
}; };
}; };
@ -199,13 +193,14 @@ etr@20070000 {
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
in-ports {
port { port {
etr_in_port: endpoint { etr_in_port: endpoint {
slave-mode;
remote-endpoint = <&replicator_out_port1>; remote-endpoint = <&replicator_out_port1>;
}; };
}; };
}; };
};
stm@20100000 { stm@20100000 {
compatible = "arm,coresight-stm", "arm,primecell"; compatible = "arm,coresight-stm", "arm,primecell";
@ -216,11 +211,13 @@ stm@20100000 {
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
out-ports {
port { port {
stm_out_port: endpoint { stm_out_port: endpoint {
}; };
}; };
}; };
};
cpu_debug0: cpu-debug@22010000 { cpu_debug0: cpu-debug@22010000 {
compatible = "arm,coresight-cpu-debug", "arm,primecell"; compatible = "arm,coresight-cpu-debug", "arm,primecell";
@ -238,12 +235,14 @@ etm0: etm@22040000 {
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
out-ports {
port { port {
cluster0_etm0_out_port: endpoint { cluster0_etm0_out_port: endpoint {
remote-endpoint = <&cluster0_funnel_in_port0>; remote-endpoint = <&cluster0_funnel_in_port0>;
}; };
}; };
}; };
};
funnel@220c0000 { /* cluster0 funnel */ funnel@220c0000 { /* cluster0 funnel */
compatible = "arm,coresight-funnel", "arm,primecell"; compatible = "arm,coresight-funnel", "arm,primecell";
@ -252,29 +251,28 @@ funnel@220c0000 { /* cluster0 funnel */
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
ports { out-ports {
port {
cluster0_funnel_out_port: endpoint {
remote-endpoint = <&main_funnel_in_port0>;
};
};
};
in-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
port@0 { port@0 {
reg = <0>;
cluster0_funnel_out_port: endpoint {
remote-endpoint = <&main_funnel_in_port0>;
};
};
port@1 {
reg = <0>; reg = <0>;
cluster0_funnel_in_port0: endpoint { cluster0_funnel_in_port0: endpoint {
slave-mode;
remote-endpoint = <&cluster0_etm0_out_port>; remote-endpoint = <&cluster0_etm0_out_port>;
}; };
}; };
port@2 { port@1 {
reg = <1>; reg = <1>;
cluster0_funnel_in_port1: endpoint { cluster0_funnel_in_port1: endpoint {
slave-mode;
remote-endpoint = <&cluster0_etm1_out_port>; remote-endpoint = <&cluster0_etm1_out_port>;
}; };
}; };
@ -297,12 +295,14 @@ etm1: etm@22140000 {
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
out-ports {
port { port {
cluster0_etm1_out_port: endpoint { cluster0_etm1_out_port: endpoint {
remote-endpoint = <&cluster0_funnel_in_port1>; remote-endpoint = <&cluster0_funnel_in_port1>;
}; };
}; };
}; };
};
cpu_debug2: cpu-debug@23010000 { cpu_debug2: cpu-debug@23010000 {
compatible = "arm,coresight-cpu-debug", "arm,primecell"; compatible = "arm,coresight-cpu-debug", "arm,primecell";
@ -320,12 +320,14 @@ etm2: etm@23040000 {
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
out-ports {
port { port {
cluster1_etm0_out_port: endpoint { cluster1_etm0_out_port: endpoint {
remote-endpoint = <&cluster1_funnel_in_port0>; remote-endpoint = <&cluster1_funnel_in_port0>;
}; };
}; };
}; };
};
funnel@230c0000 { /* cluster1 funnel */ funnel@230c0000 { /* cluster1 funnel */
compatible = "arm,coresight-funnel", "arm,primecell"; compatible = "arm,coresight-funnel", "arm,primecell";
@ -334,43 +336,40 @@ funnel@230c0000 { /* cluster1 funnel */
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
ports { out-ports {
port {
cluster1_funnel_out_port: endpoint {
remote-endpoint = <&main_funnel_in_port1>;
};
};
};
in-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
port@0 { port@0 {
reg = <0>;
cluster1_funnel_out_port: endpoint {
remote-endpoint = <&main_funnel_in_port1>;
};
};
port@1 {
reg = <0>; reg = <0>;
cluster1_funnel_in_port0: endpoint { cluster1_funnel_in_port0: endpoint {
slave-mode;
remote-endpoint = <&cluster1_etm0_out_port>; remote-endpoint = <&cluster1_etm0_out_port>;
}; };
}; };
port@2 { port@1 {
reg = <1>; reg = <1>;
cluster1_funnel_in_port1: endpoint { cluster1_funnel_in_port1: endpoint {
slave-mode;
remote-endpoint = <&cluster1_etm1_out_port>; remote-endpoint = <&cluster1_etm1_out_port>;
}; };
}; };
port@3 { port@2 {
reg = <2>; reg = <2>;
cluster1_funnel_in_port2: endpoint { cluster1_funnel_in_port2: endpoint {
slave-mode;
remote-endpoint = <&cluster1_etm2_out_port>; remote-endpoint = <&cluster1_etm2_out_port>;
}; };
}; };
port@4 { port@3 {
reg = <3>; reg = <3>;
cluster1_funnel_in_port3: endpoint { cluster1_funnel_in_port3: endpoint {
slave-mode;
remote-endpoint = <&cluster1_etm3_out_port>; remote-endpoint = <&cluster1_etm3_out_port>;
}; };
}; };
@ -393,12 +392,14 @@ etm3: etm@23140000 {
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
out-ports {
port { port {
cluster1_etm1_out_port: endpoint { cluster1_etm1_out_port: endpoint {
remote-endpoint = <&cluster1_funnel_in_port1>; remote-endpoint = <&cluster1_funnel_in_port1>;
}; };
}; };
}; };
};
cpu_debug4: cpu-debug@23210000 { cpu_debug4: cpu-debug@23210000 {
compatible = "arm,coresight-cpu-debug", "arm,primecell"; compatible = "arm,coresight-cpu-debug", "arm,primecell";
@ -416,12 +417,14 @@ etm4: etm@23240000 {
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
out-ports {
port { port {
cluster1_etm2_out_port: endpoint { cluster1_etm2_out_port: endpoint {
remote-endpoint = <&cluster1_funnel_in_port2>; remote-endpoint = <&cluster1_funnel_in_port2>;
}; };
}; };
}; };
};
cpu_debug5: cpu-debug@23310000 { cpu_debug5: cpu-debug@23310000 {
compatible = "arm,coresight-cpu-debug", "arm,primecell"; compatible = "arm,coresight-cpu-debug", "arm,primecell";
@ -439,12 +442,14 @@ etm5: etm@23340000 {
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
out-ports {
port { port {
cluster1_etm3_out_port: endpoint { cluster1_etm3_out_port: endpoint {
remote-endpoint = <&cluster1_funnel_in_port3>; remote-endpoint = <&cluster1_funnel_in_port3>;
}; };
}; };
}; };
};
replicator@20120000 { replicator@20120000 {
compatible = "arm,coresight-dynamic-replicator", "arm,primecell"; compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
@ -454,7 +459,7 @@ replicator@20120000 {
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
ports { out-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@ -472,12 +477,10 @@ replicator_out_port1: endpoint {
remote-endpoint = <&etr_in_port>; remote-endpoint = <&etr_in_port>;
}; };
}; };
};
/* replicator input port */ in-ports {
port@2 { port {
reg = <0>;
replicator_in_port0: endpoint { replicator_in_port0: endpoint {
slave-mode;
}; };
}; };
}; };

52
arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
View File

@ -7,23 +7,16 @@ funnel@20130000 { /* cssys1 */
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
ports { out-ports {
#address-cells = <1>; port {
#size-cells = <0>;
/* output port */
port@0 {
reg = <0>;
csys1_funnel_out_port: endpoint { csys1_funnel_out_port: endpoint {
remote-endpoint = <&etf1_in_port>; remote-endpoint = <&etf1_in_port>;
}; };
}; };
};
/* input port */ in-ports {
port@1 { port {
reg = <0>;
csys1_funnel_in_port0: endpoint { csys1_funnel_in_port0: endpoint {
slave-mode;
}; };
}; };
@ -37,22 +30,15 @@ etf@20140000 { /* etf1 */
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
ports { in-ports {
#address-cells = <1>; port {
#size-cells = <0>;
/* input port */
port@0 {
reg = <0>;
etf1_in_port: endpoint { etf1_in_port: endpoint {
slave-mode;
remote-endpoint = <&csys1_funnel_out_port>; remote-endpoint = <&csys1_funnel_out_port>;
}; };
}; };
};
/* output port */ out-ports {
port@1 { port {
reg = <0>;
etf1_out_port: endpoint { etf1_out_port: endpoint {
remote-endpoint = <&csys2_funnel_in_port1>; remote-endpoint = <&csys2_funnel_in_port1>;
}; };
@ -67,20 +53,18 @@ funnel@20150000 { /* cssys2 */
clocks = <&soc_smc50mhz>; clocks = <&soc_smc50mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
power-domains = <&scpi_devpd 0>; power-domains = <&scpi_devpd 0>;
ports { out-ports {
#address-cells = <1>; port {
#size-cells = <0>;
/* output port */
port@0 {
reg = <0>;
csys2_funnel_out_port: endpoint { csys2_funnel_out_port: endpoint {
remote-endpoint = <&replicator_in_port0>; remote-endpoint = <&replicator_in_port0>;
}; };
}; };
};
/* input ports */ in-ports {
port@1 { #address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>; reg = <0>;
csys2_funnel_in_port0: endpoint { csys2_funnel_in_port0: endpoint {
slave-mode; slave-mode;
@ -88,7 +72,7 @@ csys2_funnel_in_port0: endpoint {
}; };
}; };
port@2 { port@1 {
reg = <1>; reg = <1>;
csys2_funnel_in_port1: endpoint { csys2_funnel_in_port1: endpoint {
slave-mode; slave-mode;

7
arch/arm64/boot/dts/arm/juno.dts
View File

@ -257,17 +257,14 @@ &stm_out_port {
remote-endpoint = <&main_funnel_in_port2>; remote-endpoint = <&main_funnel_in_port2>;
}; };
&main_funnel { &main_funnel_in_ports {
ports { port@2 {
port@3 {
reg = <2>; reg = <2>;
main_funnel_in_port2: endpoint { main_funnel_in_port2: endpoint {
slave-mode;
remote-endpoint = <&stm_out_port>; remote-endpoint = <&stm_out_port>;
}; };
}; };
}; };
};
&cpu_debug0 { &cpu_debug0 {
cpu = <&A57_0>; cpu = <&A57_0>;