more bcm6338 and bcm6345 related fixes
SVN-Revision: 16568
This commit is contained in:
parent
8c4137900c
commit
287a2c0ba9
4 changed files with 9 additions and 1 deletions
|
@ -34,6 +34,7 @@ static unsigned int bcm63xx_memory_size;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static const unsigned long bcm96338_regs_base[] = {
|
static const unsigned long bcm96338_regs_base[] = {
|
||||||
|
[RSET_DSL_LMEM] = BCM_6338_DSL_LMEM_BASE,
|
||||||
[RSET_PERF] = BCM_6338_PERF_BASE,
|
[RSET_PERF] = BCM_6338_PERF_BASE,
|
||||||
[RSET_TIMER] = BCM_6338_TIMER_BASE,
|
[RSET_TIMER] = BCM_6338_TIMER_BASE,
|
||||||
[RSET_WDT] = BCM_6338_WDT_BASE,
|
[RSET_WDT] = BCM_6338_WDT_BASE,
|
||||||
|
|
|
@ -121,6 +121,7 @@ enum bcm63xx_regs_set {
|
||||||
* 6338 register sets base address
|
* 6338 register sets base address
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define BCM_6338_DSL_LMEM_BASE (0xfff00000)
|
||||||
#define BCM_6338_PERF_BASE (0xfffe0000)
|
#define BCM_6338_PERF_BASE (0xfffe0000)
|
||||||
#define BCM_6338_BB_BASE (0xfffe0100) /* bus bridge registers */
|
#define BCM_6338_BB_BASE (0xfffe0100) /* bus bridge registers */
|
||||||
#define BCM_6338_TIMER_BASE (0xfffe0200)
|
#define BCM_6338_TIMER_BASE (0xfffe0200)
|
||||||
|
@ -213,6 +214,8 @@ static inline unsigned long bcm63xx_regset_address(enum bcm63xx_regs_set set)
|
||||||
#else
|
#else
|
||||||
#ifdef CONFIG_BCM63XX_CPU_6338
|
#ifdef CONFIG_BCM63XX_CPU_6338
|
||||||
switch (set) {
|
switch (set) {
|
||||||
|
case RSET_DSL_LMEM:
|
||||||
|
return BCM_6338_DSL_LMEM_BASE;
|
||||||
case RSET_PERF:
|
case RSET_PERF:
|
||||||
return BCM_6338_PERF_BASE;
|
return BCM_6338_PERF_BASE;
|
||||||
case RSET_TIMER:
|
case RSET_TIMER:
|
||||||
|
|
|
@ -10,6 +10,10 @@ static inline unsigned long bcm63xx_gpio_count(void)
|
||||||
switch (bcm63xx_get_cpu_id()) {
|
switch (bcm63xx_get_cpu_id()) {
|
||||||
case BCM6358_CPU_ID:
|
case BCM6358_CPU_ID:
|
||||||
return 40;
|
return 40;
|
||||||
|
case BCM6338_CPU_ID:
|
||||||
|
return 7;
|
||||||
|
case BCM6345_CPU_ID:
|
||||||
|
return 16;
|
||||||
case BCM6348_CPU_ID:
|
case BCM6348_CPU_ID:
|
||||||
default:
|
default:
|
||||||
return 37;
|
return 37;
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#define cpu_has_smartmips 0
|
#define cpu_has_smartmips 0
|
||||||
#define cpu_has_vtag_icache 0
|
#define cpu_has_vtag_icache 0
|
||||||
|
|
||||||
#if !defined(BCMCPU_RUNTIME_DETECT) && defined(CONFIG_BCMCPU_IS_6348)
|
#if !defined(BCMCPU_RUNTIME_DETECT) && (defined(CONFIG_BCMCPU_IS_6348) || defined(CONFIG_CPU_IS_6338) || defined(CONFIG_CPU_IS_BCM6345))
|
||||||
#define cpu_has_dc_aliases 0
|
#define cpu_has_dc_aliases 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue