From 73eaeb286379ce4d8bc423720ca37c3357f55a9c Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Wed, 2 Jan 2013 10:54:26 -0800 Subject: [PATCH] --- yaml --- r: 355263 b: refs/heads/master c: d2fc6e9741f4f842d18d53f9245c19136b05abc5 h: refs/heads/master i: 355261: 058844b439f17537b29e6c4314f8932143590708 355259: 5d478449705ec9b9950bdf2df0646317c960b2d3 355255: 7bc5034d9e8eaaa33df93c28e18f72c8d670b4df 355247: 6e96f14624aad9a02e7cd8614995a500e30d2f29 355231: 358faefede3b0d4c34db77b43a6688e487a6f2b1 355199: 9c67774e9fcfb4f1af78790ae4d4e11b2b0bb6a5 v: v3 --- [refs] | 2 +- .../include/mach/regs-s3c2416-mem.h | 30 ------------------- .../mach-s3c24xx/include/mach/regs-s3c2416.h | 24 --------------- 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 trunk/arch/arm/mach-s3c24xx/include/mach/regs-s3c2416-mem.h delete mode 100644 trunk/arch/arm/mach-s3c24xx/include/mach/regs-s3c2416.h diff --git a/[refs] b/[refs] index 0bc3d4f803ef..e39e3060628d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db8304edee3f94d8a912cd2419f7ce787e8308da +refs/heads/master: d2fc6e9741f4f842d18d53f9245c19136b05abc5 diff --git a/trunk/arch/arm/mach-s3c24xx/include/mach/regs-s3c2416-mem.h b/trunk/arch/arm/mach-s3c24xx/include/mach/regs-s3c2416-mem.h deleted file mode 100644 index 2f31b74974af..000000000000 --- a/trunk/arch/arm/mach-s3c24xx/include/mach/regs-s3c2416-mem.h +++ /dev/null @@ -1,30 +0,0 @@ -/* arch/arm/mach-s3c2410/include/mach/regs-s3c2416-mem.h - * - * Copyright (c) 2009 Yauhen Kharuzhy , - * as part of OpenInkpot project - * Copyright (c) 2009 Promwad Innovation Company - * Yauhen Kharuzhy - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * S3C2416 memory register definitions -*/ - -#ifndef __ASM_ARM_REGS_S3C2416_MEM -#define __ASM_ARM_REGS_S3C2416_MEM - -#ifndef S3C2416_MEMREG -#define S3C2416_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x)) -#endif - -#define S3C2416_BANKCFG S3C2416_MEMREG(0x00) -#define S3C2416_BANKCON1 S3C2416_MEMREG(0x04) -#define S3C2416_BANKCON2 S3C2416_MEMREG(0x08) -#define S3C2416_BANKCON3 S3C2416_MEMREG(0x0C) - -#define S3C2416_REFRESH S3C2416_MEMREG(0x10) -#define S3C2416_TIMEOUT S3C2416_MEMREG(0x14) - -#endif /* __ASM_ARM_REGS_S3C2416_MEM */ diff --git a/trunk/arch/arm/mach-s3c24xx/include/mach/regs-s3c2416.h b/trunk/arch/arm/mach-s3c24xx/include/mach/regs-s3c2416.h deleted file mode 100644 index e443167efb87..000000000000 --- a/trunk/arch/arm/mach-s3c24xx/include/mach/regs-s3c2416.h +++ /dev/null @@ -1,24 +0,0 @@ -/* arch/arm/mach-s3c2410/include/mach/regs-s3c2416.h - * - * Copyright (c) 2009 Yauhen Kharuzhy , - * as part of OpenInkpot project - * Copyright (c) 2009 Promwad Innovation Company - * Yauhen Kharuzhy - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * S3C2416 specific register definitions -*/ - -#ifndef __ASM_ARCH_REGS_S3C2416_H -#define __ASM_ARCH_REGS_S3C2416_H "s3c2416" - -#define S3C2416_SWRST (S3C24XX_VA_CLKPWR + 0x44) -#define S3C2416_SWRST_RESET (0x533C2416) - -/* see regs-power.h for the other registers in the power block. */ - -#endif /* __ASM_ARCH_REGS_S3C2416_H */ -