mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/clk/zynq/clkc.c
..
..
@@ -1,21 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Zynq clock controller
3
4
  *
4
5
  *  Copyright (C) 2012 - 2013 Xilinx
5
6
  *
6
7
  *  Sören Brinkmann <soren.brinkmann@xilinx.com>
7
- *
8
- * This program is free software: you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License v2 as published by
10
- * the Free Software Foundation.
11
- *
12
- * This program is distributed in the hope that it will be useful,
13
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
- * GNU General Public License for more details.
16
- *
17
- * You should have received a copy of the GNU General Public License
18
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
8
  */
20
9
 
21
10
 #include <linux/clk/zynq.h>
..
..
@@ -158,7 +147,7 @@
158
147
 	clks[fclk] = clk_register_gate(NULL, clk_name,
159
148
 			div1_name, CLK_SET_RATE_PARENT, fclk_gate_reg,
160
149
 			0, CLK_GATE_SET_TO_DISABLE, fclk_gate_lock);
161
-	enable_reg = clk_readl(fclk_gate_reg) & 1;
150
+	enable_reg = readl(fclk_gate_reg) & 1;
162
151
 	if (enable && !enable_reg) {
163
152
 		if (clk_prepare_enable(clks[fclk]))
164
153
 			pr_warn("%s: FCLK%u enable failed\n", __func__,
..
..
@@ -287,7 +276,7 @@
287
276
 			SLCR_IOPLL_CTRL, 4, 1, 0, &iopll_lock);
288
277
 
289
278
 	/* CPU clocks */
290
-	tmp = clk_readl(SLCR_621_TRUE) & 1;
279
+	tmp = readl(SLCR_621_TRUE) & 1;
291
280
 	clk = clk_register_mux(NULL, "cpu_mux", cpu_parents, 4,
292
281
 			CLK_SET_RATE_NO_REPARENT, SLCR_ARM_CLK_CTRL, 4, 2, 0,
293
282
 			&armclk_lock);
..
..
@@ -510,7 +499,7 @@
510
499
 			&dbgclk_lock);
511
500
 
512
501
 	/* leave debug clocks in the state the bootloader set them up to */
513
-	tmp = clk_readl(SLCR_DBG_CLK_CTRL);
502
+	tmp = readl(SLCR_DBG_CLK_CTRL);
514
503
 	if (tmp & DBG_CLK_CTRL_CLKACT_TRC)
515
504
 		if (clk_prepare_enable(clks[dbg_trc]))
516
505
 			pr_warn("%s: trace clk enable failed\n", __func__);
..
..
@@ -602,7 +591,7 @@
602
591
 	}
603
592
 
604
593
 	if (of_address_to_resource(np, 0, &res)) {
605
-		pr_err("%s: failed to get resource\n", np->name);
594
+		pr_err("%pOFn: failed to get resource\n", np);
606
595
 		goto np_err;
607
596
 	}
608
597
 
..
..
@@ -611,7 +600,7 @@
611
600
 	if (slcr->data) {
612
601
 		zynq_clkc_base = (__force void __iomem *)slcr->data + res.start;
613
602
 	} else {
614
-		pr_err("%s: Unable to get I/O memory\n", np->name);
603
+		pr_err("%pOFn: Unable to get I/O memory\n", np);
615
604
 		of_node_put(slcr);
616
605
 		goto np_err;
617
606
 	}