ARM: nomadik: selectively enable UART0 on boards

[karo-tx-linux.git] / arch / arm / boot / dts / ste-nomadik-s8815.dts

diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index 85d3b95dfdba55b543aa0f66733df936d5074abc..11b5e34150b835d002e473a49a75ba49e867ed78 100644 (file)
--- a/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@ -15,6 +15,21 @@
                bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk";
        };
 
+       aliases {
+               serial0 = &uart0;
+               serial1 = &uart1;
+       };
+
+       gpio3: gpio@101e7000 {
+               /* This hog will bias the MMC/SD card detect line */
+               mmcsd-gpio {
+                       gpio-hog;
+                       gpios = <16 0x0>;
+                       output-low;
+                       line-name = "card detect bias";
+               };
+       };
+
        src@101e0000 {
                /* These chrystal drivers are not used on this board */
                disable-sxtalo;
@@ -26,6 +41,15 @@
                pinctrl-names = "default";
                pinctrl-0 = <&cd_default_mode>;
 
+               uart0 {
+                       /* Only use RX/TX pins */
+                       uart0_s8815_mode: uart0_mux {
+                               u0_default_mux {
+                                       function = "u0";
+                                       groups = "u0txrx_a_1";
+                               };
+                       };
+               };
                mmcsd-cd {
                        cd_default_mode: cd_default {
                                cd_default_cfg1 {
@@ -98,21 +122,19 @@
        };
 
 
-       /* Configure card detect for the uSD slot */
        amba {
+               /* Activate RXTX on UART 0 */
+               uart0: uart@101fd000 {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&uart0_s8815_mode>;
+                       status = "okay";
+               };
+               /* Configure card detect for the uSD slot */
                mmcsd: sdi@101f6000 {
                        cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>;
                };
        };
 
-       /* Custom board node with GPIO pins to active etc */
-       usb-s8815 {
-               /* This will bias the MMC/SD card detect line */
-               mmcsd-gpio {
-                       gpios = <&gpio3 16 0x1>;
-               };
-       };
-
        /* The user LED on the board is set up to be used for heartbeat */
        leds {
                compatible = "gpio-leds";