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

Commit 0be32d2f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-fixes-1' of... 

Merge tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

Merge "Samsung fixes for v4.0" from Kukjin Kim:

* tag samsung-fixes-1:
  ARM: EXYNOS: Fix wrong hwirq of RTC interrupt for Exynos3250 SoC
  ARM: EXYNOS: Don't use LDREX and STREX after disabling cache coherency
parents 3c02bfc4 ace283a0

arch/arm/mach-exynos/platsmp.c

+1 −2
Original line number Diff line number Diff line
@@ -126,8 +126,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) 
 */

void exynos_cpu_power_down(int cpu)

{

	if (cpu == 0 && (of_machine_is_compatible("samsung,exynos5420") ||

		of_machine_is_compatible("samsung,exynos5800"))) {

	if (cpu == 0 && (soc_is_exynos5420() || soc_is_exynos5800())) {

		/*

		 * Bypass power down for CPU0 during suspend. Check for

		 * the SYS_PWR_REG value to decide if we are suspending

arch/arm/mach-exynos/suspend.c

+2 −2
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ static unsigned int exynos_pmu_spare3; 
static u32 exynos_irqwake_intmask = 0xffffffff;



static const struct exynos_wkup_irq exynos3250_wkup_irq[] = {

	{ 73, BIT(1) }, /* RTC alarm */

	{ 74, BIT(2) }, /* RTC tick */

	{ 105, BIT(1) }, /* RTC alarm */

	{ 106, BIT(2) }, /* RTC tick */

	{ /* sentinel */ },

};