浏览代码

ARM: at91/dt: declare atmel,at91rm9200-st as a syscon

The system timer register range is used to handle three different
functionalities: Periodic Interval Timer, Real Time Timer and watchdog. Declare
it as a syscon to be able to get a regmap.
Also declare it as a simple-mfd and its watchdog subnode.

Finally, document the watchdog compatible string.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Alexandre Belloni 10 年之前
父节点
当前提交
b595809b98
共有 2 个文件被更改,包括 8 次插入2 次删除
  1. 3 1
      Documentation/devicetree/bindings/arm/atmel-at91.txt
  2. 5 1
      arch/arm/boot/dts/at91rm9200.dtsi

+ 3 - 1
Documentation/devicetree/bindings/arm/atmel-at91.txt

@@ -46,10 +46,12 @@ PIT Timer required properties:
   shared across all System Controller members.
   shared across all System Controller members.
 
 
 System Timer (ST) required properties:
 System Timer (ST) required properties:
-- compatible: Should be "atmel,at91rm9200-st"
+- compatible: Should be "atmel,at91rm9200-st", "syscon", "simple-mfd"
 - reg: Should contain registers location and length
 - reg: Should contain registers location and length
 - interrupts: Should contain interrupt for the ST which is the IRQ line
 - interrupts: Should contain interrupt for the ST which is the IRQ line
   shared across all System Controller members.
   shared across all System Controller members.
+Its subnodes can be:
+- watchdog: compatible should be "atmel,at91rm9200-wdt"
 
 
 TC/TCLIB Timer required properties:
 TC/TCLIB Timer required properties:
 - compatible: Should be "atmel,<chip>-tcb".
 - compatible: Should be "atmel,<chip>-tcb".

+ 5 - 1
arch/arm/boot/dts/at91rm9200.dtsi

@@ -356,9 +356,13 @@
 			};
 			};
 
 
 			st: timer@fffffd00 {
 			st: timer@fffffd00 {
-				compatible = "atmel,at91rm9200-st";
+				compatible = "atmel,at91rm9200-st", "syscon", "simple-mfd";
 				reg = <0xfffffd00 0x100>;
 				reg = <0xfffffd00 0x100>;
 				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
 				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+
+				watchdog {
+					compatible = "atmel,at91rm9200-wdt";
+				};
 			};
 			};
 
 
 			rtc: rtc@fffffe00 {
 			rtc: rtc@fffffe00 {