diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-06-25 13:50:20 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-06-25 13:50:18 -0700 |
| commit | 2d51e30bf2f86321f153bf456aca374420a70668 (patch) | |
| tree | 05ef13b221731fb3ab358cfbc3b426bec4d05f21 | |
| parent | 03a22b8ee2b9eb3c7f33a5e9285d878923f6a568 (diff) | |
| parent | 7cac29f013567b6ec255f79834b03a46681b2333 (diff) | |
| download | qcom-2d51e30bf2f86321f153bf456aca374420a70668.tar.gz | |
Merge "Revert "ARM: dts: msm: enable mpu6050 interrupt mode for 8939MTP""
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8939-mtp.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8939-pinctrl.dtsi | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8939-mtp.dtsi b/arch/arm/boot/dts/qcom/msm8939-mtp.dtsi index aad72f4d482..50f8f58af5a 100644 --- a/arch/arm/boot/dts/qcom/msm8939-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8939-mtp.dtsi @@ -112,13 +112,12 @@ pinctrl-0 = <&mpu6050_default>; pinctrl-1 = <&mpu6050_sleep>; interrupt-parent = <&msm_gpio>; - interrupts = <115 0x1>; + interrupts = <115 0x2>; vdd-supply = <&pm8916_l17>; vlogic-supply = <&pm8916_l16>; vi2c-supply = <&pm8916_l6>; - invn,gpio-int = <&msm_gpio 115 0x1>; + invn,gpio-int = <&msm_gpio 115 0x2>; invn,place = "Portrait Down Back Side"; - invn,use-interrupt; }; avago@39 { /* Ambient light and proximity sensor */ diff --git a/arch/arm/boot/dts/qcom/msm8939-pinctrl.dtsi b/arch/arm/boot/dts/qcom/msm8939-pinctrl.dtsi index a61358e0c88..676069e7686 100644 --- a/arch/arm/boot/dts/qcom/msm8939-pinctrl.dtsi +++ b/arch/arm/boot/dts/qcom/msm8939-pinctrl.dtsi @@ -644,7 +644,7 @@ label = "mpu6050-irq"; mpu6050_default: mpu6050_default { drive-strength = <6>; - bias-pull-down; + bias-pull-up; }; mpu6050_sleep: mpu6050_sleep { drive-strength = <2>; |