From: Tony Lindgren Date: Tue, 4 Oct 2005 07:17:44 +0000 (+0300) Subject: ARM: OMAP: Tabified X-Git-Tag: v2.6.15-omap2~172^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3c5a55e924cdf7d3c2dcfc91982458afccf7c5dd;p=linux-2.6-omap-h63xx.git ARM: OMAP: Tabified Tabified --- diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h index 000780dfbfb..5918f118afa 100644 --- a/arch/arm/mach-omap2/clock.h +++ b/arch/arm/mach-omap2/clock.h @@ -202,7 +202,7 @@ struct prcm_config { /* 2420-PRCM VII (boot) */ #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_DSS2 (0 << 13) #define RVII_CLKSEL_VLYNQ (1 << 15) diff --git a/include/asm-arm/arch-omap/system.h b/include/asm-arm/arch-omap/system.h index 9e59d582c62..175ead4ec9c 100644 --- a/include/asm-arm/arch-omap/system.h +++ b/include/asm-arm/arch-omap/system.h @@ -40,17 +40,17 @@ static inline void omap1_arch_reset(char mode) static inline void omap2_arch_reset(char mode) { u32 rate; - struct clk *vclk, *sclk; + struct clk *vclk, *sclk; unsigned long flags; - vclk = clk_get(NULL, "virt_prcm_set"); - sclk = clk_get(NULL, "sys_ck"); + vclk = clk_get(NULL, "virt_prcm_set"); + sclk = clk_get(NULL, "sys_ck"); printk(KERN_INFO "Resetting the OMAP2\n"); local_irq_save(flags); /* no distractions, we are rebooting */ - rate = clk_get_rate(sclk); - clk_set_rate(vclk, rate); /* go to bypass for OMAP limitation */ + rate = clk_get_rate(sclk); + clk_set_rate(vclk, rate); /* go to bypass for OMAP limitation */ RM_RSTCTRL_WKUP |= 2; local_irq_restore(flags); }