Our SoC branch usually contains expanded support for new SoCs and other core platform code. Some highlights from this round: - sunxi: SMP support for A23 SoC - socpga: big-endian support - pxa: conversion to common clock framework - bcm: SMP support for BCM63138 - imx: support new I.MX7D SoC - zte: basic support for ZX296702 SoC Conflicts: arch/arm/mach-socfpga/core.h Trivial remove/remove conflict with our cleanup branch. Resolution: remove both sides -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVi4RMAAoJEFk3GJrT+8Zl6/kP/1Rv9O++1Kxua6R54Og6AF1J 0miFr2fnUrUWUYg/NVbseRH5bBe6N6ir3SQMfde8W2/QibEjOoEwSwrle+mC/eiq CE0x0gtyRvXMrMU/FWkOvbmmw9uv5oz1z3IHZV6AiecNuSMLUBPfamryikQ8C+d1 O/QZtX543tJQJDOBihO5cuhoVVM37UX0unNmqGsyswlyqTPF8FxcIJAYVNtnxjmj AFaOB0nDJKLKFTiX2Ype2wOxxJX1lrLatNo4W4T+YaaK+i1uCOhgTdSN+n49K7YA KNDFEgZFQqT8VMJyG+eJVeYF+cI7yWQ7lBzIftPUjPk/7+dIHBjWPz2QdjVz3U38 kxncf4S9xGAF5G2rcKe4mFrfT3Y8QLWQpA/jFs06yLwW1O3Hlfq3DzMdGNcF7hth 17LOP8namn9+NepZEp/vAlFzRRypxWWtbkPNBIItkImC6zn0IiGjBy50DE1io27W hmQcnMb7d+0wWl2Y8OmR2lZSB97JiRZkRYMCVHVt+0zGJzp4prLvl9wbjh1VXkPv ERCDJ9nCmZsl7ZVmIXMI7KNXYuPNp7R/QAzCvuSUueswF0qxTAQ0VSSBwRMqvQsQ UUNC6p63VnjUeMUdn2EBsUQZ0Uqw3t2U5TtvooHNt9FkiGsSpwjWrvVD+LItaPoJ GPeeJrJaYQsDvTrO8wjU =ZtPK -----END PGP SIGNATURE----- Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC platform support updates from Kevin Hilman: "Our SoC branch usually contains expanded support for new SoCs and other core platform code. Some highlights from this round: - sunxi: SMP support for A23 SoC - socpga: big-endian support - pxa: conversion to common clock framework - bcm: SMP support for BCM63138 - imx: support new I.MX7D SoC - zte: basic support for ZX296702 SoC" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (134 commits) ARM: zx: Add basic defconfig support for ZX296702 ARM: dts: zx: add an initial zx296702 dts and doc clk: zx: add clock support to zx296702 dt-bindings: Add #defines for ZTE ZX296702 clocks ARM: socfpga: fix build error due to secondary_startup MAINTAINERS: ARM64: EXYNOS: Extend entry for ARM64 DTS ARM: ep93xx: simone: support for SPI-based MMC/SD cards MAINTAINERS: update Shawn's email to use kernel.org one ARM: socfpga: support suspend to ram ARM: socfpga: add CPU_METHOD_OF_DECLARE for Arria 10 ARM: socfpga: use CPU_METHOD_OF_DECLARE for socfpga_cyclone5 ARM: EXYNOS: register power domain driver from core_initcall ARM: EXYNOS: use PS_HOLD based poweroff for all supported SoCs ARM: SAMSUNG: Constify platform_device_id ARM: EXYNOS: Constify irq_domain_ops ARM: EXYNOS: add coupled cpuidle support for Exynos3250 ARM: EXYNOS: add exynos_get_boot_addr() helper ARM: EXYNOS: add exynos_set_boot_addr() helper ARM: EXYNOS: make exynos_core_restart() less verbose ARM: EXYNOS: fix exynos_boot_secondary() return value on timeout ...
		
			
				
	
	
		
			126 lines
		
	
	
	
		
			3.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			126 lines
		
	
	
	
		
			3.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright 2010-2011 Calxeda, Inc.
 | 
						|
 * Copyright 2012 Pavel Machek <pavel@denx.de>
 | 
						|
 * Based on platsmp.c, Copyright (C) 2002 ARM Ltd.
 | 
						|
 * Copyright (C) 2012 Altera Corporation
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify it
 | 
						|
 * under the terms and conditions of the GNU General Public License,
 | 
						|
 * version 2, as published by the Free Software Foundation.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope 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.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License along with
 | 
						|
 * this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
						|
 */
 | 
						|
#include <linux/delay.h>
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/smp.h>
 | 
						|
#include <linux/io.h>
 | 
						|
#include <linux/of.h>
 | 
						|
#include <linux/of_address.h>
 | 
						|
 | 
						|
#include <asm/cacheflush.h>
 | 
						|
