diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/arch-vybrid/vybrid-regs.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach-types.h | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-vybrid/vybrid-regs.h b/arch/arm/include/asm/arch-vybrid/vybrid-regs.h index d1647f0c18a..9f5178ef0af 100644 --- a/arch/arm/include/asm/arch-vybrid/vybrid-regs.h +++ b/arch/arm/include/asm/arch-vybrid/vybrid-regs.h @@ -97,7 +97,7 @@ /* AIPS 1 */ #define DDR_BASE_ADDR (AIPS1_BASE_ADDR + 0x0002E000) -#define ESDHC1_BASE_ADDR (AIPS1_BASE_ADDR + 0x00032000) +#define ESDHC1_BASE_ADDR (AIPS1_BASE_ADDR + 0x00031000) #define ESDHC2_BASE_ADDR (AIPS1_BASE_ADDR + 0x00032000) #define QSPI1_BASE_ADDR (AIPS0_BASE_ADDR + 0x00044000) #define MACNET0_BASE_ADDR (AIPS1_BASE_ADDR + 0x00050000) diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index 91079c9f104..1e216ffe492 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -1109,6 +1109,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_VYBRID_VF6XX 4146 #define MACH_TYPE_VYBRID_VF5XX 4147 #define MACH_TYPE_VYBRID_VF4XX 4148 +#define MACH_TYPE_PCM052 4391 #ifdef CONFIG_ARCH_EBSA110 # ifdef machine_arch_type @@ -14274,6 +14275,18 @@ extern unsigned int __machine_arch_type; # define machine_is_vybrid_vf4xx() (0) #endif +#ifdef CONFIG_MACH_PCM052 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_PCM052 +# endif +# define machine_is_pcm052() (machine_arch_type == MACH_TYPE_PCM052) +#else +# define machine_is_pcm052() (0) +#endif + /* * These have not yet been registered */ |