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

Commit 26f9e03f authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: marzen-reference: Remove C board code 



The generic r8a7779 machine vector is now feature-wise equivalent
to the Marzen-reference case, so simply remove the Marzen C board
code to fall over on the generic r8a7779 machine vector.

Signed-off-by: default avatarMagnus Damm <damm+renesas@opensource.se>
Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 44ade5ed

arch/arm/mach-shmobile/Kconfig

+0 −7
Original line number Original line Diff line number Diff line
@@ -89,13 +89,6 @@ config ARCH_SH73A0 
	select ARCH_RMOBILE

	select ARCH_RMOBILE

	select RENESAS_INTC_IRQPIN

	select RENESAS_INTC_IRQPIN





comment "Renesas ARM SoCs Board Type"



config MACH_MARZEN

	bool "MARZEN board"

	depends on ARCH_R8A7779

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



comment "Renesas ARM SoCs System Configuration"

comment "Renesas ARM SoCs System Configuration"

endif

endif

arch/arm/mach-shmobile/Makefile

+1 −3
Original line number Original line Diff line number Diff line
@@ -51,9 +51,7 @@ obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o 
obj-$(CONFIG_ARCH_RCAR_GEN2)	+= pm-rcar-gen2.o

obj-$(CONFIG_ARCH_RCAR_GEN2)	+= pm-rcar-gen2.o





# Board objects

# Board objects

ifdef CONFIG_ARCH_SHMOBILE_MULTI

ifndef CONFIG_ARCH_SHMOBILE_MULTI

obj-$(CONFIG_MACH_MARZEN)	+= board-marzen-reference.o

else

obj-$(CONFIG_MACH_BOCKW)	+= board-bockw.o

obj-$(CONFIG_MACH_BOCKW)	+= board-bockw.o

obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o

obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o

obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o

obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o

arch/arm/mach-shmobile/board-marzen-reference.c

deleted100644 → 0
+0 −56
Original line number Original line Diff line number Diff line 
/*

 * marzen board support - Reference DT implementation

 *

 * Copyright (C) 2011  Renesas Solutions Corp.

 * Copyright (C) 2011  Magnus Damm

 * Copyright (C) 2013  Simon Horman

 *

 * 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/clk/shmobile.h>

#include <linux/clocksource.h>

#include <linux/of_platform.h>



#include <asm/irq.h>

#include <asm/mach/arch.h>



#include "common.h"

#include "irqs.h"

#include "r8a7779.h"



static void __init marzen_init_timer(void)

{

	r8a7779_clocks_init(r8a7779_read_mode_pins());

	clocksource_of_init();

}



static void __init marzen_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */

}



static const char *marzen_boards_compat_dt[] __initdata = {

	"renesas,marzen",

	"renesas,marzen-reference",

	NULL,

};



DT_MACHINE_START(MARZEN, "marzen")

	.smp		= smp_ops(r8a7779_smp_ops),

	.map_io		= r8a7779_map_io,

	.init_early	= shmobile_init_delay,

	.init_time	= marzen_init_timer,

	.init_irq	= r8a7779_init_irq_dt,

	.init_machine	= marzen_init,

	.init_late	= shmobile_init_late,

	.dt_compat	= marzen_boards_compat_dt,

MACHINE_END