ARM: shmobile: Consolidate R8A7743 and R8A779[234] machine definitions (a0c4e2cc) · Commits · 戴 / test

arch/arm/mach-shmobile/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -9,14 +9,10 @@ obj-y := timer.o
		obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o
		obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o
		obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o
		obj-$(CONFIG_ARCH_R8A7743) += setup-r8a7743.o
		obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o
		obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o pm-r8a7779.o
		obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o
		obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o
		obj-$(CONFIG_ARCH_R8A7792) += setup-r8a7792.o
		obj-$(CONFIG_ARCH_R8A7793) += setup-r8a7793.o
		obj-$(CONFIG_ARCH_R8A7794) += setup-r8a7794.o
		obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o
		obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o

deleted100644 → 0

+0 −34

Original line number	Diff line number	Diff line
		/*
		* r8a7743 processor support
		*
		* Copyright (C) 2016 Cogent Embedded, Inc.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation; of the License.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		#include <linux/init.h>

		#include <asm/mach/arch.h>

		#include "common.h"
		#include "rcar-gen2.h"

		static const char * const r8a7743_boards_compat_dt[] __initconst = {
		"renesas,r8a7743",
		NULL,
		};

		DT_MACHINE_START(R8A7743_DT, "Generic R8A7743 (Flattened Device Tree)")
		.init_early = shmobile_init_delay,
		.init_time = rcar_gen2_timer_init,
		.init_late = shmobile_init_late,
		.reserve = rcar_gen2_reserve,
		.dt_compat = r8a7743_boards_compat_dt,
		MACHINE_END

deleted100644 → 0

+0 −35

Original line number	Diff line number	Diff line
		/*
		* r8a7792 processor support
		*
		* Copyright (C) 2014 Renesas Electronics Corporation
		* Copyright (C) 2016 Cogent Embedded, Inc.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; version 2 of the License.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		#include <linux/of_platform.h>

		#include <asm/mach/arch.h>

		#include "common.h"
		#include "rcar-gen2.h"

		static const char * const r8a7792_boards_compat_dt[] __initconst = {
		"renesas,r8a7792",
		NULL,
		};

		DT_MACHINE_START(R8A7792_DT, "Generic R8A7792 (Flattened Device Tree)")
		.init_early = shmobile_init_delay,
		.init_late = shmobile_init_late,
		.init_time = rcar_gen2_timer_init,
		.reserve = rcar_gen2_reserve,
		.dt_compat = r8a7792_boards_compat_dt,
		MACHINE_END

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		/*
		* r8a7793 processor support
		*
		* Copyright (C) 2015 Ulrich Hecht
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; version 2 of the License.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		#include <linux/init.h>
		#include <asm/mach/arch.h>

		#include "common.h"
		#include "rcar-gen2.h"

		static const char * const r8a7793_boards_compat_dt[] __initconst = {
		"renesas,r8a7793",
		NULL,
		};

		DT_MACHINE_START(R8A7793_DT, "Generic R8A7793 (Flattened Device Tree)")
		.init_early = shmobile_init_delay,
		.init_time = rcar_gen2_timer_init,
		.init_late = shmobile_init_late,
		.reserve = rcar_gen2_reserve,
		.dt_compat = r8a7793_boards_compat_dt,
		MACHINE_END

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		/*
		* r8a7794 processor support
		*
		* Copyright (C) 2014 Renesas Electronics Corporation
		* Copyright (C) 2014 Ulrich Hecht
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; version 2 of the License.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		#include <linux/of_platform.h>
		#include "common.h"
		#include "rcar-gen2.h"
		#include <asm/mach/arch.h>

		static const char * const r8a7794_boards_compat_dt[] __initconst = {
		"renesas,r8a7794",
		NULL,
		};

		DT_MACHINE_START(R8A7794_DT, "Generic R8A7794 (Flattened Device Tree)")
		.init_early = shmobile_init_delay,
		.init_late = shmobile_init_late,
		.init_time = rcar_gen2_timer_init,
		.reserve = rcar_gen2_reserve,
		.dt_compat = r8a7794_boards_compat_dt,
		MACHINE_END