ARM: exynos: Remove static mapping of SCU SFR
Lets remove static mapping of SCU SFR mainly used in CORTEX-A9 SoC based boards. Instead use mapping from device tree node of SCU. Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com> Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com> [mszyprow: rebased, added fallback to scu_a9_get_base() when no SCU DT node is available, removed compatibility break warning, fixed non-SMP build, keep SCU base mapping to avoid issues with calls from CPUidle] Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
This commit is contained in:

کامیت شده توسط
Krzysztof Kozlowski

والد
66df44b258
کامیت
3c33710b45
@@ -163,6 +163,26 @@ int exynos_cluster_power_state(int cluster)
|
||||
S5P_CORE_LOCAL_PWR_EN);
|
||||
}
|
||||
|
||||
/**
|
||||
* exynos_scu_enable : enables SCU for Cortex-A9 based system
|
||||
*/
|
||||
void exynos_scu_enable(void)
|
||||
{
|
||||
struct device_node *np;
|
||||
static void __iomem *scu_base;
|
||||
|
||||
if (!scu_base) {
|
||||
np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");
|
||||
if (np) {
|
||||
scu_base = of_iomap(np, 0);
|
||||
of_node_put(np);
|
||||
} else {
|
||||
scu_base = ioremap(scu_a9_get_base(), SZ_4K);
|
||||
}
|
||||
}
|
||||
scu_enable(scu_base);
|
||||
}
|
||||
|
||||
static void __iomem *cpu_boot_reg_base(void)
|
||||
{
|
||||
if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1)
|
||||
@@ -219,11 +239,6 @@ static void write_pen_release(int val)
|
||||
sync_cache_w(&pen_release);
|
||||
}
|
||||
|
||||
static void __iomem *scu_base_addr(void)
|
||||
{
|
||||
return (void __iomem *)(S5P_VA_SCU);
|
||||
}
|
||||
|
||||
static DEFINE_SPINLOCK(boot_lock);
|
||||
|
||||
static void exynos_secondary_init(unsigned int cpu)
|
||||
@@ -389,7 +404,7 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)
|
||||
exynos_set_delayed_reset_assertion(true);
|
||||
|
||||
if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
|
||||
scu_enable(scu_base_addr());
|
||||
exynos_scu_enable();
|
||||
|
||||
/*
|
||||
* Write the address of secondary startup into the
|
||||
|
مرجع در شماره جدید
Block a user