Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[~andy/linux] / arch / arm / mach-ux500 / cache-l2x0.c

diff --git a/arch/arm/mach-ux500/cache-l2x0.c b/arch/arm/mach-ux500/cache-l2x0.c
index e12cc92dfca51eee2d5b665462e0b7636cd69c34..82ccf1d98735520ef4727c615398e478fccb8b02 100644 (file)
--- a/arch/arm/mach-ux500/cache-l2x0.c
+++ b/arch/arm/mach-ux500/cache-l2x0.c
@@ -42,13 +42,14 @@ static int __init ux500_l2x0_init(void)
        if (cpu_is_u8500_family() || cpu_is_ux540_family())
                l2x0_base = __io_address(U8500_L2CC_BASE);
        else
-               ux500_unknown_soc();
+               /* Non-Ux500 platform */
+               return -ENODEV;
 
        /* 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