diff options
Diffstat (limited to 'arch/sparc/include/asm/leon.h')
| -rw-r--r-- | arch/sparc/include/asm/leon.h | 66 | 
1 files changed, 6 insertions, 60 deletions
diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h index a4e457f003e..07659124c14 100644 --- a/arch/sparc/include/asm/leon.h +++ b/arch/sparc/include/asm/leon.h @@ -10,19 +10,6 @@  #ifdef CONFIG_SPARC_LEON -#define ASI_LEON_NOCACHE	0x01 - -#define ASI_LEON_DCACHE_MISS	0x1 - -#define ASI_LEON_CACHEREGS	0x02 -#define ASI_LEON_IFLUSH		0x10 -#define ASI_LEON_DFLUSH		0x11 - -#define ASI_LEON_MMUFLUSH	0x18 -#define ASI_LEON_MMUREGS	0x19 -#define ASI_LEON_BYPASS		0x1c -#define ASI_LEON_FLUSH_PAGE	0x10 -  /* mmu register access, ASI_LEON_MMUREGS */  #define LEON_CNR_CTRL		0x000  #define LEON_CNR_CTXP		0x100 @@ -57,29 +44,6 @@  #define LEON_IRQMASK_R		0x0000fffe	/* bit 15- 1 of lregs.irqmask */  #define LEON_IRQPRIO_R		0xfffe0000	/* bit 31-17 of lregs.irqmask */ -/* leon uart register definitions */ -#define LEON_OFF_UDATA	0x0 -#define LEON_OFF_USTAT	0x4 -#define LEON_OFF_UCTRL	0x8 -#define LEON_OFF_USCAL	0xc - -#define LEON_UCTRL_RE	0x01 -#define LEON_UCTRL_TE	0x02 -#define LEON_UCTRL_RI	0x04 -#define LEON_UCTRL_TI	0x08 -#define LEON_UCTRL_PS	0x10 -#define LEON_UCTRL_PE	0x20 -#define LEON_UCTRL_FL	0x40 -#define LEON_UCTRL_LB	0x80 - -#define LEON_USTAT_DR	0x01 -#define LEON_USTAT_TS	0x02 -#define LEON_USTAT_TH	0x04 -#define LEON_USTAT_BR	0x08 -#define LEON_USTAT_OV	0x10 -#define LEON_USTAT_PE	0x20 -#define LEON_USTAT_FE	0x40 -  #define LEON_MCFG2_SRAMDIS		0x00002000  #define LEON_MCFG2_SDRAMEN		0x00004000  #define LEON_MCFG2_SRAMBANKSZ		0x00001e00	/* [12-9] */ @@ -89,8 +53,6 @@  #define LEON_TCNT0_MASK	0x7fffff -#define LEON_USTAT_ERROR (LEON_USTAT_OV | LEON_USTAT_PE | LEON_USTAT_FE) -/* no break yet */  #define ASI_LEON3_SYSCTRL		0x02  #define ASI_LEON3_SYSCTRL_ICFG		0x08 @@ -278,18 +240,11 @@ static inline int sparc_leon3_cpuid(void)  #define LEON2_CFG_SSIZE_MASK 0x00007000UL  #ifndef __ASSEMBLY__ -extern unsigned long srmmu_swprobe(unsigned long vaddr, unsigned long *paddr); -extern void leon_flush_icache_all(void); -extern void leon_flush_dcache_all(void); -extern void leon_flush_cache_all(void); -extern void leon_flush_tlb_all(void); -extern int leon_flush_during_switch; -extern int leon_flush_needed(void); -  struct vm_area_struct; + +extern unsigned long srmmu_swprobe(unsigned long vaddr, unsigned long *paddr);  extern void leon_flush_icache_all(void);  extern void leon_flush_dcache_all(void); -extern void leon_flush_pcache_all(struct vm_area_struct *vma, unsigned long page);  extern void leon_flush_cache_all(void);  extern void leon_flush_tlb_all(void);  extern int leon_flush_during_switch; @@ -315,28 +270,19 @@ struct leon2_cacheregs {  #include <linux/interrupt.h>  struct device_node; +struct task_struct;  extern unsigned int leon_build_device_irq(unsigned int real_irq,  					   irq_flow_handler_t flow_handler,  					   const char *name, int do_ack);  extern void leon_update_virq_handling(unsigned int virq,  			      irq_flow_handler_t flow_handler,  			      const char *name, int do_ack); -extern void leon_clear_clock_irq(void); -extern void leon_load_profile_irq(int cpu, unsigned int limit); -extern void leon_init_timers(irq_handler_t counter_fn); -extern void leon_clear_clock_irq(void); -extern void leon_load_profile_irq(int cpu, unsigned int limit); +extern void leon_init_timers(void);  extern void leon_trans_init(struct device_node *dp);  extern void leon_node_init(struct device_node *dp, struct device_node ***nextp); -extern void leon_init_IRQ(void); -extern void leon_init(void); -extern unsigned long srmmu_swprobe(unsigned long vaddr, unsigned long *paddr);  extern void init_leon(void);  extern void poke_leonsparc(void);  extern void leon3_getCacheRegs(struct leon3_cacheregs *regs); -extern int leon_flush_needed(void); -extern void leon_switch_mm(void); -extern int srmmu_swprobe_trace;  extern int leon3_ticker_irq;  #ifdef CONFIG_SMP @@ -344,7 +290,7 @@ extern int leon_smp_nrcpus(void);  extern void leon_clear_profile_irq(int cpu);  extern void leon_smp_done(void);  extern void leon_boot_cpus(void); -extern int leon_boot_one_cpu(int i); +extern int leon_boot_one_cpu(int i, struct task_struct *);  void leon_init_smp(void);  extern void cpu_idle(void);  extern void init_IRQ(void); @@ -380,7 +326,7 @@ extern int leon_ipi_irq;  #define init_leon() do {} while (0)  #define leon_smp_done() do {} while (0)  #define leon_boot_cpus() do {} while (0) -#define leon_boot_one_cpu(i) 1 +#define leon_boot_one_cpu(i, t) 1  #define leon_init_smp() do {} while (0)  #endif /* !defined(CONFIG_SPARC_LEON) */  |