Commit 5901f4c2 authored by Pankaj Dubey's avatar Pankaj Dubey Committed by Krzysztof Kozlowski
Browse files

ARM: EXYNOS: Remove SROM related register settings from mach-exynos 



As now we have dedicated driver for SROM controller, it will take care
of saving register banks during S2R so we can safely remove these
settings from mach-exynos.

Signed-off-by: default avatarPankaj Dubey <pankaj.dubey@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene@kernel.org>
[k.kozlowski: Need to select also SAMSUNG_MC]
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
parent ffd51977

arch/arm/mach-exynos/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ menuconfig ARCH_EXYNOS 
	select COMMON_CLK_SAMSUNG

	select EXYNOS_THERMAL

	select EXYNOS_PMU

	select EXYNOS_SROM if PM

	select HAVE_ARM_SCU if SMP

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -26,11 +27,13 @@ menuconfig ARCH_EXYNOS 
	select PINCTRL_EXYNOS

	select PM_GENERIC_DOMAINS if PM

	select S5P_DEV_MFC

	select SAMSUNG_MC

	select SOC_SAMSUNG

	select SRAM

	select THERMAL

	select THERMAL_OF

	select MFD_SYSCON

	select MEMORY

	select CLKSRC_EXYNOS_MCT

	select POWER_RESET

	select POWER_RESET_SYSCON

arch/arm/mach-exynos/exynos.c

+0 −17
Original line number Diff line number Diff line
@@ -31,11 +31,6 @@ 


static struct map_desc exynos4_iodesc[] __initdata = {

	{

		.virtual	= (unsigned long)S5P_VA_SROMC,

		.pfn		= __phys_to_pfn(EXYNOS4_PA_SROMC),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_CMU,

		.pfn		= __phys_to_pfn(EXYNOS4_PA_CMU),

		.length		= SZ_128K,
@@ -58,15 +53,6 @@ static struct map_desc exynos4_iodesc[] __initdata = { 
	},

};



static struct map_desc exynos5_iodesc[] __initdata = {

	{

		.virtual	= (unsigned long)S5P_VA_SROMC,

		.pfn		= __phys_to_pfn(EXYNOS5_PA_SROMC),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	},

};



static struct platform_device exynos_cpuidle = {

	.name              = "exynos_cpuidle",

#ifdef CONFIG_ARM_EXYNOS_CPUIDLE
@@ -138,9 +124,6 @@ static void __init exynos_map_io(void) 
{

	if (soc_is_exynos4())

		iotable_init(exynos4_iodesc, ARRAY_SIZE(exynos4_iodesc));



	if (soc_is_exynos5())

		iotable_init(exynos5_iodesc, ARRAY_SIZE(exynos5_iodesc));

}



static void __init exynos_init_io(void)

arch/arm/mach-exynos/include/mach/map.h

+0 −3
Original line number Diff line number Diff line
@@ -25,7 +25,4 @@ 


#define EXYNOS4_PA_COREPERI		0x10500000



#define EXYNOS4_PA_SROMC		0x12570000

#define EXYNOS5_PA_SROMC		0x12250000



#endif /* __ASM_ARCH_MAP_H */

arch/arm/mach-exynos/regs-srom.h

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

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * S5P SROMC register definitions

 *

