MIPS: jz4740: Rename jz4740 folders to ingenic

Now that all the jz4740 platform code has been removed, and we're left
with only a Kconfig and the cpu-feature-overrides.h file, finalize the
cleanup process by renaming the jz4740 and include/mach-jz4740 folders
to ingenic and include/mach-ingenic.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 74604b8..c08c98d 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1034,8 +1034,8 @@ source "arch/mips/bcm47xx/Kconfig"
 source "arch/mips/bcm63xx/Kconfig"
 source "arch/mips/bmips/Kconfig"
 source "arch/mips/generic/Kconfig"
+source "arch/mips/ingenic/Kconfig"
 source "arch/mips/jazz/Kconfig"
-source "arch/mips/jz4740/Kconfig"
 source "arch/mips/lantiq/Kconfig"
 source "arch/mips/pic32/Kconfig"
 source "arch/mips/pistachio/Kconfig"

diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform
index 7d511fc..f8ef2f9 100644 (file)
--- a/arch/mips/generic/Platform
+++ b/arch/mips/generic/Platform
@@ -9,7 +9,7 @@
 #
 
 # Note: order matters, keep the asm/mach-generic include last.
-cflags-$(CONFIG_MACH_INGENIC_SOC)      += -I$(srctree)/arch/mips/include/asm/mach-jz4740
+cflags-$(CONFIG_MACH_INGENIC_SOC)      += -I$(srctree)/arch/mips/include/asm/mach-ingenic
 cflags-$(CONFIG_MIPS_GENERIC)  += -I$(srctree)/arch/mips/include/asm/mach-generic
 
 load-$(CONFIG_MIPS_GENERIC)    += 0xffffffff80100000

diff --git a/arch/mips/include/asm/mach-ingenic/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ingenic/cpu-feature-overrides.h
new file mode 100644 (file)
index 0000000..7c5e576
--- /dev/null
+++ b/arch/mips/include/asm/mach-ingenic/cpu-feature-overrides.h
@@ -0,0 +1,50 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ */
+#ifndef __ASM_MACH_JZ4740_CPU_FEATURE_OVERRIDES_H
+#define __ASM_MACH_JZ4740_CPU_FEATURE_OVERRIDES_H
+
+#define cpu_has_tlb 1
+#define cpu_has_4kex           1
+#define cpu_has_3k_cache       0
+#define cpu_has_4k_cache       1
+#define cpu_has_tx39_cache     0
+#define cpu_has_counter                0
+#define cpu_has_watch          1
+#define cpu_has_divec          1
+#define cpu_has_vce            0
+#define cpu_has_cache_cdex_p   0
+#define cpu_has_cache_cdex_s   0
+#define cpu_has_prefetch       1
+#define cpu_has_mcheck 1
+#define cpu_has_ejtag 1
+#define cpu_has_llsc           1
+#define cpu_has_mips16 0
+#define cpu_has_mips16e2       0
+#define cpu_has_mdmx 0
+#define cpu_has_mips3d 0
+#define cpu_has_smartmips 0
+#define kernel_uses_llsc       1
+#define cpu_has_vtag_icache    1
+#define cpu_has_dc_aliases     0
+#define cpu_has_ic_fills_f_dc  0
+#define cpu_has_pindexed_dcache 0
+#define cpu_has_mips32r1       1
+#define cpu_has_mips64r1       0
+#define cpu_has_mips64r2       0
+#define cpu_has_dsp            0
+#define cpu_has_dsp2           0
+#define cpu_has_mipsmt         0
+#define cpu_has_userlocal      0
+#define cpu_has_nofpuex 0
+#define cpu_has_64bits         0
+#define cpu_has_64bit_zero_reg 0
+#define cpu_has_inclusive_pcaches 0
+
+#define cpu_dcache_line_size() 32
+#define cpu_icache_line_size() 32
+
+#endif

diff --git a/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h b/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h
deleted file mode 100644 (file)
index 7c5e576..0000000
--- a/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- */
-#ifndef __ASM_MACH_JZ4740_CPU_FEATURE_OVERRIDES_H
-#define __ASM_MACH_JZ4740_CPU_FEATURE_OVERRIDES_H
-
-#define cpu_has_tlb 1
-#define cpu_has_4kex           1
-#define cpu_has_3k_cache       0
-#define cpu_has_4k_cache       1
-#define cpu_has_tx39_cache     0
-#define cpu_has_counter                0
-#define cpu_has_watch          1
-#define cpu_has_divec          1
-#define cpu_has_vce            0
-#define cpu_has_cache_cdex_p   0
-#define cpu_has_cache_cdex_s   0
-#define cpu_has_prefetch       1
-#define cpu_has_mcheck 1
-#define cpu_has_ejtag 1
-#define cpu_has_llsc           1
-#define cpu_has_mips16 0
-#define cpu_has_mips16e2       0
-#define cpu_has_mdmx 0
-#define cpu_has_mips3d 0
-#define cpu_has_smartmips 0
-#define kernel_uses_llsc       1
-#define cpu_has_vtag_icache    1
-#define cpu_has_dc_aliases     0
-#define cpu_has_ic_fills_f_dc  0
-#define cpu_has_pindexed_dcache 0
-#define cpu_has_mips32r1       1
-#define cpu_has_mips64r1       0
-#define cpu_has_mips64r2       0
-#define cpu_has_dsp            0
-#define cpu_has_dsp2           0
-#define cpu_has_mipsmt         0
-#define cpu_has_userlocal      0
-#define cpu_has_nofpuex 0
-#define cpu_has_64bits         0
-#define cpu_has_64bit_zero_reg 0
-#define cpu_has_inclusive_pcaches 0
-
-#define cpu_dcache_line_size() 32
-#define cpu_icache_line_size() 32
-
-#endif

