diff --git a/src/arm/BBORG_COMMS-00A2.dts b/src/arm/BBORG_COMMS-00A2.dts
index 089a940a..119bd204 100644
--- a/src/arm/BBORG_COMMS-00A2.dts
+++ b/src/arm/BBORG_COMMS-00A2.dts
@@ -1,4 +1,7 @@
 /*
+ * Copyright (C) 2020 Deepak Khatri <deepaklorkhatri7@gmail.com>
+ *
+ * Based on older BBORG_COMMS-00A2.dts for kernel <4.14x
  * Copyright (C) 2012,2019 Texas Instruments Incorporated - http://www.ti.com/
  * Copyright (C) 2015 Robert Nelson <robertcnelson@gmail.com>
  * Copyright (C) 2015 Sebastian Jegerås
@@ -7,101 +10,60 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+
 /dts-v1/;
 /plugin/;
 
-#include <dt-bindings/board/am335x-bbw-bbb-base.h>
-#include <dt-bindings/pinctrl/am33xx.h>
-#include <dt-bindings/gpio/gpio.h>
-
-/ {
-	compatible = "ti,beaglebone", "ti,beaglebone-black", "ti,beaglebone-green";
-
-	/* identification */
-	part-number = "BBORG_COMMS";
-	version = "00A2";
-
-	/* state the resources this cape uses */
-	exclusive-use =
-		/* the pin header uses */
-		//"P9.15", /* SINK A */
-		//"P9.23", /* SINK B */
-		//"P9.36", /* LOOP A */
-		//"P9.35", /* LOOP B */
-		"P9.24",	/* can1_rx */
-		"P9.26",	/* can1_tx */
-		"P9.13",		// uart4_txd
-		"P9.11",		// uart4_rxd
-
-		/* the hardware ip uses */
-		"uart4",
-		"dcan1";
-
-	/*
-	 * Helper to show loaded overlays under: /proc/device-tree/chosen/overlays/
-	 */
-	fragment@0 {
-		target-path="/";
-		__overlay__ {
-
-			chosen {
-				overlays {
-					BBORG_COMMS-00A2 = __TIMESTAMP__;
-				};
-			};
-		};
+/*
+ * Helper to show loaded overlays under: /proc/device-tree/chosen/overlays/
+ */
+&{/chosen} {
+	overlays {
+		BBORG_COMMS-00A2 = __TIMESTAMP__;
 	};
+};
 
-	/*
-	 * Free up the pins used by the cape from the pinmux helpers.
-	 */
-	fragment@1 {
-		target = <&ocp>;
-		__overlay__ {
-			P9_24_pinmux { status = "disabled"; };	/* P9_24: uart1_txd.d_can1_rx */
-			P9_26_pinmux { status = "disabled"; };	/* P9_26: uart1_rxd.d_can1_tx */
-			P9_13_pinmux { status = "disabled"; };	/* P9_13: gpmc_wpn.uart4_txd_mux2 */
-			P9_11_pinmux { status = "disabled"; };	/* P9_11: gpmc_wait0.uart4_rxd_mux2 */
-		};
-	};
+/*
+ * Update the default pinmux of the pins.
+ * See these files for the phandles (&P9_* & &P8_*)
+ * https://github.com/beagleboard/BeagleBoard-DeviceTrees/src/arm/am335x-bone-common-univ.dtsi
+ * https://github.com/beagleboard/BeagleBoard-DeviceTrees/src/arm/am572x-bone-common-univ.dtsi
+ */
+&ocp {
+	P9_24_pinmux { pinctrl-0 = <&P9_24_can_pin>; }; /* CAN TX */
+	P9_26_pinmux { pinctrl-0 = <&P9_26_can_pin>; }; /* CAN TX */
+	P9_13_pinmux { pinctrl-0 = <&P9_13_uart_pin>; }; /* UART TX */
+	P9_11_pinmux { pinctrl-0 = <&P9_11_uart_pin>; }; /* UART RX */
+	P9_15_pinmux { pinctrl-0 = <&P9_15_gpio_pin>; }; /* GPIO: SINK A*/
+	P9_23_pinmux { pinctrl-0 = <&P9_23_gpio_pin>; }; /* GPIO: SINK B */
+};
 
-	fragment@2 {
-		target = <&am33xx_pinmux>;
-		__overlay__ {
-			bborg_comms_can_pins: pinmux_comms_can_pins {
-				pinctrl-single,pins = <
-					BONE_P9_24 (PIN_INPUT_PULLUP | MUX_MODE2)	/* P9_24: uart1_txd.d_can1_rx */
-					BONE_P9_26 (PIN_OUTPUT_PULLUP | MUX_MODE2)	/* P9_26: uart1_rxd.d_can1_tx */
-				>;
-			};
-			bborg_comms_rs485_pins: pinmux_comms_rs485_pins {
-				pinctrl-single,pins = <
-					BONE_P9_13 (PIN_OUTPUT | MUX_MODE6)	/* P9_13: gpmc_wpn.uart4_txd_mux2 */
-					BONE_P9_11 (PIN_INPUT  | MUX_MODE6)	/* P9_11: gpmc_wait0.uart4_rxd_mux2 */
-				>;
-			};
-		};
-	};
+/*
+ * See these files for the phandles (&bone_*) and nodes
+ * https://github.com/beagleboard/BeagleBoard-DeviceTrees/src/arm/bbai-bone-buses.dtsi
+ * https://github.com/beagleboard/BeagleBoard-DeviceTrees/src/arm/bbb-bone-buses.dtsi
+ */
+&bone_can_1 {
+	status = "okay";
+};
+	
+&bone_uart_4 {
+	status = "okay";
+};
 
-	fragment@3 {
-		target = <&dcan1>;
-		__overlay__ {
+&{/} {
+	leds {
+		// SINK A
+		led_P9_15 {
 			status = "okay";
-			pinctrl-names = "default";
-			pinctrl-0 = <&bborg_comms_can_pins>;
+			label = "Sink_A";
+			default-state = "off";
 		};
-	};
-	
-	fragment@4 {
-		target = <&uart4>;
-		__overlay__ {
+		// SINK B
+		led_P9_23 {
 			status = "okay";
-			pinctrl-names = "default";
-			pinctrl-0 = <&bborg_comms_rs485_pins>;
-			//rs485-rts-delay = <0 0>;
-			//rts-gpio = <&gpio3 19 1>; /*  GPIO_ACTIVE_HIGH>; */
-			//rs485-rts-active-high;
-			//linux,rs485-enabled-at-boot-time;
+			label = "Sink_B";
+			default-state = "off";
 		};
 	};
 };