diff options
| author | Andy Gross <andy.gross@linaro.org> | 2018-06-25 23:53:28 -0500 |
|---|---|---|
| committer | Andy Gross <andy.gross@linaro.org> | 2018-06-25 23:53:28 -0500 |
| commit | 9573ce74d3bc797758cbd55194aae1b7248f2503 (patch) | |
| tree | 00fefaf28ca0b3e0aa872005a435f7dd38c1bb32 /arch | |
| parent | ce397d215ccd07b8ae3f71db689aedb85d56ab40 (diff) | |
| parent | 6b4154a655a258c67bcfabbd4c3a06637e74ebcd (diff) | |
Merge tag 'qcom-fixes-for-4.18-rc1' into linus
Qualcomm Fixes for v4.18-rc1
* Fix coresight graph on msm8916
* Disable uart0 on db820c by default
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index 0f829db33efe..4d5ef01f43a3 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi @@ -75,7 +75,7 @@ serial@75b1000 { label = "LS-UART0"; - status = "okay"; + status = "disabled"; pinctrl-names = "default", "sleep"; pinctrl-0 = <&blsp2_uart2_4pins_default>; pinctrl-1 = <&blsp2_uart2_4pins_sleep>; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 650f356f69ca..c2625d15a8c0 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1191,14 +1191,14 @@ port@0 { reg = <0>; - etf_out: endpoint { + etf_in: endpoint { slave-mode; remote-endpoint = <&funnel0_out>; }; }; port@1 { reg = <0>; - etf_in: endpoint { + etf_out: endpoint { remote-endpoint = <&replicator_in>; }; }; |