---

yaml --- r: 296204 b: refs/heads/master c: 582d5fb h: refs/heads/master v: v3
git-mirror · Mar 1, 2012 · cd1979e · cd1979e
1 parent 7db14cc
commit cd1979e
Show file tree

Hide file tree

Showing 7 changed files with 283 additions and 22 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a9fe01ecf68c9b100499908122944597c63f21f
+refs/heads/master: 582d5fbd4e81e7debe5f3a0e6ce1a0bcdf636c6e
diff --git a/trunk/Documentation/devicetree/bindings/gpio/gpio_atmel.txt b/trunk/Documentation/devicetree/bindings/gpio/gpio_atmel.txt
@@ -1,7 +1,7 @@
 * Atmel GPIO controller (PIO)
 
 Required properties:
-- compatible: "atmel,at91rm9200-gpio"
+- compatible: "atmel,<chip>-gpio", where <chip> is at91rm9200 or at91sam9x5.
 - reg: Should contain GPIO controller registers location and length
 - interrupts: Should be the port interrupt shared by all the pins.
 - #gpio-cells: Should be two.  The first cell is the pin number and

diff --git a/trunk/arch/arm/boot/dts/at91sam9x5.dtsi b/trunk/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -89,7 +89,7 @@
 			};
 
 			pioA: gpio@fffff400 {
-				compatible = "atmel,at91rm9200-gpio";
+				compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
 				reg = <0xfffff400 0x100>;
 				interrupts = <2 4>;
 				#gpio-cells = <2>;
@@ -98,7 +98,7 @@
 			};
 
 			pioB: gpio@fffff600 {
-				compatible = "atmel,at91rm9200-gpio";
+				compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
 				reg = <0xfffff600 0x100>;
 				interrupts = <2 4>;
 				#gpio-cells = <2>;
@@ -107,7 +107,7 @@
 			};
 
 			pioC: gpio@fffff800 {
-				compatible = "atmel,at91rm9200-gpio";
+				compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
 				reg = <0xfffff800 0x100>;
 				interrupts = <3 4>;
 				#gpio-cells = <2>;
@@ -116,7 +116,7 @@
 			};
 
 			pioD: gpio@fffffa00 {
-				compatible = "atmel,at91rm9200-gpio";
+				compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
 				reg = <0xfffffa00 0x100>;
 				interrupts = <3 4>;
 				#gpio-cells = <2>;

diff --git a/trunk/arch/arm/mach-at91/board-dt.c b/trunk/arch/arm/mach-at91/board-dt.c
@@ -86,6 +86,7 @@ static const struct of_device_id irq_of_match[] __initconst = {
 
 	{ .compatible = "atmel,at91rm9200-aic", .data = at91_aic_of_init },
 	{ .compatible = "atmel,at91rm9200-gpio", .data = at91_gpio_of_irq_setup },
+	{ .compatible = "atmel,at91sam9x5-gpio", .data = at91_gpio_of_irq_setup },
 	{ /*sentinel*/ }
 };