ARM: tegra: Replace legacy *,wakeup property with wakeup-source

[cascardo/linux.git] / arch / arm / boot / dts / tegra124-jetson-tk1.dts

diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index 66b4451..95b580a 100644 (file)
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -12,7 +12,11 @@
        aliases {
                rtc0 = "/i2c@0,7000d000/pmic@40";
                rtc1 = "/rtc@0,7000e000";
+
+               /* This order keeps the mapping DB9 connector <-> ttyS0 */
                serial0 = &uartd;
+               serial1 = &uarta;
+               serial2 = &uartb;
        };
 
        memory {
@@ -1367,6 +1371,28 @@
                };
        };
 
+       /*
+        * First high speed UART, exposed on the expansion connector J3A2
+        *   Pin 41: BR_UART1_TXD
+        *   Pin 44: BR_UART1_RXD
+        */
+       serial@70006000 {
+               compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               status = "okay";
+       };
+
+       /*
+        * Second high speed UART, exposed on the expansion connector J3A2
+        *   Pin 65: UART2_RXD
+        *   Pin 68: UART2_TXD
+        *   Pin 71: UART2_CTS_L
+        *   Pin 74: UART2_RTS_L
+        */
+       serial@70006040 {
+               compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
+               status = "okay";
+       };
+
        /* DB9 serial port */
        serial@0,70006300 {
                status = "okay";
@@ -1761,7 +1787,7 @@
                        gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        debounce-interval = <10>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                };
        };