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

Commit ff20775d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-marzen-board-removal-for-v4.3' of... 

Merge tag 'renesas-marzen-board-removal-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Renesas ARM Based SoC Marzen Board Removal for v4.3

* Remove legacy r8a7779 SoC code
* Remove legacy marzen board code

* tag 'renesas-marzen-board-removal-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: r8a7779: Remove legacy SoC code
  ARM: shmobile: marzen: Remove legacy board code
  ARM: shmobile: r8a7779: Cleanup header file
  ARM: shmobile: marzen-reference: Remove C board code
  ARM: shmobile: r8a7779: Generic SMP ops
  ARM: shmobile: r8a7779: Generic CCF and timer support

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 39aa437e c99cd90d

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -503,7 +503,8 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ 
dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \

	r8a7778-bockw.dtb \

	r8a7778-bockw-reference.dtb \

	r8a7779-marzen.dtb

	r8a7779-marzen.dtb \

	sh73a0-kzm9g.dtb

dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \

	emev2-kzm9d.dtb \

	r7s72100-genmai.dtb \

arch/arm/mach-shmobile/Kconfig

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

	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"

endif
@@ -139,13 +132,6 @@ config MACH_BOCKW_REFERENCE 


	   This is intended to aid developers



config MACH_MARZEN

	bool "MARZEN board"

	depends on ARCH_R8A7779

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select USE_OF



comment "Renesas ARM SoCs System Configuration"



config CPU_HAS_INTEVT

arch/arm/mach-shmobile/Makefile

+1 −6
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o 
ifndef CONFIG_COMMON_CLK

obj-y				+= clock.o

obj-$(CONFIG_ARCH_R8A7778)	+= clock-r8a7778.o

obj-$(CONFIG_ARCH_R8A7779)	+= clock-r8a7779.o

endif



# CPU reset vector handling objects
@@ -49,13 +48,9 @@ obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o 
obj-$(CONFIG_ARCH_RCAR_GEN2)	+= pm-rcar-gen2.o



# Board objects

ifdef CONFIG_ARCH_SHMOBILE_MULTI

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

else

ifndef CONFIG_ARCH_SHMOBILE_MULTI

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

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

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

endif



# Framework support

obj-$(CONFIG_SMP)		+= $(smp-y)

arch/arm/mach-shmobile/Makefile.boot

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
loadaddr-y	:=

loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000

loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000

loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000



__ZRELADDR	:= $(sort $(loadaddr-y))

   zreladdr-y   += $(__ZRELADDR)

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

deleted100644 → 0
+0 −56
Original line number 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 *const marzen_boards_compat_dt[] __initconst = {

	"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