Skip to content

Commit 8617d7d

Browse files
torvaldstorvalds
committed
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
2 parents a4ebad6 + 439667f commit 8617d7d

File tree

13 files changed

+6
-161
lines changed

13 files changed

+6
-161
lines changed

‎arch/mips/alchemy/common/dma.c‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -131,29 +131,6 @@ static const struct dma_dev dma_dev_table_bank2[DMA_NUM_DEV_BANK2] = {
131131
{ AU1100_SD1_PHYS_ADDR + 0x04, DMA_DS | DMA_DW8 | DMA_DR } /* coherent */
132132
};
133133

134-
void dump_au1000_dma_channel(unsigned int dmanr)
135-
{
136-
struct dma_chan *chan;
137-
138-
if (dmanr >= NUM_AU1000_DMA_CHANNELS)
139-
return;
140-
chan = &au1000_dma_table[dmanr];
141-
142-
printk(KERN_INFO "Au1000 DMA%d Register Dump:\n", dmanr);
143-
printk(KERN_INFO " mode = 0x%08x\n",
144-
__raw_readl(chan->io + DMA_MODE_SET));
145-
printk(KERN_INFO " addr = 0x%08x\n",
146-
__raw_readl(chan->io + DMA_PERIPHERAL_ADDR));
147-
printk(KERN_INFO " start0 = 0x%08x\n",
148-
__raw_readl(chan->io + DMA_BUFFER0_START));
149-
printk(KERN_INFO " start1 = 0x%08x\n",
150-
__raw_readl(chan->io + DMA_BUFFER1_START));
151-
printk(KERN_INFO " count0 = 0x%08x\n",
152-
__raw_readl(chan->io + DMA_BUFFER0_COUNT));
153-
printk(KERN_INFO " count1 = 0x%08x\n",
154-
__raw_readl(chan->io + DMA_BUFFER1_COUNT));
155-
}
156-
157134
/*
158135
* Finds a free channel, and binds the requested device to it.
159136
* Returns the allocated channel number, or negative on error.

‎arch/mips/include/asm/cmp.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,4 @@
77
*/
88
struct task_struct;
99

10-
extern void cmp_smp_setup(void);
11-
extern void cmp_smp_finish(void);
12-
extern void cmp_boot_secondary(int cpu, struct task_struct *t);
13-
extern void cmp_init_secondary(void);
14-
extern void cmp_prepare_cpus(unsigned int max_cpus);
15-
16-
/* This is platform specific */
17-
extern void cmp_send_ipi(int cpu, unsigned int action);
1810
#endif /* _ASM_CMP_H */

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,5 @@ extern void prom_identify_arch(u32);
160160
extern void prom_init_cmdline(s32, s32 *, u32);
161161

162162
extern void register_prom_console(void);
163-
extern void unregister_prom_console(void);
164163

