forked from luck/tmp_suning_uos_patched
Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
This commit is contained in:
commit
a45570ebf3
@ -27,6 +27,7 @@
|
||||
#include <linux/mtd/nand.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/workqueue.h>
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
@ -27,6 +27,7 @@
|
||||
|
||||
#include <asm/arch/clock.h>
|
||||
#include <asm/arch/sram.h>
|
||||
#include <asm/div64.h>
|
||||
|
||||
#include "prcm-regs.h"
|
||||
#include "memory.h"
|
||||
|
@ -1013,7 +1013,8 @@ static struct clk dss2_fck = { /* Alt clk used in power management */
|
||||
.name = "dss2_fck",
|
||||
.parent = &sys_ck, /* fixed at sys_ck or 48MHz */
|
||||
.flags = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |
|
||||
RATE_CKCTL | CM_CORE_SEL1 | RATE_FIXED,
|
||||
RATE_CKCTL | CM_CORE_SEL1 | RATE_FIXED |
|
||||
DELAYED_APP,
|
||||
.enable_reg = (void __iomem *)&CM_FCLKEN1_CORE,
|
||||
.enable_bit = 1,
|
||||
.src_offset = 13,
|
||||
|
Loading…
Reference in New Issue
Block a user