diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 20:53:13 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 20:53:13 +0000 |
commit | 23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8 (patch) | |
tree | 60ab5e96f1e6e0ddd46eadf34d8a83ae2d8db72a /arch/arm/plat-tcc/system.c | |
parent | e195ffbe4573f79d590e63e2ae32dac2a73d5768 (diff) | |
parent | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (diff) | |
download | linux-stable-23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8.tar.gz |
Merge branch 'depends/rmk/for-linus' into next/soc
Conflicts:
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.c
Diffstat (limited to 'arch/arm/plat-tcc/system.c')
-rw-r--r-- | arch/arm/plat-tcc/system.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/arch/arm/plat-tcc/system.c b/arch/arm/plat-tcc/system.c deleted file mode 100644 index cc208fae3e7a..000000000000 --- a/arch/arm/plat-tcc/system.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * System functions for Telechips TCCxxxx SoCs - * - * Copyright (C) Hans J. Koch <hjk@linutronix.de> - * - * Licensed under the terms of the GPL v2. - * - */ - -#include <linux/io.h> - -#include <mach/tcc8k-regs.h> - -/* System reboot */ -void plat_tcc_reboot(void) -{ - /* Make sure clocks are on */ - __raw_writel(0xffffffff, CKC_BASE + BCLKCTR0_OFFS); - - /* Enable watchdog reset */ - __raw_writel(0x49, TIMER_BASE + TWDCFG_OFFS); - /* Wait for reset */ - while(1) - ; -} |