diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-06 09:07:19 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-06 09:07:19 -0800 |
| commit | 3e15f887cf8e29bf8fc7f365ddaae27a1453fa8e (patch) | |
| tree | ab2950330c7d7d1df5fe4689cad21e609da4ae87 | |
| parent | 38b693f401299290a57bb15527bd2eb064af5ebe (diff) | |
| parent | d26af6deeb58e9fbb7499699349ef746277f158c (diff) | |
Merge "ARM: dts: msm: Add support for APQ8096A"
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts index 1bca588f448e..7fa5b2850635 100644 --- a/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts +++ b/arch/arm/boot/dts/qcom/apq8096pro-auto-cdp.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2018, 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 @@ -20,7 +20,7 @@ / { model = "Qualcomm Technologies, Inc. APQ 8096 pro AUTO CDP"; compatible = "qcom,apq8096-cdp", "qcom,apq8096", "qcom,cdp"; - qcom,msm-id = <316 0x10000>; + qcom,msm-id = <316 0x10000>, <387 0x10000>; qcom,board-id = <0x03010001 0>; }; diff --git a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts index 0bb04361eabe..c2d9f6696307 100644 --- a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts +++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts @@ -21,7 +21,7 @@ / { model = "Qualcomm Technologies, Inc. APQ 8096pro V1.1 AUTO ADP LITE"; compatible = "qcom,apq8096-adp", "qcom,msm8996", "qcom,adp"; - qcom,msm-id = <316 0x10001>; + qcom,msm-id = <316 0x10001>, <387 0x10001>; qcom,board-id = <0x03010019 0>; }; diff --git a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts index 908dc4a20372..9ca38fcac0bb 100644 --- a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts +++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts @@ -21,7 +21,7 @@ / { model = "Qualcomm Technologies, Inc. MSM 8996pro AUTO ADP"; compatible = "qcom,apq8096-adp", "qcom,msm8996", "qcom,adp"; - qcom,msm-id = <316 0x10001>; + qcom,msm-id = <316 0x10001>, <387 0x10001> ; qcom,board-id = <0x02010019 0>, <0x00010001 0>; }; diff --git a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts index e69640ddd363..422db71b26d4 100644 --- a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts +++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2018, 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 @@ -20,7 +20,7 @@ / { model = "Qualcomm Technologies, Inc. APQ 8096 pro v1.1 AUTO CDP"; compatible = "qcom,msm8996-cdp", "qcom,msm8996", "qcom,cdp"; - qcom,msm-id = <316 0x10001>; + qcom,msm-id = <316 0x10001>, <387 0x10001>; qcom,board-id = <0x03010001 0>, <0x00010001 0>; }; |