summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-10-27 15:49:16 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-27 15:49:16 -0700
commit66f8ffa044f5585e3ca5bbb24015655c25b7b636 (patch)
treed26dcb628e4e55dafa48fadd209af1026a5147e2
parent8779c92e1a3b18e0eaaef77337b1a5c459450f9c (diff)
parent48c3c0c1024f456694fef88007be4d1cc5a788eb (diff)
Merge "ARM: dts: msm: add SLPI fw name property for msmcobalt"
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi4
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt.dtsi3
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
index aefda85db0af..beecee843778 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
@@ -940,3 +940,7 @@
lanes-per-direction = <2>;
};
+
+&ssc_sensors {
+ qcom,firmware-name = "slpi_v2";
+};
diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi
index b21e2dcf8c1a..60b514c7ca20 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi
@@ -2810,9 +2810,10 @@
};
};
- qcom,msm-ssc-sensors {
+ ssc_sensors: qcom,msm-ssc-sensors {
compatible = "qcom,msm-ssc-sensors";
status = "ok";
+ qcom,firmware-name = "slpi_v1";
};
dcc: dcc@10b3000 {