diff options
Diffstat (limited to 'arch/arm/include/asm/arch-s5pc1xx/cpu.h')
| -rw-r--r-- | arch/arm/include/asm/arch-s5pc1xx/cpu.h | 39 | 
1 files changed, 32 insertions, 7 deletions
| diff --git a/arch/arm/include/asm/arch-s5pc1xx/cpu.h b/arch/arm/include/asm/arch-s5pc1xx/cpu.h index b3af8cc78..e74959fe2 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/cpu.h +++ b/arch/arm/include/asm/arch-s5pc1xx/cpu.h @@ -25,9 +25,9 @@  #define S5PC1XX_ADDR_BASE	0xE0000000 -#define S5PC1XX_CLOCK_BASE	0xE0100000 -  /* S5PC100 */ +#define S5PC100_PRO_ID		0xE0000000 +#define S5PC100_CLOCK_BASE	0xE0100000  #define S5PC100_GPIO_BASE	0xE0300000  #define S5PC100_VIC0_BASE	0xE4000000  #define S5PC100_VIC1_BASE	0xE4100000 @@ -41,6 +41,8 @@  #define S5PC100_MMC_BASE	0xED800000  /* S5PC110 */ +#define S5PC110_PRO_ID		0xE0000000 +#define S5PC110_CLOCK_BASE	0xE0100000  #define S5PC110_GPIO_BASE	0xE0200000  #define S5PC110_PWMTIMER_BASE	0xE2500000  #define S5PC110_WATCHDOG_BASE	0xE2700000 @@ -54,21 +56,44 @@  #define S5PC110_VIC2_BASE	0xF2200000  #define S5PC110_VIC3_BASE	0xF2300000 -/* Chip ID */ -#define S5PC1XX_PRO_ID		0xE0000000 -  #ifndef __ASSEMBLY__ +#include <asm/io.h>  /* CPU detection macros */ -extern unsigned int s5pc1xx_cpu_id; +extern unsigned int s5p_cpu_id; + +static inline void s5p_set_cpu_id(void) +{ +	s5p_cpu_id = readl(S5PC100_PRO_ID); +	s5p_cpu_id = 0xC000 | ((s5p_cpu_id & 0x00FFF000) >> 12); +}  #define IS_SAMSUNG_TYPE(type, id)			\  static inline int cpu_is_##type(void)			\  {							\ -	return s5pc1xx_cpu_id == id ? 1 : 0;		\ +	return s5p_cpu_id == id ? 1 : 0;		\  }  IS_SAMSUNG_TYPE(s5pc100, 0xc100)  IS_SAMSUNG_TYPE(s5pc110, 0xc110) + +#define SAMSUNG_BASE(device, base)				\ +static inline unsigned int samsung_get_base_##device(void)	\ +{								\ +	if (cpu_is_s5pc100())					\ +		return S5PC100_##base;				\ +	else if (cpu_is_s5pc110())				\ +		return S5PC110_##base;				\ +	else							\ +		return 0;					\ +} + +SAMSUNG_BASE(clock, CLOCK_BASE) +SAMSUNG_BASE(gpio, GPIO_BASE) +SAMSUNG_BASE(pro_id, PRO_ID) +SAMSUNG_BASE(mmc, MMC_BASE) +SAMSUNG_BASE(sromc, SROMC_BASE) +SAMSUNG_BASE(timer, PWMTIMER_BASE) +SAMSUNG_BASE(uart, UART_BASE)  #endif  #endif	/* _S5PC1XX_CPU_H */ |