diff --git a/Documentation/platforms/arm64/a527/boards/avaota-a1/index.rst b/Documentation/platforms/arm64/a527/boards/avaota-a1/index.rst
index 7104c975ef1..76f80c689eb 100644
--- a/Documentation/platforms/arm64/a527/boards/avaota-a1/index.rst
+++ b/Documentation/platforms/arm64/a527/boards/avaota-a1/index.rst
@@ -2,6 +2,8 @@
PINE64 Yuzuki Avaota-A1
=======================
+.. tags:: chip:a527
+
`Avaota-A1 `_
is an ARM64 Single-Board Computer based on the Allwinner A527 SoC.
diff --git a/Documentation/platforms/arm64/a64/boards/pinephone/index.rst b/Documentation/platforms/arm64/a64/boards/pinephone/index.rst
index cd51b9f526c..758bb47dd2c 100644
--- a/Documentation/platforms/arm64/a64/boards/pinephone/index.rst
+++ b/Documentation/platforms/arm64/a64/boards/pinephone/index.rst
@@ -2,6 +2,8 @@
PINE64 PinePhone
================
+.. tags:: chip:a64
+
`PinePhone `_ is an ARM64 smartphone created by PINE64.
Features
diff --git a/Documentation/platforms/arm64/bcm2711/boards/raspberrypi-4b/index.rst b/Documentation/platforms/arm64/bcm2711/boards/raspberrypi-4b/index.rst
index c8028475a81..4337e067a60 100644
--- a/Documentation/platforms/arm64/bcm2711/boards/raspberrypi-4b/index.rst
+++ b/Documentation/platforms/arm64/bcm2711/boards/raspberrypi-4b/index.rst
@@ -2,7 +2,7 @@
Raspberry Pi 4B
===============
-.. tags:: experimental
+.. tags:: chip:bcm2711, experimental
The `Raspberry Pi 4B `_ is an ARM64
hobbyist board created by Raspberry Pi.
diff --git a/Documentation/platforms/arm64/fvp-v8r/boards/fvp-armv8r/index.rst b/Documentation/platforms/arm64/fvp-v8r/boards/fvp-armv8r/index.rst
index 47be1e2497a..dff6a5c4c1b 100644
--- a/Documentation/platforms/arm64/fvp-v8r/boards/fvp-armv8r/index.rst
+++ b/Documentation/platforms/arm64/fvp-v8r/boards/fvp-armv8r/index.rst
@@ -2,5 +2,7 @@
fvp-armv8r
==========
+.. tags:: chip:virt
+
.. include:: README.txt
:literal:
diff --git a/Documentation/platforms/arm64/imx8/boards/imx8qm-mek/index.rst b/Documentation/platforms/arm64/imx8/boards/imx8qm-mek/index.rst
index aa993fd87d1..94fd9cec6f2 100644
--- a/Documentation/platforms/arm64/imx8/boards/imx8qm-mek/index.rst
+++ b/Documentation/platforms/arm64/imx8/boards/imx8qm-mek/index.rst
@@ -2,5 +2,7 @@
imx8qm-mek
==========
+.. tags:: chip:imx8
+
.. include:: README.txt
:literal:
diff --git a/Documentation/platforms/arm64/imx9/boards/imx93-evk/index.rst b/Documentation/platforms/arm64/imx9/boards/imx93-evk/index.rst
index 97ed448898f..3f273cdc3a3 100644
--- a/Documentation/platforms/arm64/imx9/boards/imx93-evk/index.rst
+++ b/Documentation/platforms/arm64/imx9/boards/imx93-evk/index.rst
@@ -2,5 +2,7 @@
imx93-evk
==========
+.. tags:: chip:imx93
+
.. include:: README.txt
:literal:
diff --git a/Documentation/platforms/arm64/qemu/boards/qemu-armv8a/index.rst b/Documentation/platforms/arm64/qemu/boards/qemu-armv8a/index.rst
index ada3e678ed9..3471a019a69 100644
--- a/Documentation/platforms/arm64/qemu/boards/qemu-armv8a/index.rst
+++ b/Documentation/platforms/arm64/qemu/boards/qemu-armv8a/index.rst
@@ -2,5 +2,7 @@
qemu-armv8a
===========
+.. tags:: chip:virt
+
.. include:: README.txt
:literal:
diff --git a/Documentation/platforms/arm64/rk3399/boards/nanopi_m4/index.rst b/Documentation/platforms/arm64/rk3399/boards/nanopi_m4/index.rst
index 2f35889a83f..997a37514c6 100644
--- a/Documentation/platforms/arm64/rk3399/boards/nanopi_m4/index.rst
+++ b/Documentation/platforms/arm64/rk3399/boards/nanopi_m4/index.rst
@@ -1,3 +1,5 @@
=========
nanopi_m4
=========
+
+.. tags:: chip:rk3399
diff --git a/Documentation/platforms/arm64/rk3399/boards/pinephonepro/index.rst b/Documentation/platforms/arm64/rk3399/boards/pinephonepro/index.rst
index 8b86dda58fc..186bbce6bc5 100644
--- a/Documentation/platforms/arm64/rk3399/boards/pinephonepro/index.rst
+++ b/Documentation/platforms/arm64/rk3399/boards/pinephonepro/index.rst
@@ -1,3 +1,5 @@
============
pinephonepro
============
+
+.. tags:: chip:rk3399
diff --git a/Documentation/platforms/arm64/zynq-mpsoc/boards/zcu111/index.rst b/Documentation/platforms/arm64/zynq-mpsoc/boards/zcu111/index.rst
index ad3a1c1869d..a4c773cc6f3 100644
--- a/Documentation/platforms/arm64/zynq-mpsoc/boards/zcu111/index.rst
+++ b/Documentation/platforms/arm64/zynq-mpsoc/boards/zcu111/index.rst
@@ -2,6 +2,8 @@
Zynq UltraScale+ RFSoC ZCU111
=============================
+.. tags:: chip:xczu28dr, chip:fpga, chip:zynq, chip:ultrascale
+
The `ZCU111 `_ is a
development board based on the Zynq UltraScale+ RFSoC(XCZU28DR) from XilinX(AMD).