| Message ID | 1408377107-3822-6-git-send-email-ulrich.hecht+renesas@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
It seems that this is a dependency of "[PATCH 3/8] ARM: shmobile: Initial r8a7794 Alt board support" (which elsewhere I will suggest dropping) and "[PATCH 2/8] ARM: shmobile: Initial r8a7794 SoC support". Please consider re-ordering the series accordingly. On Mon, Aug 18, 2014 at 05:51:44PM +0200, Ulrich Hecht wrote: > Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > --- > arch/arm/mach-shmobile/timer.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c > index 942efdc..0b01770 100644 > --- a/arch/arm/mach-shmobile/timer.c > +++ b/arch/arm/mach-shmobile/timer.c > @@ -60,7 +60,7 @@ void __init shmobile_setup_delay(unsigned int max_cpu_core_mhz, > void __init shmobile_init_delay(void) > { > struct device_node *np, *cpus; > - bool is_a8_a9 = false; > + bool is_a7_a8_a9 = false; > bool is_a15 = false; > u32 max_freq = 0; > > @@ -74,9 +74,10 @@ 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") || > + if (of_device_is_compatible(np, "arm,cortex-a7") || > + of_device_is_compatible(np, "arm,cortex-a8") || > of_device_is_compatible(np, "arm,cortex-a9")) > - is_a8_a9 = true; > + is_a7_a8_a9 = true; > else if (of_device_is_compatible(np, "arm,cortex-a15")) > is_a15 = true; > } > @@ -86,7 +87,7 @@ void __init shmobile_init_delay(void) > if (!max_freq) > return; > > - if (is_a8_a9) > + if (is_a7_a8_a9) > shmobile_setup_delay_hz(max_freq, 1, 3); > else if (is_a15 && !IS_ENABLED(CONFIG_ARM_ARCH_TIMER)) > shmobile_setup_delay_hz(max_freq, 2, 4); > -- > 1.8.4.5 > > -- > 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 > -- 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 942efdc..0b01770 100644 --- a/arch/arm/mach-shmobile/timer.c +++ b/arch/arm/mach-shmobile/timer.c @@ -60,7 +60,7 @@ void __init shmobile_setup_delay(unsigned int max_cpu_core_mhz, void __init shmobile_init_delay(void) { struct device_node *np, *cpus; - bool is_a8_a9 = false; + bool is_a7_a8_a9 = false; bool is_a15 = false; u32 max_freq = 0; @@ -74,9 +74,10 @@ 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") || + if (of_device_is_compatible(np, "arm,cortex-a7") || + of_device_is_compatible(np, "arm,cortex-a8") || of_device_is_compatible(np, "arm,cortex-a9")) - is_a8_a9 = true; + is_a7_a8_a9 = true; else if (of_device_is_compatible(np, "arm,cortex-a15")) is_a15 = true; } @@ -86,7 +87,7 @@ void __init shmobile_init_delay(void) if (!max_freq) return; - if (is_a8_a9) + if (is_a7_a8_a9) shmobile_setup_delay_hz(max_freq, 1, 3); else if (is_a15 && !IS_ENABLED(CONFIG_ARM_ARCH_TIMER)) shmobile_setup_delay_hz(max_freq, 2, 4);
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> --- arch/arm/mach-shmobile/timer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)