diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-05-26 04:55:59 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-14 09:54:57 -0400 |
commit | 9cfceacb4983272c1f0a6926aec2b127143df692 (patch) | |
tree | 6653d5cc81602cfae1b8f96cf65714d2a4613d9e /arch/arm/boot | |
parent | 7bf0f5bd9213cd0d75383ec36d3aae5f08e185c4 (diff) |
ARM: at91: dt: sam9260: add i2c gpio pinctrl
commit f89ae61bd74ae195c464bdd97a134e30908884d5 upstream.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Boris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/at91sam9260.dtsi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi index 84c4bef2d726..43a18f74cddb 100644 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi | |||
@@ -340,6 +340,14 @@ | |||
340 | }; | 340 | }; |
341 | }; | 341 | }; |
342 | 342 | ||
343 | i2c_gpio0 { | ||
344 | pinctrl_i2c_gpio0: i2c_gpio0-0 { | ||
345 | atmel,pins = | ||
346 | <0 23 0x0 0x3 /* PA23 gpio I2C_SDA pin */ | ||
347 | 0 24 0x0 0x3>; /* PA24 gpio I2C_SCL pin */ | ||
348 | }; | ||
349 | }; | ||
350 | |||
343 | pioA: gpio@fffff400 { | 351 | pioA: gpio@fffff400 { |
344 | compatible = "atmel,at91rm9200-gpio"; | 352 | compatible = "atmel,at91rm9200-gpio"; |
345 | reg = <0xfffff400 0x200>; | 353 | reg = <0xfffff400 0x200>; |
@@ -592,6 +600,8 @@ | |||
592 | i2c-gpio,delay-us = <2>; /* ~100 kHz */ | 600 | i2c-gpio,delay-us = <2>; /* ~100 kHz */ |
593 | #address-cells = <1>; | 601 | #address-cells = <1>; |
594 | #size-cells = <0>; | 602 | #size-cells = <0>; |
603 | pinctrl-names = "default"; | ||
604 | pinctrl-0 = <&pinctrl_i2c_gpio0>; | ||
595 | status = "disabled"; | 605 | status = "disabled"; |
596 | }; | 606 | }; |
597 | }; | 607 | }; |