openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

MIPS: Loongson: clean up the coding style 

With the help of script/checkpatch.pl, i have cleaned up the coding
style.

1. remove un-needed header files and tune some comments.
2. remove some un-needed { }

add a new header file loongson.h:

3. move some common header files to loongson.h
4. move some common extern declartions to loongson.h

and this new header file is needed for future loongson2f support.

Signed-off-by: Wu Zhangjin <wuzj@lemote.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Wu Zhangjin 2009-07-02 23:23:03 +08:00 committed by Ralf Baechle
parent bd92aa013e
commit 5e983ff654
14 changed files with 62 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/mips/include/asm/mach-lemote/loongson.h Normal file
View File

@ -0,0 +1,36 @@
/*
* Copyright (C) 2009 Lemote, Inc. & Institute of Computing Technology
* Author: Wu Zhangjin <wuzj@lemote.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
*/
#ifndef __ASM_MACH_LOONGSON_LOONGSON_H
#define __ASM_MACH_LOONGSON_LOONGSON_H
#include <linux/io.h>
#include <linux/init.h>
/* there is an internal bonito64-compatiable northbridge in loongson2e/2f */
#include <asm/mips-boards/bonito64.h>
/* loongson internal northbridge initialization */
extern void bonito_irq_init(void);
/* loongson-based machines specific reboot setup */
extern void mips_reboot_setup(void);
/* environment arguments from bootloader */
extern unsigned long bus_clock, cpu_clock_freq;
extern unsigned long memsize, highmemsize;
/* loongson-specific command line, env and memory initialization */
extern void __init prom_init_memory(void);
extern void __init prom_init_cmdline(void);
extern void __init prom_init_env(void);
#endif /* __ASM_MACH_LOONGSON_LOONGSON_H */

8
arch/mips/include/asm/mach-lemote/pci.h
View File

@ -19,11 +19,13 @@
* 02139, USA. * 02139, USA.
*/ */
#ifndef _LEMOTE_PCI_H_ #ifndef __ASM_MACH_LEMOTE_PCI_H_
#define _LEMOTE_PCI_H_ #define __ASM_MACH_LEMOTE_PCI_H_
extern struct pci_ops bonito64_pci_ops;
#define LOONGSON2E_PCI_MEM_START 0x14000000UL #define LOONGSON2E_PCI_MEM_START 0x14000000UL
#define LOONGSON2E_PCI_MEM_END 0x1fffffffUL #define LOONGSON2E_PCI_MEM_END 0x1fffffffUL
#define LOONGSON2E_PCI_IO_START 0x00004000UL #define LOONGSON2E_PCI_IO_START 0x00004000UL
#endif /* !_LEMOTE_PCI_H_ */ #endif /* !__ASM_MACH_LEMOTE_PCI_H_ */

27
arch/mips/lemote/lm2e/bonito-irq.c
View File

