summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-05-30 16:04:24 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-05-30 16:04:24 -0700
commit22d89182eaf9ce50c14199e796abc8c4a89d13ff (patch)
tree2604bf98e0c5ef3f66338548cfc75e1fc1b23480
parent350f6ac81713d53ee0447b8a17249efef75405d2 (diff)
parent616f419e9f39994f726e7497267f5762f63f64fc (diff)
Merge "ARM: dts: msm: Add support for MSM8996pro UFS based board"
-rw-r--r--arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts4
-rw-r--r--arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-cdp.dts4
2 files changed, 4 insertions, 4 deletions
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 497f3f10fe24..840d82fa9084 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
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2017, 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
@@ -22,7 +22,7 @@
model = "Qualcomm Technologies, Inc. MSM 8996pro AUTO ADP";
compatible = "qcom,apq8096-adp", "qcom,msm8996", "qcom,adp";
qcom,msm-id = <316 0x10001>;
- qcom,board-id = <0x02010019 0>;
+ qcom,board-id = <0x02010019 0>, <0x00010001 0>;
};
&spi_9 {
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 2c54dfe19e18..ecde7c667f9a 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-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2017, 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
@@ -21,7 +21,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,board-id = <0x03010001 0>;
+ qcom,board-id = <0x03010001 0>, <0x00010001 0>;
};
&spi_9 {