diff options
| author | Robin Gong <b38343@freescale.com> | 2012-11-19 11:35:14 +0800 |
|---|---|---|
| committer | Robin Gong <b38343@freescale.com> | 2012-11-19 11:40:01 +0800 |
| commit | 326e7cd8fb5cac15d0423d67f50f7a10416ab53b (patch) | |
| tree | 77db0881e7d0a1c1cfce22281c39e17165b132a1 | |
| parent | c9f6d63a6b91b4494d60191f9fa6cc3b1bd29847 (diff) | |
ENGR00234045 fix building error caused by ENGR00233366
Forget submit some local change...
Signed-off-by: Robin Gong <b38343@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx6/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/system.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx6/cpu.c b/arch/arm/mach-mx6/cpu.c index 029e39d01f22..7a874da254f0 100644 --- a/arch/arm/mach-mx6/cpu.c +++ b/arch/arm/mach-mx6/cpu.c @@ -34,7 +34,7 @@ struct cpu_op *(*get_cpu_op)(int *op); bool enable_wait_mode = true; -+u32 enable_ldo_mode = LDO_MODE_DEFAULT; +u32 enable_ldo_mode = LDO_MODE_DEFAULT; u32 arm_max_freq = CPU_AT_1_2GHz; bool mem_clk_on_in_wait; int chip_rev; diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c index 9ab2583182d4..e216f687cd89 100644 --- a/arch/arm/plat-mxc/system.c +++ b/arch/arm/plat-mxc/system.c @@ -61,7 +61,7 @@ void arch_reset(char mode, const char *cmd) /*On Sabresd board use WDOG2 to reset external PMIC, so here do * more WDOG2 reset.*/ wcr_enable = 0x14; - __raw_write(wcr_enable, IO_ADDRESS(MX6Q_WDOG2_BASE_ADDR)); + __raw_writew(wcr_enable, IO_ADDRESS(MX6Q_WDOG2_BASE_ADDR)); __raw_writew(wcr_enable, IO_ADDRESS(MX6Q_WDOG2_BASE_ADDR)); } else wcr_enable = (1 << 2); |