projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Drop linux/delay.h from common header
[oweals/u-boot.git]
/
drivers
/
clk
/
rockchip
/
clk_rk3036.c
diff --git
a/drivers/clk/rockchip/clk_rk3036.c
b/drivers/clk/rockchip/clk_rk3036.c
index 5e11318042dc21fad837133e641b4bc3e603cf75..274572f70c14ef39cbc14316bd540cb1848970af 100644
(file)
--- a/
drivers/clk/rockchip/clk_rk3036.c
+++ b/
drivers/clk/rockchip/clk_rk3036.c
@@
-1,23
+1,24
@@
+// SPDX-License-Identifier: GPL-2.0
/*
* (C) Copyright 2015 Google, Inc
/*
* (C) Copyright 2015 Google, Inc
- *
- * SPDX-License-Identifier: GPL-2.0
*/
#include <common.h>
#include <clk-uclass.h>
#include <dm.h>
#include <errno.h>
*/
#include <common.h>
#include <clk-uclass.h>
#include <dm.h>
#include <errno.h>
+#include <log.h>
+#include <malloc.h>
#include <syscon.h>
#include <asm/io.h>
#include <syscon.h>
#include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/cru_rk3036.h>
-#include <asm/arch/hardware.h>
+#include <asm/arch
-rockchip
/clock.h>
+#include <asm/arch
-rockchip
/cru_rk3036.h>
+#include <asm/arch
-rockchip
/hardware.h>
#include <dm/lists.h>
#include <dt-bindings/clock/rk3036-cru.h>
#include <dm/lists.h>
#include <dt-bindings/clock/rk3036-cru.h>
+#include <linux/delay.h>
#include <linux/log2.h>
#include <linux/log2.h>
-
-DECLARE_GLOBAL_DATA_PTR;
+#include <linux/stringify.h>
enum {
VCO_MAX_HZ = 2400U * 1000000,
enum {
VCO_MAX_HZ = 2400U * 1000000,
@@
-355,7
+356,7
@@
static int rk3036_clk_bind(struct udevice *dev)
sys_child->priv = priv;
}
sys_child->priv = priv;
}
-#if CONFIG_IS_ENABLED(
CONFIG_
RESET_ROCKCHIP)
+#if CONFIG_IS_ENABLED(RESET_ROCKCHIP)
ret = offsetof(struct rk3036_cru, cru_softrst_con[0]);
ret = rockchip_reset_bind(dev, ret, 9);
if (ret)
ret = offsetof(struct rk3036_cru, cru_softrst_con[0]);
ret = rockchip_reset_bind(dev, ret, 9);
if (ret)