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>
191 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/boot_param.h [deleted file]
arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h [deleted file]
arch/mips/include/asm/mach-loongson/cs5536/cs5536.h [deleted file]
arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h [deleted file]
arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h [deleted file]
arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h [deleted file]
arch/mips/include/asm/mach-loongson/dma-coherence.h [deleted file]
arch/mips/include/asm/mach-loongson/gpio.h [deleted file]
arch/mips/include/asm/mach-loongson/irq.h [deleted file]
arch/mips/include/asm/mach-loongson/kernel-entry-init.h [deleted file]
arch/mips/include/asm/mach-loongson/loongson.h [deleted file]
arch/mips/include/asm/mach-loongson/loongson_hwmon.h [deleted file]
arch/mips/include/asm/mach-loongson/machine.h [deleted file]
arch/mips/include/asm/mach-loongson/mc146818rtc.h [deleted file]
arch/mips/include/asm/mach-loongson/mem.h [deleted file]
arch/mips/include/asm/mach-loongson/mmzone.h [deleted file]
arch/mips/include/asm/mach-loongson/pci.h [deleted file]
arch/mips/include/asm/mach-loongson/spaces.h [deleted file]
arch/mips/include/asm/mach-loongson/topology.h [deleted file]
arch/mips/include/asm/mach-loongson/workarounds.h [deleted file]
arch/mips/include/asm/mach-loongson1/cpufreq.h [deleted file]
arch/mips/include/asm/mach-loongson1/irq.h [deleted file]
arch/mips/include/asm/mach-loongson1/loongson1.h [deleted file]
arch/mips/include/asm/mach-loongson1/platform.h [deleted file]
arch/mips/include/asm/mach-loongson1/prom.h [deleted file]
arch/mips/include/asm/mach-loongson1/regs-clk.h [deleted file]
arch/mips/include/asm/mach-loongson1/regs-mux.h [deleted file]
arch/mips/include/asm/mach-loongson1/regs-pwm.h [deleted file]
arch/mips/include/asm/mach-loongson1/regs-wdt.h [deleted file]
arch/mips/include/asm/mach-loongson32/cpufreq.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson32/irq.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson32/loongson1.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson32/platform.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson32/prom.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson32/regs-clk.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson32/regs-mux.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson32/regs-pwm.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson32/regs-wdt.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/boot_param.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/cs5536/cs5536.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/cs5536/cs5536_mfgpt.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/cs5536/cs5536_pci.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/cs5536/cs5536_vsm.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/dma-coherence.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/gpio.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/irq.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/kernel-entry-init.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/loongson.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/loongson_hwmon.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/machine.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/mc146818rtc.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/mem.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/mmzone.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/pci.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/spaces.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/topology.h [new file with mode: 0644]
arch/mips/include/asm/mach-loongson64/workarounds.h [new file with mode: 0644]
arch/mips/loongson/Kconfig [deleted file]
arch/mips/loongson/Makefile [deleted file]
arch/mips/loongson/Platform [deleted file]
arch/mips/loongson/common/Makefile [deleted file]
arch/mips/loongson/common/bonito-irq.c [deleted file]
arch/mips/loongson/common/cmdline.c [deleted file]
arch/mips/loongson/common/cs5536/Makefile [deleted file]
arch/mips/loongson/common/cs5536/cs5536_acc.c [deleted file]
arch/mips/loongson/common/cs5536/cs5536_ehci.c [deleted file]
arch/mips/loongson/common/cs5536/cs5536_ide.c [deleted file]
arch/mips/loongson/common/cs5536/cs5536_isa.c [deleted file]
arch/mips/loongson/common/cs5536/cs5536_mfgpt.c [deleted file]
arch/mips/loongson/common/cs5536/cs5536_ohci.c [deleted file]
arch/mips/loongson/common/cs5536/cs5536_pci.c [deleted file]
arch/mips/loongson/common/dma-swiotlb.c [deleted file]
arch/mips/loongson/common/early_printk.c [deleted file]
arch/mips/loongson/common/env.c [deleted file]
arch/mips/loongson/common/init.c [deleted file]
arch/mips/loongson/common/irq.c [deleted file]
arch/mips/loongson/common/machtype.c [deleted file]
arch/mips/loongson/common/mem.c [deleted file]
arch/mips/loongson/common/pci.c [deleted file]
arch/mips/loongson/common/platform.c [deleted file]
arch/mips/loongson/common/pm.c [deleted file]
arch/mips/loongson/common/reset.c [deleted file]
arch/mips/loongson/common/rtc.c [deleted file]
arch/mips/loongson/common/serial.c [deleted file]
arch/mips/loongson/common/setup.c [deleted file]
arch/mips/loongson/common/time.c [deleted file]
arch/mips/loongson/common/uart_base.c [deleted file]
arch/mips/loongson/fuloong-2e/Makefile [deleted file]
arch/mips/loongson/fuloong-2e/irq.c [deleted file]
arch/mips/loongson/fuloong-2e/reset.c [deleted file]
arch/mips/loongson/lemote-2f/Makefile [deleted file]
arch/mips/loongson/lemote-2f/clock.c [deleted file]
arch/mips/loongson/lemote-2f/ec_kb3310b.c [deleted file]
arch/mips/loongson/lemote-2f/ec_kb3310b.h [deleted file]
arch/mips/loongson/lemote-2f/irq.c [deleted file]
arch/mips/loongson/lemote-2f/machtype.c [deleted file]
arch/mips/loongson/lemote-2f/pm.c [deleted file]
arch/mips/loongson/lemote-2f/reset.c [deleted file]
arch/mips/loongson/loongson-3/Makefile [deleted file]
arch/mips/loongson/loongson-3/cop2-ex.c [deleted file]
arch/mips/loongson/loongson-3/hpet.c [deleted file]
arch/mips/loongson/loongson-3/irq.c [deleted file]
arch/mips/loongson/loongson-3/numa.c [deleted file]
arch/mips/loongson/loongson-3/platform.c [deleted file]
arch/mips/loongson/loongson-3/smp.c [deleted file]
arch/mips/loongson/loongson-3/smp.h [deleted file]
arch/mips/loongson1/Kconfig [deleted file]
arch/mips/loongson1/Makefile [deleted file]
arch/mips/loongson1/Platform [deleted file]
arch/mips/loongson1/common/Makefile [deleted file]
arch/mips/loongson1/common/irq.c [deleted file]
arch/mips/loongson1/common/platform.c [deleted file]
arch/mips/loongson1/common/prom.c [deleted file]
arch/mips/loongson1/common/reset.c [deleted file]
arch/mips/loongson1/common/setup.c [deleted file]
arch/mips/loongson1/common/time.c [deleted file]
arch/mips/loongson1/ls1b/Makefile [deleted file]
arch/mips/loongson1/ls1b/board.c [deleted file]
arch/mips/loongson32/Kconfig [new file with mode: 0644]
arch/mips/loongson32/Makefile [new file with mode: 0644]
arch/mips/loongson32/Platform [new file with mode: 0644]
arch/mips/loongson32/common/Makefile [new file with mode: 0644]
arch/mips/loongson32/common/irq.c [new file with mode: 0644]
arch/mips/loongson32/common/platform.c [new file with mode: 0644]
arch/mips/loongson32/common/prom.c [new file with mode: 0644]
arch/mips/loongson32/common/reset.c [new file with mode: 0644]
arch/mips/loongson32/common/setup.c [new file with mode: 0644]
arch/mips/loongson32/common/time.c [new file with mode: 0644]
arch/mips/loongson32/ls1b/Makefile [new file with mode: 0644]
arch/mips/loongson32/ls1b/board.c [new file with mode: 0644]
arch/mips/loongson64/Kconfig [new file with mode: 0644]
arch/mips/loongson64/Makefile [new file with mode: 0644]
arch/mips/loongson64/Platform [new file with mode: 0644]
arch/mips/loongson64/common/Makefile [new file with mode: 0644]
arch/mips/loongson64/common/bonito-irq.c [new file with mode: 0644]
arch/mips/loongson64/common/cmdline.c [new file with mode: 0644]
arch/mips/loongson64/common/cs5536/Makefile [new file with mode: 0644]
arch/mips/loongson64/common/cs5536/cs5536_acc.c [new file with mode: 0644]
arch/mips/loongson64/common/cs5536/cs5536_ehci.c [new file with mode: 0644]
arch/mips/loongson64/common/cs5536/cs5536_ide.c [new file with mode: 0644]
arch/mips/loongson64/common/cs5536/cs5536_isa.c [new file with mode: 0644]
arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c [new file with mode: 0644]
arch/mips/loongson64/common/cs5536/cs5536_ohci.c [new file with mode: 0644]
arch/mips/loongson64/common/cs5536/cs5536_pci.c [new file with mode: 0644]
arch/mips/loongson64/common/dma-swiotlb.c [new file with mode: 0644]
arch/mips/loongson64/common/early_printk.c [new file with mode: 0644]
arch/mips/loongson64/common/env.c [new file with mode: 0644]
arch/mips/loongson64/common/init.c [new file with mode: 0644]
arch/mips/loongson64/common/irq.c [new file with mode: 0644]
arch/mips/loongson64/common/machtype.c [new file with mode: 0644]
arch/mips/loongson64/common/mem.c [new file with mode: 0644]
arch/mips/loongson64/common/pci.c [new file with mode: 0644]
arch/mips/loongson64/common/platform.c [new file with mode: 0644]
arch/mips/loongson64/common/pm.c [new file with mode: 0644]
arch/mips/loongson64/common/reset.c [new file with mode: 0644]
arch/mips/loongson64/common/rtc.c [new file with mode: 0644]
arch/mips/loongson64/common/serial.c [new file with mode: 0644]
arch/mips/loongson64/common/setup.c [new file with mode: 0644]
arch/mips/loongson64/common/time.c [new file with mode: 0644]
arch/mips/loongson64/common/uart_base.c [new file with mode: 0644]
arch/mips/loongson64/fuloong-2e/Makefile [new file with mode: 0644]
arch/mips/loongson64/fuloong-2e/irq.c [new file with mode: 0644]
arch/mips/loongson64/fuloong-2e/reset.c [new file with mode: 0644]
arch/mips/loongson64/lemote-2f/Makefile [new file with mode: 0644]
arch/mips/loongson64/lemote-2f/clock.c [new file with mode: 0644]
arch/mips/loongson64/lemote-2f/ec_kb3310b.c [new file with mode: 0644]
arch/mips/loongson64/lemote-2f/ec_kb3310b.h [new file with mode: 0644]
arch/mips/loongson64/lemote-2f/irq.c [new file with mode: 0644]
arch/mips/loongson64/lemote-2f/machtype.c [new file with mode: 0644]
arch/mips/loongson64/lemote-2f/pm.c [new file with mode: 0644]
arch/mips/loongson64/lemote-2f/reset.c [new file with mode: 0644]
arch/mips/loongson64/loongson-3/Makefile [new file with mode: 0644]
arch/mips/loongson64/loongson-3/cop2-ex.c [new file with mode: 0644]
arch/mips/loongson64/loongson-3/hpet.c [new file with mode: 0644]
arch/mips/loongson64/loongson-3/irq.c [new file with mode: 0644]
arch/mips/loongson64/loongson-3/numa.c [new file with mode: 0644]
arch/mips/loongson64/loongson-3/platform.c [new file with mode: 0644]
arch/mips/loongson64/loongson-3/smp.c [new file with mode: 0644]
arch/mips/loongson64/loongson-3/smp.h [new file with mode: 0644]
drivers/clk/Makefile
drivers/cpufreq/ls1x-cpufreq.c
drivers/rtc/Kconfig
drivers/rtc/rtc-ls1x.c