diff --git a/arch/mips/ingenic/Kconfig b/arch/mips/ingenic/Kconfig
new file mode 100644 (file)
index 0000000..3238e16
--- /dev/null
+++ b/arch/mips/ingenic/Kconfig
@@ -0,0 +1,76 @@
+# SPDX-License-Identifier: GPL-2.0
+
+config MACH_INGENIC_GENERIC
+       bool
+       select MACH_INGENIC
+       select MACH_JZ4740
+       select MACH_JZ4770
+       select MACH_JZ4780
+       select MACH_X1000
+
+choice
+       prompt "Machine type"
+       depends on MACH_INGENIC_SOC
+       default INGENIC_GENERIC_BOARD
+
+config INGENIC_GENERIC_BOARD
+       bool "Generic board"
+       select MACH_INGENIC_GENERIC
+
+config JZ4740_QI_LB60
+       bool "Qi Hardware Ben NanoNote"
+       select MACH_JZ4740
+
+config JZ4740_RS90
+       bool "YLM RetroMini (RS-90)"
+       select MACH_JZ4725B
+
+config JZ4770_GCW0
+       bool "Game Consoles Worldwide GCW Zero"
+       select MACH_JZ4770
+
+config JZ4780_CI20
+       bool "MIPS Creator CI20"
+       select MACH_JZ4780
+
+config X1000_CU1000_NEO
+       bool "YSH & ATIL CU1000 Module with Neo backplane"
+       select MACH_X1000
+
+config X1830_CU1830_NEO
+       bool "YSH & ATIL CU1830 Module with Neo backplane"
+       select MACH_X1830
+
+endchoice
+
+config MACH_JZ4725B
+       bool
+       select SYS_HAS_CPU_MIPS32_R1
+
+config MACH_JZ4740
+       bool
+       select SYS_HAS_CPU_MIPS32_R1
+
+config MACH_JZ4770
+       bool
+       select MIPS_CPU_SCACHE
+       select SYS_HAS_CPU_MIPS32_R2
+       select SYS_SUPPORTS_HIGHMEM
+
+config MACH_JZ4780
+       bool
+       select MIPS_CPU_SCACHE
+       select SYS_HAS_CPU_MIPS32_R2
+       select SYS_SUPPORTS_HIGHMEM
+
+config MACH_X1000
+       bool
+       select MIPS_CPU_SCACHE
+       select SYS_HAS_CPU_MIPS32_R2
+       select SYS_SUPPORTS_HIGHMEM
+
+config MACH_X1830
+       bool
+       select MIPS_CPU_SCACHE
+       select SYS_HAS_CPU_MIPS32_R2
+       select SYS_SUPPORTS_HIGHMEM

diff --git a/arch/mips/jz4740/Kconfig b/arch/mips/jz4740/Kconfig
deleted file mode 100644 (file)
index 3238e16..0000000
--- a/arch/mips/jz4740/Kconfig
+++ /dev/null
@@ -1,76 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-config MACH_INGENIC_GENERIC
-       bool
-       select MACH_INGENIC
-       select MACH_JZ4740
-       select MACH_JZ4770
-       select MACH_JZ4780
-       select MACH_X1000
-
-choice
-       prompt "Machine type"
-       depends on MACH_INGENIC_SOC
-       default INGENIC_GENERIC_BOARD
-
-config INGENIC_GENERIC_BOARD
-       bool "Generic board"
-       select MACH_INGENIC_GENERIC
-
-config JZ4740_QI_LB60
-       bool "Qi Hardware Ben NanoNote"
-       select MACH_JZ4740
-
-config JZ4740_RS90
-       bool "YLM RetroMini (RS-90)"
-       select MACH_JZ4725B
-
-config JZ4770_GCW0
-       bool "Game Consoles Worldwide GCW Zero"
-       select MACH_JZ4770
-
-config JZ4780_CI20
-       bool "MIPS Creator CI20"
-       select MACH_JZ4780
-
-config X1000_CU1000_NEO
-       bool "YSH & ATIL CU1000 Module with Neo backplane"
-       select MACH_X1000
-
-config X1830_CU1830_NEO
-       bool "YSH & ATIL CU1830 Module with Neo backplane"
-       select MACH_X1830
-
-endchoice
-
-config MACH_JZ4725B
-       bool
-       select SYS_HAS_CPU_MIPS32_R1
-
-config MACH_JZ4740
-       bool
-       select SYS_HAS_CPU_MIPS32_R1
-
-config MACH_JZ4770
-       bool
-       select MIPS_CPU_SCACHE
-       select SYS_HAS_CPU_MIPS32_R2
-       select SYS_SUPPORTS_HIGHMEM
-
-config MACH_JZ4780
-       bool
-       select MIPS_CPU_SCACHE
-       select SYS_HAS_CPU_MIPS32_R2
-       select SYS_SUPPORTS_HIGHMEM
-
-config MACH_X1000
-       bool
-       select MIPS_CPU_SCACHE
-       select SYS_HAS_CPU_MIPS32_R2
-       select SYS_SUPPORTS_HIGHMEM
-
-config MACH_X1830
-       bool
-       select MIPS_CPU_SCACHE
-       select SYS_HAS_CPU_MIPS32_R2
-       select SYS_SUPPORTS_HIGHMEM