Merge tag 'usb-serial-5.15-rc1-2' of https://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / clk / clk-highbank.c

diff --git a/drivers/clk/clk-highbank.c b/drivers/clk/clk-highbank.c
index 8e45810..2a0cea2 100644 (file)
--- a/drivers/clk/clk-highbank.c
+++ b/drivers/clk/clk-highbank.c
@@ -1,23 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright 2011-2012 Calxeda, Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/err.h>
-#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/io.h>
 #include <linux/of.h>
@@ -272,7 +260,7 @@ static const struct clk_ops periclk_ops = {
        .set_rate = clk_periclk_set_rate,
 };
 
-static __init struct clk *hb_clk_init(struct device_node *node, const struct clk_ops *ops)
+static void __init hb_clk_init(struct device_node *node, const struct clk_ops *ops, unsigned long clkflags)
 {
        u32 reg;
        struct hb_clk *hb_clk;
@@ -284,11 +272,11 @@ static __init struct clk *hb_clk_init(struct device_node *node, const struct clk
 
        rc = of_property_read_u32(node, "reg", &reg);
        if (WARN_ON(rc))
-               return NULL;
+               return;
 
        hb_clk = kzalloc(sizeof(*hb_clk), GFP_KERNEL);
        if (WARN_ON(!hb_clk))
-               return NULL;
+               return;
 
        /* Map system registers */
        srnp = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs");
@@ -301,7 +289,7 @@ static __init struct clk *hb_clk_init(struct device_node *node, const struct clk
 
        init.name = clk_name;
        init.ops = ops;
-       init.flags = 0;
+       init.flags = clkflags;
        parent_name = of_clk_get_parent_name(node, 0);
        init.parent_names = &parent_name;
        init.num_parents = 1;
@@ -311,33 +299,31 @@ static __init struct clk *hb_clk_init(struct device_node *node, const struct clk
        rc = clk_hw_register(NULL, &hb_clk->hw);
        if (WARN_ON(rc)) {
                kfree(hb_clk);
-               return NULL;
+               return;
        }
-       rc = of_clk_add_hw_provider(node, of_clk_hw_simple_get, &hb_clk->hw);
-       return hb_clk->hw.clk;
+       of_clk_add_hw_provider(node, of_clk_hw_simple_get, &hb_clk->hw);
 }
 
 static void __init hb_pll_init(struct device_node *node)
 {
-       hb_clk_init(node, &clk_pll_ops);
+       hb_clk_init(node, &clk_pll_ops, 0);
 }
 CLK_OF_DECLARE(hb_pll, "calxeda,hb-pll-clock", hb_pll_init);
 
 static void __init hb_a9periph_init(struct device_node *node)
 {
-       hb_clk_init(node, &a9periphclk_ops);
+       hb_clk_init(node, &a9periphclk_ops, 0);
 }
 CLK_OF_DECLARE(hb_a9periph, "calxeda,hb-a9periph-clock", hb_a9periph_init);
 
 static void __init hb_a9bus_init(struct device_node *node)
 {
-       struct clk *clk = hb_clk_init(node, &a9bclk_ops);
-       clk_prepare_enable(clk);
+       hb_clk_init(node, &a9bclk_ops, CLK_IS_CRITICAL);
 }
 CLK_OF_DECLARE(hb_a9bus, "calxeda,hb-a9bus-clock", hb_a9bus_init);
 
 static void __init hb_emmc_init(struct device_node *node)
 {
-       hb_clk_init(node, &periclk_ops);
+       hb_clk_init(node, &periclk_ops, 0);
 }
 CLK_OF_DECLARE(hb_emmc, "calxeda,hb-emmc-clock", hb_emmc_init);