diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2012-01-02 12:43:51 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-01-02 13:32:13 +0100 |
| commit | cbc08bfb42f6c220d5539dc74ce99e9d6ee1ff06 (patch) | |
| tree | 239d8310087b166fe2ec998e0b2f3968577cdbda /arch/arm/mach-samsung | |
| parent | c4da63642f482640d37380a4004fdd49eff0f50c (diff) | |
| download | barebox-cbc08bfb42f6c220d5539dc74ce99e9d6ee1ff06.tar.gz barebox-cbc08bfb42f6c220d5539dc74ce99e9d6ee1ff06.tar.xz | |
MACH SAMSUNG/S3C: Make it more generic for future updates
Start with renaming files to share them in the S3C CPU family,
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-samsung')
| -rw-r--r-- | arch/arm/mach-samsung/generic.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-samsung/gpio-s3c24x0.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-samsung/include/mach/gpio.h | 7 | ||||
| -rw-r--r-- | arch/arm/mach-samsung/include/mach/s3c-generic.h (renamed from arch/arm/mach-samsung/include/mach/s3c24xx-generic.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-samsung/include/mach/s3c-iomap.h (renamed from arch/arm/mach-samsung/include/mach/s3c24x0-iomap.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-samsung/lowlevel-init.S | 2 |
6 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-samsung/generic.c b/arch/arm/mach-samsung/generic.c index d2f2ac7ac0..3c24b1aa35 100644 --- a/arch/arm/mach-samsung/generic.c +++ b/arch/arm/mach-samsung/generic.c @@ -27,7 +27,7 @@ #include <init.h> #include <clock.h> #include <io.h> -#include <mach/s3c24x0-iomap.h> +#include <mach/s3c-iomap.h> /** * Calculate the current M-PLL clock. diff --git a/arch/arm/mach-samsung/gpio-s3c24x0.c b/arch/arm/mach-samsung/gpio-s3c24x0.c index 946ec3396e..23b2609fd9 100644 --- a/arch/arm/mach-samsung/gpio-s3c24x0.c +++ b/arch/arm/mach-samsung/gpio-s3c24x0.c @@ -18,7 +18,7 @@ #include <common.h> #include <errno.h> #include <io.h> -#include <mach/s3c24x0-iomap.h> +#include <mach/s3c-iomap.h> #include <mach/gpio.h> static const unsigned char group_offset[] = diff --git a/arch/arm/mach-samsung/include/mach/gpio.h b/arch/arm/mach-samsung/include/mach/gpio.h index 37db4f55fc..372339490c 100644 --- a/arch/arm/mach-samsung/include/mach/gpio.h +++ b/arch/arm/mach-samsung/include/mach/gpio.h @@ -8,17 +8,12 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA */ #ifndef __ASM_MACH_GPIO_H #define __ASM_MACH_GPIO_H -#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2410) +#ifdef CONFIG_ARCH_S3C24xx # include <mach/iomux-s3c24x0.h> #endif diff --git a/arch/arm/mach-samsung/include/mach/s3c24xx-generic.h b/arch/arm/mach-samsung/include/mach/s3c-generic.h index b8abcf1d9c..b8abcf1d9c 100644 --- a/arch/arm/mach-samsung/include/mach/s3c24xx-generic.h +++ b/arch/arm/mach-samsung/include/mach/s3c-generic.h diff --git a/arch/arm/mach-samsung/include/mach/s3c24x0-iomap.h b/arch/arm/mach-samsung/include/mach/s3c-iomap.h index a990d80c4a..a990d80c4a 100644 --- a/arch/arm/mach-samsung/include/mach/s3c24x0-iomap.h +++ b/arch/arm/mach-samsung/include/mach/s3c-iomap.h diff --git a/arch/arm/mach-samsung/lowlevel-init.S b/arch/arm/mach-samsung/lowlevel-init.S index e8004e588c..852928393b 100644 --- a/arch/arm/mach-samsung/lowlevel-init.S +++ b/arch/arm/mach-samsung/lowlevel-init.S @@ -19,7 +19,7 @@ */ #include <config.h> -#include <mach/s3c24x0-iomap.h> +#include <mach/s3c-iomap.h> .section ".text_bare_init.s3c24x0_disable_wd","ax" |