165164
#endif /* _ASM_DEC_PROM_H */

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ extern int request_au1000_dma(int dev_id,
124124
extern void free_au1000_dma(unsigned int dmanr);
125125
extern int au1000_dma_read_proc(char *buf, char **start, off_t fpos,
126126
int length, int *eof, void *data);
127-
extern void dump_au1000_dma_channel(unsigned int dmanr);
128127
extern spinlock_t au1000_dma_spin_lock;
129128

130129
static inline struct dma_chan *get_dma_chan(unsigned int dmanr)

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,4 @@ extern void mips_pcibios_init(void);
7373
#define mips_pcibios_init() do { } while (0)
7474
#endif
7575

76-
extern void mips_scroll_message(void);
77-
extern void mips_display_message(const char *str);
78-
7976
#endif /* __ASM_MIPS_BOARDS_GENERIC_H */

‎arch/mips/include/asm/mips_mt.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ extern int vpelimit;
1717
extern cpumask_t mt_fpu_cpumask;
1818
extern unsigned long mt_fpemul_threshold;
1919

20-
extern void mips_mt_regdump(unsigned long previous_mvpcontrol_value);
21-
2220
#ifdef CONFIG_MIPS_MT
2321
extern void mips_mt_set_cpuoptions(void);
2422
#else

‎arch/mips/include/uapi/asm/sigcontext.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ struct sigcontext {
5656

5757
#if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32
5858

59-
#include <linux/posix_types.h>
6059
/*
6160
* Keep this struct definition in sync with the sigcontext fragment
6261
* in arch/mips/kernel/asm-offsets.c

‎arch/mips/jazz/setup.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#include <asm/reboot.h>
2424
#include <asm/tlbmisc.h>
2525

26-
extern asmlinkage void jazz_handle_int(void);
27-
2826
extern void jazz_machine_restart(char *command);
2927

3028
static struct resource jazz_io_resources[] = {

‎arch/mips/kernel/mips-mt.c‎

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -43,83 +43,6 @@ static int __init maxtcs(char *str)
4343

4444
__setup("maxtcs=", maxtcs);
4545

46-
/*
47-
* Dump new MIPS MT state for the core. Does not leave TCs halted.
48-
* Takes an argument which taken to be a pre-call MVPControl value.
49-
*/
50-
51-
void mips_mt_regdump(unsigned long mvpctl)
52-
{
53-
unsigned long flags;
54-
unsigned long vpflags;
55-
unsigned long mvpconf0;
56-
int nvpe;
57-
int ntc;
58-
int i;
59-
int tc;
60-
unsigned long haltval;
61-
unsigned long tcstatval;
62-
63-
local_irq_save(flags);
64-
vpflags = dvpe();
65-
printk("=== MIPS MT State Dump ===\n");
66-
printk("-- Global State --\n");
67-
printk(" MVPControl Passed: %08lx\n", mvpctl);
68-
printk(" MVPControl Read: %08lx\n", vpflags);
69-
printk(" MVPConf0 : %08lx\n", (mvpconf0 = read_c0_mvpconf0()));
70-
nvpe = ((mvpconf0 & MVPCONF0_PVPE) >> MVPCONF0_PVPE_SHIFT) + 1;
71-
ntc = ((mvpconf0 & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1;
72-
printk("-- per-VPE State --\n");
73-
for (i = 0; i < nvpe; i++) {
74-
for (tc = 0; tc < ntc; tc++) {
75-
settc(tc);
76-
if ((read_tc_c0_tcbind() & TCBIND_CURVPE) == i) {
77-
printk(" VPE %d\n", i);
78-
printk(" VPEControl : %08lx\n",
79-
read_vpe_c0_vpecontrol());
80-
printk(" VPEConf0 : %08lx\n",
81-
read_vpe_c0_vpeconf0());
82-
printk(" VPE%d.Status : %08lx\n",
83-
i, read_vpe_c0_status());
84-
printk(" VPE%d.EPC : %08lx %pS\n",
85-
i, read_vpe_c0_epc(),
86-
(void *) read_vpe_c0_epc());
87-
printk(" VPE%d.Cause : %08lx\n",
88-
i, read_vpe_c0_cause());
89-
printk(" VPE%d.Config7 : %08lx\n",
90-
i, read_vpe_c0_config7());
91-
break; /* Next VPE */
92-
}
93-
}
94-
}
95-
printk("-- per-TC State --\n");
96-
for (tc = 0; tc < ntc; tc++) {
97-
settc(tc);
98-
if (read_tc_c0_tcbind() == read_c0_tcbind()) {
99-
/* Are we dumping ourself? */
100-
haltval = 0; /* Then we're not halted, and mustn't be */
101-
tcstatval = flags; /* And pre-dump TCStatus is flags */
102-
printk(" TC %d (current TC with VPE EPC above)\n", tc);
103-
} else {
104-
haltval = read_tc_c0_tchalt();
105-
write_tc_c0_tchalt(1);
106-
tcstatval = read_tc_c0_tcstatus();
107-
printk(" TC %d\n", tc);
108-
}
109-
printk(" TCStatus : %08lx\n", tcstatval);
110-
printk(" TCBind : %08lx\n", read_tc_c0_tcbind());
111-
printk(" TCRestart : %08lx %pS\n",
112-
read_tc_c0_tcrestart(), (void *) read_tc_c0_tcrestart());
113-
printk(" TCHalt : %08lx\n", haltval);
114-
printk(" TCContext : %08lx\n", read_tc_c0_tccontext());
115-
if (!haltval)
116-
write_tc_c0_tchalt(0);
117-
}
118-
printk("===========================\n");
119-
evpe(vpflags);
120-
local_irq_restore(flags);
121-
}
122-
12346
static int mt_opt_rpsctl = -1;
12447
static int mt_opt_nblsu = -1;
12548
static int mt_opt_forceconfig7;

‎arch/mips/ralink/irq-gic.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/of.h>
1111
#include <linux/irqchip.h>
1212
#include <asm/mips-cps.h>
13+
#include <asm/time.h>
1314

1415
int get_c0_perfcount_int(void)
1516
{

0 commit comments

Comments
 (0)