diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-12 19:58:56 +0300 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-12 19:58:56 +0300 |
commit | f85bb96a52f47a016aa5b67a9eff0c7f19a5b64c (patch) | |
tree | 0618209975b2807c01b18d384ded4f8342abe3a9 /arch/arm64/boot/dts/qcom/msm8916-mtp.dts | |
parent | d4e209db57abe07163fe84b43b533a4b6246b0c3 (diff) | |
parent | 0faf49393534fa4263bfbda7d0566e2e3d1aaf37 (diff) |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151112.0
Conflicting files:
Diffstat (limited to 'arch/arm64/boot/dts/qcom/msm8916-mtp.dts')
-rw-r--r-- | arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts index fced77f0fd3a..6c68b4ed4de2 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts @@ -13,10 +13,13 @@ /dts-v1/; +#include <dt-bindings/arm/qcom-ids.h> #include "msm8916-mtp.dtsi" / { model = "Qualcomm Technologies, Inc. MSM 8916 MTP"; compatible = "qcom,msm8916-mtp", "qcom,msm8916-mtp-smb1360", "qcom,msm8916", "qcom,mtp"; + qcom,board-id = <QCOM_BRD_ID(MTP, 1, 0) QCOM_BRD_SUBTYPE_DEFAULT>, + <QCOM_BRD_ID(MTP, 1, 0) QCOM_BRD_SUBTYPE_MTP8916_SMB1360>; }; |