mips: ingenic: Do not manually reference the CPU clock
authorAidan MacDonald <aidanmacdonald.0x0@gmail.com>
Thu, 28 Apr 2022 16:44:54 +0000 (17:44 +0100)
committerStephen Boyd <sboyd@kernel.org>
Wed, 18 May 2022 20:56:26 +0000 (13:56 -0700)
It isn't necessary to manually walk the device tree and enable
the CPU clock anymore. The CPU and other necessary clocks are
now flagged as critical in the clock driver, which accomplishes
the same thing in a more declarative fashion.

Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20220428164454.17908-4-aidanmacdonald.0x0@gmail.com
Tested-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com> # On X1000 and X1830
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
arch/mips/generic/board-ingenic.c

index 3f44f14..c422bbc 100644 (file)
@@ -131,36 +131,10 @@ static const struct platform_suspend_ops ingenic_pm_ops __maybe_unused = {
 
 static int __init ingenic_pm_init(void)
 {
-       struct device_node *cpu_node;
-       struct clk *cpu0_clk;
-       int ret;
-
        if (boot_cpu_type() == CPU_XBURST) {
                if (IS_ENABLED(CONFIG_PM_SLEEP))
                        suspend_set_ops(&ingenic_pm_ops);
                _machine_halt = ingenic_halt;
-
-               /*
-                * Unconditionally enable the clock for the first CPU.
-                * This makes sure that the PLL that feeds the CPU won't be
-                * stopped while the kernel is running.
-                */
-               cpu_node = of_get_cpu_node(0, NULL);
-               if (!cpu_node) {
-                       pr_err("Unable to get CPU node\n");
-               } else {
-                       cpu0_clk = of_clk_get(cpu_node, 0);
-                       if (IS_ERR(cpu0_clk)) {
-                               pr_err("Unable to get CPU0 clock\n");
-                               return PTR_ERR(cpu0_clk);
-                       }
-
-                       ret = clk_prepare_enable(cpu0_clk);
-                       if (ret) {
-                               pr_err("Unable to enable CPU0 clock\n");
-                               return ret;
-                       }
-               }
        }
 
        return 0;