Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-16 09:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi

Browse source 
- Revert "sunxi: psci: avoid error address-of-packed-member"
This commit is contained in:
Tom Rini 2020-03-18 07:48:53 -04:00
commit 14eb12a3c8
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
arch/arm/cpu/armv7/sunxi/psci.c
View file

@ -75,7 +75,7 @@ static void __secure __mdelay(u32 ms)
isb(); isb();
} }
static void __secure clamp_release(void __maybe_unused *clamp) static void __secure clamp_release(u32 __maybe_unused *clamp)
{ {
#if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \ #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
defined(CONFIG_MACH_SUN8I_H3) || \ defined(CONFIG_MACH_SUN8I_H3) || \
@ -90,7 +90,7 @@ static void __secure clamp_release(void __maybe_unused *clamp)
#endif #endif
} }
static void __secure clamp_set(void __maybe_unused *clamp) static void __secure clamp_set(u32 __maybe_unused *clamp)
{ {
#if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \ #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
defined(CONFIG_MACH_SUN8I_H3) || \ defined(CONFIG_MACH_SUN8I_H3) || \
@ -99,28 +99,22 @@ static void __secure clamp_set(void __maybe_unused *clamp)
#endif #endif
} }
static void __secure sunxi_power_switch(void *clamp, void *pwroff_ptr, bool on, static void __secure sunxi_power_switch(u32 *clamp, u32 *pwroff, bool on,
int cpu) int cpu)
{ {
u32 pwroff;
memcpy(&pwroff, pwroff_ptr, sizeof(u32));
if (on) { if (on) {
/* Release power clamp */ /* Release power clamp */
clamp_release(clamp); clamp_release(clamp);
/* Clear power gating */ /* Clear power gating */
clrbits_le32(&pwroff, BIT(cpu)); clrbits_le32(pwroff, BIT(cpu));
} else { } else {
/* Set power gating */ /* Set power gating */
setbits_le32(&pwroff, BIT(cpu)); setbits_le32(pwroff, BIT(cpu));
/* Activate power clamp */ /* Activate power clamp */
clamp_set(clamp); clamp_set(clamp);
} }
memcpy(pwroff_ptr, &pwroff, sizeof(u32));
} }
#ifdef CONFIG_MACH_SUN8I_R40 #ifdef CONFIG_MACH_SUN8I_R40