Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
clk
/
ti
/
apll.c
diff --git
a/kernel/drivers/clk/ti/apll.c
b/kernel/drivers/clk/ti/apll.c
index
49baf38
..
f3eab6e
100644
(file)
--- a/
kernel/drivers/clk/ti/apll.c
+++ b/
kernel/drivers/clk/ti/apll.c
@@
-15,6
+15,7
@@
* GNU General Public License for more details.
*/
* GNU General Public License for more details.
*/
+#include <linux/clk.h>
#include <linux/clk-provider.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/clk-provider.h>
#include <linux/module.h>
#include <linux/slab.h>
@@
-27,6
+28,8
@@
#include <linux/clk/ti.h>
#include <linux/delay.h>
#include <linux/clk/ti.h>
#include <linux/delay.h>
+#include "clock.h"
+
#define APLL_FORCE_LOCK 0x1
#define APLL_AUTO_IDLE 0x2
#define MAX_APLL_WAIT_TRIES 1000000
#define APLL_FORCE_LOCK 0x1
#define APLL_AUTO_IDLE 0x2
#define MAX_APLL_WAIT_TRIES 1000000
@@
-47,7
+50,7
@@
static int dra7_apll_enable(struct clk_hw *hw)
if (!ad)
return -EINVAL;
if (!ad)
return -EINVAL;
- clk_name =
__clk_get_name(clk->hw.clk
);
+ clk_name =
clk_hw_get_name(&clk->hw
);
state <<= __ffs(ad->idlest_mask);
state <<= __ffs(ad->idlest_mask);
@@
-170,7
+173,6
@@
static void __init of_dra7_apll_setup(struct device_node *node)
struct clk_hw_omap *clk_hw = NULL;
struct clk_init_data *init = NULL;
const char **parent_names = NULL;
struct clk_hw_omap *clk_hw = NULL;
struct clk_init_data *init = NULL;
const char **parent_names = NULL;
- int i;
ad = kzalloc(sizeof(*ad), GFP_KERNEL);
clk_hw = kzalloc(sizeof(*clk_hw), GFP_KERNEL);
ad = kzalloc(sizeof(*ad), GFP_KERNEL);
clk_hw = kzalloc(sizeof(*clk_hw), GFP_KERNEL);
@@
-195,8
+197,7
@@
static void __init of_dra7_apll_setup(struct device_node *node)
if (!parent_names)
goto cleanup;
if (!parent_names)
goto cleanup;
- for (i = 0; i < init->num_parents; i++)
- parent_names[i] = of_clk_get_parent_name(node, i);
+ of_clk_parent_fill(node, parent_names, init->num_parents);
init->parent_names = parent_names;
init->parent_names = parent_names;
@@
-272,7
+273,7
@@
static int omap2_apll_enable(struct clk_hw *hw)
if (i == MAX_APLL_WAIT_TRIES) {
pr_warn("%s failed to transition to locked\n",
if (i == MAX_APLL_WAIT_TRIES) {
pr_warn("%s failed to transition to locked\n",
-
__clk_get_name(clk->hw.clk
));
+
clk_hw_get_name(&clk->hw
));
return -EBUSY;
}
return -EBUSY;
}