diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-09-26 18:14:20 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-09-26 18:14:19 -0700 |
| commit | d84edcaecb889b93ef88ed0da828c47f1574ce66 (patch) | |
| tree | a6e4618ef5d513b9b7f0b75adda3bcfe5401d620 | |
| parent | 77b66d3fe85ad5051806cc2a56ec54554bde563d (diff) | |
| parent | 559147107d60457861992981a29b6bb0f9e6ed20 (diff) | |
Merge "ARM: dts: msm: Add NFC device for msm8610"
| -rw-r--r-- | arch/arm/boot/dts/msm8610-mtp.dtsi | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/msm8610-mtp.dtsi b/arch/arm/boot/dts/msm8610-mtp.dtsi index 6f0d66882a1..b9403bd22ad 100644 --- a/arch/arm/boot/dts/msm8610-mtp.dtsi +++ b/arch/arm/boot/dts/msm8610-mtp.dtsi @@ -146,6 +146,17 @@ capella,ps_conf1_val = <0x0006>; capella,ps_conf3_val = <0x3010>; }; + nfc-nci@0e { + compatible = "qcom,nfc-nci"; + reg = <0x0e>; + qcom,irq-gpio = <&msmgpio 77 0x00>; + qcom,dis-gpio = <&msmgpio 93 0x00>; + qcom,clk-en-gpio = <&msmgpio 78 0x00>; + qcom,clk-src = "GPCLK"; + interrupt-parent = <&msmgpio>; + interrupts = <77 0>; + qcom,clk-gpio = <&pm8110_gpios 1 0>; + }; }; gen-vkeys { @@ -387,6 +398,11 @@ &pm8110_gpios { gpio@c000 { /* GPIO 1 */ + qcom,mode = <0>; /* QPNP_PIN_MODE_DIG_IN */ + qcom,pull = <5>; /* QPNP_PIN_PULL_NO */ + qcom,vin-sel = <2>; /* QPNP_PIN_VIN2 */ + qcom,src-sel = <2>; /* QPNP_PIN_SEL_FUNC_1 */ + qcom,master-en = <1>; }; gpio@c100 { /* GPIO 2 */ |