mirror of
https://github.com/torvalds/linux.git
synced 2024-12-15 15:41:58 +00:00
b4b50fd78b
This branch contains mostly additions and changes to platform enablement and SoC-level drivers. Since there's sometimes a dependency on device-tree changes, there's also a fair amount of those in this branch. Pieces worth mentioning are: - Mbus driver for Marvell platforms, allowing kernel configuration and resource allocation of on-chip peripherals. - Enablement of the mbus infrastructure from Marvell PCI-e drivers. - Preparation of MSI support for Marvell platforms. - Addition of new PCI-e host controller driver for Tegra platforms - Some churn caused by sharing of macro names between i.MX 6Q and 6DL platforms in the device tree sources and header files. - Various suspend/PM updates for Tegra, including LP1 support. - Versatile Express support for MCPM, part of big little support. - Allwinner platform support for A20 and A31 SoCs (dual and quad Cortex-A7) - OMAP2+ support for DRA7, a new Cortex-A15-based SoC. The code that touches other architectures are patches moving MSI arch-specific functions over to weak symbols and removal of ARCH_SUPPORTS_MSI, acked by PCI maintainers. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJSKhYmAAoJEIwa5zzehBx322AP/1ONYs8o8f7/Gzq6lZvTN6T3 0pBTApg6Jfioi3lwKvUAEIcsW82YKQ+UZkbW66GQH6+Ri4aZJKZHuz0+JPU67OJ4 LtSLuzVWrymy2VOOUvAnS/SXkOZw/pHhU4cLNHn1dMndhUL1Uqp9/XwuiHEQyFsP uOkpcBtIu0EWElov0PKKZ5SWBg8JJs2vy5ydiViGelWHCrZvDDZkWzIsDcBQxJLQ juzT4+JE+KOu7vKmfw78o6iHoCS2TBRAN9YUCajRb8Wl+out1hrTahHnDWaZ5Mce EskcQNkJROqFbjD4k3ABN4XGTv2VDmrztIwFe0SEQ7Dz/9ypCrBGT69uI9xIqTXr GwVRIwAUFTpMupK0gy93z1ajV3N0CXV79out9+jQNUQybYE+czp8QOyhmuc1tZx0 8fn9jlBQe9Vy6yrs39gEcE7nUwrayeyQ+6UvqqwsE2pWZabNAnCMSPX5+QIu+T/3 tQ7+jYmfFeserp1sIDOHOnxfhtW9EI6U9d1h/DUCwrsuFdkL9ha4M/vh9Pwgye98 tBdz0T4yE39AJQwwFWRkv1jcQKcGu6WqJanmvS4KRBksGwuLWxy+ewOnkz2ifS25 ZYSyxAryZRBvQRqlOK11rXPfRcbGcY0MG9lkKX96rGcyWEizgE1DdjxXD8HoIleN R8heV6GX5OzlFLGX2tKK =fJ5x -----END PGP SIGNATURE----- Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC platform changes from Olof Johansson: "This branch contains mostly additions and changes to platform enablement and SoC-level drivers. Since there's sometimes a dependency on device-tree changes, there's also a fair amount of those in this branch. Pieces worth mentioning are: - Mbus driver for Marvell platforms, allowing kernel configuration and resource allocation of on-chip peripherals. - Enablement of the mbus infrastructure from Marvell PCI-e drivers. - Preparation of MSI support for Marvell platforms. - Addition of new PCI-e host controller driver for Tegra platforms - Some churn caused by sharing of macro names between i.MX 6Q and 6DL platforms in the device tree sources and header files. - Various suspend/PM updates for Tegra, including LP1 support. - Versatile Express support for MCPM, part of big little support. - Allwinner platform support for A20 and A31 SoCs (dual and quad Cortex-A7) - OMAP2+ support for DRA7, a new Cortex-A15-based SoC. The code that touches other architectures are patches moving MSI arch-specific functions over to weak symbols and removal of ARCH_SUPPORTS_MSI, acked by PCI maintainers" * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (266 commits) tegra-cpuidle: provide stub when !CONFIG_CPU_IDLE PCI: tegra: replace devm_request_and_ioremap by devm_ioremap_resource ARM: tegra: Drop ARCH_SUPPORTS_MSI and sort list ARM: dts: vf610-twr: enable i2c0 device ARM: dts: i.MX51: Add one more I2C2 pinmux entry ARM: dts: i.MX51: Move pins configuration under "iomuxc" label ARM: dtsi: imx6qdl-sabresd: Add USB OTG vbus pin to pinctrl_hog ARM: dtsi: imx6qdl-sabresd: Add USB host 1 VBUS regulator ARM: dts: imx27-phytec-phycore-som: Enable AUDMUX ARM: dts: i.MX27: Disable AUDMUX in the template ARM: dts: wandboard: Add support for SDIO bcm4329 ARM: i.MX5 clocks: Remove optional clock setup (CKIH1) from i.MX51 template ARM: dts: imx53-qsb: Make USBH1 functional ARM i.MX6Q: dts: Enable I2C1 with EEPROM and PMIC on Phytec phyFLEX-i.MX6 Ouad module ARM i.MX6Q: dts: Enable SPI NOR flash on Phytec phyFLEX-i.MX6 Ouad module ARM: dts: imx6qdl-sabresd: Add touchscreen support ARM: imx: add ocram clock for imx53 ARM: dts: imx: ocram size is different between imx6q and imx6dl ARM: dts: imx27-phytec-phycore-som: Fix regulator settings ARM: dts: i.MX27: Remove clock name from CPU node ...
133 lines
3.3 KiB
C
133 lines
3.3 KiB
C
/*
|
|
* Symmetric Multi Processing (SMP) support for Armada XP
|
|
*
|
|
* Copyright (C) 2012 Marvell
|
|
*
|
|
* Lior Amsalem <alior@marvell.com>
|
|
* Yehuda Yitschak <yehuday@marvell.com>
|
|
* Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
* Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*
|
|
* The Armada XP SoC has 4 ARMv7 PJ4B CPUs running in full HW coherency
|
|
* This file implements the routines for preparing the SMP infrastructure
|
|
* and waking up the secondary CPUs
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/mbus.h>
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/smp_plat.h>
|
|
#include "common.h"
|
|
#include "armada-370-xp.h"
|
|
#include "pmsu.h"
|
|
#include "coherency.h"
|
|
|
|
#define AXP_BOOTROM_BASE 0xfff00000
|
|
#define AXP_BOOTROM_SIZE 0x100000
|
|
|
|
static struct clk *__init get_cpu_clk(int cpu)
|
|
{
|
|
struct clk *cpu_clk;
|
|
struct device_node *np = of_get_cpu_node(cpu, NULL);
|
|
|
|
if (WARN(!np, "missing cpu node\n"))
|
|
return NULL;
|
|
cpu_clk = of_clk_get(np, 0);
|
|
if (WARN_ON(IS_ERR(cpu_clk)))
|
|
return NULL;
|
|
return cpu_clk;
|
|
}
|
|
|
|
void __init set_secondary_cpus_clock(void)
|
|
{
|
|
int thiscpu, cpu;
|
|
unsigned long rate;
|
|
struct clk *cpu_clk;
|
|
|
|
thiscpu = smp_processor_id();
|
|
cpu_clk = get_cpu_clk(thiscpu);
|
|
if (!cpu_clk)
|
|
return;
|
|
clk_prepare_enable(cpu_clk);
|
|
rate = clk_get_rate(cpu_clk);
|
|
|
|
/* set all the other CPU clk to the same rate than the boot CPU */
|
|
for_each_possible_cpu(cpu) {
|
|
if (cpu == thiscpu)
|
|
continue;
|
|
cpu_clk = get_cpu_clk(cpu);
|
|
if (!cpu_clk)
|
|
return;
|
|
clk_set_rate(cpu_clk, rate);
|
|
}
|
|
}
|
|
|
|
static void armada_xp_secondary_init(unsigned int cpu)
|
|
{
|
|
armada_xp_mpic_smp_cpu_init();
|
|
}
|
|
|
|
static int armada_xp_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
pr_info("Booting CPU %d\n", cpu);
|
|
|
|
armada_xp_boot_cpu(cpu, armada_xp_secondary_startup);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void __init armada_xp_smp_init_cpus(void)
|
|
{
|
|
unsigned int ncores = num_possible_cpus();
|
|
|
|
if (ncores == 0 || ncores > ARMADA_XP_MAX_CPUS)
|
|
panic("Invalid number of CPUs in DT\n");
|
|
|
|
set_smp_cross_call(armada_mpic_send_doorbell);
|
|
}
|
|
|
|
void __init armada_xp_smp_prepare_cpus(unsigned int max_cpus)
|
|
{
|
|
struct device_node *node;
|
|
struct resource res;
|
|
int err;
|
|
|
|
set_secondary_cpus_clock();
|
|
flush_cache_all();
|
|
set_cpu_coherent(cpu_logical_map(smp_processor_id()), 0);
|
|
|
|
/*
|
|
* In order to boot the secondary CPUs we need to ensure
|
|
* the bootROM is mapped at the correct address.
|
|
*/
|
|
node = of_find_compatible_node(NULL, NULL, "marvell,bootrom");
|
|
if (!node)
|
|
panic("Cannot find 'marvell,bootrom' compatible node");
|
|
|
|
err = of_address_to_resource(node, 0, &res);
|
|
if (err < 0)
|
|
panic("Cannot get 'bootrom' node address");
|
|
|
|
if (res.start != AXP_BOOTROM_BASE ||
|
|
resource_size(&res) != AXP_BOOTROM_SIZE)
|
|
panic("The address for the BootROM is incorrect");
|
|
}
|
|
|
|
struct smp_operations armada_xp_smp_ops __initdata = {
|
|
.smp_init_cpus = armada_xp_smp_init_cpus,
|
|
.smp_prepare_cpus = armada_xp_smp_prepare_cpus,
|
|
.smp_secondary_init = armada_xp_secondary_init,
|
|
.smp_boot_secondary = armada_xp_boot_secondary,
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
.cpu_die = armada_xp_cpu_die,
|
|
#endif
|
|
};
|