projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
08e5708
)
rk312x:clk:modify set cru_misc_con
author
张晴
<zhangqing@rock-chips.com>
Fri, 22 Aug 2014 09:46:34 +0000
(17:46 +0800)
committer
张晴
<zhangqing@rock-chips.com>
Fri, 22 Aug 2014 09:46:34 +0000
(17:46 +0800)
arch/arm/mach-rockchip/rk312x.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-rockchip/rk312x.c
b/arch/arm/mach-rockchip/rk312x.c
index 01ff0f575e0ab0d916dd31d657301fa7a4e18103..f1b81764a03c51e27a13cda4da444462aabbacaf 100755
(executable)
--- a/
arch/arm/mach-rockchip/rk312x.c
+++ b/
arch/arm/mach-rockchip/rk312x.c
@@
-104,8
+104,6
@@
static void usb_uart_init(void)
static void __init rk312x_dt_map_io(void)
{
- u32 val;
-
iotable_init(rk312x_io_desc, ARRAY_SIZE(rk312x_io_desc));
debug_ll_io_init();
usb_uart_init();
@@
-118,9
+116,7
@@
static void __init rk312x_dt_map_io(void)
dsb();
writel_relaxed(1, RK312X_TIMER5_VIRT + 0x10);
dsb();
- val = readl_relaxed(RK_CRU_VIRT + RK312X_CRU_MISC_CON);
- val &= (~(1 << 15));
- writel_relaxed(0x80000000 | val, RK_CRU_VIRT + RK312X_CRU_MISC_CON);
+ writel_relaxed(0x80000000, RK_CRU_VIRT + RK312X_CRU_MISC_CON);
dsb();
}