diff options
| author | Olof Johansson <olof@lixom.net> | 2018-06-23 20:22:43 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-06-23 20:22:43 +0300 |
| commit | fab9715bb89720c0eaf1a289972d133502d5267d (patch) | |
| tree | 466e08f0db400eb60d54db5af5b173ec88a76058 /arch/arm64 | |
| parent | 526e43e21296935b66f969452366c95408f43c0b (diff) | |
| parent | 6b4154a655a258c67bcfabbd4c3a06637e74ebcd (diff) | |
| download | linux-fab9715bb89720c0eaf1a289972d133502d5267d.tar.xz | |
Merge tag 'qcom-fixes-for-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes
Qualcomm Fixes for v4.18-rc1
* Fix coresight graph on msm8916
* Disable uart0 on db820c by default
* tag 'qcom-fixes-for-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
arm64: dts: msm8916: fix Coresight ETF graph connections
arm64: dts: apq8096-db820c: disable uart0 by default
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64')
| -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>; }; }; |