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

Commit 26ab69cb authored by Heiko Stübner's avatar Heiko Stübner Committed by Olof Johansson
Browse files

ARM: rockchip: convert smp bringup to CPU_METHOD_OF_DECLARE 



With the newly introduced CPU_METHOD_OF_DECLARE is not necessary anymore
to reference the relevant smp_ops in the board file, but instead it can
simply be set by the enable-method property of the cpu nodes.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 1ef81bf7

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ nodes to be present and contain the properties described below. 
			    "marvell,armada-375-smp"

			    "marvell,armada-380-smp"

			    "marvell,armada-xp-smp"

			    "rockchip,rk3066-smp"



	- cpu-release-addr

		Usage: required for systems that have an "enable-method"

arch/arm/boot/dts/rk3066a.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		enable-method = "rockchip,rk3066-smp";



		cpu@0 {

			device_type = "cpu";

arch/arm/boot/dts/rk3188.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		enable-method = "rockchip,rk3066-smp";



		cpu@0 {

			device_type = "cpu";

arch/arm/mach-rockchip/core.h

+0 −2
Original line number Diff line number Diff line
@@ -18,5 +18,3 @@ extern char rockchip_secondary_trampoline_end; 


extern unsigned long rockchip_boot_fn;

extern void rockchip_secondary_startup(void);
 


extern struct smp_operations rockchip_smp_ops;

arch/arm/mach-rockchip/platsmp.c

+2 −1
Original line number Diff line number Diff line
@@ -178,7 +178,8 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus) 
		pmu_set_power_domain(0 + i, false);

}



struct smp_operations rockchip_smp_ops __initdata = {

static struct smp_operations rockchip_smp_ops __initdata = {

	.smp_prepare_cpus	= rockchip_smp_prepare_cpus,

	.smp_boot_secondary	= rockchip_boot_secondary,

};

CPU_METHOD_OF_DECLARE(rk3066_smp, "rockchip,rk3066-smp", &rockchip_smp_ops);