diff --git a/boards/capes/cape-interface-spec.rst b/boards/capes/cape-interface-spec.rst
index de142c553a99d33663e05bd8077f0f820d133994..ba296b87f13a3b9bdf45b925eac710ca71124bee 100644
--- a/boards/capes/cape-interface-spec.rst
+++ b/boards/capes/cape-interface-spec.rst
@@ -14,10 +14,12 @@ Background and overview
 
    Resources 
    
-   * See `Device Tree: Supporting Similar Boards - The BeagleBone Example blog post <https://beagleboard.org/blog/2022-03-31-device-tree-supporting-similar-boards-the-beaglebone-example>`_ blog post on BeagleBoard.org
+   * See `Device Tree: Supporting Similar Boards - The BeagleBone Example blog post <https://beagleboard.org/blog/2022-03-31-device-tree-supporting-similar-boards-the-beaglebone-example>`_ on BeagleBoard.org
    * See `spreadsheet with pin header details <https://docs.google.com/spreadsheets/d/1fE-AsDZvJ-bBwzNBj1_sPDrutvEvsmARqFwvbw_HkrE/edit?usp=sharing>`_ 
    * See `elinux.org Cape Expansion Headers for BeagleBone page <https://elinux.org/Beagleboard:Cape_Expansion_Headers>`_
    * See :ref:`BeagleBone Black System Reference Manual Connectors section <beagleboneblack-connectors>`
+   * See :ref:`BeagleBone AI System Reference Manual Connectors section <beaglebone-ai-connectors>`
+   * See :ref:`BeagleBone AI-64 System Reference Manual Connectors section <TODO>`
 
 .. note:: Below, when mentioning "Black", this is true for all AM3358-based BeagleBone boards. "AI" is AM5729-based. "AI-64" is TDA4VM-based.
 
@@ -25,7 +27,7 @@ The device tree symbols for the BeagleBone Cape Compatibility Layer are provided
 
 * Black: `bbb-bone-buses.dtsi <https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/blob/v5.10.x-ti-unified/src/arm/bbb-bone-buses.dtsi>`_
 * AI: `bbai-bone-buses.dtsi <https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/blob/v5.10.x-ti-unified/src/arm/bbai-bone-buses.dtsi>`_
-* AI-64: `k3-j721e-beagleboneai-64-bone-buses.dtsi#9 <https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/blob/v5.10.x-ti-unified/src/arm64/k3-j721e-beagleboneai64-bone-buses.dtsi>`_
+* AI-64: `k3-j721e-beagleboneai-64-bone-buses.dtsi <https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/blob/v5.10.x-ti-unified/src/arm64/k3-j721e-beagleboneai64-bone-buses.dtsi>`_
 
 The udev rules used to create the userspace symlinks for the BeagleBone Cape Compatibility Layer are provided in `usr-customizations <https://git.beagleboard.org/beagleboard/usr-customizations>`_ at:
 
@@ -33,61 +35,61 @@ More details can be found in :ref:`bone-methodology`.
 
 .. table:: Overall
 
