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

Commit c64738e5 authored by Mylène Josserand's avatar Mylène Josserand Committed by Maxime Ripard
Browse files

ARM: sun9i: smp: Rename clusters's power-off 



To prepare the support for sun8i-a83t, rename the macro that handles
the power-off of clusters because it is different from sun9i-a80 to
sun8i-a83t.

The power off register for clusters are different from a80 and a83t.

Signed-off-by: default avatarMylène Josserand <mylene.josserand@bootlin.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
parent cad160ed

arch/arm/mach-sunxi/mc_smp.c

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#define PRCM_CPU_PO_RST_CTRL_CORE(n)	BIT(n)

#define PRCM_CPU_PO_RST_CTRL_CORE_ALL	0xf

#define PRCM_PWROFF_GATING_REG(c)	(0x100 + 0x4 * (c))

#define PRCM_PWROFF_GATING_REG_CLUSTER	BIT(4)

#define PRCM_PWROFF_GATING_REG_CLUSTER_SUN9I	BIT(4)

#define PRCM_PWROFF_GATING_REG_CORE(n)	BIT(n)

#define PRCM_PWR_SWITCH_REG(c, cpu)	(0x140 + 0x10 * (c) + 0x4 * (cpu))

#define PRCM_CPU_SOFT_ENTRY_REG		0x164
@@ -255,7 +255,7 @@ static int sunxi_cluster_powerup(unsigned int cluster) 


	/* clear cluster power gate */

	reg = readl(prcm_base + PRCM_PWROFF_GATING_REG(cluster));

	reg &= ~PRCM_PWROFF_GATING_REG_CLUSTER;

	reg &= ~PRCM_PWROFF_GATING_REG_CLUSTER_SUN9I;

	writel(reg, prcm_base + PRCM_PWROFF_GATING_REG(cluster));

	udelay(20);
@@ -452,7 +452,7 @@ static int sunxi_cluster_powerdown(unsigned int cluster) 
	/* gate cluster power */

	pr_debug("%s: gate cluster power\n", __func__);

	reg = readl(prcm_base + PRCM_PWROFF_GATING_REG(cluster));

	reg |= PRCM_PWROFF_GATING_REG_CLUSTER;

	reg |= PRCM_PWROFF_GATING_REG_CLUSTER_SUN9I;

	writel(reg, prcm_base + PRCM_PWROFF_GATING_REG(cluster));

	udelay(20);