Merge branch 'armsoc/for-3.11/dt' of git://github.com/broadcom/bcm11351 into next/dt

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / at91-ariag25.dts

diff --git a/arch/arm/boot/dts/at91-ariag25.dts b/arch/arm/boot/dts/at91-ariag25.dts
index c7aebba4e8e737a28e884e1700894577160faf92..cce45f5177f9f0aef6b40e0e775617f47398c48e 100644 (file)
--- a/arch/arm/boot/dts/at91-ariag25.dts
+++ b/arch/arm/boot/dts/at91-ariag25.dts
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "at91sam9g25.dtsi"
+#include "at91sam9g25.dtsi"
 
 / {
        model = "Acme Systems Aria G25";
@@ -21,6 +21,7 @@
                serial3 = &usart2;
                serial4 = &usart3;
                serial5 = &uart0;
+               serial6 = &uart1;
        };
 
        chosen {
@@ -112,13 +113,17 @@
                                status = "okay";
                        };
 
+                       /*
+                        * UART0/1 pins are marked as GPIO on
+                        * Aria documentation.
+                        * Change to "okay" if you need additional serial ports
+                        */
                        uart0: serial@f8040000 {
-                               compatible = "atmel,at91sam9260-usart";
-                               reg = <0xf8040000 0x200>;
-                               interrupts = <15 4 5>;
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart0>;
-                               status = "okay";
+                               status = "disabled";
+                       };
+
+                       uart1: serial@f8044000 {
+                               status = "disabled";
                        };
 
                        adc0: adc@f804c000 {
@@ -138,6 +143,10 @@
                                        };
                                };
                        };
+
+                       rtc@fffffeb0 {
+                               status = "okay";
+                       };
                };
 
                usb0: ohci@00600000 {
@@ -156,7 +165,7 @@
                /* little green LED in middle of Aria G25 module */
                aria_led {
                        label = "aria_led";
-                       gpios = <&pioB 8 0>; /* PB8 */
+                       gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
                        linux,default-trigger = "heartbeat";
                };
 
@@ -164,7 +173,7 @@
 
        onewire@0 {
                compatible = "w1-gpio";
-               gpios = <&pioA 21 1>;
+               gpios = <&pioA 21 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_w1_0>;
        };