diff --git a/src/arm/am335x-boneblue.dts b/src/arm/am335x-boneblue.dts
index 91668af5ac234a38d340474917abe762206fca21..9489548bbbea196dfb393701865937de914047a6 100644
--- a/src/arm/am335x-boneblue.dts
+++ b/src/arm/am335x-boneblue.dts
@@ -1052,7 +1052,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "spidev";
-		symlink = "spi/1.0";
+		symlink = "bone/spi/1.0";
 		reg = <0>;
 		spi-max-frequency = <24000000>;
 	};
@@ -1061,7 +1061,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "spidev";
-		symlink = "spi/1.1";
+		symlink = "bone/spi/1.1";
 		reg = <1>;
 		spi-max-frequency = <24000000>;
 	};
diff --git a/src/arm/am335x-bonegreen-gateway.dts b/src/arm/am335x-bonegreen-gateway.dts
index eadb0fee7035929358420ebb6b6d14a4276723ba..f6b9b663c15d2c13d43485327af26f39f206f18d 100644
--- a/src/arm/am335x-bonegreen-gateway.dts
+++ b/src/arm/am335x-bonegreen-gateway.dts
@@ -8,7 +8,6 @@
 #include "am335x-bone-common.dtsi"
 #include "am335x-bonegreen-common.dtsi"
 #include <dt-bindings/interrupt-controller/irq.h>
-/* #include "am335x-bone-jtag.dtsi" */
 
 / {
 	model = "SeeedStudio BeagleBone Green Gateway";
diff --git a/src/arm/am335x-bonegreen.dts b/src/arm/am335x-bonegreen.dts
index b96c0ef0222331f87546adacc0420529534e0c17..3961784d94e92ece3bbb2db289d9258c9256c212 100644
--- a/src/arm/am335x-bonegreen.dts
+++ b/src/arm/am335x-bonegreen.dts
@@ -7,7 +7,6 @@
 #include "am33xx.dtsi"
 #include "am335x-bone-common.dtsi"
 #include "am335x-bonegreen-common.dtsi"
-/* #include "am335x-bone-jtag.dtsi" */
 
 / {
 	model = "TI AM335x BeagleBone Green";
diff --git a/src/arm/am335x-pocketbeagle.dts b/src/arm/am335x-pocketbeagle.dts
index f5a501ada095693f40b69e2e08d765f22f3cc849..920ac2175da7bf2d4627f4d0a5b6c1ae0d5c8a69 100644
--- a/src/arm/am335x-pocketbeagle.dts
+++ b/src/arm/am335x-pocketbeagle.dts
@@ -22,7 +22,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "spidev";
-		symlink = "spi/0.0";
+		symlink = "bone/spi/0.0";
 		reg = <0>;
 		spi-max-frequency = <24000000>;
 	};
@@ -31,7 +31,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "spidev";
-		symlink = "spi/0.1";
+		symlink = "bone/spi/0.1";
 		reg = <1>;
 		spi-max-frequency = <24000000>;
 		status = "disabled";
@@ -47,7 +47,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "spidev";
-		symlink = "spi/1.0";
+		symlink = "bone/spi/1.0";
 		reg = <0>;
 		spi-max-frequency = <24000000>;
 	};
@@ -56,7 +56,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "spidev";
-		symlink = "spi/1.1";
+		symlink = "bone/spi/1.1";
 		reg = <1>;
 		spi-max-frequency = <24000000>;
 	};