@ -10,32 +10,10 @@
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/ */
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/io.h>
#include <linux/types.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/mips-boards/bonito64.h>
#include <loongson.h>
static inline void bonito_irq_enable(unsigned int irq) static inline void bonito_irq_enable(unsigned int irq)
{ {
@ -66,9 +44,8 @@ void bonito_irq_init(void)
{ {
u32 i; u32 i;
for (i = BONITO_IRQ_BASE; i < BONITO_IRQ_BASE + 32; i++) { for (i = BONITO_IRQ_BASE; i < BONITO_IRQ_BASE + 32; i++)
set_irq_chip_and_handler(i, &bonito_irq_type, handle_level_irq); set_irq_chip_and_handler(i, &bonito_irq_type, handle_level_irq);
}
setup_irq(BONITO_IRQ_BASE + 10, &dma_timeout_irqaction); setup_irq(BONITO_IRQ_BASE + 10, &dma_timeout_irqaction);
} }

5
arch/mips/lemote/lm2e/cmdline.c
View File

@ -17,11 +17,10 @@
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*/ */
#include <linux/io.h>
#include <linux/init.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <loongson.h>
int prom_argc; int prom_argc;
/* pmon passes arguments in 32bit pointers */ /* pmon passes arguments in 32bit pointers */
int *_prom_argv; int *_prom_argv;

4
arch/mips/lemote/lm2e/early_printk.c
View File

@ -9,11 +9,9 @@
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*/ */
#include <linux/io.h>
#include <linux/init.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#include <asm/mips-boards/bonito64.h> #include <loongson.h>
#define UART_BASE (BONITO_PCIIO_BASE + 0x3f8) #define UART_BASE (BONITO_PCIIO_BASE + 0x3f8)

6
arch/mips/lemote/lm2e/env.c
View File

@ -17,12 +17,10 @@
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*/ */
#include <linux/io.h>
#include <linux/init.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <loongson.h>
unsigned long bus_clock, cpu_clock_freq; unsigned long bus_clock, cpu_clock_freq;
unsigned long memsize, highmemsize; unsigned long memsize, highmemsize;

6
arch/mips/lemote/lm2e/init.c
View File

@ -8,15 +8,11 @@
* option) any later version. * option) any later version.
*/ */
#include <linux/init.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/mips-boards/bonito64.h>
extern void __init prom_init_cmdline(void); #include <loongson.h>
extern void __init prom_init_env(void);
extern void __init prom_init_memory(void);
void __init prom_init(void) void __init prom_init(void)
{ {

48
arch/mips/lemote/lm2e/irq.c
View File

@ -6,35 +6,14 @@
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/ */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h>
#include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/irq_cpu.h> #include <asm/irq_cpu.h>
#include <asm/i8259.h> #include <asm/i8259.h>
#include <asm/mipsregs.h>
#include <asm/mips-boards/bonito64.h>
#include <loongson.h>
/* /*
* the first level int-handler will jump here if it is a bonito irq * the first level int-handler will jump here if it is a bonito irq
*/ */
@ -67,27 +46,24 @@ static void i8259_irqdispatch(void)
int irq; int irq;
irq = i8259_irq(); irq = i8259_irq();
if (irq >= 0) { if (irq >= 0)
do_IRQ(irq); do_IRQ(irq);
} else { else
spurious_interrupt(); spurious_interrupt();
}
} }
asmlinkage void plat_irq_dispatch(void) asmlinkage void plat_irq_dispatch(void)
{ {
unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM; unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
if (pending & CAUSEF_IP7) { if (pending & CAUSEF_IP7)
do_IRQ(MIPS_CPU_IRQ_BASE + 7); do_IRQ(MIPS_CPU_IRQ_BASE + 7);
} else if (pending & CAUSEF_IP5) { else if (pending & CAUSEF_IP5)
i8259_irqdispatch(); i8259_irqdispatch();
} else if (pending & CAUSEF_IP2) { else if (pending & CAUSEF_IP2)
bonito_irqdispatch(); bonito_irqdispatch();
} else { else
spurious_interrupt(); spurious_interrupt();
}
} }
static struct irqaction cascade_irqaction = { static struct irqaction cascade_irqaction = {
@ -97,8 +73,6 @@ static struct irqaction cascade_irqaction = {
void __init arch_init_irq(void) void __init arch_init_irq(void)
{ {
extern void bonito_irq_init(void);
/* /*
* Clear all of the interrupts while we change the able around a bit. * Clear all of the interrupts while we change the able around a bit.
* int-handler is not on bootstrap * int-handler is not on bootstrap
@ -128,16 +102,8 @@ void __init arch_init_irq(void)
init_i8259_irqs(); init_i8259_irqs();
bonito_irq_init(); bonito_irq_init();
/*
printk("GPIODATA=%x, GPIOIE=%x\n", BONITO_GPIODATA, BONITO_GPIOIE);
printk("INTEN=%x, INTSET=%x, INTCLR=%x, INTISR=%x\n",
BONITO_INTEN, BONITO_INTENSET,
BONITO_INTENCLR, BONITO_INTISR);
*/
/* bonito irq at IP2 */ /* bonito irq at IP2 */
setup_irq(MIPS_CPU_IRQ_BASE + 2, &cascade_irqaction); setup_irq(MIPS_CPU_IRQ_BASE + 2, &cascade_irqaction);
/* 8259 irq at IP5 */ /* 8259 irq at IP5 */
setup_irq(MIPS_CPU_IRQ_BASE + 5, &cascade_irqaction); setup_irq(MIPS_CPU_IRQ_BASE + 5, &cascade_irqaction);
} }

2
arch/mips/lemote/lm2e/mem.c
View File

@ -10,7 +10,7 @@
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
extern unsigned long memsize, highmemsize; #include <loongson.h>
void __init prom_init_memory(void) void __init prom_init_memory(void)
{ {

26
arch/mips/lemote/lm2e/pci.c
View File

@ -1,6 +1,4 @@
/* /*
* pci.c
*
* Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology * Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.com * Author: Fuxin Zhang, zhangfx@lemote.com
* *
@ -8,31 +6,11 @@
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/ */
#include <linux/types.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <asm/mips-boards/bonito64.h>
#include <asm/mach-lemote/pci.h>
extern struct pci_ops bonito64_pci_ops; #include <pci.h>
#include <loongson.h>
static struct resource loongson2e_pci_mem_resource = { static struct resource loongson2e_pci_mem_resource = {
.name = "LOONGSON2E PCI MEM", .name = "LOONGSON2E PCI MEM",

43
arch/mips/lemote/lm2e/reset.c
View File

@ -1,43 +0,0 @@
/*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.com
* Copyright (C) 2009 Lemote, Inc. & Institute of Computing Technology
* Author: Zhangjin Wu, wuzj@lemote.com
*/
#include <linux/init.h>
#include <linux/pm.h>
#include <linux/io.h>
#include <asm/reboot.h>
#include <asm/mips-boards/bonito64.h>
static void loongson2e_restart(char *command)
{
/* do preparation for reboot */
BONITO_BONGENCFG &= ~(1 << 2);
BONITO_BONGENCFG |= (1 << 2);
/* reboot via jumping to boot base address */
((void (*)(void))ioremap_nocache(BONITO_BOOT_BASE, 4)) ();
}
static void loongson2e_halt(void)
{
while (1) ;
}
static int __init mips_reboot_setup(void)
{
_machine_restart = loongson2e_restart;
_machine_halt = loongson2e_halt;
pm_power_off = loongson2e_halt;
return 0;
}
arch_initcall(mips_reboot_setup);

22
arch/mips/lemote/lm2e/setup.c
View File

@ -1,7 +1,4 @@
/* /*
* BRIEF MODULE DESCRIPTION
* setup.c - board dependent boot routines
*
* Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology * Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology
* Author: Fuxin Zhang, zhangfx@lemote.com * Author: Fuxin Zhang, zhangfx@lemote.com
* *
@ -9,28 +6,13 @@
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/ */
#include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/wbflush.h> #include <asm/wbflush.h>
#include <loongson.h>
#ifdef CONFIG_VT #ifdef CONFIG_VT
#include <linux/console.h> #include <linux/console.h>
#include <linux/screen_info.h> #include <linux/screen_info.h>

5
arch/mips/lemote/lm2e/time.c
View File

@ -10,13 +10,10 @@
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*/ */
#include <linux/init.h>
#include <asm/mc146818-time.h> #include <asm/mc146818-time.h>
#include <asm/time.h> #include <asm/time.h>
extern unsigned long cpu_clock_freq; #include <loongson.h>
void __init plat_time_init(void) void __init plat_time_init(void)
{ {

18
arch/mips/pci/fixup-lm2e.c
View File

@ -1,6 +1,4 @@
/* /*
* fixup-lm2e.c
*
* Copyright (C) 2004 ICT CAS * Copyright (C) 2004 ICT CAS
* Author: Li xiaoyu, ICT CAS * Author: Li xiaoyu, ICT CAS
* lixy@ict.ac.cn * lixy@ict.ac.cn
@ -12,22 +10,6 @@
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your * Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. * option) any later version.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/pci.h> #include <linux/pci.h>