MIPS: Loongson: Naming style cleanup and rework
authorHuacai Chen <chenhc@lemote.com>
Tue, 21 Apr 2015 02:00:35 +0000 (10:00 +0800)
committerRalf Baechle <ralf@linux-mips.org>
Sun, 21 Jun 2015 19:53:59 +0000 (21:53 +0200)
commit30ad29bb48881ee11f5daf30c6fc50292ae08c57
treed899b18a17e6269123ff2795f2e6d832523f1fb9
parentabcc82b19fa9b4f41e02f28715005851b580163d
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: Huacai 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: Ralf Baechle <ralf@linux-mips.org>
102 files changed:
arch/mips/Kbuild.platforms
arch/mips/Kconfig
arch/mips/boot/compressed/uart-16550.c
arch/mips/configs/fuloong2e_defconfig
arch/mips/configs/lemote2f_defconfig
arch/mips/configs/loongson3_defconfig
arch/mips/configs/ls1b_defconfig
arch/mips/include/asm/mach-loongson/workarounds.h [deleted file]
arch/mips/include/asm/mach-loongson32/cpufreq.h [moved from arch/mips/include/asm/mach-loongson1/cpufreq.h with 81% similarity]
arch/mips/include/asm/mach-loongson32/irq.h [moved from arch/mips/include/asm/mach-loongson1/irq.h with 95% similarity]
arch/mips/include/asm/mach-loongson32/loongson1.h [moved from arch/mips/include/asm/mach-loongson1/loongson1.h with 91% similarity]
arch/mips/include/asm/mach-loongson32/platform.h [moved from arch/mips/include/asm/mach-loongson1/platform.h with 85% similarity]
arch/mips/include/asm/mach-loongson32/prom.h [moved from arch/mips/include/asm/mach-loongson1/prom.h with 84% similarity]
arch/mips/include/asm/mach-loongson32/regs-clk.h [moved from arch/mips/include/asm/mach-loongson1/regs-clk.h with 90% similarity]
arch/mips/include/asm/mach-loongson32/regs-mux.h [moved from arch/mips/include/asm/mach-loongson1/regs-mux.h with 94% similarity]
arch/mips/include/asm/mach-loongson32/regs-pwm.h [moved from arch/mips/include/asm/mach-loongson1/regs-pwm.h with 84% similarity]
arch/mips/include/asm/mach-loongson32/regs-wdt.h [moved from arch/mips/include/asm/mach-loongson1/regs-wdt.h with 77% similarity]
arch/mips/include/asm/mach-loongson64/boot_param.h [moved from arch/mips/include/asm/mach-loongson/boot_param.h with 98% similarity]
arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h [moved from arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h with 90% similarity]
arch/mips/include/asm/mach-loongson64/cs5536/cs5536.h [moved from arch/mips/include/asm/mach-loongson/cs5536/cs5536.h with 100% similarity]
arch/mips/include/asm/mach-loongson64/cs5536/cs5536_mfgpt.h [moved from arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h with 100% similarity]
arch/mips/include/asm/mach-loongson64/cs5536/cs5536_pci.h [moved from arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h with 100% similarity]
arch/mips/include/asm/mach-loongson64/cs5536/cs5536_vsm.h [moved from arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h with 100% similarity]
arch/mips/include/asm/mach-loongson64/dma-coherence.h [moved from arch/mips/include/asm/mach-loongson/dma-coherence.h with 93% similarity]
arch/mips/include/asm/mach-loongson64/gpio.h [moved from arch/mips/include/asm/mach-loongson/gpio.h with 100% similarity]
arch/mips/include/asm/mach-loongson64/irq.h [moved from arch/mips/include/asm/mach-loongson/irq.h with 92% similarity]
arch/mips/include/asm/mach-loongson64/kernel-entry-init.h [moved from arch/mips/include/asm/mach-loongson/kernel-entry-init.h with 88% similarity]
arch/mips/include/asm/mach-loongson64/loongson.h [moved from arch/mips/include/asm/mach-loongson/loongson.h with 98% similarity]
arch/mips/include/asm/mach-loongson64/loongson_hwmon.h [moved from arch/mips/include/asm/mach-loongson/loongson_hwmon.h with 100% similarity]
arch/mips/include/asm/mach-loongson64/machine.h [moved from arch/mips/include/asm/mach-loongson/machine.h with 84% similarity]
arch/mips/include/asm/mach-loongson64/mc146818rtc.h [moved from arch/mips/include/asm/mach-loongson/mc146818rtc.h with 85% similarity]
arch/mips/include/asm/mach-loongson64/mem.h [moved from arch/mips/include/asm/mach-loongson/mem.h with 89% similarity]
arch/mips/include/asm/mach-loongson64/mmzone.h [moved from arch/mips/include/asm/mach-loongson/mmzone.h with 100% similarity]
arch/mips/include/asm/mach-loongson64/pci.h [moved from arch/mips/include/asm/mach-loongson/pci.h with 93% similarity]
arch/mips/include/asm/mach-loongson64/spaces.h [moved from arch/mips/include/asm/mach-loongson/spaces.h with 65% similarity]
arch/mips/include/asm/mach-loongson64/topology.h [moved from arch/mips/include/asm/mach-loongson/topology.h with 100% similarity]
arch/mips/include/asm/mach-loongson64/workarounds.h [new file with mode: 0644]
arch/mips/loongson32/Kconfig [moved from arch/mips/loongson1/Kconfig with 96% similarity]
arch/mips/loongson32/Makefile [moved from arch/mips/loongson1/Makefile with 74% similarity]
arch/mips/loongson32/Platform [moved from arch/mips/loongson1/Platform with 59% similarity]
arch/mips/loongson32/common/Makefile [moved from arch/mips/loongson1/common/Makefile with 100% similarity]
arch/mips/loongson32/common/irq.c [moved from arch/mips/loongson1/common/irq.c with 100% similarity]
arch/mips/loongson32/common/platform.c [moved from arch/mips/loongson1/common/platform.c with 100% similarity]
arch/mips/loongson32/common/prom.c [moved from arch/mips/loongson1/common/prom.c with 100% similarity]
arch/mips/loongson32/common/reset.c [moved from arch/mips/loongson1/common/reset.c with 100% similarity]
arch/mips/loongson32/common/setup.c [moved from arch/mips/loongson1/common/setup.c with 100% similarity]
arch/mips/loongson32/common/time.c [moved from arch/mips/loongson1/common/time.c with 100% similarity]
arch/mips/loongson32/ls1b/Makefile [moved from arch/mips/loongson1/ls1b/Makefile with 100% similarity]
arch/mips/loongson32/ls1b/board.c [moved from arch/mips/loongson1/ls1b/board.c with 100% similarity]
arch/mips/loongson64/Kconfig [moved from arch/mips/loongson/Kconfig with 98% similarity]
arch/mips/loongson64/Makefile [moved from arch/mips/loongson/Makefile with 88% similarity]
arch/mips/loongson64/Platform [moved from arch/mips/loongson/Platform with 87% similarity]
arch/mips/loongson64/common/Makefile [moved from arch/mips/loongson/common/Makefile with 100% similarity]
arch/mips/loongson64/common/bonito-irq.c [moved from arch/mips/loongson/common/bonito-irq.c with 100% similarity]
arch/mips/loongson64/common/cmdline.c [moved from arch/mips/loongson/common/cmdline.c with 100% similarity]
arch/mips/loongson64/common/cs5536/Makefile [moved from arch/mips/loongson/common/cs5536/Makefile with 100% similarity]
arch/mips/loongson64/common/cs5536/cs5536_acc.c [moved from arch/mips/loongson/common/cs5536/cs5536_acc.c with 100% similarity]
arch/mips/loongson64/common/cs5536/cs5536_ehci.c [moved from arch/mips/loongson/common/cs5536/cs5536_ehci.c with 100% similarity]
arch/mips/loongson64/common/cs5536/cs5536_ide.c [moved from arch/mips/loongson/common/cs5536/cs5536_ide.c with 100% similarity]
arch/mips/loongson64/common/cs5536/cs5536_isa.c [moved from arch/mips/loongson/common/cs5536/cs5536_isa.c with 100% similarity]
arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c [moved from arch/mips/loongson/common/cs5536/cs5536_mfgpt.c with 100% similarity]
arch/mips/loongson64/common/cs5536/cs5536_ohci.c [moved from arch/mips/loongson/common/cs5536/cs5536_ohci.c with 100% similarity]
arch/mips/loongson64/common/cs5536/cs5536_pci.c [moved from arch/mips/loongson/common/cs5536/cs5536_pci.c with 100% similarity]
arch/mips/loongson64/common/dma-swiotlb.c [moved from arch/mips/loongson/common/dma-swiotlb.c with 100% similarity]
arch/mips/loongson64/common/early_printk.c [moved from arch/mips/loongson/common/early_printk.c with 100% similarity]
arch/mips/loongson64/common/env.c [moved from arch/mips/loongson/common/env.c with 100% similarity]
arch/mips/loongson64/common/init.c [moved from arch/mips/loongson/common/init.c with 100% similarity]
arch/mips/loongson64/common/irq.c [moved from arch/mips/loongson/common/irq.c with 100% similarity]
arch/mips/loongson64/common/machtype.c [moved from arch/mips/loongson/common/machtype.c with 100% similarity]
arch/mips/loongson64/common/mem.c [moved from arch/mips/loongson/common/mem.c with 100% similarity]
arch/mips/loongson64/common/pci.c [moved from arch/mips/loongson/common/pci.c with 100% similarity]
arch/mips/loongson64/common/platform.c [moved from arch/mips/loongson/common/platform.c with 100% similarity]
arch/mips/loongson64/common/pm.c [moved from arch/mips/loongson/common/pm.c with 100% similarity]
arch/mips/loongson64/common/reset.c [moved from arch/mips/loongson/common/reset.c with 100% similarity]
arch/mips/loongson64/common/rtc.c [moved from arch/mips/loongson/common/rtc.c with 100% similarity]
arch/mips/loongson64/common/serial.c [moved from arch/mips/loongson/common/serial.c with 100% similarity]
arch/mips/loongson64/common/setup.c [moved from arch/mips/loongson/common/setup.c with 100% similarity]
arch/mips/loongson64/common/time.c [moved from arch/mips/loongson/common/time.c with 100% similarity]
arch/mips/loongson64/common/uart_base.c [moved from arch/mips/loongson/common/uart_base.c with 100% similarity]
arch/mips/loongson64/fuloong-2e/Makefile [moved from arch/mips/loongson/fuloong-2e/Makefile with 100% similarity]
arch/mips/loongson64/fuloong-2e/irq.c [moved from arch/mips/loongson/fuloong-2e/irq.c with 100% similarity]
arch/mips/loongson64/fuloong-2e/reset.c [moved from arch/mips/loongson/fuloong-2e/reset.c with 100% similarity]
arch/mips/loongson64/lemote-2f/Makefile [moved from arch/mips/loongson/lemote-2f/Makefile with 100% similarity]
arch/mips/loongson64/lemote-2f/clock.c [moved from arch/mips/loongson/lemote-2f/clock.c with 100% similarity]
arch/mips/loongson64/lemote-2f/ec_kb3310b.c [moved from arch/mips/loongson/lemote-2f/ec_kb3310b.c with 100% similarity]
arch/mips/loongson64/lemote-2f/ec_kb3310b.h [moved from arch/mips/loongson/lemote-2f/ec_kb3310b.h with 100% similarity]
arch/mips/loongson64/lemote-2f/irq.c [moved from arch/mips/loongson/lemote-2f/irq.c with 100% similarity]
arch/mips/loongson64/lemote-2f/machtype.c [moved from arch/mips/loongson/lemote-2f/machtype.c with 100% similarity]
arch/mips/loongson64/lemote-2f/pm.c [moved from arch/mips/loongson/lemote-2f/pm.c with 100% similarity]
arch/mips/loongson64/lemote-2f/reset.c [moved from arch/mips/loongson/lemote-2f/reset.c with 100% similarity]
arch/mips/loongson64/loongson-3/Makefile [moved from arch/mips/loongson/loongson-3/Makefile with 100% similarity]
arch/mips/loongson64/loongson-3/cop2-ex.c [moved from arch/mips/loongson/loongson-3/cop2-ex.c with 100% similarity]
arch/mips/loongson64/loongson-3/hpet.c [moved from arch/mips/loongson/loongson-3/hpet.c with 100% similarity]
arch/mips/loongson64/loongson-3/irq.c [moved from arch/mips/loongson/loongson-3/irq.c with 100% similarity]
arch/mips/loongson64/loongson-3/numa.c [moved from arch/mips/loongson/loongson-3/numa.c with 100% similarity]
arch/mips/loongson64/loongson-3/platform.c [moved from arch/mips/loongson/loongson-3/platform.c with 100% similarity]
arch/mips/loongson64/loongson-3/smp.c [moved from arch/mips/loongson/loongson-3/smp.c with 100% similarity]
arch/mips/loongson64/loongson-3/smp.h [moved from arch/mips/loongson/loongson-3/smp.h with 100% similarity]
drivers/clk/Makefile
drivers/cpufreq/ls1x-cpufreq.c
drivers/rtc/Kconfig
drivers/rtc/rtc-ls1x.c