arm/dt: msm8610: Add support for Atmel touchscreen
Add necessary GPIO, clock and DT settings for Atmel touch
controller to work on CDP & MTP. This includes settings for
i2c, and disabling the spi bus which was configured on
the same address.
Change-Id: Ic1e8322603bf454d5772ef4fecbc57765c9c0dd9
Signed-off-by: Chun Zhang <chunz@codeaurora.org>
diff --git a/arch/arm/boot/dts/msm8610.dtsi b/arch/arm/boot/dts/msm8610.dtsi
index 84fe7d2..2921bde 100644
--- a/arch/arm/boot/dts/msm8610.dtsi
+++ b/arch/arm/boot/dts/msm8610.dtsi
@@ -57,7 +57,6 @@
};
aliases {
- spi0 = &spi_0;
sdhc1 = &sdhc_1; /* SDC1 eMMC slot */
sdhc2 = &sdhc_2; /* SDC2 SD card slot */
};
@@ -428,16 +427,19 @@
qcom,pmic-arb-channel = <0>;
};
- i2c@f9925000 { /* BLSP-1 QUP-3 */
- cell-index = <0>;
+ i2c@f9923000 { /* BLSP-1 QUP-1 */
+ cell-index = <1>;
compatible = "qcom,i2c-qup";
#address-cells = <1>;
#size-cells = <0>;
reg-names = "qup_phys_addr";
- reg = <0xf9925000 0x1000>;
+ reg = <0xf9923000 0x1000>;
interrupt-names = "qup_err_intr";
- interrupts = <0 97 0>;
+ interrupts = <0 95 0>;
qcom,i2c-bus-freq = <100000>;
+ qcom,i2c-src-freq = <19200000>;
+ qcom,sda-gpio = <&msmgpio 2 0>;
+ qcom,scl-gpio = <&msmgpio 3 0>;
};
i2c@f9928000 { /* BLSP1 QUP6 */
@@ -455,27 +457,16 @@
qcom,scl-gpio = <&msmgpio 17 0>;
};
- spi_0: spi@f9923000 { /* BLSP1 QUP1 */
- compatible = "qcom,spi-qup-v2";
+ i2c@f9925000 { /* BLSP-1 QUP-3 */
+ cell-index = <0>;
+ compatible = "qcom,i2c-qup";
#address-cells = <1>;
#size-cells = <0>;
- reg-names = "spi_physical", "spi_bam_physical";
- reg = <0xf9923000 0x1000>,
- <0xf9904000 0xF000>;
- interrupt-names = "spi_irq", "spi_bam_irq";
- interrupts = <0 95 0>, <0 238 0>;
- spi-max-frequency = <19200000>;
-
- gpios = <&msmgpio 3 0>, /* CLK */
- <&msmgpio 1 0>, /* MISO */
- <&msmgpio 0 0>; /* MOSI */
- cs-gpios = <&msmgpio 2 0>;
-
- qcom,infinite-mode = <0>;
- qcom,use-bam;
- qcom,ver-reg-exists;
- qcom,bam-consumer-pipe-index = <12>;
- qcom,bam-producer-pipe-index = <13>;
+ reg-names = "qup_phys_addr";
+ reg = <0xf9925000 0x1000>;
+ interrupt-names = "qup_err_intr";
+ interrupts = <0 97 0>;
+ qcom,i2c-bus-freq = <100000>;
};
qcom,pronto@fb21b000 {