--- zzzz-none-000/linux-5.15.111/arch/arm/mm/ioremap.c	2023-05-11 14:00:40.000000000 +0000
+++ puma7-arm-6670-761/linux-5.15.111/arch/arm/mm/ioremap.c	2024-02-07 09:27:16.000000000 +0000
@@ -285,9 +285,16 @@
 	 * Don't allow RAM to be mapped with mismatched attributes - this
 	 * causes problems with ARMv6+
 	 */
+#if defined(CONFIG_ARM_PUMA_C55_MEMORY) || (CONFIG_ARM_PUMA_C55_MEMORY >= 0)
+     /*--- but access to C55-P-Code should be uncached! ---*/
+    if (mtype != MT_DEVICE) {
+#endif/*--- #if !defined(CONFIG_ARM_PUMA_C55_MEMORY) || (CONFIG_ARM_PUMA_C55_MEMORY == 0) ---*/
 	if (WARN_ON(memblock_is_map_memory(PFN_PHYS(pfn)) &&
 		    mtype != MT_MEMORY_RW))
 		return NULL;
+#if defined(CONFIG_ARM_PUMA_C55_MEMORY) || (CONFIG_ARM_PUMA_C55_MEMORY >= 0)
+	}
+#endif/*--- #if !defined(CONFIG_ARM_PUMA_C55_MEMORY) || (CONFIG_ARM_PUMA_C55_MEMORY == 0) ---*/
 
 	area = get_vm_area_caller(size, VM_IOREMAP, caller);
  	if (!area)