Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0d685cad354b773fbb6a698e73097f8b5aa4a342

Authored by Ben Dooks
Committed by Russell King
1 parent 530ef3c2a9

[ARM] 4522/1: S3C: split include/asm-arm/arch/memory.h 

Split the S3C2400 out of S3C2410 memory.h files
ready for S3C2400 support to be added.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 2 changed files with 23 additions and 13 deletions Side-by-side Diff

include/asm-arm/arch-s3c2400/memory.h
Diff comments   View file @ 0d685ca
  1 +/* linux/include/asm-arm/arch-s3c2400/memory.h
  2 + * from linux/include/asm-arm/arch-rpc/memory.h
  3 + *
  4 + * Copyright 2007 Simtec Electronics
  5 + * http://armlinux.simtec.co.uk/
  6 + * Ben Dooks <ben@simtec.co.uk>
  7 + *
  8 + * Copyright (C) 1996,1997,1998 Russell King.
  9 + *
  10 + * This program is free software; you can redistribute it and/or modify
  11 + * it under the terms of the GNU General Public License version 2 as
  12 + * published by the Free Software Foundation.
  13 +*/
  14 +
  15 +#ifndef __ASM_ARCH_MEMORY_H
  16 +#define __ASM_ARCH_MEMORY_H
  17 +
  18 +#define PHYS_OFFSET UL(0x0C000000)
  19 +
  20 +#define __virt_to_bus(x) __virt_to_phys(x)
  21 +#define __bus_to_virt(x) __phys_to_virt(x)
  22 +
  23 +#endif
include/asm-arm/arch-s3c2410/memory.h
Diff comments   View file @ 0d685ca
... ... @@ -11,20 +11,7 @@
11 11 #ifndef __ASM_ARCH_MEMORY_H
12 12 #define __ASM_ARCH_MEMORY_H
13 13  
14   -/*
15   - * DRAM starts at 0x30000000 for S3C2410/S3C2440
16   - * and at 0x0C000000 for S3C2400
17   - */
18   -#ifdef CONFIG_CPU_S3C2400
19   -#define PHYS_OFFSET UL(0x0C000000)
20   -#else
21 14 #define PHYS_OFFSET UL(0x30000000)
22   -#endif
23   -
24   -/*
25   - * These are exactly the same on the S3C2410 as the
26   - * physical memory view.
27   -*/
28 15  
29 16 #define __virt_to_bus(x) __virt_to_phys(x)
30 17 #define __bus_to_virt(x) __phys_to_virt(x)