From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 21 Nov 2012 09:48:33 +0000 (+0100)
Subject: Merge branch 'delivery/pinctrl-at91-3.8' of http://github.com/at91linux/linux-at91... 
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~94^2~4^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17d6b293e72547f75f5d9b680b75459cb8f2c9cf;p=pandora-kernel.git

Merge branch 'delivery/pinctrl-at91-3.8' of github.com/at91linux/linux-at91 into at91
---

17d6b293e72547f75f5d9b680b75459cb8f2c9cf
diff --cc Documentation/devicetree/bindings/arm/atmel-at91.txt
index d187e9f7cf1c,8adc9a8d6be9..1196290082d1
--- a/Documentation/devicetree/bindings/arm/atmel-at91.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt
@@@ -7,8 -7,14 +7,14 @@@ PIT Timer required properties
  - interrupts: Should contain interrupt for the PIT which is the IRQ line
    shared across all System Controller members.
  
+ System Timer (ST) required properties:
+ - compatible: Should be "atmel,at91rm9200-st"
+ - reg: Should contain registers location and length
+ - interrupts: Should contain interrupt for the ST which is the IRQ line
+   shared across all System Controller members.
+ 
  TC/TCLIB Timer required properties:
 -- compatible: Should be "atmel,<chip>-pit".
 +- compatible: Should be "atmel,<chip>-tcb".
    <chip> can be "at91rm9200" or "at91sam9x5"
  - reg: Should contain registers location and length
  - interrupts: Should contain all interrupts for the TC block