From: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Commit f89ae61bd74ae195c464bdd97a134e30908884d5 upstream. Applies on 3.10.x.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Signed-off-by: Nicolas Ferre <[email protected]>
---
Hello,

This patch removes the use of macros which are not available in 3.10.
It's needed in order to get a working i2c bus on boards using at91sam9260 SoC.

Best Regards,

Boris

 arch/arm/boot/dts/at91sam9260.dtsi |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi 
b/arch/arm/boot/dts/at91sam9260.dtsi
index a776f50..de571d9 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -347,6 +347,14 @@
                                        };
                                };
 
+                               i2c_gpio0 {
+                                       pinctrl_i2c_gpio0: i2c_gpio0-0 {
+                                               atmel,pins =
+                                                       <0 23 0x0 0x3   /* PA23 
gpio I2C_SDA pin */
+                                                        0 24 0x0 0x3>; /* PA24 
gpio I2C_SCL pin */
+                                       };
+                               };
+
                                pioA: gpio@fffff400 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x200>;
@@ -599,6 +607,8 @@
                i2c-gpio,delay-us = <2>;        /* ~100 kHz */
                #address-cells = <1>;
                #size-cells = <0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_i2c_gpio0>;
                status = "disabled";
        };
 };
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to