Skip to content

L
linux-davinci
Commit 54b89177 authored by Ben Dooks's avatar Ben Dooks
Browse files
Options

ARM: Merge next-samsung-s5p6440-iodec 

Merge branch 'next-samsung-s5p6440-iodec' into next-samsung-try10
parents a0c814af af151940
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
arch/arm/mach-s5p6440/include/mach/map.h
View file @ 54b89177
...@@ -15,6 +15,11 @@ ...@@ -15,6 +15,11 @@
#include <plat/map-base.h> #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 */ /* SYSCON */
#define S5P6440_PA_SYSCON (0xE0100000) #define S5P6440_PA_SYSCON (0xE0100000)
#define S5P_PA_SYSCON S5P6440_PA_SYSCON #define S5P_PA_SYSCON S5P6440_PA_SYSCON
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment