OSDN Git Service

drivers/cpufreq: change CONFIG_6xx to CONFIG_PPC_BOOK3S_32
authorChristophe Leroy <christophe.leroy@c-s.fr>
Sat, 17 Nov 2018 10:24:54 +0000 (10:24 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 26 Nov 2018 11:33:37 +0000 (22:33 +1100)
Today, powerpc has three CONFIG labels which means exactly the same:
- CONFIG_6xx
- CONFIG_PPC_BOOK3S_32
- CONFIG_PPC_STD_MMU_32

By consistency with PPC64, CONFIG_PPC_BOOK3S_32 is the preferred one.
Using a label with includes _PPC_ also makes it clearer that it is
linked to powerpc.

In preparation of the removal of CONFIG_6xx, this patch replaces it
by CONFIG_PPC_BOOK3S_32

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
drivers/cpufreq/pmac32-cpufreq.c

index 61ae06c..52f0d91 100644 (file)
@@ -128,7 +128,7 @@ static int cpu_750fx_cpu_speed(int low_speed)
                        mtspr(SPRN_HID2, hid2);
                }
        }
-#ifdef CONFIG_6xx
+#ifdef CONFIG_PPC_BOOK3S_32
        low_choose_750fx_pll(low_speed);
 #endif
        if (low_speed == 1) {
@@ -166,7 +166,7 @@ static int dfs_set_cpu_speed(int low_speed)
        }
 
        /* set frequency */
-#ifdef CONFIG_6xx
+#ifdef CONFIG_PPC_BOOK3S_32
        low_choose_7447a_dfs(low_speed);
 #endif
        udelay(100);