-	+-----------------------------------------------+-----+------------------------------------+
-	| .. centered:: P9                              |     |    .. centered:: P8                |
-	+===============+=====+======+==================+=====+===========+=====+======+===========+
-	|   Functions   | odd | even |    Functions     |     | Functions | odd | even | Functions |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| USB D+        | E1  | E2   | USB D-           |     | -         | -   | -    | -         |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| 5V OUT        | E3  | E4   | GND              |     | -         | -   | -    | -         |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| GND           | 1   | 2    | GND              |     | GND       | 1   | 2    | GND       |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| 3V3 OUT       | 3   | 4    | 3V3 OUT          |     | D M       | 3   | 4    | D M       |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| 5V IN         | 5   | 6    | 5V IN            |     | D M C4t   | 5   | 6    | D M C4r   |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| 5V OUT        | 7   | 8    | 5V OUT           |     | C2r D     | 7   | 8    | C2t D     |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| PWR BUT       | 9   | 10   | RESET            |     | D C3r     | 9   | 10   | D C3t     |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| D U4r         | 11  | 12   | D                |     | D P0o     | 11  | 12   | D Q2a P0o |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| D U4t         | 13  | 14   | D E1a            |     | D E2b     | 13  | 14   | D         |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| D             | 15  | 16   | D E1b            |     | D P0i     | 15  | 16   | D P0i     |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| D I1c S00     | 17  | 18   | D I1d S0o        |     | D         | 17  | 18   | D         |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| C0r D I2c     | 19  | 20   | C0t D I2d        |     | D E2a     | 19  | 20   | D M P1    |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| D E0b S0i U2t | 21  | 22   | D E0a S0c U2r    |     | D M P1    | 21  | 22   | D M Q2b   |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| D S01         | 23  | 24   | C1r D I3c U1t    |     | D M       | 23  | 24   | D M       |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| D P0          | 25  | 26   | C1t D I3d U1r    |     | D M       | 25  | 26   | D         |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| D P0 Q0b      | 27  | 28   | D P0 S10         |     | D L P1    | 27  | 28   | D L P1    |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| D E S1i P0    | 29  | 30   | D P0 S1o         |     | D L P1    | 29  | 30   | D L P1    |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| D E S1c P0    | 31  | 32   | ADC VDD          |     | D L       | 31  | 32   | D L       |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| A4            | 33  | 34   | ADC GND          |     | D L Q1b   | 33  | 34   | D E L     |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| A6            | 35  | 36   | A5               |     | D L Q1a   | 35  | 36   | D E L     |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| A2            | 37  | 38   | A3               |     | D L U5t   | 37  | 38   | D L U5r   |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| A0            | 39  | 40   | A1               |     | D L P1    | 39  | 40   | D L P1    |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| D P0          | 41  | 42   | D Q0a S11 U3t P0 |     | D L P1    | 41  | 42   | D L P1    |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| GND           | 43  | 44   | GND              |     | D L P1    | 43  | 44   | D L P1    |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
-	| GND           | 45  | 46   | GND              |     | D E L P1  | 45  | 46   | D E L P1  |
-	+---------------+-----+------+------------------+-----+-----------+-----+------+-----------+
+	+-----------------------------------------------+-----+--------------------------------------+
+	| .. centered:: P9                              |     |    .. centered:: P8                  |
+	+===============+=====+======+==================+=====+============+=====+======+============+
+	|   Functions   | odd | even |    Functions     |     | Functions  | odd | even | Functions  |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| USB D+        | E1  | E2   | USB D-           |     |            |     |      |            |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| 5V OUT        | E3  | E4   | GND              |     |            |     |      |            |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| GND           | 1   | 2    | GND              |     | GND        | 1   | 2    | GND        |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| 3V3 OUT       | 3   | 4    | 3V3 OUT          |     | D M        | 3   | 4    | D M        |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| 5V IN         | 5   | 6    | 5V IN            |     | D M C4t    | 5   | 6    | D M C4r    |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| 5V OUT        | 7   | 8    | 5V OUT           |     | C2r D      | 7   | 8    | C2t D      |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| PWR BUT       | 9   | 10   | RESET            |     | D C3r      | 9   | 10   | D C3t      |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| D U4r         | 11  | 12   | D                |     | D P0o      | 11  | 12   | D Q2a P0o  |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| D U4t         | 13  | 14   | D E1a            |     | D E2b      | 13  | 14   | D          |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| D             | 15  | 16   | D E1b            |     | D P0i      | 15  | 16   | D P0i      |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| D I1c S00     | 17  | 18   | D I1d S0o        |     | D          | 17  | 18   | D          |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| C0r D I2c     | 19  | 20   | C0t D I2d        |     | D E2a      | 19  | 20   | D M P1     |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| D E0b S0i U2t | 21  | 22   | D E0a S0c U2r    |     | D M P1     | 21  | 22   | D M Q2b    |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| D S01         | 23  | 24   | C1r D I3c U1t    |     | D M        | 23  | 24   | D M        |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| D P0          | 25  | 26   | C1t D I3d U1r    |     | D M        | 25  | 26   | D          |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| D P0 Q0b      | 27  | 28   | D P0 S10         |     | D L P1     | 27  | 28   | D L P1 U6r |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| D E S1i P0    | 29  | 30   | D P0 S1o         |     | D L P1 U6t | 29  | 30   | D L P1     |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| D E S1c P0    | 31  | 32   | ADC VDD          |     | D L        | 31  | 32   | D L        |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| A4            | 33  | 34   | ADC GND          |     | D L Q1b    | 33  | 34   | D E L      |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| A6            | 35  | 36   | A5               |     | D L Q1a    | 35  | 36   | D E L      |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| A2            | 37  | 38   | A3               |     | D L U5t    | 37  | 38   | D L U5r    |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| A0            | 39  | 40   | A1               |     | D L P1     | 39  | 40   | D L P1     |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| D P0          | 41  | 42   | D Q0a S11 U3t P0 |     | D L P1     | 41  | 42   | D L P1     |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| GND           | 43  | 44   | GND              |     | D L P1     | 43  | 44   | D L P1     |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
+	| GND           | 45  | 46   | GND              |     | D E L P1   | 45  | 46   | D E L P1   |
+	+---------------+-----+------+------------------+-----+------------+-----+------+------------+
 
 .. note:
 
