Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70e95648 authored by Vineet Gupta's avatar Vineet Gupta
Browse files

ARC: [arcfpga] consolidate machine description, DT 



* AA4/ML509 have same machine descriptions
* Rename simulation machine description

Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
parent 619f3018

arch/arc/boot/dts/angel4.dts

+0 −5
Original line number Original line Diff line number Diff line
@@ -24,11 +24,6 @@ 
		serial0 = &arcuart0;

		serial0 = &arcuart0;

	};

	};





	memory {

		device_type = "memory";

		reg = <0x00000000 0x10000000>;	/* 256M */

	};



	fpga {

	fpga {

		compatible = "simple-bus";

		compatible = "simple-bus";

		#address-cells = <1>;

		#address-cells = <1>;

arch/arc/boot/dts/nsimosci.dts

+0 −5
Original line number Original line Diff line number Diff line
@@ -27,11 +27,6 @@ 
		serial0 = &uart0;

		serial0 = &uart0;

	};

	};





	memory {

		device_type = "memory";

		reg = <0x80000000 0x10000000>;	/* 256M */

	};



	fpga {

	fpga {

		compatible = "simple-bus";

		compatible = "simple-bus";

		#address-cells = <1>;

		#address-cells = <1>;

arch/arc/plat-arcfpga/platform.c

+7 −20
Original line number Original line Diff line number Diff line
@@ -48,27 +48,14 @@ static void __init plat_fpga_populate_dev(void) 
 * callback set, by matching the DT compatible name.

 * callback set, by matching the DT compatible name.

 */

 */





static const char *aa4_compat[] __initconst = {

static const char *legacy_fpga_compat[] __initconst = {

	"snps,arc-angel4",

	"snps,arc-angel4",

	NULL,

};



MACHINE_START(ANGEL4, "angel4")

	.dt_compat	= aa4_compat,

	.init_early	= plat_fpga_early_init,

	.init_machine	= plat_fpga_populate_dev,

#ifdef CONFIG_ISS_SMP_EXTN

	.init_smp	= iss_model_init_smp,

#endif

MACHINE_END



static const char *ml509_compat[] __initconst = {

	"snps,arc-ml509",

	"snps,arc-ml509",

	NULL,

	NULL,

};

};





MACHINE_START(ML509, "ml509")

MACHINE_START(LEGACY_FPGA, "legacy_fpga")

	.dt_compat	= ml509_compat,

	.dt_compat	= legacy_fpga_compat,

	.init_early	= plat_fpga_early_init,

	.init_early	= plat_fpga_early_init,

	.init_machine	= plat_fpga_populate_dev,

	.init_machine	= plat_fpga_populate_dev,

#ifdef CONFIG_ISS_SMP_EXTN

#ifdef CONFIG_ISS_SMP_EXTN
@@ -76,13 +63,13 @@ MACHINE_START(ML509, "ml509") 
#endif

#endif

MACHINE_END

MACHINE_END





static const char *nsimosci_compat[] __initconst = {

static const char *simulation_compat[] __initconst = {

	"snps,nsim",

	"snps,nsimosci",

	"snps,nsimosci",

	NULL,

	NULL,

};

};





MACHINE_START(NSIMOSCI, "nsimosci")

MACHINE_START(SIMULATION, "simulation")

	.dt_compat	= nsimosci_compat,

	.dt_compat	= simulation_compat,

	.init_early	= NULL,

	.init_machine	= plat_fpga_populate_dev,

	.init_machine	= plat_fpga_populate_dev,

MACHINE_END
 
MACHINE_END