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

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / boot / dts / at91sam9x5.dtsi

diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 347b438d47faf453dabaecf20d118af58f2f1504..640b3bbbb706f91ce14dce29af5b2d7d573c5e0d 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -361,6 +361,54 @@
                                        };
                                };
 
+                               i2c0 {
+                                       pinctrl_i2c0: i2c0-0 {
+                                               atmel,pins =
+                                                       <0 30 0x1 0x0   /* PA30 periph A I2C0 data */
+                                                        0 31 0x1 0x0>; /* PA31 periph A I2C0 clock */
+                                       };
+                               };
+
+                               i2c1 {
+                                       pinctrl_i2c1: i2c1-0 {
+                                               atmel,pins =
+                                                       <2 0 0x3 0x0    /* PC0 periph C I2C1 data */
+                                                        2 1 0x3 0x0>;  /* PC1 periph C I2C1 clock */
+                                       };
+                               };
+
+                               i2c2 {
+                                       pinctrl_i2c2: i2c2-0 {
+                                               atmel,pins =
+                                                       <1 4 0x2 0x0    /* PB4 periph B I2C2 data */
+                                                        1 5 0x2 0x0>;  /* PB5 periph B I2C2 clock */
+                                       };
+                               };
+
+                               i2c_gpio0 {
+                                       pinctrl_i2c_gpio0: i2c_gpio0-0 {
+                                               atmel,pins =
+                                                       <0 30 0x0 0x2   /* PA30 gpio multidrive I2C0 data */
+                                                        0 31 0x0 0x2>; /* PA31 gpio multidrive I2C0 clock */
+                                       };
+                               };
+
+                               i2c_gpio1 {
+                                       pinctrl_i2c_gpio1: i2c_gpio1-0 {
+                                               atmel,pins =
+                                                       <2 0 0x0 0x2    /* PC0 gpio multidrive I2C1 data */
+                                                        2 1 0x0 0x2>;  /* PC1 gpio multidrive I2C1 clock */
+                                       };
+                               };
+
+                               i2c_gpio2 {
+                                       pinctrl_i2c_gpio2: i2c_gpio2-0 {
+                                               atmel,pins =
+                                                       <1 4 0x0 0x2    /* PB4 gpio multidrive I2C2 data */
+                                                        1 5 0x0 0x2>;  /* PB5 gpio multidrive I2C2 clock */
+                                       };
+                               };
+
                                pioA: gpio@fffff400 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x200>;
@@ -489,6 +537,8 @@
                                interrupts = <9 4 6>;
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_i2c0>;
                                status = "disabled";
                        };
 
@@ -498,6 +548,8 @@
                                interrupts = <10 4 6>;
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_i2c1>;
                                status = "disabled";
                        };
 
@@ -507,6 +559,8 @@
                                interrupts = <11 4 6>;
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_i2c2>;
                                status = "disabled";
                        };
 
@@ -523,6 +577,9 @@
                                atmel,adc-drdy-mask = <0x1000000>;
                                atmel,adc-status-register = <0x30>;
                                atmel,adc-trigger-register = <0xc0>;
+                               atmel,adc-res = <8 10>;
+                               atmel,adc-res-names = "lowres", "highres";
+                               atmel,adc-use-res = "highres";
 
                                trigger@0 {
                                        trigger-name = "external-rising";
@@ -569,6 +626,13 @@
                                pinctrl-0 = <&pinctrl_spi1>;
                                status = "disabled";
                        };
+
+                       rtc@fffffeb0 {
+                               compatible = "atmel,at91rm9200-rtc";
+                               reg = <0xfffffeb0 0x40>;
+                               interrupts = <1 4 7>;
+                               status = "disabled";
+                       };
                };
 
                nand0: nand@40000000 {
@@ -617,6 +681,8 @@
                i2c-gpio,delay-us = <2>;        /* ~100 kHz */
                #address-cells = <1>;
                #size-cells = <0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_i2c_gpio0>;
                status = "disabled";
        };
 
@@ -630,6 +696,8 @@
                i2c-gpio,delay-us = <2>;        /* ~100 kHz */
                #address-cells = <1>;
                #size-cells = <0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_i2c_gpio1>;
                status = "disabled";
        };
 
@@ -643,6 +711,8 @@
                i2c-gpio,delay-us = <2>;        /* ~100 kHz */
                #address-cells = <1>;
                #size-cells = <0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_i2c_gpio2>;
                status = "disabled";
        };
 };