diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5b714695b01bb9db0455ad2f5c959a714aa00064..8b53e77c9ef94eed231b0ad3c4912fd9af342d48 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1660,7 +1660,7 @@ config LOCAL_TIMERS
 config ARCH_NR_GPIO
 	int
 	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
-	default 355 if ARCH_U8500
+	default 392 if ARCH_U8500
 	default 264 if MACH_H4700
 	default 512 if SOC_OMAP5
 	default 288 if ARCH_VT8500 || ARCH_SUNXI
diff --git a/arch/arm/mach-ux500/cache-l2x0.c b/arch/arm/mach-ux500/cache-l2x0.c
index 1c1609da76cec13dd0032d9e123519ba83f9ba75..f815efe54c7356a4bf68dd388a19fb1824b6b22b 100644
--- a/arch/arm/mach-ux500/cache-l2x0.c
+++ b/arch/arm/mach-ux500/cache-l2x0.c
@@ -47,8 +47,8 @@ static int __init ux500_l2x0_init(void)
 	/* Unlock before init */
 	ux500_l2x0_unlock();
 
-	/* DB9540's L2 has 128KB way size */
-	if (cpu_is_u9540())
+	/* DBx540's L2 has 128KB way size */
+	if (cpu_is_ux540_family())
 		/* 128KB way size */
 		aux_val |= (0x4 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT);
 	else