Commit 30ad29bb authored by Huacai Chen's avatar Huacai Chen Committed by Ralf Baechle

MIPS: Loongson: Naming style cleanup and rework

Currently, code of Loongson-2/3 is under loongson directory and code of
Loongson-1 is under loongson1 directory. Besides, there are Kconfig
options such as MACH_LOONGSON and MACH_LOONGSON1. This naming style is
very ugly and confusing. Since Loongson-2/3 are both 64-bit general-
purpose CPU while Loongson-1 is 32-bit SoC, we rename both file names
and Kconfig symbols from loongson/loongson1 to loongson64/loongson32.

[ralf@linux-mips.org: Resolve a number of simple conflicts.]
Signed-off-by: default avatarHuacai Chen <chenhc@lemote.com>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: Kelvin Cheung <keguang.zhang@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/9790/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent abcc82b1
...@@ -15,8 +15,8 @@ platforms += jazz ...@@ -15,8 +15,8 @@ platforms += jazz
platforms += jz4740 platforms += jz4740
platforms += lantiq platforms += lantiq
platforms += lasat platforms += lasat
platforms += loongson platforms += loongson32
platforms += loongson1 platforms += loongson64
platforms += mti-malta platforms += mti-malta
platforms += mti-sead3 platforms += mti-sead3
platforms += netlogic platforms += netlogic
......
...@@ -26,7 +26,7 @@ config MIPS ...@@ -26,7 +26,7 @@ config MIPS
select HAVE_SYSCALL_TRACEPOINTS select HAVE_SYSCALL_TRACEPOINTS
select ARCH_HAS_ELF_RANDOMIZE select ARCH_HAS_ELF_RANDOMIZE
select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
select RTC_LIB if !MACH_LOONGSON select RTC_LIB if !MACH_LOONGSON64
select GENERIC_ATOMIC64 if !64BIT select GENERIC_ATOMIC64 if !64BIT
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
select HAVE_DMA_ATTRS select HAVE_DMA_ATTRS
...@@ -346,26 +346,28 @@ config LASAT ...@@ -346,26 +346,28 @@ config LASAT
select SYS_SUPPORTS_64BIT_KERNEL if BROKEN select SYS_SUPPORTS_64BIT_KERNEL if BROKEN
select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN
config MACH_LOONGSON config MACH_LOONGSON32
bool "Loongson family of machines" bool "Loongson-1 family of machines"
select SYS_SUPPORTS_ZBOOT select SYS_SUPPORTS_ZBOOT
help help
This enables the support of Loongson family of machines. This enables support for the Loongson-1 family of machines.
Loongson is a family of general-purpose MIPS-compatible CPUs. Loongson-1 is a family of 32-bit MIPS-compatible SoCs developed by
developed at Institute of Computing Technology (ICT), the Institute of Computing Technology (ICT), Chinese Academy of
Chinese Academy of Sciences (CAS) in the People's Republic Sciences (CAS).
of China. The chief architect is Professor Weiwu Hu.
config MACH_LOONGSON1 config MACH_LOONGSON64
bool "Loongson 1 family of machines" bool "Loongson-2/3 family of machines"
select SYS_SUPPORTS_ZBOOT select SYS_SUPPORTS_ZBOOT
help help
This enables support for the Loongson 1 based machines. This enables the support of Loongson-2/3 family of machines.
Loongson 1 is a family of 32-bit MIPS-compatible SoCs developed by Loongson-2 is a family of single-core CPUs and Loongson-3 is a
the ICT (Institute of Computing Technology) and the Chinese Academy family of multi-core CPUs. They are both 64-bit general-purpose
of Sciences. MIPS-compatible CPUs. Loongson-2/3 are developed by the Institute
of Computing Technology (ICT), Chinese Academy of Sciences (CAS)
in the People's Republic of China. The chief architect is Professor
Weiwu Hu.
config MACH_PISTACHIO config MACH_PISTACHIO
bool "IMG Pistachio SoC based boards" bool "IMG Pistachio SoC based boards"
...@@ -948,8 +950,8 @@ source "arch/mips/sibyte/Kconfig" ...@@ -948,8 +950,8 @@ source "arch/mips/sibyte/Kconfig"
source "arch/mips/txx9/Kconfig" source "arch/mips/txx9/Kconfig"
source "arch/mips/vr41xx/Kconfig" source "arch/mips/vr41xx/Kconfig"
source "arch/mips/cavium-octeon/Kconfig" source "arch/mips/cavium-octeon/Kconfig"
source "arch/mips/loongson/Kconfig" source "arch/mips/loongson32/Kconfig"
source "arch/mips/loongson1/Kconfig" source "arch/mips/loongson64/Kconfig"
source "arch/mips/netlogic/Kconfig" source "arch/mips/netlogic/Kconfig"
source "arch/mips/paravirt/Kconfig" source "arch/mips/paravirt/Kconfig"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <asm/addrspace.h> #include <asm/addrspace.h>
#if defined(CONFIG_MACH_LOONGSON) || defined(CONFIG_MIPS_MALTA) #if defined(CONFIG_MACH_LOONGSON64) || defined(CONFIG_MIPS_MALTA)
#define UART_BASE 0x1fd003f8 #define UART_BASE 0x1fd003f8
#define PORT(offset) (CKSEG1ADDR(UART_BASE) + (offset)) #define PORT(offset) (CKSEG1ADDR(UART_BASE) + (offset))
#endif #endif
......
CONFIG_MACH_LOONGSON=y CONFIG_MACH_LOONGSON64=y
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_NO_HZ=y CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y CONFIG_HIGH_RES_TIMERS=y
......
CONFIG_MACH_LOONGSON=y CONFIG_MACH_LOONGSON64=y
CONFIG_LEMOTE_MACH2F=y CONFIG_LEMOTE_MACH2F=y
CONFIG_CS5536_MFGPT=y CONFIG_CS5536_MFGPT=y
CONFIG_64BIT=y CONFIG_64BIT=y
......
CONFIG_MACH_LOONGSON=y CONFIG_MACH_LOONGSON64=y
CONFIG_SWIOTLB=y CONFIG_SWIOTLB=y
CONFIG_LOONGSON_MACH3X=y CONFIG_LOONGSON_MACH3X=y
CONFIG_CPU_LOONGSON3=y CONFIG_CPU_LOONGSON3=y
......
CONFIG_MACH_LOONGSON1=y CONFIG_MACH_LOONGSON32=y
CONFIG_PREEMPT=y CONFIG_PREEMPT=y
# CONFIG_SECCOMP is not set # CONFIG_SECCOMP is not set
CONFIG_EXPERIMENTAL=y CONFIG_EXPERIMENTAL=y
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
*/ */
#ifndef __ASM_MACH_LOONGSON1_CPUFREQ_H #ifndef __ASM_MACH_LOONGSON32_CPUFREQ_H
#define __ASM_MACH_LOONGSON1_CPUFREQ_H #define __ASM_MACH_LOONGSON32_CPUFREQ_H
struct plat_ls1x_cpufreq { struct plat_ls1x_cpufreq {
const char *clk_name; /* CPU clk */ const char *clk_name; /* CPU clk */
...@@ -20,4 +20,4 @@ struct plat_ls1x_cpufreq { ...@@ -20,4 +20,4 @@ struct plat_ls1x_cpufreq {
unsigned int min_freq; /* in kHz */ unsigned int min_freq; /* in kHz */
}; };
#endif /* __ASM_MACH_LOONGSON1_CPUFREQ_H */ #endif /* __ASM_MACH_LOONGSON32_CPUFREQ_H */
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
*/ */
#ifndef __ASM_MACH_LOONGSON1_IRQ_H #ifndef __ASM_MACH_LOONGSON32_IRQ_H
#define __ASM_MACH_LOONGSON1_IRQ_H #define __ASM_MACH_LOONGSON32_IRQ_H
/* /*
* CPU core Interrupt Numbers * CPU core Interrupt Numbers
...@@ -70,4 +70,4 @@ ...@@ -70,4 +70,4 @@
#define NR_IRQS (MIPS_CPU_IRQS + LS1X_IRQS) #define NR_IRQS (MIPS_CPU_IRQS + LS1X_IRQS)
#endif /* __ASM_MACH_LOONGSON1_IRQ_H */ #endif /* __ASM_MACH_LOONGSON32_IRQ_H */
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
*/ */
#ifndef __ASM_MACH_LOONGSON1_LOONGSON1_H #ifndef __ASM_MACH_LOONGSON32_LOONGSON1_H
#define __ASM_MACH_LOONGSON1_LOONGSON1_H #define __ASM_MACH_LOONGSON32_LOONGSON1_H
#define DEFAULT_MEMSIZE 256 /* If no memsize provided */ #define DEFAULT_MEMSIZE 256 /* If no memsize provided */
...@@ -47,4 +47,4 @@ ...@@ -47,4 +47,4 @@
#include <regs-pwm.h> #include <regs-pwm.h>
#include <regs-wdt.h> #include <regs-wdt.h>
#endif /* __ASM_MACH_LOONGSON1_LOONGSON1_H */ #endif /* __ASM_MACH_LOONGSON32_LOONGSON1_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
*/ */
#ifndef __ASM_MACH_LOONGSON1_PLATFORM_H #ifndef __ASM_MACH_LOONGSON32_PLATFORM_H
#define __ASM_MACH_LOONGSON1_PLATFORM_H #define __ASM_MACH_LOONGSON32_PLATFORM_H
#include <linux/platform_device.h> #include <linux/platform_device.h>
...@@ -23,4 +23,4 @@ extern struct platform_device ls1x_rtc_pdev; ...@@ -23,4 +23,4 @@ extern struct platform_device ls1x_rtc_pdev;
extern void __init ls1x_clk_init(void); extern void __init ls1x_clk_init(void);
extern void __init ls1x_serial_setup(struct platform_device *pdev); extern void __init ls1x_serial_setup(struct platform_device *pdev);
#endif /* __ASM_MACH_LOONGSON1_PLATFORM_H */ #endif /* __ASM_MACH_LOONGSON32_PLATFORM_H */
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* option) any later version. * option) any later version.
*/ */
#ifndef __ASM_MACH_LOONGSON1_PROM_H #ifndef __ASM_MACH_LOONGSON32_PROM_H
#define __ASM_MACH_LOONGSON1_PROM_H #define __ASM_MACH_LOONGSON32_PROM_H
#include <linux/io.h> #include <linux/io.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -21,4 +21,4 @@ extern unsigned long memsize, highmemsize; ...@@ -21,4 +21,4 @@ extern unsigned long memsize, highmemsize;
extern char *prom_getenv(char *name); extern char *prom_getenv(char *name);
extern void __init prom_init_cmdline(void); extern void __init prom_init_cmdline(void);
#endif /* __ASM_MACH_LOONGSON1_PROM_H */ #endif /* __ASM_MACH_LOONGSON32_PROM_H */
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
* option) any later version. * option) any later version.
*/ */
#ifndef __ASM_MACH_LOONGSON1_REGS_CLK_H #ifndef __ASM_MACH_LOONGSON32_REGS_CLK_H
#define __ASM_MACH_LOONGSON1_REGS_CLK_H #define __ASM_MACH_LOONGSON32_REGS_CLK_H
#define LS1X_CLK_REG(x) \ #define LS1X_CLK_REG(x) \
((void __iomem *)KSEG1ADDR(LS1X_CLK_BASE + (x))) ((void __iomem *)KSEG1ADDR(LS1X_CLK_BASE + (x)))
...@@ -48,4 +48,4 @@ ...@@ -48,4 +48,4 @@
#define BYPASS_DDR_WIDTH 1 #define BYPASS_DDR_WIDTH 1
#define BYPASS_CPU_WIDTH 1 #define BYPASS_CPU_WIDTH 1
#endif /* __ASM_MACH_LOONGSON1_REGS_CLK_H */ #endif /* __ASM_MACH_LOONGSON32_REGS_CLK_H */
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
* option) any later version. * option) any later version.
*/ */
#ifndef __ASM_MACH_LOONGSON1_REGS_MUX_H #ifndef __ASM_MACH_LOONGSON32_REGS_MUX_H
#define __ASM_MACH_LOONGSON1_REGS_MUX_H #define __ASM_MACH_LOONGSON32_REGS_MUX_H
#define LS1X_MUX_REG(x) \ #define LS1X_MUX_REG(x) \
((void __iomem *)KSEG1ADDR(LS1X_MUX_BASE + (x))) ((void __iomem *)KSEG1ADDR(LS1X_MUX_BASE + (x)))
...@@ -64,4 +64,4 @@ ...@@ -64,4 +64,4 @@
#define GMAC1_USE_PWM23 (0x1 << 1) #define GMAC1_USE_PWM23 (0x1 << 1)
#define GMAC0_USE_PWM01 0x1 #define GMAC0_USE_PWM01 0x1
#endif /* __ASM_MACH_LOONGSON1_REGS_MUX_H */ #endif /* __ASM_MACH_LOONGSON32_REGS_MUX_H */
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
* option) any later version. * option) any later version.
*/ */
#ifndef __ASM_MACH_LOONGSON1_REGS_PWM_H #ifndef __ASM_MACH_LOONGSON32_REGS_PWM_H
#define __ASM_MACH_LOONGSON1_REGS_PWM_H #define __ASM_MACH_LOONGSON32_REGS_PWM_H
/* Loongson 1 PWM Timer Register Definitions */ /* Loongson 1 PWM Timer Register Definitions */
#define PWM_CNT 0x0 #define PWM_CNT 0x0
...@@ -26,4 +26,4 @@ ...@@ -26,4 +26,4 @@
#define PWM_OE (0x1 << 3) #define PWM_OE (0x1 << 3)
#define CNT_EN 0x1 #define CNT_EN 0x1
#endif /* __ASM_MACH_LOONGSON1_REGS_PWM_H */ #endif /* __ASM_MACH_LOONGSON32_REGS_PWM_H */
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
* option) any later version. * option) any later version.
*/ */
#ifndef __ASM_MACH_LOONGSON1_REGS_WDT_H #ifndef __ASM_MACH_LOONGSON32_REGS_WDT_H
#define __ASM_MACH_LOONGSON1_REGS_WDT_H #define __ASM_MACH_LOONGSON32_REGS_WDT_H
#define WDT_EN 0x0 #define WDT_EN 0x0
#define WDT_TIMER 0x4 #define WDT_TIMER 0x4
#define WDT_SET 0x8 #define WDT_SET 0x8
#endif /* __ASM_MACH_LOONGSON1_REGS_WDT_H */ #endif /* __ASM_MACH_LOONGSON32_REGS_WDT_H */
#ifndef __ASM_MACH_LOONGSON_BOOT_PARAM_H_ #ifndef __ASM_MACH_LOONGSON64_BOOT_PARAM_H_
#define __ASM_MACH_LOONGSON_BOOT_PARAM_H_ #define __ASM_MACH_LOONGSON64_BOOT_PARAM_H_
#define SYSTEM_RAM_LOW 1 #define SYSTEM_RAM_LOW 1
#define SYSTEM_RAM_HIGH 2 #define SYSTEM_RAM_HIGH 2
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
* loongson2f user manual. * loongson2f user manual.
*/ */
#ifndef __ASM_MACH_LOONGSON_CPU_FEATURE_OVERRIDES_H #ifndef __ASM_MACH_LOONGSON64_CPU_FEATURE_OVERRIDES_H
#define __ASM_MACH_LOONGSON_CPU_FEATURE_OVERRIDES_H #define __ASM_MACH_LOONGSON64_CPU_FEATURE_OVERRIDES_H
#define cpu_dcache_line_size() 32 #define cpu_dcache_line_size() 32
#define cpu_icache_line_size() 32 #define cpu_icache_line_size() 32
...@@ -58,4 +58,4 @@ ...@@ -58,4 +58,4 @@
#define cpu_has_wsbh IS_ENABLED(CONFIG_CPU_LOONGSON3) #define cpu_has_wsbh IS_ENABLED(CONFIG_CPU_LOONGSON3)
#endif /* __ASM_MACH_LOONGSON_CPU_FEATURE_OVERRIDES_H */ #endif /* __ASM_MACH_LOONGSON64_CPU_FEATURE_OVERRIDES_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* Author: Fuxin Zhang, zhangfx@lemote.com * Author: Fuxin Zhang, zhangfx@lemote.com
* *
*/ */
#ifndef __ASM_MACH_LOONGSON_DMA_COHERENCE_H #ifndef __ASM_MACH_LOONGSON64_DMA_COHERENCE_H
#define __ASM_MACH_LOONGSON_DMA_COHERENCE_H #define __ASM_MACH_LOONGSON64_DMA_COHERENCE_H
#ifdef CONFIG_SWIOTLB #ifdef CONFIG_SWIOTLB
#include <linux/swiotlb.h> #include <linux/swiotlb.h>
...@@ -82,4 +82,4 @@ static inline void plat_post_dma_flush(struct device *dev) ...@@ -82,4 +82,4 @@ static inline void plat_post_dma_flush(struct device *dev)
{ {
} }
#endif /* __ASM_MACH_LOONGSON_DMA_COHERENCE_H */ #endif /* __ASM_MACH_LOONGSON64_DMA_COHERENCE_H */
#ifndef __ASM_MACH_LOONGSON_IRQ_H_ #ifndef __ASM_MACH_LOONGSON64_IRQ_H_
#define __ASM_MACH_LOONGSON_IRQ_H_ #define __ASM_MACH_LOONGSON64_IRQ_H_
#include <boot_param.h> #include <boot_param.h>
...@@ -40,4 +40,4 @@ extern void fixup_irqs(void); ...@@ -40,4 +40,4 @@ extern void fixup_irqs(void);
extern void loongson3_ipi_interrupt(struct pt_regs *regs); extern void loongson3_ipi_interrupt(struct pt_regs *regs);
#include_next <irq.h> #include_next <irq.h>
#endif /* __ASM_MACH_LOONGSON_IRQ_H_ */ #endif /* __ASM_MACH_LOONGSON64_IRQ_H_ */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* Copyright (C) 2009 Jiajie Chen (chenjiajie@cse.buaa.edu.cn) * Copyright (C) 2009 Jiajie Chen (chenjiajie@cse.buaa.edu.cn)
* Copyright (C) 2012 Huacai Chen (chenhc@lemote.com) * Copyright (C) 2012 Huacai Chen (chenhc@lemote.com)
*/ */
#ifndef __ASM_MACH_LOONGSON_KERNEL_ENTRY_H #ifndef __ASM_MACH_LOONGSON64_KERNEL_ENTRY_H
#define __ASM_MACH_LOONGSON_KERNEL_ENTRY_H #define __ASM_MACH_LOONGSON64_KERNEL_ENTRY_H
/* /*
* Override macros used in arch/mips/kernel/head.S. * Override macros used in arch/mips/kernel/head.S.
...@@ -49,4 +49,4 @@ ...@@ -49,4 +49,4 @@
#endif #endif
.endm .endm
#endif /* __ASM_MACH_LOONGSON_KERNEL_ENTRY_H */ #endif /* __ASM_MACH_LOONGSON64_KERNEL_ENTRY_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* option) any later version. * option) any later version.
*/ */
#ifndef __ASM_MACH_LOONGSON_LOONGSON_H #ifndef __ASM_MACH_LOONGSON64_LOONGSON_H
#define __ASM_MACH_LOONGSON_LOONGSON_H #define __ASM_MACH_LOONGSON64_LOONGSON_H
#include <linux/io.h> #include <linux/io.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -357,4 +357,4 @@ extern unsigned long _loongson_addrwincfg_base; ...@@ -357,4 +357,4 @@ extern unsigned long _loongson_addrwincfg_base;
#endif /* ! CONFIG_CPU_SUPPORTS_ADDRWINCFG */ #endif /* ! CONFIG_CPU_SUPPORTS_ADDRWINCFG */
#endif /* __ASM_MACH_LOONGSON_LOONGSON_H */ #endif /* __ASM_MACH_LOONGSON64_LOONGSON_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* option) any later version. * option) any later version.
*/ */
#ifndef __ASM_MACH_LOONGSON_MACHINE_H #ifndef __ASM_MACH_LOONGSON64_MACHINE_H
#define __ASM_MACH_LOONGSON_MACHINE_H #define __ASM_MACH_LOONGSON64_MACHINE_H
#ifdef CONFIG_LEMOTE_FULOONG2E #ifdef CONFIG_LEMOTE_FULOONG2E
...@@ -30,4 +30,4 @@ ...@@ -30,4 +30,4 @@
#endif /* CONFIG_LOONGSON_MACH3X */ #endif /* CONFIG_LOONGSON_MACH3X */
#endif /* __ASM_MACH_LOONGSON_MACHINE_H */ #endif /* __ASM_MACH_LOONGSON64_MACHINE_H */
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* *
* RTC routines for PC style attached Dallas chip. * RTC routines for PC style attached Dallas chip.
*/ */
#ifndef __ASM_MACH_LOONGSON_MC146818RTC_H #ifndef __ASM_MACH_LOONGSON64_MC146818RTC_H
#define __ASM_MACH_LOONGSON_MC146818RTC_H #define __ASM_MACH_LOONGSON64_MC146818RTC_H
#include <linux/io.h> #include <linux/io.h>
...@@ -33,4 +33,4 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr) ...@@ -33,4 +33,4 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1970) #define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1970)
#endif #endif
#endif /* __ASM_MACH_LOONGSON_MC146818RTC_H */ #endif /* __ASM_MACH_LOONGSON64_MC146818RTC_H */
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* option) any later version. * option) any later version.
*/ */
#ifndef __ASM_MACH_LOONGSON_MEM_H #ifndef __ASM_MACH_LOONGSON64_MEM_H
#define __ASM_MACH_LOONGSON_MEM_H #define __ASM_MACH_LOONGSON64_MEM_H
/* /*
* high memory space * high memory space
...@@ -38,4 +38,4 @@ ...@@ -38,4 +38,4 @@
#define LOONGSON_MMIO_MEM_END 0x80000000 #define LOONGSON_MMIO_MEM_END 0x80000000
#endif #endif
#endif /* __ASM_MACH_LOONGSON_MEM_H */ #endif /* __ASM_MACH_LOONGSON64_MEM_H */
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
* option) any later version. * option) any later version.
*/ */
#ifndef __ASM_MACH_LOONGSON_PCI_H_ #ifndef __ASM_MACH_LOONGSON64_PCI_H_
#define __ASM_MACH_LOONGSON_PCI_H_ #define __ASM_MACH_LOONGSON64_PCI_H_
extern struct pci_ops loongson_pci_ops; extern struct pci_ops loongson_pci_ops;
...@@ -52,4 +52,4 @@ extern struct pci_ops loongson_pci_ops; ...@@ -52,4 +52,4 @@ extern struct pci_ops loongson_pci_ops;
#endif /* !CONFIG_CPU_SUPPORTS_ADDRWINCFG */ #endif /* !CONFIG_CPU_SUPPORTS_ADDRWINCFG */
#endif /* !__ASM_MACH_LOONGSON_PCI_H_ */ #endif /* !__ASM_MACH_LOONGSON64_PCI_H_ */
#ifndef __ASM_MACH_LOONGSON_SPACES_H_ #ifndef __ASM_MACH_LOONGSON64_SPACES_H_
#define __ASM_MACH_LOONGSON_SPACES_H_ #define __ASM_MACH_LOONGSON64_SPACES_H_
#if defined(CONFIG_64BIT) #if defined(CONFIG_64BIT)
#define CAC_BASE _AC(0x9800000000000000, UL) #define CAC_BASE _AC(0x9800000000000000, UL)
......
#ifndef __ASM_MACH_LOONGSON_WORKAROUNDS_H_ #ifndef __ASM_MACH_LOONGSON64_WORKAROUNDS_H_
#define __ASM_MACH_LOONGSON_WORKAROUNDS_H_ #define __ASM_MACH_LOONGSON64_WORKAROUNDS_H_
#define WORKAROUND_CPUFREQ 0x00000001 #define WORKAROUND_CPUFREQ 0x00000001
#define WORKAROUND_CPUHOTPLUG 0x00000002 #define WORKAROUND_CPUHOTPLUG 0x00000002
......
if MACH_LOONGSON1 if MACH_LOONGSON32
choice choice
prompt "Machine Type" prompt "Machine Type"
...@@ -58,4 +58,4 @@ config TIMER_USE_PWM3 ...@@ -58,4 +58,4 @@ config TIMER_USE_PWM3
endchoice endchoice
endif # MACH_LOONGSON1 endif # MACH_LOONGSON32
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Common code for all Loongson 1 based systems # Common code for all Loongson 1 based systems
# #
obj-$(CONFIG_MACH_LOONGSON1) += common/ obj-$(CONFIG_MACH_LOONGSON32) += common/
# #
# Loongson LS1B board # Loongson LS1B board
......
...@@ -2,6 +2,6 @@ cflags-$(CONFIG_CPU_LOONGSON1) += \ ...@@ -2,6 +2,6 @@ cflags-$(CONFIG_CPU_LOONGSON1) += \
$(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
-Wa,-mips32r2 -Wa,--trap -Wa,-mips32r2 -Wa,--trap
platform-$(CONFIG_MACH_LOONGSON1) += loongson1/ platform-$(CONFIG_MACH_LOONGSON32) += loongson32/
cflags-$(CONFIG_MACH_LOONGSON1) += -I$(srctree)/arch/mips/include/asm/mach-loongson1 cflags-$(CONFIG_MACH_LOONGSON32) += -I$(srctree)/arch/mips/include/asm/mach-loongson32
load-$(CONFIG_LOONGSON1_LS1B) += 0xffffffff80100000 load-$(CONFIG_LOONGSON1_LS1B) += 0xffffffff80100000
if MACH_LOONGSON if MACH_LOONGSON64
choice choice
prompt "Machine Type" prompt "Machine Type"
...@@ -155,4 +155,4 @@ config LOONGSON_MC146818 ...@@ -155,4 +155,4 @@ config LOONGSON_MC146818
config LEFI_FIRMWARE_INTERFACE config LEFI_FIRMWARE_INTERFACE
bool bool
endif # MACH_LOONGSON endif # MACH_LOONGSON64
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Common code for all Loongson based systems # Common code for all Loongson based systems
# #
obj-$(CONFIG_MACH_LOONGSON) += common/ obj-$(CONFIG_MACH_LOONGSON64) += common/
# #
# Lemote Fuloong mini-PC (Loongson 2E-based) # Lemote Fuloong mini-PC (Loongson 2E-based)
......
...@@ -26,8 +26,8 @@ endif ...@@ -26,8 +26,8 @@ endif
# Loongson Machines' Support # Loongson Machines' Support
# #
platform-$(CONFIG_MACH_LOONGSON) += loongson/ platform-$(CONFIG_MACH_LOONGSON64) += loongson64/
cflags-$(CONFIG_MACH_LOONGSON) += -I$(srctree)/arch/mips/include/asm/mach-loongson -mno-branch-likely cflags-$(CONFIG_MACH_LOONGSON64) += -I$(srctree)/arch/mips/include/asm/mach-loongson64 -mno-branch-likely
load-$(CONFIG_LEMOTE_FULOONG2E) += 0xffffffff80100000 load-$(CONFIG_LEMOTE_FULOONG2E) += 0xffffffff80100000
load-$(CONFIG_LEMOTE_MACH2F) += 0xffffffff80200000 load-$(CONFIG_LEMOTE_MACH2F) += 0xffffffff80200000
load-$(CONFIG_LOONGSON_MACH3X) += 0xffffffff80200000 load-$(CONFIG_LOONGSON_MACH3X) += 0xffffffff80200000
...@@ -24,7 +24,7 @@ obj-$(CONFIG_COMMON_CLK_CDCE706) += clk-cdce706.o ...@@ -24,7 +24,7 @@ obj-$(CONFIG_COMMON_CLK_CDCE706) += clk-cdce706.o
obj-$(CONFIG_ARCH_CLPS711X) += clk-clps711x.o obj-$(CONFIG_ARCH_CLPS711X) += clk-clps711x.o
obj-$(CONFIG_ARCH_EFM32) += clk-efm32gg.o obj-$(CONFIG_ARCH_EFM32) += clk-efm32gg.o
obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o obj-$(CONFIG_ARCH_HIGHBANK) += clk-highbank.o
obj-$(CONFIG_MACH_LOONGSON1) += clk-ls1x.o obj-$(CONFIG_MACH_LOONGSON32) += clk-ls1x.o
obj-$(CONFIG_COMMON_CLK_MAX_GEN) += clk-max-gen.o obj-$(CONFIG_COMMON_CLK_MAX_GEN) += clk-max-gen.o
obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o
obj-$(CONFIG_COMMON_CLK_MAX77802) += clk-max77802.o obj-$(CONFIG_COMMON_CLK_MAX77802) += clk-max77802.o
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/mach-loongson1/cpufreq.h> #include <cpufreq.h>
#include <asm/mach-loongson1/loongson1.h> #include <loongson1.h>
static struct { static struct {
struct device *dev; struct device *dev;
......
...@@ -1484,7 +1484,7 @@ config RTC_DRV_PUV3 ...@@ -1484,7 +1484,7 @@ config RTC_DRV_PUV3
config RTC_DRV_LOONGSON1 config RTC_DRV_LOONGSON1
tristate "loongson1 RTC support" tristate "loongson1 RTC support"
depends on MACH_LOONGSON1 depends on MACH_LOONGSON32
help help
This is a driver for the loongson1 on-chip Counter0 (Time-Of-Year This is a driver for the loongson1 on-chip Counter0 (Time-Of-Year
counter) to be used as a RTC. counter) to be used as a RTC.
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment