diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-07-11 21:09:42 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-07-11 21:09:42 -0700 |
| commit | b6729217bcfd11a68302676be355277b83bc0b45 (patch) | |
| tree | 2943650df81453aa7ef5938c78a258adff8e8b88 | |
| parent | ef86f1cfc4d6fcfb26f8064d4dd1b39d24f52059 (diff) | |
| parent | 20b46f6b3d1bf02b24da17b810c3a03a9e92bca0 (diff) | |
Merge "ARM: dts: msm: Add devices for sa8155 virtual machines on multi mode" into LV.AU.0.0.2_rb1.1LV.AU.0.0.2-00310-qtiquingvm.0
| -rw-r--r-- | arch/arm64/boot/dts/qcom/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sa8155-vm-la-mt.dts | 30 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sa8155-vm-lv-mt.dts | 12 |
3 files changed, 43 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index d31d7aa4926e..33ecfef5ebbc 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -102,6 +102,7 @@ endif dtb-$(CONFIG_QTI_GVM) += sa8155-vm.dtb \ sa8155-vm-lv.dtb \ sa8155-vm-lv-mt.dtb \ + sa8155-vm-la-mt.dtb \ sa6155p-vm.dtb \ sa8195-vm.dtb diff --git a/arch/arm64/boot/dts/qcom/sa8155-vm-la-mt.dts b/arch/arm64/boot/dts/qcom/sa8155-vm-la-mt.dts new file mode 100644 index 000000000000..ad4132c52f38 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sa8155-vm-la-mt.dts @@ -0,0 +1,30 @@ +/* Copyright (c) 2019, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; + +#include "sa8155-vm.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. SA8155 Virtual Machine"; + compatible = "qcom,sa8155"; + qcom,pmic-name = "PM8150"; + qcom,board-id = <0 0>; +}; + +&slpi_tlmm { + status = "ok"; +}; + +&apps_smmu { + status = "ok"; +}; diff --git a/arch/arm64/boot/dts/qcom/sa8155-vm-lv-mt.dts b/arch/arm64/boot/dts/qcom/sa8155-vm-lv-mt.dts index e686cf9d7d76..c2a9e394cbaa 100644 --- a/arch/arm64/boot/dts/qcom/sa8155-vm-lv-mt.dts +++ b/arch/arm64/boot/dts/qcom/sa8155-vm-lv-mt.dts @@ -33,6 +33,10 @@ status = "ok"; }; +&qupv3_se13_4uart { + status = "ok"; +}; + &usb0 { status = "ok"; }; @@ -41,6 +45,14 @@ status = "ok"; }; +&pcie0_msi { + status = "ok"; +}; + +&pcie0 { + status = "ok"; +}; + &sde_kms_hyp { /delete-property/ qcom,client-id; qcom,client-id = "7816"; |