@@ -114,28 +116,29 @@ Digital GPIO
 
 The compatibility layer comes with simple reference nodes for attaching the Linux gpio-leds or gpio-keys to any cape header GPIO pin. This provides simple userspace general purpose input or output with various trigger modes.
 
-The format followed for the gpio-leds nodes is **bone_led_P8_## / bone_led_P9_##**. The **gpio-leds** driver is used by these reference nodes internally and allows users to easily create compatible led nodes in overlays for Black, AI and AI-64. For the definitions, you can see
+The format followed for the gpio-leds nodes is **bone_led_P8_## / bone_led_P9_##**. The **gpio-leds** driver is used by these reference nodes internally and allows users to easily create compatible led nodes in overlays for Black, AI and AI-64.
 
-Example overlays
------------------
 
-.. table:: Bone LEDs Overlay Examples
+.. code-block:: c
+   :linenos:
+   :caption: Example device tree overlay to enable LED driver on header P8 pin 3
+   :name: bone_cape_spec_led_example
 
-	+---------+------+-------------------------------------------------------------------------------------------------------------------------------------------------------+
-	| Header  | Pin  | Overlay                                                                                                                                               |
-	+=========+======+=======================================================================================================================================================+
-	| P8      | 3    | `BONE-LED_P8_03.dts <https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/blob/v5.10.x-ti-unified/src/arm/overlays/LED_P8_03.dts>`_      |
-	+---------+------+-------------------------------------------------------------------------------------------------------------------------------------------------------+
-	| P8      | 4    | `BONE-LED_P8_04.dts <https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/blob/v5.10.x-ti-unified/src/arm/overlays/LED_P8_04.dts>`_      |
-	+---------+------+-------------------------------------------------------------------------------------------------------------------------------------------------------+
+   /dts-v1/;
+   /plugin/;
 
-Definitions
------------------
+   &bone_led_P8_03 {
+       status = "okay";
+   }
 
-.. table:: Bone keys and LEDs
+In :ref:`bone_cape_spec_led_example`, it is possible to redefine the default label
+and other properties defined in the
+`gpio-leds schema <https://elixir.bootlin.com/linux/v5.10/source/Documentation/devicetree/bindings/leds/leds-gpio.yaml>`_.
+
+.. table:: Bone GPIO LEDs interface
 
 	+------------------------+-------------+----------+-----------+-----------+
-	| LED                    | Header pin  | Black    | AI        | AI-64     |
+	| LED SYSFS              | Header pin  | Black    | AI        | AI-64     |
 	+========================+=============+==========+===========+===========+
 	| /sys/class/leds/P8_03  | P8_03       | gpio1_6  | gpio1_24  | gpio0_20  |
 	+------------------------+-------------+----------+-----------+-----------+
@@ -267,19 +270,19 @@ Definitions
 	+------------------------+-------------+----------+-----------+-----------+
 	| /sys/class/leds/P9_31  | P9_31       | gpio3_14 | gpio5_10  | gpio0_52  |
 	+------------------------+-------------+----------+-----------+-----------+
