Commit 8617d7d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS updates from Thomas Bogendoerfer:

 - use devm_clk_get_enabled() helper

 - prototype fixes

 - cleanup unused stuff

* tag 'mips_6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  mips: Remove posix_types.h include from sigcontext.h
  bus: bt1-apb: change to use devm_clk_get_enabled() helper
  bus: bt1-axi: change to use devm_clk_get_enabled() helper
  MIPS: dec: prom: Remove unused unregister_prom_console() declaration
  MIPS: Remove unused mips_display/_scroll_message() declarations
  MIPS: Remove unused declarations in asm/cmp.h
  MIPS: MT: Remove unused function mips_mt_regdump()
  mips/jazz: remove unused jazz_handle_int() declaration
  MIPS: Remove unused function dump_au1000_dma_channel() in dma.c
  MIPS: ralink: Fix missing `get_c0_perfcount_int` prototype
  MIPS: ralink: Fix missing `plat_time_init` prototype
parents a4ebad65 439667fb

arch/mips/alchemy/common/dma.c

+0 −23
Original line number Diff line number Diff line
@@ -131,29 +131,6 @@ static const struct dma_dev dma_dev_table_bank2[DMA_NUM_DEV_BANK2] = { 
	{ AU1100_SD1_PHYS_ADDR + 0x04, DMA_DS | DMA_DW8 | DMA_DR }	/* coherent */

};



void dump_au1000_dma_channel(unsigned int dmanr)

{

	struct dma_chan *chan;



	if (dmanr >= NUM_AU1000_DMA_CHANNELS)

		return;

	chan = &au1000_dma_table[dmanr];



	printk(KERN_INFO "Au1000 DMA%d Register Dump:\n", dmanr);

	printk(KERN_INFO "  mode = 0x%08x\n",

	       __raw_readl(chan->io + DMA_MODE_SET));

	printk(KERN_INFO "  addr = 0x%08x\n",

	       __raw_readl(chan->io + DMA_PERIPHERAL_ADDR));

	printk(KERN_INFO "  start0 = 0x%08x\n",

	       __raw_readl(chan->io + DMA_BUFFER0_START));

	printk(KERN_INFO "  start1 = 0x%08x\n",

	       __raw_readl(chan->io + DMA_BUFFER1_START));

	printk(KERN_INFO "  count0 = 0x%08x\n",

	       __raw_readl(chan->io + DMA_BUFFER0_COUNT));

	printk(KERN_INFO "  count1 = 0x%08x\n",

	       __raw_readl(chan->io + DMA_BUFFER1_COUNT));

}



/*

 * Finds a free channel, and binds the requested device to it.

 * Returns the allocated channel number, or negative on error.

arch/mips/include/asm/cmp.h

+0 −8
Original line number Diff line number Diff line
@@ -7,12 +7,4 @@ 
 */

struct task_struct;



extern void cmp_smp_setup(void);

extern void cmp_smp_finish(void);

extern void cmp_boot_secondary(int cpu, struct task_struct *t);

extern void cmp_init_secondary(void);

extern void cmp_prepare_cpus(unsigned int max_cpus);



/* This is platform specific */

extern void cmp_send_ipi(int cpu, unsigned int action);

#endif /*  _ASM_CMP_H */

arch/mips/include/asm/dec/prom.h

+0 −1
Original line number Diff line number Diff line
@@ -160,6 +160,5 @@ extern void prom_identify_arch(u32); 
extern void prom_init_cmdline(s32, s32 *, u32);



extern void register_prom_console(void);

extern void unregister_prom_console(void);



#endif /* _ASM_DEC_PROM_H */

arch/mips/include/asm/mach-au1x00/au1000_dma.h

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ extern int request_au1000_dma(int dev_id, 
extern void free_au1000_dma(unsigned int dmanr);

extern int au1000_dma_read_proc(char *buf, char **start, off_t fpos,

				int length, int *eof, void *data);

extern void dump_au1000_dma_channel(unsigned int dmanr);

extern spinlock_t au1000_dma_spin_lock;



static inline struct dma_chan *get_dma_chan(unsigned int dmanr)

arch/mips/include/asm/mips-boards/generic.h

+0 −3
Original line number Diff line number Diff line
@@ -73,7 +73,4 @@ extern void mips_pcibios_init(void); 
#define mips_pcibios_init() do { } while (0)

#endif



extern void mips_scroll_message(void);

extern void mips_display_message(const char *str);



#endif	/* __ASM_MIPS_BOARDS_GENERIC_H */