mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/clk/clk-conf.c
..
..
@@ -1,10 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0
1
2
 /*
2
3
  * Copyright (C) 2014 Samsung Electronics Co., Ltd.
3
4
  * Sylwester Nawrocki <s.nawrocki@samsung.com>
4
- *
5
- * This program is free software; you can redistribute it and/or modify
6
- * it under the terms of the GNU General Public License version 2 as
7
- * published by the Free Software Foundation.
8
5
  */
9
6
 
10
7
 #include <linux/clk.h>
..
..
@@ -13,7 +10,6 @@
13
10
 #include <linux/device.h>
14
11
 #include <linux/of.h>
15
12
 #include <linux/printk.h>
16
-#include "clk.h"
17
13
 
18
14
 static int __set_clk_parents(struct device_node *node, bool clk_supplier)
19
15
 {
..
..
@@ -39,7 +35,7 @@
39
35
 		}
40
36
 		if (clkspec.np == node && !clk_supplier)
41
37
 			return 0;
42
-		pclk = of_clk_get_from_provider_with_orphans(&clkspec);
38
+		pclk = of_clk_get_from_provider(&clkspec);
43
39
 		if (IS_ERR(pclk)) {
44
40
 			if (PTR_ERR(pclk) != -EPROBE_DEFER)
45
41
 				pr_warn("clk: couldn't get parent clock %d for %pOF\n",
..
..
@@ -55,7 +51,7 @@
55
51
 			rc = 0;
56
52
 			goto err;
57
53
 		}
58
-		clk = of_clk_get_from_provider_with_orphans(&clkspec);
54
+		clk = of_clk_get_from_provider(&clkspec);
59
55
 		if (IS_ERR(clk)) {
60
56
 			if (PTR_ERR(clk) != -EPROBE_DEFER)
61
57
 				pr_warn("clk: couldn't get assigned clock %d for %pOF\n",