aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2011-08-09 15:30:01 -0400
committerLinus Walleij <linus.walleij@linaro.org>2011-08-17 04:20:29 -0400
commitc43ed5600b285e7b3bfe868ffe2eb259939c4b98 (patch)
treef358310c22f862672b219a0f66953de7eef4949e
parent73285146544589424e8e1c1ebd6304d3c6231acf (diff)
mach-u300: drop SEMI config option
When we have only dual-RAM configurations, the SEMI (shared memory interface) must always be enabled. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/mach-u300/Kconfig8
-rw-r--r--arch/arm/mach-u300/core.c9
2 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig
index d3a9ca45ef85..966a5a06a58c 100644
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@ -54,14 +54,6 @@ config U300_DEBUG
54 help 54 help
55 Debug support for U300 in sysfs, procfs etc. 55 Debug support for U300 in sysfs, procfs etc.
56 56
57config MACH_U300_SEMI_IS_SHARED
58 bool "The SEMI is used by both the access and application side"
59 depends on MACH_U300
60 help
61 This makes it possible to use the SEMI (Shared External
62 Memory Interface) from both from access and application
63 side.
64
65config MACH_U300_SPIDUMMY 57config MACH_U300_SPIDUMMY
66 bool "SSP/SPI dummy chip" 58 bool "SSP/SPI dummy chip"
67 select SPI 59 select SPI
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 399c89f14dfb..8b78af90166f 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -1837,17 +1837,10 @@ void __init u300_init_devices(void)
1837 /* Register subdevices on the SPI bus */ 1837 /* Register subdevices on the SPI bus */
1838 u300_spi_register_board_devices(); 1838 u300_spi_register_board_devices();
1839 1839
1840#ifndef CONFIG_MACH_U300_SEMI_IS_SHARED 1840 /* Enable SEMI self refresh */
1841 /*
1842 * Enable SEMI self refresh. Self-refresh of the SDRAM is entered when
1843 * both subsystems are requesting this mode.
1844 * If we not share the Acc SDRAM, this is never the case. Therefore
1845 * enable it here from the App side.
1846 */
1847 val = readw(U300_SYSCON_VBASE + U300_SYSCON_SMCR) | 1841 val = readw(U300_SYSCON_VBASE + U300_SYSCON_SMCR) |
1848 U300_SYSCON_SMCR_SEMI_SREFREQ_ENABLE; 1842 U300_SYSCON_SMCR_SEMI_SREFREQ_ENABLE;
1849 writew(val, U300_SYSCON_VBASE + U300_SYSCON_SMCR); 1843 writew(val, U300_SYSCON_VBASE + U300_SYSCON_SMCR);
1850#endif /* CONFIG_MACH_U300_SEMI_IS_SHARED */
1851} 1844}
1852 1845
1853static int core_module_init(void) 1846static int core_module_init(void)