Skip to content

L
linux-davinci
Commit 3c5a55e9 authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

ARM: OMAP: Tabified 

Tabified
parent 959368fe
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
arch/arm/mach-omap2/clock.h
View file @ 3c5a55e9
...@@ -202,7 +202,7 @@ struct prcm_config { ...@@ -202,7 +202,7 @@ struct prcm_config {
/* 2420-PRCM VII (boot) */ /* 2420-PRCM VII (boot) */
#define RVII_CLKSEL_L3 (1 << 0) #define RVII_CLKSEL_L3 (1 << 0)
#define RVII_CLKSEL_L4 (1 << 5) #define RVII_CLKSEL_L4 (1 << 5)
#define RVII_CLKSEL_DSS1 (1 << 8) #define RVII_CLKSEL_DSS1 (1 << 8)
#define RVII_CLKSEL_DSS2 (0 << 13) #define RVII_CLKSEL_DSS2 (0 << 13)
#define RVII_CLKSEL_VLYNQ (1 << 15) #define RVII_CLKSEL_VLYNQ (1 << 15)
......
include/asm-arm/arch-omap/system.h
View file @ 3c5a55e9
...@@ -40,17 +40,17 @@ static inline void omap1_arch_reset(char mode) ...@@ -40,17 +40,17 @@ static inline void omap1_arch_reset(char mode)
static inline void omap2_arch_reset(char mode) static inline void omap2_arch_reset(char mode)
{ {
u32 rate; u32 rate;
struct clk *vclk, *sclk; struct clk *vclk, *sclk;
unsigned long flags; unsigned long flags;
vclk = clk_get(NULL, "virt_prcm_set"); vclk = clk_get(NULL, "virt_prcm_set");
sclk = clk_get(NULL, "sys_ck"); sclk = clk_get(NULL, "sys_ck");
printk(KERN_INFO "Resetting the OMAP2\n"); printk(KERN_INFO "Resetting the OMAP2\n");
local_irq_save(flags); /* no distractions, we are rebooting */ local_irq_save(flags); /* no distractions, we are rebooting */
rate = clk_get_rate(sclk); rate = clk_get_rate(sclk);
clk_set_rate(vclk, rate); /* go to bypass for OMAP limitation */ clk_set_rate(vclk, rate); /* go to bypass for OMAP limitation */
RM_RSTCTRL_WKUP |= 2; RM_RSTCTRL_WKUP |= 2;
local_irq_restore(flags); local_irq_restore(flags);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment