diff --git a/src/arm/BONE-UART1-00A0.dts b/src/arm/BONE-UART1-00A0.dts
index f04c1496..1ad24a8f 100644
--- a/src/arm/BONE-UART1-00A0.dts
+++ b/src/arm/BONE-UART1-00A0.dts
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2020 Deepak Khatri <deepaklorkhatri7@gmail.com>
  *
- * Virtual cape for /bone/uart/1
+ * Virtual cape for /dev/bone/uart/1
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -21,11 +21,11 @@
 };
 
 /*
-* Free up the pins used by the cape from the pinmux helpers.
+* Update the default pinmux of the pins.
 */
 &ocp {
-    P9_24_pinmux { status = "disabled"; };
-    P9_26_pinmux { status = "disabled"; };
+    P9_24_pinmux { pinctrl-0 = <&P9_24_uart_pin>; };    /* UART TX*/
+    P9_26_pinmux { pinctrl-0 = <&P9_26_uart_pin>; };    /* UART RX*/
 };
 
 &bone_uart_1 {
diff --git a/src/arm/BONE-UART2-00A0.dts b/src/arm/BONE-UART2-00A0.dts
index 325f3f51..dfb70c39 100644
--- a/src/arm/BONE-UART2-00A0.dts
+++ b/src/arm/BONE-UART2-00A0.dts
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2020 Deepak Khatri <deepaklorkhatri7@gmail.com>
  *
- * Virtual cape for /bone/uart/2
+ * Virtual cape for /dev/bone/uart/2
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -21,11 +21,11 @@
 };
 
 /*
-* Free up the pins used by the cape from the pinmux helpers.
+* Update the default pinmux of the pins.
 */
 &ocp {
-    P9_21_pinmux { status = "disabled"; };
-    P9_22_pinmux { status = "disabled"; };
+    P9_21_pinmux { pinctrl-0 = <&P9_21_uart_pin>; };    /* UART TX*/
+    P9_22_pinmux { pinctrl-0 = <&P9_22_uart_pin>; };    /* UART RX*/
 };
 
 &bone_uart_2 {
diff --git a/src/arm/BONE-UART3-00A0.dts b/src/arm/BONE-UART3-00A0.dts
index 1c49b38e..67efd3c4 100644
--- a/src/arm/BONE-UART3-00A0.dts
+++ b/src/arm/BONE-UART3-00A0.dts
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2020 Deepak Khatri <deepaklorkhatri7@gmail.com>
  *
- * Virtual cape for /bone/uart/3 (only on BBB)
+ * Virtual cape for /dev/bone/uart/3 (only on BBB)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -21,10 +21,10 @@
 };
 
 /*
-* Free up the pins used by the cape from the pinmux helpers.
+* Update the default pinmux of the pins.
 */
 &ocp {
-    P9_42_pinmux { status = "disabled"; };
+    P9_42_pinmux { pinctrl-0 = <&P9_42_uart_pin>; };    /*UART TX*/
 };
 
 &bone_uart_3 {
diff --git a/src/arm/BONE-UART4-00A0.dts b/src/arm/BONE-UART4-00A0.dts
index 3f849d9a..76788ab5 100644
--- a/src/arm/BONE-UART4-00A0.dts
+++ b/src/arm/BONE-UART4-00A0.dts
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2020 Deepak Khatri <deepaklorkhatri7@gmail.com>
  *
- * Virtual cape for /bone/uart/4
+ * Virtual cape for /dev/bone/uart/4
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -21,11 +21,11 @@
 };
 
 /*
-* Free up the pins used by the cape from the pinmux helpers.
+* Update the default pinmux of the pins.
 */
 &ocp {
-    P9_13_pinmux { status = "disabled"; };
-    P9_11_pinmux { status = "disabled"; };
+    P9_13_pinmux { pinctrl-0 = <&P9_13_uart_pin>; };    /* UART TX*/
+    P9_11_pinmux { pinctrl-0 = <&P9_11_uart_pin>; };    /* UART RX*/
 };
 
 &bone_uart_4 {
diff --git a/src/arm/BONE-UART5-00A0.dts b/src/arm/BONE-UART5-00A0.dts
index 940f09fd..71120afa 100644
--- a/src/arm/BONE-UART5-00A0.dts
+++ b/src/arm/BONE-UART5-00A0.dts
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2020 Deepak Khatri <deepaklorkhatri7@gmail.com>
  *
- * Virtual cape for /bone/uart/5
+ * Virtual cape for /dev/bone/uart/5
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -21,11 +21,11 @@
 };
 
 /*
-* Free up the pins used by the cape from the pinmux helpers.
+* Update the default pinmux of the pins.
 */
 &ocp {
-    P9_37_pinmux { status = "disabled"; };
-    P9_38_pinmux { status = "disabled"; };
+    P9_37_pinmux { pinctrl-0 = <&P9_37_uart_pin>; };    /* UART TX*/
+    P9_38_pinmux { pinctrl-0 = <&P9_38_uart_pin>; };    /* UART RX*/
 };
 
 &bone_uart_5 {