| Message ID | 1585558776-21953-1-git-send-email-maobibo@loongson.cn (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
| Series | None | expand |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 9a8ff2d..6a6d2e2 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -412,6 +412,7 @@ config MACH_INGENIC select GENERIC_IRQ_CHIP select BUILTIN_DTB if MIPS_NO_APPENDED_DTB select USE_OF + select HAVE_MACH_HEAD_FILES config LANTIQ bool "Lantiq based platforms" diff --git a/arch/mips/jz4740/Platform b/arch/mips/jz4740/Platform index a2a5a85..937b7fa 100644 --- a/arch/mips/jz4740/Platform +++ b/arch/mips/jz4740/Platform @@ -1,4 +1,4 @@ platform-$(CONFIG_MACH_INGENIC) += jz4740/ -cflags-$(CONFIG_MACH_INGENIC) += -I$(srctree)/arch/mips/include/asm/mach-jz4740 +cflags-$(CONFIG_MACH_INGENIC) += -I$(srctree)/arch/mips/jz4740/include load-$(CONFIG_MACH_INGENIC) += 0xffffffff80010000 zload-$(CONFIG_MACH_INGENIC) += 0xffffffff81000000 diff --git a/arch/mips/include/asm/mach-jz4740/base.h b/arch/mips/jz4740/include/mach/base.h similarity index 100% rename from arch/mips/include/asm/mach-jz4740/base.h rename to arch/mips/jz4740/include/mach/base.h diff --git a/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h b/arch/mips/jz4740/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h rename to arch/mips/jz4740/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/include/asm/mach-jz4740/dma.h b/arch/mips/jz4740/include/mach/dma.h similarity index 100% rename from arch/mips/include/asm/mach-jz4740/dma.h rename to arch/mips/jz4740/include/mach/dma.h diff --git a/arch/mips/jz4740/include/mach/ioremap.h b/arch/mips/jz4740/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/jz4740/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <asm/mach-generic/ioremap.h> diff --git a/arch/mips/include/asm/mach-jz4740/irq.h b/arch/mips/jz4740/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-jz4740/irq.h rename to arch/mips/jz4740/include/mach/irq.h diff --git a/arch/mips/jz4740/include/mach/kernel-entry-init.h b/arch/mips/jz4740/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/jz4740/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <asm/mach-generic/kernel-entry-init.h> diff --git a/arch/mips/jz4740/include/mach/kmalloc.h b/arch/mips/jz4740/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/jz4740/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <asm/mach-generic/kmalloc.h> diff --git a/arch/mips/jz4740/include/mach/mangle-port.h b/arch/mips/jz4740/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/jz4740/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <asm/mach-generic/mangle-port.h> diff --git a/arch/mips/jz4740/include/mach/mc146818rtc.h b/arch/mips/jz4740/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/jz4740/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <asm/mach-generic/mc146818rtc.h> diff --git a/arch/mips/jz4740/include/mach/spaces.h b/arch/mips/jz4740/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/jz4740/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <asm/mach-generic/spaces.h> diff --git a/arch/mips/include/asm/mach-jz4740/timer.h b/arch/mips/jz4740/include/mach/timer.h similarity index 100% rename from arch/mips/include/asm/mach-jz4740/timer.h rename to arch/mips/jz4740/include/mach/timer.h diff --git a/arch/mips/jz4740/include/mach/topology.h b/arch/mips/jz4740/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/jz4740/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <asm/mach-generic/topology.h> diff --git a/arch/mips/jz4740/include/mach/war.h b/arch/mips/jz4740/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/jz4740/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <asm/mach-generic/war.h> diff --git a/arch/mips/jz4740/time.c b/arch/mips/jz4740/time.c index 605a84a..64a5a19 100644 --- a/arch/mips/jz4740/time.c +++ b/arch/mips/jz4740/time.c @@ -7,7 +7,7 @@ #include <linux/clocksource.h> #include <linux/of_clk.h> -#include <asm/mach-jz4740/timer.h> +#include <mach/timer.h> void __init plat_time_init(void) { diff --git a/arch/mips/jz4740/timer.c b/arch/mips/jz4740/timer.c index 5c9f82d..a473d49 100644 --- a/arch/mips/jz4740/timer.c +++ b/arch/mips/jz4740/timer.c @@ -9,8 +9,8 @@ #include <linux/init.h> #include <linux/kernel.h> -#include <asm/mach-jz4740/base.h> -#include <asm/mach-jz4740/timer.h> +#include <mach/base.h> +#include <mach/timer.h> void __iomem *jz4740_timer_base; EXPORT_SYMBOL_GPL(jz4740_timer_base); diff --git a/drivers/pwm/pwm-jz4740.c b/drivers/pwm/pwm-jz4740.c index 9d78cc2..bb9d266 100644 --- a/drivers/pwm/pwm-jz4740.c +++ b/drivers/pwm/pwm-jz4740.c @@ -18,7 +18,7 @@ #include <linux/platform_device.h> #include <linux/pwm.h> -#include <asm/mach-jz4740/timer.h> +#include <mach/timer.h> #define NUM_PWM 8
Remove header files from arch/mips/include/asm/mach-jz4740 to arch/mips/jz4740/include/mach Signed-off-by: bibo mao <maobibo@loongson.cn> --- arch/mips/Kconfig | 1 + arch/mips/jz4740/Platform | 2 +- arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/base.h | 0 .../asm/mach-jz4740 => jz4740/include/mach}/cpu-feature-overrides.h | 0 arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/dma.h | 0 arch/mips/jz4740/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/irq.h | 0 arch/mips/jz4740/include/mach/kernel-entry-init.h | 2 ++ arch/mips/jz4740/include/mach/kmalloc.h | 2 ++ arch/mips/jz4740/include/mach/mangle-port.h | 2 ++ arch/mips/jz4740/include/mach/mc146818rtc.h | 2 ++ arch/mips/jz4740/include/mach/spaces.h | 2 ++ arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/timer.h | 0 arch/mips/jz4740/include/mach/topology.h | 2 ++ arch/mips/jz4740/include/mach/war.h | 2 ++ arch/mips/jz4740/time.c | 2 +- arch/mips/jz4740/timer.c | 4 ++-- drivers/pwm/pwm-jz4740.c | 2 +- 18 files changed, 22 insertions(+), 5 deletions(-) rename arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/base.h (100%) rename arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/cpu-feature-overrides.h (100%) rename arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/dma.h (100%) create mode 100644 arch/mips/jz4740/include/mach/ioremap.h rename arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/irq.h (100%) create mode 100644 arch/mips/jz4740/include/mach/kernel-entry-init.h create mode 100644 arch/mips/jz4740/include/mach/kmalloc.h create mode 100644 arch/mips/jz4740/include/mach/mangle-port.h create mode 100644 arch/mips/jz4740/include/mach/mc146818rtc.h create mode 100644 arch/mips/jz4740/include/mach/spaces.h rename arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/timer.h (100%) create mode 100644 arch/mips/jz4740/include/mach/topology.h create mode 100644 arch/mips/jz4740/include/mach/war.h