Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c070d6ba authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'actions-arm-soc+sps-for-4.13' of... 

Merge tag 'actions-arm-soc+sps-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions into next/soc

Pull "Actions Semi ARM SoC for v4.13 #2" from Andreas Färber:

This adds SMP code to bring up the remaining S500 CPU cores
by reusing a helper factored out of the SPS power domains driver.

* tag 'actions-arm-soc+sps-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions:
  ARM: owl: smp: Implement SPS power-gating for CPU2 and CPU3
  soc: actions: owl-sps: Factor out owl_sps_set_pg() for power-gating
  soc: actions: Add Owl SPS
  dt-bindings: power: Add Owl SPS power domains
parents dc366b16 b6a0e18c

Documentation/devicetree/bindings/power/actions,owl-sps.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Actions Semi Owl Smart Power System (SPS)



Required properties:

- compatible          :  "actions,s500-sps" for S500

- reg                 :  Offset and length of the register set for the device.

- #power-domain-cells :  Must be 1.

                         See macros in:

                          include/dt-bindings/power/owl-s500-powergate.h for S500





Example:



		sps: power-controller@b01b0100 {

			compatible = "actions,s500-sps";

			reg = <0xb01b0100 0x100>;

			#power-domain-cells = <1>;

		};

arch/arm/mach-actions/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ menuconfig ARCH_ACTIONS 
	select GENERIC_IRQ_CHIP

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select OWL_PM_DOMAINS_HELPER

	select OWL_TIMER

	help

	  This enables support for the Actions Semiconductor S500 SoC family.

arch/arm/mach-actions/platsmp.c

+34 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/smp.h>

#include <linux/soc/actions/owl-sps.h>

#include <asm/cacheflush.h>

#include <asm/smp_plat.h>

#include <asm/smp_scu.h>
@@ -28,7 +29,13 @@ 


#define OWL_CPUx_FLAG_BOOT	0x55aa



#define OWL_SPS_PG_CTL_PWR_CPU2	BIT(5)

#define OWL_SPS_PG_CTL_PWR_CPU3	BIT(6)

#define OWL_SPS_PG_CTL_ACK_CPU2	BIT(21)

#define OWL_SPS_PG_CTL_ACK_CPU3	BIT(22)



static void __iomem *scu_base_addr;

static void __iomem *sps_base_addr;

static void __iomem *timer_base_addr;

static int ncores;
@@ -58,14 +65,27 @@ void owl_secondary_startup(void); 


static int s500_wakeup_secondary(unsigned int cpu)

{

	int ret;



	if (cpu > 3)

		return -EINVAL;



	/* The generic PM domain driver is not available this early. */

	switch (cpu) {

	case 2:

		ret = owl_sps_set_pg(sps_base_addr,

		                     OWL_SPS_PG_CTL_PWR_CPU2,

				     OWL_SPS_PG_CTL_ACK_CPU2, true);

		if (ret)

			return ret;

		break;

	case 3:

		/* CPU2/3 are power-gated */

		return -EINVAL;

		ret = owl_sps_set_pg(sps_base_addr,

		                     OWL_SPS_PG_CTL_PWR_CPU3,

				     OWL_SPS_PG_CTL_ACK_CPU3, true);

		if (ret)

			return ret;

		break;

	}



	/* wait for CPUx to run to WFE instruction */
@@ -133,6 +153,18 @@ static void __init s500_smp_prepare_cpus(unsigned int max_cpus) 
		return;

	}



	node = of_find_compatible_node(NULL, NULL, "actions,s500-sps");

	if (!node) {

		pr_err("%s: missing sps\n", __func__);

		return;

	}



	sps_base_addr = of_iomap(node, 0);

	if (!sps_base_addr) {

		pr_err("%s: could not map sps registers\n", __func__);

		return;

	}



	if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) {

		node = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");

		if (!node) {

drivers/soc/Kconfig

+1 −0
Original line number Diff line number Diff line 
menu "SOC (System On Chip) specific Drivers"



source "drivers/soc/actions/Kconfig"

source "drivers/soc/atmel/Kconfig"

source "drivers/soc/bcm/Kconfig"

source "drivers/soc/fsl/Kconfig"

drivers/soc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# Makefile for the Linux Kernel SOC specific device drivers.

#



obj-$(CONFIG_ARCH_ACTIONS)	+= actions/

obj-$(CONFIG_ARCH_AT91)		+= atmel/

obj-y				+= bcm/

obj-$(CONFIG_ARCH_DOVE)		+= dove/