Skip to content

Commit

Permalink
ARM: Merge next-samsung-s5p6440-iodec
Browse files Browse the repository at this point in the history
Merge branch 'next-samsung-s5p6440-iodec' into next-samsung-try10
  • Loading branch information
Ben Dooks committed Jan 19, 2010
2 parents a0c814a + af15194 commit 54b8917
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions arch/arm/mach-s5p6440/include/mach/map.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@

#include <plat/map-base.h>

/* Chip ID */
#define S5P6440_PA_CHIPID (0xE0000000)
#define S5P_PA_CHIPID S5P6440_PA_CHIPID
#define S5P_VA_CHIPID S3C_ADDR(0x00700000)

/* SYSCON */
#define S5P6440_PA_SYSCON (0xE0100000)
#define S5P_PA_SYSCON S5P6440_PA_SYSCON
Expand Down

0 comments on commit 54b8917

Please sign in to comment.