summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-10-24 20:02:53 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-10-24 20:02:52 -0700
commitb3ede85de2db1fd39a653863cba4e9a968765e45 (patch)
tree5ee41585e1ce19c403ee235d52cf8c9f06ae066d
parent13b2fc0bc35394322566ce56e9aef8d982c45ba6 (diff)
parent08dcce6a734af98d1990acbee7d9e251ebc26497 (diff)
Merge "ARM: dts: msm: add support for QBT1000 on SDM630"
-rw-r--r--arch/arm/boot/dts/qcom/sdm630-mtp.dtsi10
-rw-r--r--arch/arm/boot/dts/qcom/sdm630.dtsi10
2 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm630-mtp.dtsi b/arch/arm/boot/dts/qcom/sdm630-mtp.dtsi
index bb50f23d8126..fd7cc8a7c5c2 100644
--- a/arch/arm/boot/dts/qcom/sdm630-mtp.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm630-mtp.dtsi
@@ -56,6 +56,16 @@
qcom,master-en = <1>;
status = "okay";
};
+
+ /* GPIO 11 for Home Key */
+ gpio@ca00 {
+ status = "okay";
+ qcom,mode = <0>;
+ qcom,pull = <0>;
+ qcom,vin-sel = <0>;
+ qcom,src-sel = <0>;
+ qcom,out-strength = <1>;
+ };
};
&i2c_6 { /* BLSP1 QUP6 (NFC) */
diff --git a/arch/arm/boot/dts/qcom/sdm630.dtsi b/arch/arm/boot/dts/qcom/sdm630.dtsi
index ae110fe22535..cd88489e0978 100644
--- a/arch/arm/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm630.dtsi
@@ -629,6 +629,16 @@
qcom,sensors = <12>;
};
+ qcom,qbt1000 {
+ compatible = "qcom,qbt1000";
+ clock-names = "core", "iface";
+ clocks = <&clock_gcc GCC_BLSP1_QUP3_SPI_APPS_CLK>,
+ <&clock_gcc GCC_BLSP1_AHB_CLK>;
+ clock-frequency = <15000000>;
+ qcom,ipc-gpio = <&tlmm 72 0>;
+ qcom,finger-detect-gpio = <&pm660_gpios 11 0>;
+ };
+
qcom,sensor-information {
compatible = "qcom,sensor-information";
sensor_information0: qcom,sensor-information-0 {