Message ID | 1452537674-20006-3-git-send-email-geert+renesas@glider.be (mailing list archive) |
---|---|
State | Accepted |
Commit | 32178fbeb41efdc8d99ae7ebd5a18866d3f81e92 |
Delegated to: | Simon Horman |
Headers | show |
On Mon, Jan 11, 2016 at 07:41:13PM +0100, Geert Uytterhoeven wrote: > Commit edf4100906044225 ("ARM: shmobile: sh7372 dtsi: Remove Legacy > file") removed the DTS for the last shmobile SoC with a Cortex A8 CPU > core (sh7372 aka SH-Mobile AP4). > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Thanks, I have queued this up for v4.6. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c index d61014a52b43e205..15fc9db797ea6359 100644 --- a/arch/arm/mach-shmobile/timer.c +++ b/arch/arm/mach-shmobile/timer.c @@ -52,9 +52,7 @@ void __init shmobile_init_delay(void) if (!of_property_read_u32(np, "clock-frequency", &freq)) max_freq = max(max_freq, freq); - if (of_device_is_compatible(np, "arm,cortex-a8")) { - div = 2; - } else if (of_device_is_compatible(np, "arm,cortex-a9")) { + if (of_device_is_compatible(np, "arm,cortex-a9")) { div = 1; } else if (of_device_is_compatible(np, "arm,cortex-a7") || of_device_is_compatible(np, "arm,cortex-a15")) {
Commit edf4100906044225 ("ARM: shmobile: sh7372 dtsi: Remove Legacy file") removed the DTS for the last shmobile SoC with a Cortex A8 CPU core (sh7372 aka SH-Mobile AP4). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/timer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)