 * 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.

*/



#ifndef __PLAT_SAMSUNG_REGS_SROM_H

#define __PLAT_SAMSUNG_REGS_SROM_H __FILE__



#include <mach/map.h>



#define S5P_SROMREG(x)		(S5P_VA_SROMC + (x))



#define S5P_SROM_BW		S5P_SROMREG(0x0)

#define S5P_SROM_BC0		S5P_SROMREG(0x4)

#define S5P_SROM_BC1		S5P_SROMREG(0x8)

#define S5P_SROM_BC2		S5P_SROMREG(0xc)

#define S5P_SROM_BC3		S5P_SROMREG(0x10)

#define S5P_SROM_BC4		S5P_SROMREG(0x14)

#define S5P_SROM_BC5		S5P_SROMREG(0x18)



/* one register BW holds 4 x 4-bit packed settings for NCS0 - NCS3 */



#define S5P_SROM_BW__DATAWIDTH__SHIFT		0

#define S5P_SROM_BW__ADDRMODE__SHIFT		1

#define S5P_SROM_BW__WAITENABLE__SHIFT		2

#define S5P_SROM_BW__BYTEENABLE__SHIFT		3



#define S5P_SROM_BW__CS_MASK			0xf



#define S5P_SROM_BW__NCS0__SHIFT		0

#define S5P_SROM_BW__NCS1__SHIFT		4

#define S5P_SROM_BW__NCS2__SHIFT		8

#define S5P_SROM_BW__NCS3__SHIFT		12

#define S5P_SROM_BW__NCS4__SHIFT		16

#define S5P_SROM_BW__NCS5__SHIFT		20



/* applies to same to BCS0 - BCS3 */



#define S5P_SROM_BCX__PMC__SHIFT		0

#define S5P_SROM_BCX__TACP__SHIFT		4

#define S5P_SROM_BCX__TCAH__SHIFT		8

#define S5P_SROM_BCX__TCOH__SHIFT		12

#define S5P_SROM_BCX__TACC__SHIFT		16

#define S5P_SROM_BCX__TCOS__SHIFT		24

#define S5P_SROM_BCX__TACS__SHIFT		28



#endif /* __PLAT_SAMSUNG_REGS_SROM_H */

arch/arm/mach-exynos/suspend.c

+2 −18
Original line number Diff line number Diff line
@@ -34,10 +34,11 @@ 
#include <asm/smp_scu.h>

#include <asm/suspend.h>



#include <mach/map.h>



#include <plat/pm-common.h>



#include "common.h"

#include "regs-srom.h"



#define REG_TABLE_END (-1U)
@@ -53,15 +54,6 @@ struct exynos_wkup_irq { 
	u32 mask;

};



static struct sleep_save exynos_core_save[] = {

	/* SROM side */

	SAVE_ITEM(S5P_SROM_BW),

	SAVE_ITEM(S5P_SROM_BC0),

	SAVE_ITEM(S5P_SROM_BC1),

	SAVE_ITEM(S5P_SROM_BC2),

	SAVE_ITEM(S5P_SROM_BC3),

};



struct exynos_pm_data {

	const struct exynos_wkup_irq *wkup_irq;

	unsigned int wake_disable_mask;
@@ -343,8 +335,6 @@ static void exynos_pm_prepare(void) 
	/* Set wake-up mask registers */

	exynos_pm_set_wakeup_mask();



	s3c_pm_do_save(exynos_core_save, ARRAY_SIZE(exynos_core_save));



	exynos_pm_enter_sleep_mode();



	/* ensure at least INFORM0 has the resume address */
@@ -375,8 +365,6 @@ static void exynos5420_pm_prepare(void) 
	/* Set wake-up mask registers */

	exynos_pm_set_wakeup_mask();



	s3c_pm_do_save(exynos_core_save, ARRAY_SIZE(exynos_core_save));



	exynos_pmu_spare3 = pmu_raw_readl(S5P_PMU_SPARE3);

	/*

	 * The cpu state needs to be saved and restored so that the
@@ -467,8 +455,6 @@ static void exynos_pm_resume(void) 
	/* For release retention */

	exynos_pm_release_retention();



	s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save));



	if (cpuid == ARM_CPU_PART_CORTEX_A9)

		scu_enable(S5P_VA_SCU);
@@ -535,8 +521,6 @@ static void exynos5420_pm_resume(void) 


	pmu_raw_writel(exynos_pmu_spare3, S5P_PMU_SPARE3);



	s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save));



early_wakeup:



	tmp = pmu_raw_readl(EXYNOS5420_SFR_AXI_CGDIS1);