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

Commit ea023be7 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-soc-next-2017-08-24' into soc/next 



This pull request brings in a move of the bcm2836/7 SMP init code from
the irqchip driver to platsmp.c (general move acked by the maintainer,
v2 of the patch including a squashed in fix to prevent a dependency on
updated DT compatibles) and an added sev() to wake up the secondary
CPUs on newer firmware.  It also garbage collects some stub clock code
from before we had a proper clock driver, which has been acked by the
clk maintainers to go through the ARM trees.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents 2bd6bf03 968f7641

arch/arm/mach-bcm/Makefile

+5 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,11 @@ endif 




# BCM2835

# BCM2835

obj-$(CONFIG_ARCH_BCM2835)	+= board_bcm2835.o

obj-$(CONFIG_ARCH_BCM2835)	+= board_bcm2835.o

ifeq ($(CONFIG_ARCH_BCM2835),y)

ifeq ($(CONFIG_ARM),y)

obj-$(CONFIG_SMP)		+= platsmp.o

endif

endif





# BCM5301X

# BCM5301X

obj-$(CONFIG_ARCH_BCM_5301X)	+= bcm_5301x.o

obj-$(CONFIG_ARCH_BCM_5301X)	+= bcm_5301x.o

arch/arm/mach-bcm/board_bcm2835.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -15,15 +15,11 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/irqchip.h>

#include <linux/irqchip.h>

#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/clk/bcm2835.h>





#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/map.h>





static void __init bcm2835_init(void)

#include "platsmp.h"

{

	bcm2835_init_clocks();

}





static const char * const bcm2835_compat[] = {

static const char * const bcm2835_compat[] = {

#ifdef CONFIG_ARCH_MULTI_V6

#ifdef CONFIG_ARCH_MULTI_V6
@@ -31,11 +27,12 @@ static const char * const bcm2835_compat[] = { 
#endif

#endif

#ifdef CONFIG_ARCH_MULTI_V7

#ifdef CONFIG_ARCH_MULTI_V7

	"brcm,bcm2836",

	"brcm,bcm2836",

	"brcm,bcm2837",

#endif

#endif

	NULL

	NULL

};

};





DT_MACHINE_START(BCM2835, "BCM2835")

DT_MACHINE_START(BCM2835, "BCM2835")

	.init_machine = bcm2835_init,

	.dt_compat = bcm2835_compat,

	.dt_compat = bcm2835_compat

	.smp = smp_ops(bcm2836_smp_ops),

MACHINE_END
 
MACHINE_END

arch/arm/mach-bcm/platsmp.c

+38 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/irqchip/irq-bcm2836.h>

#include <linux/jiffies.h>

#include <linux/jiffies.h>

#include <linux/of.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_address.h>
@@ -287,6 +288,38 @@ static int nsp_boot_secondary(unsigned int cpu, struct task_struct *idle) 
	return ret;

	return ret;

}

}





static int bcm2836_boot_secondary(unsigned int cpu, struct task_struct *idle)

{

	void __iomem *intc_base;

	struct device_node *dn;

	char *name;



	name = "brcm,bcm2836-l1-intc";

	dn = of_find_compatible_node(NULL, NULL, name);

	if (!dn) {

		pr_err("unable to find intc node\n");

		return -ENODEV;

	}



	intc_base = of_iomap(dn, 0);

	of_node_put(dn);



	if (!intc_base) {

		pr_err("unable to remap intc base register\n");

		return -ENOMEM;

	}



	writel(virt_to_phys(secondary_startup),

	       intc_base + LOCAL_MAILBOX3_SET0 + 16 * cpu);



	dsb(sy);

	sev();



	iounmap(intc_base);



	return 0;

}



static const struct smp_operations kona_smp_ops __initconst = {

static const struct smp_operations kona_smp_ops __initconst = {

	.smp_prepare_cpus	= bcm_smp_prepare_cpus,

	.smp_prepare_cpus	= bcm_smp_prepare_cpus,

	.smp_boot_secondary	= kona_boot_secondary,

	.smp_boot_secondary	= kona_boot_secondary,
@@ -305,3 +338,8 @@ static const struct smp_operations nsp_smp_ops __initconst = { 
	.smp_boot_secondary	= nsp_boot_secondary,

	.smp_boot_secondary	= nsp_boot_secondary,

};

};

CPU_METHOD_OF_DECLARE(bcm_smp_nsp, "brcm,bcm-nsp-smp", &nsp_smp_ops);

CPU_METHOD_OF_DECLARE(bcm_smp_nsp, "brcm,bcm-nsp-smp", &nsp_smp_ops);



const struct smp_operations bcm2836_smp_ops __initconst = {

	.smp_boot_secondary	= bcm2836_boot_secondary,

};

CPU_METHOD_OF_DECLARE(bcm_smp_bcm2836, "brcm,bcm2836-smp", &bcm2836_smp_ops);

arch/arm/mach-bcm/platsmp.h

0 → 100644
+10 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2017 Stefan Wahren <stefan.wahren@i2se.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 */



extern const struct smp_operations bcm2836_smp_ops;

drivers/clk/bcm/clk-bcm2835-aux.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 




#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/clk-provider.h>

#include <linux/clk/bcm2835.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <dt-bindings/clock/bcm2835-aux.h>

#include <dt-bindings/clock/bcm2835-aux.h>