diff --git a/include/dt-bindings/memory/tegra264-mc.h b/include/dt-bindings/memory/tegra264-mc.h
index d4ffffa6..692f977f 100644
--- a/include/dt-bindings/memory/tegra264-mc.h
+++ b/include/dt-bindings/memory/tegra264-mc.h
@@ -233,25 +233,25 @@
 /* UFS write client */
 #define TEGRA264_MEMORY_CLIENT_UFSW 0x15d
 /* XUSB HOST Read Client */
-#define TEGRA264_MEMORY_CLIENT_XUSB 0x166
+#define TEGRA264_MEMORY_CLIENT_XUSB_DEVR 0x166
 /* XUSB HOST Write Client */
-#define TEGRA264_MEMORY_CLIENT_XUSB 0x167
+#define TEGRA264_MEMORY_CLIENT_XUSB_DEVW 0x167
 /* XUSB SS0 Read Client */
-#define TEGRA264_MEMORY_CLIENT_XUSB 0x168
+#define TEGRA264_MEMORY_CLIENT_XUSB_DEV1R 0x168
 /* XUSB SS1 Write Client */
-#define TEGRA264_MEMORY_CLIENT_XUSB 0x169
+#define TEGRA264_MEMORY_CLIENT_XUSB_DEV2W 0x169
 /* XUSB SS2 Read Client */
-#define TEGRA264_MEMORY_CLIENT_XUSB 0x16a
+#define TEGRA264_MEMORY_CLIENT_XUSB_DEV3R 0x16a
 /* XUSB SS2 Write Client */
-#define TEGRA264_MEMORY_CLIENT_XUSB 0x16b
+#define TEGRA264_MEMORY_CLIENT_XUSB_DEV3W 0x16b
 /* XUSB SS3 Read Client */
-#define TEGRA264_MEMORY_CLIENT_XUSB 0x16c
+#define TEGRA264_MEMORY_CLIENT_XUSB_DEV4R 0x16c
 /* XUSB SS3 Write Client */
-#define TEGRA264_MEMORY_CLIENT_XUSB 0x16d
+#define TEGRA264_MEMORY_CLIENT_XUSB_DEV4W 0x16d
 /* XUSB DEV Read Client */
-#define TEGRA264_MEMORY_CLIENT_XUSB 0x16e
+#define TEGRA264_MEMORY_CLIENT_XUSB_DEV5R 0x16e
 /* XUSB DEV Write Client */
-#define TEGRA264_MEMORY_CLIENT_XUSB 0x16f
+#define TEGRA264_MEMORY_CLIENT_XUSB_DEV5W 0x16f
 /* DCE Read client */
 #define TEGRA264_MEMORY_CLIENT_DCER 0x17a
 /* DCE Write client */
@@ -265,9 +265,9 @@
 /* DISPNISO write client */
 #define TEGRA264_MEMORY_CLIENT_DISPNISOW 0x17f
 /* XUSB SS0 Write Client */
-#define TEGRA264_MEMORY_CLIENT_XUSB 0x180
+#define TEGRA264_MEMORY_CLIENT_XUSB_DEV1W 0x180
 /* XUSB SS1 Read Client */
-#define TEGRA264_MEMORY_CLIENT_XUSB 0x181
+#define TEGRA264_MEMORY_CLIENT_XUSB_DEV2R 0x181
 /* Disp ISO Read Client */
 #define TEGRA264_MEMORY_CLIENT_DISPR 0x182
 /* MSSSEQ Read Client */
@@ -366,22 +366,22 @@
 #define TEGRA264_MEMORY_CLIENT_SBR 0x1c6
 /* Strongbox (SB) write client */
 #define TEGRA264_MEMORY_CLIENT_SBW 0x1c7
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1c8
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1c9
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1ca
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1cb
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1cc
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1cd
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1ce
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1cf
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1d0
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1d1
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1d2
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1d3
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1d4
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1d5
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1d6
-#define TEGRA264_MEMORY_CLIENT_HSS 0x1d7
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU0R 0x1c8
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU0W 0x1c9
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU1R 0x1ca
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU1W 0x1cb
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU2R 0x1cc
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU2W 0x1cd
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU3R 0x1ce
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU3W 0x1cf
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU4R 0x1d0
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU4W 0x1d1
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU5R 0x1d2
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU5W 0x1d3
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU6R 0x1d4
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU6W 0x1d5
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU7R 0x1d6
+#define TEGRA264_MEMORY_CLIENT_HSS_MIU7W 0x1d7
 #define TEGRA264_MEMORY_CLIENT_GMMUR2MC 0x1d8
 #define TEGRA264_MEMORY_CLIENT_UCFELAR 0x1d9
 #define TEGRA264_MEMORY_CLIENT_UCFELAW 0x1da