-	| /sys/class/leds/P9_33  | P9_33       | NA       | NA        | gpio0_50  |
+	| /sys/class/leds/P9_33  | P9_33       | *n/a*    | *n/a*     | gpio0_50  |
 	+------------------------+-------------+----------+-----------+-----------+
-	| /sys/class/leds/P9_35  | P9_35       | NA       | NA        | gpio0_55  |
+	| /sys/class/leds/P9_35  | P9_35       | *n/a*    | *n/a*     | gpio0_55  |
 	+------------------------+-------------+----------+-----------+-----------+
-	| /sys/class/leds/P9_36  | P9_36       | NA       | NA        | gpio0_56  |
+	| /sys/class/leds/P9_36  | P9_36       | *n/a*    | *n/a*     | gpio0_56  |
 	+------------------------+-------------+----------+-----------+-----------+
-	| /sys/class/leds/P9_37  | P9_37       | NA       | NA        | gpio0_57  |
+	| /sys/class/leds/P9_37  | P9_37       | *n/a*    | *n/a*     | gpio0_57  |
 	+------------------------+-------------+----------+-----------+-----------+
-	| /sys/class/leds/P9_38  | P9_38       | NA       | NA        | gpio0_58  |
+	| /sys/class/leds/P9_38  | P9_38       | *n/a*    | *n/a*     | gpio0_58  |
 	+------------------------+-------------+----------+-----------+-----------+
-	| /sys/class/leds/P9_39  | P9_39       | NA       | NA        | gpio0_54  |
+	| /sys/class/leds/P9_39  | P9_39       | *n/a*    | *n/a*     | gpio0_54  |
 	+------------------------+-------------+----------+-----------+-----------+
-	| /sys/class/leds/P9_40  | P9_40       | NA       | NA        | gpio0_81  |
+	| /sys/class/leds/P9_40  | P9_40       | *n/a*    | *n/a*     | gpio0_81  |
 	+------------------------+-------------+----------+-----------+-----------+
 	| /sys/class/leds/P9_41  | P9_41       | gpio0_20 | gpio6_20  | gpio1_0   |
 	+------------------------+-------------+----------+-----------+-----------+
@@ -297,60 +300,62 @@ Compatibility layer provides simple I2C bone bus nodes for creating compatible o
 
 .. table:: Bone I2C
 
-	+------------------+--------------+--------+-------+------------+-----------------+--------+---------------+
-	| SYSFS            | DT symbol    | Black  | AI    | AI-64      | SCL             | SDA    | Overlay       |
-	+==================+==============+========+=======+============+=================+========+===============+
-	| /dev/bone/i2c/0  | bone_i2c_0   | I2C0   | I2C1  | TBD        | .. centered:: N/A (On-board)             |
-	+------------------+--------------+--------+-------+------------+-----------------+--------+---------------+
-	| /dev/bone/i2c/1  | bone_i2c_1   | I2C1   | I2C5  | MAIN_I2C6  | P9.17           | P9.18  | BONE-I2C1.dts |
-	+------------------+--------------+--------+-------+------------+-----------------+--------+---------------+
-	| /dev/bone/i2c/2  | bone_i2c_2   | I2C2   | I2C4  | MAIN_I2C3  | P9.19           | P9.20  | BONE-I2C2.dts |
-	+------------------+--------------+--------+-------+------------+-----------------+--------+---------------+
-	| /dev/bone/i2c/3  | bone_i2c_3   | I2C1   | I2C3  | MAIN_I2C4  | P9.24           | P9.26  | BONE-I2C3.dts |
-	+------------------+--------------+--------+-------+------------+-----------------+--------+---------------+
-	| /dev/bone/i2c/4  | bone_i2c_4   | I2C2   | N/A   | MAIN_I2C3  | P9.21           | P9.22  | BONE-I2C4.dts |
-	+------------------+--------------+--------+-------+------------+-----------------+--------+---------------+
+	+------------------+--------------+--------+-------+------------+-----------------+--------+-----------+
+	| SYSFS            | DT symbol    | Black  | AI    | AI-64      | SCL             | SDA    | Overlay   |
+	+==================+==============+========+=======+============+=================+========+===========+
+	| /dev/bone/i2c/0  | bone_i2c_0   | I2C0   | I2C1  | TBD        | .. centered:: N/A (On-board)         |
+	+------------------+--------------+--------+-------+------------+-----------------+--------+-----------+
+	| /dev/bone/i2c/1  | bone_i2c_1   | I2C1   | I2C5  | MAIN_I2C6  | P9.17           | P9.18  | BONE-I2C1 |
+	+------------------+--------------+--------+-------+------------+-----------------+--------+-----------+
+	| /dev/bone/i2c/2  | bone_i2c_2   | I2C2   | I2C4  | MAIN_I2C3  | P9.19           | P9.20  | BONE-I2C2 |
+	+------------------+--------------+--------+-------+------------+-----------------+--------+-----------+
+	| /dev/bone/i2c/3  | bone_i2c_3   | I2C1   | I2C3  | MAIN_I2C4  | P9.24           | P9.26  | BONE-I2C3 |
+	+------------------+--------------+--------+-------+------------+-----------------+--------+-----------+
+	| /dev/bone/i2c/4  | bone_i2c_4   | I2C2   | -     | MAIN_I2C3  | P9.21           | P9.22  | BONE-I2C4 |
+	+------------------+--------------+--------+-------+------------+-----------------+--------+-----------+
 
 
 SPI
