openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm64: dts: qcom: msm8916: Disable coresight by default 

On some msm8916 devices, attempts at initializing coresight cause the boot to
fail. This was fixed by disabling the coresight-related nodes in the board dts
files. However, a cleaner approach was chosen for fixing the same issue on
msm8998: disabling coresight by default, and enabling it in board dts files
where desired.

This patch implements the same solution for msm8916, removes now redundant
overwrites in board specific dts files and and enables coresight in db410c's
board dts in order to keep the current behavior.

Fixes: b1fcc5702a ("arm64: dts: qcom: msm8916: Add CTI options")
Signed-off-by: Michael Srba <michael.srba@seznam.cz>

Reviewed-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com>
Link: https://lore.kernel.org/r/20200513184735.30104-1-michael.srba@seznam.cz
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Michael Srba 2020-05-13 20:47:35 +02:00 committed by Bjorn Andersson
parent 9fc18435d2
commit b3d6fd8f25
4 changed files with 56 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
View File

@ -519,6 +519,27 @@ mpps@a000 {
wcnss@a21b000 { wcnss@a21b000 {
status = "okay"; status = "okay";
}; };
tpiu@820000 { status = "okay"; };
funnel@821000 { status = "okay"; };
replicator@824000 { status = "okay"; };
etf@825000 { status = "okay"; };
etr@826000 { status = "okay"; };
funnel@841000 { status = "okay"; };
debug@850000 { status = "okay"; };
debug@852000 { status = "okay"; };
debug@854000 { status = "okay"; };
debug@856000 { status = "okay"; };
etm@85c000 { status = "okay"; };
etm@85d000 { status = "okay"; };
etm@85e000 { status = "okay"; };
etm@85f000 { status = "okay"; };
cti@810000 { status = "okay"; };
cti@811000 { status = "okay"; };
cti@858000 { status = "okay"; };
cti@859000 { status = "okay"; };
cti@85a000 { status = "okay"; };
cti@85b000 { status = "okay"; };
}; };
usb2513 { usb2513 {

23
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
View File

@ -82,29 +82,6 @@ phy {
wcnss@a21b000 { wcnss@a21b000 {
status = "okay"; status = "okay";
}; };
/*
* Attempting to enable these devices causes a "synchronous
* external abort". Suspected cause is that the debug power
* domain is not enabled by default on this device.
* Disable these devices for now to avoid the crash.
*
* See: https://lore.kernel.org/linux-arm-msm/20190618202623.GA53651@gerhold.net/
*/
tpiu@820000 { status = "disabled"; };
funnel@821000 { status = "disabled"; };
replicator@824000 { status = "disabled"; };
etf@825000 { status = "disabled"; };
etr@826000 { status = "disabled"; };
funnel@841000 { status = "disabled"; };
debug@850000 { status = "disabled"; };
debug@852000 { status = "disabled"; };
debug@854000 { status = "disabled"; };
debug@856000 { status = "disabled"; };
etm@85c000 { status = "disabled"; };
etm@85d000 { status = "disabled"; };
etm@85e000 { status = "disabled"; };
etm@85f000 { status = "disabled"; };
}; };
// FIXME: Use extcon device provided by charger driver when available // FIXME: Use extcon device provided by charger driver when available

23
arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
View File

@ -75,29 +75,6 @@ phy {
wcnss@a21b000 { wcnss@a21b000 {
status = "okay"; status = "okay";
}; };
/*
* Attempting to enable these devices causes a "synchronous
* external abort". Suspected cause is that the debug power
* domain is not enabled by default on this device.
* Disable these devices for now to avoid the crash.
*
* See: https://lore.kernel.org/linux-arm-msm/20190618202623.GA53651@gerhold.net/
*/
tpiu@820000 { status = "disabled"; };
funnel@821000 { status = "disabled"; };
replicator@824000 { status = "disabled"; };
etf@825000 { status = "disabled"; };
etr@826000 { status = "disabled"; };
funnel@841000 { status = "disabled"; };
debug@850000 { status = "disabled"; };
debug@852000 { status = "disabled"; };
debug@854000 { status = "disabled"; };
debug@856000 { status = "disabled"; };
etm@85c000 { status = "disabled"; };
etm@85d000 { status = "disabled"; };
etm@85e000 { status = "disabled"; };
etm@85f000 { status = "disabled"; };
}; };
gpio-keys { gpio-keys {

35
arch/arm64/boot/dts/qcom/msm8916.dtsi
View File

@ -1258,6 +1258,8 @@ tpiu@820000 {
clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
clock-names = "apb_pclk", "atclk"; clock-names = "apb_pclk", "atclk";
status = "disabled";
in-ports { in-ports {
port { port {
tpiu_in: endpoint { tpiu_in: endpoint {
@ -1274,6 +1276,8 @@ funnel@821000 {
clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
clock-names = "apb_pclk", "atclk"; clock-names = "apb_pclk", "atclk";
status = "disabled";
in-ports { in-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@ -1313,6 +1317,8 @@ replicator@824000 {
clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
clock-names = "apb_pclk", "atclk"; clock-names = "apb_pclk", "atclk";
status = "disabled";
out-ports { out-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@ -1347,6 +1353,8 @@ etf@825000 {
clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
clock-names = "apb_pclk", "atclk"; clock-names = "apb_pclk", "atclk";
status = "disabled";
in-ports { in-ports {
port { port {
etf_in: endpoint { etf_in: endpoint {
@ -1371,6 +1379,8 @@ etr@826000 {
clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
clock-names = "apb_pclk", "atclk"; clock-names = "apb_pclk", "atclk";
status = "disabled";
in-ports { in-ports {
port { port {
etr_in: endpoint { etr_in: endpoint {
@ -1387,6 +1397,8 @@ funnel@841000 { /* APSS funnel only 4 inputs are used */
clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>, <&rpmcc RPM_QDSS_A_CLK>;
clock-names = "apb_pclk", "atclk"; clock-names = "apb_pclk", "atclk";
status = "disabled";
in-ports { in-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@ -1432,6 +1444,7 @@ debug@850000 {
clocks = <&rpmcc RPM_QDSS_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
cpu = <&CPU0>; cpu = <&CPU0>;
status = "disabled";
}; };
debug@852000 { debug@852000 {
@ -1440,6 +1453,7 @@ debug@852000 {
clocks = <&rpmcc RPM_QDSS_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
cpu = <&CPU1>; cpu = <&CPU1>;
status = "disabled";
}; };
debug@854000 { debug@854000 {
@ -1448,6 +1462,7 @@ debug@854000 {
clocks = <&rpmcc RPM_QDSS_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
cpu = <&CPU2>; cpu = <&CPU2>;
status = "disabled";
}; };
debug@856000 { debug@856000 {
@ -1456,6 +1471,7 @@ debug@856000 {
clocks = <&rpmcc RPM_QDSS_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
cpu = <&CPU3>; cpu = <&CPU3>;
status = "disabled";
}; };
etm0: etm@85c000 { etm0: etm@85c000 {
@ -1468,6 +1484,8 @@ etm0: etm@85c000 {
cpu = <&CPU0>; cpu = <&CPU0>;
status = "disabled";
out-ports { out-ports {
port { port {
etm0_out: endpoint { etm0_out: endpoint {
@ -1487,6 +1505,8 @@ etm1: etm@85d000 {
cpu = <&CPU1>; cpu = <&CPU1>;
status = "disabled";
out-ports { out-ports {
port { port {
etm1_out: endpoint { etm1_out: endpoint {
@ -1506,6 +1526,8 @@ etm2: etm@85e000 {
cpu = <&CPU2>; cpu = <&CPU2>;
status = "disabled";
out-ports { out-ports {
port { port {
etm2_out: endpoint { etm2_out: endpoint {
@ -1525,6 +1547,8 @@ etm3: etm@85f000 {
cpu = <&CPU3>; cpu = <&CPU3>;
status = "disabled";
out-ports { out-ports {
port { port {
etm3_out: endpoint { etm3_out: endpoint {
@ -1542,6 +1566,8 @@ cti@810000 {
clocks = <&rpmcc RPM_QDSS_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
}; };
/* CTI 1 - TPIU connections */ /* CTI 1 - TPIU connections */
@ -1551,6 +1577,8 @@ cti@811000 {
clocks = <&rpmcc RPM_QDSS_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
status = "disabled";
}; };
/* CTIs 2-11 - no information - not instantiated */ /* CTIs 2-11 - no information - not instantiated */
@ -1568,6 +1596,7 @@ cti@858000 {
cpu = <&CPU0>; cpu = <&CPU0>;
arm,cs-dev-assoc = <&etm0>; arm,cs-dev-assoc = <&etm0>;
status = "disabled";
}; };
/* CTI - CPU-1 */ /* CTI - CPU-1 */
@ -1581,6 +1610,8 @@ cti@859000 {
cpu = <&CPU1>; cpu = <&CPU1>;
arm,cs-dev-assoc = <&etm1>; arm,cs-dev-assoc = <&etm1>;
status = "disabled";
}; };
/* CTI - CPU-2 */ /* CTI - CPU-2 */
@ -1594,6 +1625,8 @@ cti@85a000 {
cpu = <&CPU2>; cpu = <&CPU2>;
arm,cs-dev-assoc = <&etm2>; arm,cs-dev-assoc = <&etm2>;
status = "disabled";
}; };
/* CTI - CPU-3 */ /* CTI - CPU-3 */
@ -1607,6 +1640,8 @@ cti@85b000 {
cpu = <&CPU3>; cpu = <&CPU3>;
arm,cs-dev-assoc = <&etm3>; arm,cs-dev-assoc = <&etm3>;
status = "disabled";
}; };