#include <asm/smp_scu.h>
 | 
						|
#include <asm/smp_plat.h>
 | 
						|
 | 
						|
#include "core.h"
 | 
						|
 | 
						|
static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)
 | 
						|
{
 | 
						|
	int trampoline_size = &secondary_trampoline_end - &secondary_trampoline;
 | 
						|
 | 
						|
	if (socfpga_cpu1start_addr) {
 | 
						|
		/* This will put CPU #1 into reset. */
 | 
						|
		writel(RSTMGR_MPUMODRST_CPU1,
 | 
						|
		       rst_manager_base_addr + SOCFPGA_RSTMGR_MODMPURST);
 | 
						|
 | 
						|
		memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);
 | 
						|
 | 
						|
		writel(virt_to_phys(secondary_startup),
 | 
						|
		       sys_manager_base_addr + (socfpga_cpu1start_addr & 0x000000ff));
 | 
						|
 | 
						|
		flush_cache_all();
 | 
						|
		smp_wmb();
 | 
						|
		outer_clean_range(0, trampoline_size);
 | 
						|
 | 
						|
		/* This will release CPU #1 out of reset. */
 | 
						|
		writel(0, rst_manager_base_addr + SOCFPGA_RSTMGR_MODMPURST);
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int socfpga_a10_boot_secondary(unsigned int cpu, struct task_struct *idle)
 | 
						|
{
 | 
						|
	int trampoline_size = &secondary_trampoline_end - &secondary_trampoline;
 | 
						|
 | 
						|
	if (socfpga_cpu1start_addr) {
 | 
						|
		writel(RSTMGR_MPUMODRST_CPU1, rst_manager_base_addr +
 | 
						|
		       SOCFPGA_A10_RSTMGR_MODMPURST);
 | 
						|
		memcpy(phys_to_virt(0), &secondary_trampoline, trampoline_size);
 | 
						|
 | 
						|
		writel(virt_to_phys(secondary_startup),
 | 
						|
		       sys_manager_base_addr + (socfpga_cpu1start_addr & 0x00000fff));
 | 
						|
 | 
						|
		flush_cache_all();
 | 
						|
		smp_wmb();
 | 
						|
		outer_clean_range(0, trampoline_size);
 | 
						|
 | 
						|
		/* This will release CPU #1 out of reset. */
 | 
						|
		writel(0, rst_manager_base_addr + SOCFPGA_A10_RSTMGR_MODMPURST);
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static void __init socfpga_smp_prepare_cpus(unsigned int max_cpus)
 | 
						|
{
 | 
						|
	struct device_node *np;
 | 
						|
	void __iomem *socfpga_scu_base_addr;
 | 
						|
 | 
						|
	np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");
 | 
						|
	if (!np) {
 | 
						|
		pr_err("%s: missing scu\n", __func__);
 | 
						|
		return;
 | 
						|
	}
 | 
						|
 | 
						|
	socfpga_scu_base_addr = of_iomap(np, 0);
 | 
						|
	if (!socfpga_scu_base_addr)
 | 
						|
		return;
 | 
						|
	scu_enable(socfpga_scu_base_addr);
 | 
						|
}
 | 
						|
 | 
						|
/*
 | 
						|
 * platform-specific code to shutdown a CPU
 | 
						|
 *
 | 
						|
 * Called with IRQs disabled
 | 
						|
 */
 | 
						|
static void socfpga_cpu_die(unsigned int cpu)
 | 
						|
{
 | 
						|
	/* Do WFI. If we wake up early, go back into WFI */
 | 
						|
	while (1)
 | 
						|
		cpu_do_idle();
 | 
						|
}
 | 
						|
 | 
						|
static struct smp_operations socfpga_smp_ops __initdata = {
 | 
						|
	.smp_prepare_cpus	= socfpga_smp_prepare_cpus,
 | 
						|
	.smp_boot_secondary	= socfpga_boot_secondary,
 | 
						|
#ifdef CONFIG_HOTPLUG_CPU
 | 
						|
	.cpu_die		= socfpga_cpu_die,
 | 
						|
#endif
 | 
						|
};
 | 
						|
 | 
						|
static struct smp_operations socfpga_a10_smp_ops __initdata = {
 | 
						|
	.smp_prepare_cpus	= socfpga_smp_prepare_cpus,
 | 
						|
	.smp_boot_secondary	= socfpga_a10_boot_secondary,
 | 
						|
#ifdef CONFIG_HOTPLUG_CPU
 | 
						|
	.cpu_die		= socfpga_cpu_die,
 | 
						|
#endif
 | 
						|
};
 | 
						|
 | 
						|
CPU_METHOD_OF_DECLARE(socfpga_smp, "altr,socfpga-smp", &socfpga_smp_ops);
 | 
						|
CPU_METHOD_OF_DECLARE(socfpga_a10_smp, "altr,socfpga-a10-smp", &socfpga_a10_smp_ops);
 |