Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / boot / dts / qcom-msm8660.dtsi

diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi
index 221c4584552f9df40ababa4dc3cc22c2216d0811..33030f9419fefdbf267e4e7ce1e0947def1c77e0 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8660.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8660.dtsi
@@ -124,6 +124,73 @@
                        reg = <0x900000 0x4000>;
                };
 
+               gsbi6: gsbi@16500000 {
+                       compatible = "qcom,gsbi-v1.0.0";
+                       cell-index = <12>;
+                       reg = <0x16500000 0x100>;
+                       clocks = <&gcc GSBI6_H_CLK>;
+                       clock-names = "iface";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+
+                       syscon-tcsr = <&tcsr>;
+
+                       gsbi6_serial: serial@16540000 {
+                               compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
+                               reg = <0x16540000 0x1000>,
+                                     <0x16500000 0x1000>;
+                               interrupts = <GIC_SPI 156 IRQ_TYPE_NONE>;
+                               clocks = <&gcc GSBI6_UART_CLK>, <&gcc GSBI6_H_CLK>;
+                               clock-names = "core", "iface";
+                               status = "disabled";
+                       };
+
+                       gsbi6_i2c: i2c@16580000 {
+                               compatible = "qcom,i2c-qup-v1.1.1";
+                               reg = <0x16580000 0x1000>;
+                               interrupts = <GIC_SPI 157 IRQ_TYPE_NONE>;
+                               clocks = <&gcc GSBI6_QUP_CLK>, <&gcc GSBI6_H_CLK>;
+                               clock-names = "core", "iface";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
+               };
+
+               gsbi7: gsbi@16600000 {
+                       compatible = "qcom,gsbi-v1.0.0";
+                       cell-index = <12>;
+                       reg = <0x16600000 0x100>;
+                       clocks = <&gcc GSBI7_H_CLK>;
+                       clock-names = "iface";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+
+                       syscon-tcsr = <&tcsr>;
+
+                       gsbi7_serial: serial@16640000 {
+                               compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
+                               reg = <0x16640000 0x1000>,
+                                     <0x16600000 0x1000>;
+                               interrupts = <GIC_SPI 158 IRQ_TYPE_NONE>;
+                               clocks = <&gcc GSBI7_UART_CLK>, <&gcc GSBI7_H_CLK>;
+                               clock-names = "core", "iface";
+                               status = "disabled";
+                       };
+
+                       gsbi7_i2c: i2c@16680000 {
+                               compatible = "qcom,i2c-qup-v1.1.1";
+                               reg = <0x16680000 0x1000>;
+                               interrupts = <GIC_SPI 159 IRQ_TYPE_NONE>;
+                               clocks = <&gcc GSBI7_QUP_CLK>, <&gcc GSBI7_H_CLK>;
+                               clock-names = "core", "iface";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
+               };
 
                gsbi8: gsbi@19800000 {
                        compatible = "qcom,gsbi-v1.0.0";
@@ -317,37 +384,37 @@
                                        #size-cells = <0>;
                                        #io-channel-cells = <2>;
 
-                                       vcoin: adc-channel@00 {
+                                       vcoin: adc-channel@0 {
                                                reg = <0x00 0x00>;
                                        };
-                                       vbat: adc-channel@01 {
+                                       vbat: adc-channel@1 {
                                                reg = <0x00 0x01>;
                                        };
-                                       dcin: adc-channel@02 {
+                                       dcin: adc-channel@2 {
                                                reg = <0x00 0x02>;
                                        };
-                                       ichg: adc-channel@03 {
+                                       ichg: adc-channel@3 {
                                                reg = <0x00 0x03>;
                                        };
-                                       vph_pwr: adc-channel@04 {
+                                       vph_pwr: adc-channel@4 {
                                                reg = <0x00 0x04>;
                                        };
-                                       usb_vbus: adc-channel@0a {
+                                       usb_vbus: adc-channel@a {
                                                reg = <0x00 0x0a>;
                                        };
-                                       die_temp: adc-channel@0b {
+                                       die_temp: adc-channel@b {
                                                reg = <0x00 0x0b>;
                                        };
-                                       ref_625mv: adc-channel@0c {
+                                       ref_625mv: adc-channel@c {
                                                reg = <0x00 0x0c>;
                                        };
-                                       ref_1250mv: adc-channel@0d {
+                                       ref_1250mv: adc-channel@d {
                                                reg = <0x00 0x0d>;
                                        };
-                                       ref_325mv: adc-channel@0e {
+                                       ref_325mv: adc-channel@e {
                                                reg = <0x00 0x0e>;
                                        };
-                                       ref_muxoff: adc-channel@0f {
+                                       ref_muxoff: adc-channel@f {
                                                reg = <0x00 0x0f>;
                                        };
                                };