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

Commit 61f14c01 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_4.16_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips 

Pull MIPS fix from James Hogan:
 "A single change (and associated DT binding update) to allow the
  address of the MIPS Cluster Power Controller (CPC) to be chosen by DT,
  which allows SMP to work on generic MIPS kernels where the bootloader
  hasn't configured the CPC address (i.e. the new Ranchu platform)"

* tag 'mips_4.16_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
  MIPS: CPC: Map registers using DT in mips_cpc_default_phys_base()
  dt-bindings: Document mti,mips-cpc binding
parents 178e834c 791412da

Documentation/devicetree/bindings/power/mti,mips-cpc.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
Binding for MIPS Cluster Power Controller (CPC).



This binding allows a system to specify where the CPC registers are

located.



Required properties:

compatible : Should be "mti,mips-cpc".

regs: Should describe the address & size of the CPC register region.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9206,6 +9206,7 @@ MIPS GENERIC PLATFORM 
M:	Paul Burton <paul.burton@mips.com>

L:	linux-mips@linux-mips.org

S:	Supported

F:	Documentation/devicetree/bindings/power/mti,mips-cpc.txt

F:	arch/mips/generic/

F:	arch/mips/tools/generic-board-config.sh

arch/mips/kernel/mips-cpc.c

+13 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 


#include <linux/errno.h>

#include <linux/percpu.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/spinlock.h>



#include <asm/mips-cps.h>
@@ -22,6 +24,17 @@ static DEFINE_PER_CPU_ALIGNED(unsigned long, cpc_core_lock_flags); 


phys_addr_t __weak mips_cpc_default_phys_base(void)

{

	struct device_node *cpc_node;

	struct resource res;

	int err;



	cpc_node = of_find_compatible_node(of_root, NULL, "mti,mips-cpc");

	if (cpc_node) {

		err = of_address_to_resource(cpc_node, 0, &res);

		if (!err)

			return res.start;

	}



	return 0;

}