------
+***
 
-SPI bone bus nodes allow creating compatible overlays for Black, AI and AI-64. For the definitions, you can see `bbai-bone-buses.dtsi#L406 <https://github.com/lorforlinux/BeagleBoard-DeviceTrees/blob/97a6f0daa9eab09633a2064f68a53b107d6e3968/src/arm/bbai-bone-buses.dtsi#L406>`_ & `bbb-bone-buses.dtsi#L423 <https://github.com/lorforlinux/BeagleBoard-DeviceTrees/blob/97a6f0daa9eab09633a2064f68a53b107d6e3968/src/arm/bbb-bone-buses.dtsi#L423>`_.
+SPI bone bus nodes allow creating compatible overlays for Black, AI and AI-64.
 
 .. table:: Bone bus SPI
 
-	+--------------------+------------+--------+-------+------------+--------+--------+--------+---------------------------------------+--------------------------------------------------------------------------------------------------------------+
-	| Bone bus           | DT symbol  | Black  | AI    | AI-64      | SDO    | SDI    | CLK    | CS                                    | Overlay                                                                                                      |
-	+====================+============+========+=======+============+========+========+========+=======================================+==============================================================================================================+
-	| /dev/bone/spi/0.x  | bone_spi_0 | SPI0   | SPI2  | MAIN_SPI6  | P9.18  | P9.21  | P9.22  | - P9.17 (CS0)                         | - `BONE-SPI0_0.dts <https://github.com/lorforlinux/bb.org-overlays/blob/bone_spi/src/arm/BONE-SPI0_0.dts>`_  |
-	|                    |            |        |       |            |        |        |        | - P9.23 (CS1 - BBAI and BBAI64 only)  | - `BONE-SPI0_0.dts <https://github.com/lorforlinux/bb.org-overlays/blob/bone_spi/src/arm/BONE-SPI0_1.dts>`_  |
-	+--------------------+------------+--------+-------+------------+--------+--------+--------+---------------------------------------+--------------------------------------------------------------------------------------------------------------+
-	| /dev/bone/spi/1.x  | bone_spi_1 | SPI1   | SPI3  | MAIN_SPI7  | P9.30  | P9.29  | P9.31  | - P9.28 (CS0)                         | - `BONE-SPI0_0.dts <https://github.com/lorforlinux/bb.org-overlays/blob/bone_spi/src/arm/BONE-SPI1_0.dts>`_  |
-	|                    |            |        |       |            |        |        |        | - P9.42 (CS1)                         | - `BONE-SPI0_0.dts <https://github.com/lorforlinux/bb.org-overlays/blob/bone_spi/src/arm/BONE-SPI1_1.dts>`_  |
-	+--------------------+------------+--------+-------+------------+--------+--------+--------+---------------------------------------+--------------------------------------------------------------------------------------------------------------+
+	+--------------------+------------+--------+-------+------------+--------+--------+--------+---------------------------------------+---------------+
+	| Bone bus           | DT symbol  | Black  | AI    | AI-64      | SDO    | SDI    | CLK    | CS                                    | Overlays      |
+	+====================+============+========+=======+============+========+========+========+=======================================+===============+
+	| /dev/bone/spi/0.x  | bone_spi_0 | SPI0   | SPI2  | MAIN_SPI6  | P9.18  | P9.21  | P9.22  | - P9.17 (CS0)                         | - BONE-SPI0_0 |
+	|                    |            |        |       |            |        |        |        | - P9.23 (CS1 - BBAI and BBAI64 only)  | - BONE-SPI0_1 |
+	+--------------------+------------+--------+-------+------------+--------+--------+--------+---------------------------------------+---------------+
+	| /dev/bone/spi/1.x  | bone_spi_1 | SPI1   | SPI3  | MAIN_SPI7  | P9.30  | P9.29  | P9.31  | - P9.28 (CS0)                         | - BONE-SPI1_0 |
+	|                    |            |        |       |            |        |        |        | - P9.42 (CS1)                         | - BONE-SPI1_1 |
+	+--------------------+------------+--------+-------+------------+--------+--------+--------+---------------------------------------+---------------+
 
 UART
