OSDN Git Service

ARM: mmp/mmp2: fix cpu_is_mmp2() on mmp2-dt
authorLubomir Rintel <lkundrak@v3.sk>
Sun, 2 Dec 2018 11:12:24 +0000 (12:12 +0100)
committerOlof Johansson <olof@lixom.net>
Mon, 3 Dec 2018 20:39:21 +0000 (12:39 -0800)
commit76f4e2c3b6a560cdd7a75b87df543e04d05a9e5f
tree3bd2acc240d360de6c4978727ae2586f7384f7b8
parent358b5f73ce60fb1369be557c38a52e886834f44d
ARM: mmp/mmp2: fix cpu_is_mmp2() on mmp2-dt

cpu_is_mmp2() was equivalent to cpu_is_pj4(), wouldn't be correct for
multiplatform kernels. Fix it by also considering mmp_chip_id, as is
done for cpu_is_pxa168() and cpu_is_pxa910() above.

Moreover, it is only available with CONFIG_CPU_MMP2 and thus doesn't work
on DT-based MMP2 machines. Enable it on CONFIG_MACH_MMP2_DT too.

Note: CONFIG_CPU_MMP2 is only used for machines that use board files
instead of DT. It should perhaps be renamed. I'm not doing it now, because
I don't have a better idea.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: stable@vger.kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-mmp/cputype.h