Skip to content

L
linux
Commit 6302cbe7 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'juno-updates-4.20' of... 

Merge tag 'juno-updates-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/dt

ARMv8 Juno/Vexpress updates for v4.20

1. Enablement of scatter gather mode for CoreSight TMC-ETR routing

2. Usage of updated coresight graph bindings that eliminates loads of
   dtc warnings

* tag 'juno-updates-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  arm64: dts: juno: Enable coresight tmc scatter gather in ETR
  arm64: dts: juno: Update entries to match latest coresight bindings
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b610209c 79daf2a4
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 121 deletions
arch/arm64/boot/dts/arm/juno-base.dtsi
View file @ 6302cbe7
...@@ -115,22 +115,17 @@ etf@20010000 { /* etf0 */ ...@@ -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,10 +139,11 @@ tpiu@20030000 { ...@@ -144,10 +139,11 @@ 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>;
port { in-ports {
tpiu_in_port: endpoint { port {
slave-mode; tpiu_in_port: endpoint {
remote-endpoint = <&replicator_out_port0>; remote-endpoint = <&replicator_out_port0>;
};
}; };
}; };
}; };
...@@ -160,31 +156,29 @@ 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,10 +193,12 @@ etr@20070000 { ...@@ -199,10 +193,12 @@ 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>;
port { arm,scatter-gather;
etr_in_port: endpoint { in-ports {
slave-mode; port {
remote-endpoint = <&replicator_out_port1>; etr_in_port: endpoint {
remote-endpoint = <&replicator_out_port1>;
};
}; };
}; };
}; };
...@@ -216,8 +212,10 @@ stm@20100000 { ...@@ -216,8 +212,10 @@ 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>;
port { out-ports {
stm_out_port: endpoint { port {
stm_out_port: endpoint {
};
}; };
}; };
}; };
...@@ -238,9 +236,11 @@ etm0: etm@22040000 { ...@@ -238,9 +236,11 @@ 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>;
port { out-ports {
cluster0_etm0_out_port: endpoint { port {
remote-endpoint = <&cluster0_funnel_in_port0>; cluster0_etm0_out_port: endpoint {
remote-endpoint = <&cluster0_funnel_in_port0>;
};
}; };
}; };
}; };
...@@ -252,29 +252,28 @@ funnel@220c0000 { /* cluster0 funnel */ ...@@ -252,29 +252,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 {
#address-cells = <1>; port {
#size-cells = <0>;
port@0 {
reg = <0>;
cluster0_funnel_out_port: endpoint { cluster0_funnel_out_port: endpoint {
remote-endpoint = <&main_funnel_in_port0>; remote-endpoint = <&main_funnel_in_port0>;
}; };
}; };
};
port@1 { in-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
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,9 +296,11 @@ etm1: etm@22140000 { ...@@ -297,9 +296,11 @@ 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>;
port { out-ports {
cluster0_etm1_out_port: endpoint { port {
remote-endpoint = <&cluster0_funnel_in_port1>; cluster0_etm1_out_port: endpoint {
remote-endpoint = <&cluster0_funnel_in_port1>;
};
}; };
}; };
}; };
...@@ -320,9 +321,11 @@ etm2: etm@23040000 { ...@@ -320,9 +321,11 @@ 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>;
port { out-ports {
cluster1_etm0_out_port: endpoint { port {
remote-endpoint = <&cluster1_funnel_in_port0>; cluster1_etm0_out_port: endpoint {
remote-endpoint = <&cluster1_funnel_in_port0>;
};
}; };
}; };
}; };
...@@ -334,43 +337,40 @@ funnel@230c0000 { /* cluster1 funnel */ ...@@ -334,43 +337,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 {
#address-cells = <1>; port {
#size-cells = <0>;
port@0 {
reg = <0>;
cluster1_funnel_out_port: endpoint { cluster1_funnel_out_port: endpoint {
remote-endpoint = <&main_funnel_in_port1>; remote-endpoint = <&main_funnel_in_port1>;
}; };
}; };
};
port@1 { in-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
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,9 +393,11 @@ etm3: etm@23140000 { ...@@ -393,9 +393,11 @@ 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>;
port { out-ports {
cluster1_etm1_out_port: endpoint { port {
remote-endpoint = <&cluster1_funnel_in_port1>; cluster1_etm1_out_port: endpoint {
remote-endpoint = <&cluster1_funnel_in_port1>;
};
}; };
}; };
}; };
...@@ -416,9 +418,11 @@ etm4: etm@23240000 { ...@@ -416,9 +418,11 @@ 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>;
port { out-ports {
cluster1_etm2_out_port: endpoint { port {
remote-endpoint = <&cluster1_funnel_in_port2>; cluster1_etm2_out_port: endpoint {
remote-endpoint = <&cluster1_funnel_in_port2>;
};
}; };
}; };
}; };
...@@ -439,9 +443,11 @@ etm5: etm@23340000 { ...@@ -439,9 +443,11 @@ 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>;
port { out-ports {
cluster1_etm3_out_port: endpoint { port {
remote-endpoint = <&cluster1_funnel_in_port3>; cluster1_etm3_out_port: endpoint {
remote-endpoint = <&cluster1_funnel_in_port3>;
};
}; };
}; };
}; };
...@@ -454,7 +460,7 @@ replicator@20120000 { ...@@ -454,7 +460,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 +478,10 @@ replicator_out_port1: endpoint { ...@@ -472,12 +478,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;
}; };
}; };
}; };
......
arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
View file @ 6302cbe7
...@@ -7,23 +7,16 @@ funnel@20130000 { /* cssys1 */ ...@@ -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 */ ...@@ -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 */ ...@@ -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 { ...@@ -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;
......
arch/arm64/boot/dts/arm/juno.dts
View file @ 6302cbe7
...@@ -257,14 +257,11 @@ &stm_out_port { ...@@ -257,14 +257,11 @@ &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 { remote-endpoint = <&stm_out_port>;
slave-mode;
remote-endpoint = <&stm_out_port>;
};
}; };
}; };
}; };
......
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