Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[karo-tx-linux.git] / arch / blackfin / mach-common / cpufreq.c

diff --git a/arch/blackfin/mach-common/cpufreq.c b/arch/blackfin/mach-common/cpufreq.c
index 6e87dc13f6bfa1dde4dbfa72e4ce506b711cad62..c854a27cbeab2087d88b5711433b1247a94013e1 100644 (file)
--- a/arch/blackfin/mach-common/cpufreq.c
+++ b/arch/blackfin/mach-common/cpufreq.c
@@ -64,7 +64,8 @@ static void __init bfin_init_tables(unsigned long cclk, unsigned long sclk)
 
        /* Anomaly 273 seems to still exist on non-BF54x w/dcache turned on */
 #if ANOMALY_05000273 || ANOMALY_05000274 || \
-       (!defined(CONFIG_BF54x) && defined(CONFIG_BFIN_EXTMEM_DCACHEABLE))
+       (!(defined(CONFIG_BF54x) || defined(CONFIG_BF60x)) \
+       && defined(CONFIG_BFIN_EXTMEM_DCACHEABLE))
        min_cclk = sclk * 2;
 #else
        min_cclk = sclk;
@@ -173,7 +174,7 @@ static int bfin_target(struct cpufreq_policy *poli,
 #else
                        ret = cpu_set_cclk(cpu, freqs.new * 1000);
                        if (ret != 0) {
-                               pr_debug("cpufreq set freq failed %d\n", ret);
+                               WARN_ONCE(ret, "cpufreq set freq failed %d\n", ret);
                                break;
                        }
 #endif