------
+*****
 
-UART bone bus nodes allow creating compatible overlays for Black, AI and AI-64. For the definitions, you can see `bbai-bone-buses.dtsi#L367 <https://github.com/lorforlinux/BeagleBoard-DeviceTrees/blob/97a6f0daa9eab09633a2064f68a53b107d6e3968/src/arm/bbai-bone-buses.dtsi#L367>`_ & `bbb-bone-buses.dtsi#L382 <https://github.com/lorforlinux/BeagleBoard-DeviceTrees/blob/97a6f0daa9eab09633a2064f68a53b107d6e3968/src/arm/bbb-bone-buses.dtsi#L382>`_
+UART bone bus nodes allow creating compatible overlays for Black, AI and AI-64.
 
 .. table:: Bone bus UART
 
-	+-------------------+--------+--------+-----------------------+----------------------------------+--------+---------------------------------------------+---------------------------------------------+-----------------------------------------------------------------------------------------------------------+
-	| Bone bus          | Black  | AI     | AI-64                 | TX                               | RX     | RTSn                                        | CTSn                                        | Overlays                                                                                                  |
-	+===================+========+========+=======================+==================================+========+=============================================+=============================================+===========================================================================================================+
-	| /dev/bone/uart/0  | UART0  | UART1  | MAIN_UART0            | .. centered:: NA (console debug header pins)                                                                                                                                                                                                      |
-	+-------------------+--------+--------+-----------------------+----------------------------------+--------+---------------------------------------------+---------------------------------------------+-----------------------------------------------------------------------------------------------------------+
-	| /dev/bone/uart/1  | UART1  | UART10 | MAIN_UART2            | P9.24                            | P9.26  | P9.19 P8.4 (N/A on AM3358)                  | P9.20 P8.3 (N/A on AM3358)                  | `BONE-UART1.dts <https://github.com/lorforlinux/bb.org-overlays/blob/bone_uart/src/arm/BONE-UART1.dts>`_  |
-	+-------------------+--------+--------+-----------------------+----------------------------------+--------+---------------------------------------------+---------------------------------------------+-----------------------------------------------------------------------------------------------------------+
-	| /dev/bone/uart/2  | UART2  | UART3  | -                     | P9.21                            | P9.22  | P8.38 (N/A on AM5729)                       | P8.37 (N/A on AM5729)                       | `BONE-UART2.dts <https://github.com/lorforlinux/bb.org-overlays/blob/bone_uart/src/arm/BONE-UART2.dts>`_  |
-	+-------------------+--------+--------+-----------------------+----------------------------------+--------+---------------------------------------------+---------------------------------------------+-----------------------------------------------------------------------------------------------------------+
-	| /dev/bone/uart/3  | UART3  | -      | -                     | P9.42                            | NA    | -                                            | -                                           | `BONE-UART3.dts <https://github.com/lorforlinux/bb.org-overlays/blob/bone_uart/src/arm/BONE-UART3.dts>`_  |
-	+-------------------+--------+--------+-----------------------+----------------------------------+--------+---------------------------------------------+---------------------------------------------+-----------------------------------------------------------------------------------------------------------+
-	| /dev/bone/uart/4  | UART4  | UART5  | MAIN_UART0 (console)  | P9.13                            | P9.11  | P8.33 (N/A on AM5729) P8.6 (N/A on AM3358)  | P8.35 (N/A on AM5729) P8.5 (N/A on AM3358)  | `BONE-UART4.dts <https://github.com/lorforlinux/bb.org-overlays/blob/bone_uart/src/arm/BONE-UART4.dts>`_  |
-	+-------------------+--------+--------+-----------------------+----------------------------------+--------+---------------------------------------------+---------------------------------------------+-----------------------------------------------------------------------------------------------------------+
-	| /dev/bone/uart/5  | UART5  | UART8  | MAIN_UART5            | P8.37                            | P8.38  | P8.32                                       | P8.31                                       | `BONE-UART5.dts <https://github.com/lorforlinux/bb.org-overlays/blob/bone_uart/src/arm/BONE-UART5.dts>`_  |
-	+-------------------+--------+--------+-----------------------+----------------------------------+--------+---------------------------------------------+---------------------------------------------+-----------------------------------------------------------------------------------------------------------+
+	+-------------------+--------------+--------+--------+-----------------------+--------+--------+---------------------------------------------+---------------------------------------------+------------+
+	| Bone bus          | DT symbol    | Black  | AI     | AI-64                 | TX     | RX     | RTSn                                        | CTSn                                        | Overlays   |
+	+===================+==============+========+========+=======================+========+========+=============================================+=============================================+============+
+	| /dev/bone/uart/0  | bone_uart_0  | UART0  | UART1  | MAIN_UART0            | .. centered:: NA (console debug header pins)                                                                             |
+	+-------------------+--------------+--------+--------+-----------------------+--------+--------+---------------------------------------------+---------------------------------------------+------------+
+	| /dev/bone/uart/1  | bone_uart_1  | UART1  | UART10 | MAIN_UART2            | P9.24  | P9.26  | P9.19 P8.4 (N/A on AM3358)                  | P9.20 P8.3 (N/A on AM3358)                  | BONE-UART1 |
+	+-------------------+--------------+--------+--------+-----------------------+--------+--------+---------------------------------------------+---------------------------------------------+------------+
+	| /dev/bone/uart/2  | bone_uart_2  | UART2  | UART3  | *n/a*                 | P9.21  | P9.22  | P8.38 (N/A on AM5729)                       | P8.37 (N/A on AM5729)                       | BONE-UART2 |
+	+-------------------+--------------+--------+--------+-----------------------+--------+--------+---------------------------------------------+---------------------------------------------+------------+
+	| /dev/bone/uart/3  | bone_uart_3  | UART3  | *n/a*  | *n/a*                 | P9.42  | *n/a*  | *n/a*                                       | *n/a*                                       | BONE-UART3 |
+	+-------------------+--------------+--------+--------+-----------------------+--------+--------+---------------------------------------------+---------------------------------------------+------------+
+	| /dev/bone/uart/4  | bone_uart_4  | UART4  | UART5  | MAIN_UART0 (console)  | P9.13  | P9.11  | P8.33 (N/A on AM5729) P8.6 (N/A on AM3358)  | P8.35 (N/A on AM5729) P8.5 (N/A on AM3358)  | BONE-UART4 |
+	+-------------------+--------------+--------+--------+-----------------------+--------+--------+---------------------------------------------+---------------------------------------------+------------+
+	| /dev/bone/uart/5  | bone_uart_5  | UART5  | UART8  | MAIN_UART5            | P8.37  | P8.38  | P8.32                                       | P8.31                                       | BONE-UART5 |
+	+-------------------+--------------+--------+--------+-----------------------+--------+--------+---------------------------------------------+---------------------------------------------+------------+
+	| /dev/bone/uart/6  | bone_uart_6  | *n/a*  | *n/a*  | MAIN_UART8            | P8.29  | P8.28  | *n/a*                                       | *n/a*                                       | BONE-UART6 |
+	+-------------------+--------------+--------+--------+-----------------------+--------+--------+---------------------------------------------+---------------------------------------------+------------+
 
 
 CAN