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

Commit 44d88c75 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

ARM: shmobile: Remove legacy SoC code for R-Mobile A1



The last user of the R-Mobile A1 (r8a7740) legacy SoC code was the
Armadillo-800 EVA legacy board code, which has been removed.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
[horms: resolved trivial conflicts with v4.2-rc1]
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 6a902a2e
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -103,13 +103,6 @@ if ARCH_SHMOBILE_LEGACY

comment "Renesas ARM SoCs System Type"

config ARCH_R8A7740
	bool "R-Mobile A1 (R8A77400)"
	select ARCH_RMOBILE
	select ARCH_WANT_OPTIONAL_GPIOLIB
	select ARM_GIC
	select RENESAS_INTC_IRQPIN

config ARCH_R8A7778
	bool "R-Car M1A (R8A77781)"
	select ARCH_RCAR_GEN1
+1 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ obj-y := timer.o console.o
# CPU objects
obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o
obj-$(CONFIG_ARCH_R8A73A4)	+= setup-r8a73a4.o
obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o pm-r8a7740.o
obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.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
@@ -20,7 +20,6 @@ obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o
# Clock objects
ifndef CONFIG_COMMON_CLK
obj-y				+= clock.o
obj-$(CONFIG_ARCH_R8A7740)	+= clock-r8a7740.o
obj-$(CONFIG_ARCH_R8A7778)	+= clock-r8a7778.o
obj-$(CONFIG_ARCH_R8A7779)	+= clock-r8a7779.o
endif
+0 −675

File deleted.

Preview size limit exceeded, changes collapsed.

+0 −129
Original line number Diff line number Diff line
/*
 * r8a7740 power management support
 *
 * Copyright (C) 2012  Renesas Solutions Corp.
 * Copyright (C) 2012  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
 *
 * This file is subject to the terms and conditions of the GNU General Public
 * License.  See the file "COPYING" in the main directory of this archive
 * for more details.
 */
#include <linux/console.h>
#include <linux/io.h>
#include <linux/suspend.h>

#include "common.h"
#include "pm-rmobile.h"

#define SYSC_BASE	IOMEM(0xe6180000)

#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)
static int r8a7740_pd_a3sm_suspend(void)
{
	/*
	 * The A3SM domain contains the CPU core and therefore it should
	 * only be turned off if the CPU is not in use.
	 */
	return -EBUSY;
}

static int r8a7740_pd_a3sp_suspend(void)
{
	/*
	 * Serial consoles make use of SCIF hardware located in A3SP,
	 * keep such power domain on if "no_console_suspend" is set.
	 */
	return console_suspend_enabled ? 0 : -EBUSY;
}

static int r8a7740_pd_d4_suspend(void)
{
	/*
	 * The D4 domain contains the Coresight-ETM hardware block and
	 * therefore it should only be turned off if the debug module is
	 * not in use.
	 */
	return -EBUSY;
}

static struct rmobile_pm_domain r8a7740_pm_domains[] = {
	{
		.genpd.name	= "A4LC",
		.base		= SYSC_BASE,
		.bit_shift	= 1,
	}, {
		.genpd.name	= "A4MP",
		.base		= SYSC_BASE,
		.bit_shift	= 2,
	}, {
		.genpd.name	= "D4",
		.base		= SYSC_BASE,
		.bit_shift	= 3,
		.gov		= &pm_domain_always_on_gov,
		.suspend	= r8a7740_pd_d4_suspend,
	}, {
		.genpd.name	= "A4R",
		.base		= SYSC_BASE,
		.bit_shift	= 5,
	}, {
		.genpd.name	= "A3RV",
		.base		= SYSC_BASE,
		.bit_shift	= 6,
	}, {
		.genpd.name	= "A4S",
		.base		= SYSC_BASE,
		.bit_shift	= 10,
		.no_debug	= true,
	}, {
		.genpd.name	= "A3SP",
		.base		= SYSC_BASE,
		.bit_shift	= 11,
		.gov		= &pm_domain_always_on_gov,
		.no_debug	= true,
		.suspend	= r8a7740_pd_a3sp_suspend,
	}, {
		.genpd.name	= "A3SM",
		.base		= SYSC_BASE,
		.bit_shift	= 12,
		.gov		= &pm_domain_always_on_gov,
		.suspend	= r8a7740_pd_a3sm_suspend,
	}, {
		.genpd.name	= "A3SG",
		.base		= SYSC_BASE,
		.bit_shift	= 13,
	}, {
		.genpd.name	= "A4SU",
		.base		= SYSC_BASE,
		.bit_shift	= 20,
	},
};

void __init r8a7740_init_pm_domains(void)
{
	rmobile_init_domains(r8a7740_pm_domains, ARRAY_SIZE(r8a7740_pm_domains));
	pm_genpd_add_subdomain_names("A4R", "A3RV");
	pm_genpd_add_subdomain_names("A4S", "A3SP");
	pm_genpd_add_subdomain_names("A4S", "A3SM");
	pm_genpd_add_subdomain_names("A4S", "A3SG");
}
#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */

#ifdef CONFIG_SUSPEND
static int r8a7740_enter_suspend(suspend_state_t suspend_state)
{
	cpu_do_idle();
	return 0;
}

static void r8a7740_suspend_init(void)
{
	shmobile_suspend_ops.enter = r8a7740_enter_suspend;
}
#else
static void r8a7740_suspend_init(void) {}
#endif

void __init r8a7740_pm_init(void)
{
	r8a7740_suspend_init();
}

arch/arm/mach-shmobile/r8a7740.h

deleted100644 → 0
+0 −58

File deleted.

Preview size limit exceeded, changes collapsed.

Loading