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

Commit 4f7df3cb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-soc-5.1' of... 

Merge tag 'samsung-soc-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/fixes

Samsung mach/soc changes for v5.1

Two fixes: one for handling timeout while booting secondary CPU of
Exynos and second for S3C24xx DVS notifier.

* tag 'samsung-soc-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: exynos: Fix timeout when booting secondary CPUs
  ARM: s3c24xx: Fix boolean expressions in osiris_dvs_notify

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents cfe9930e 4bdf2f3f

arch/arm/mach-exynos/platsmp.c

+2 −2
Original line number Diff line number Diff line
@@ -336,9 +336,9 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) 
		/* wait max 10 ms until cpu1 is on */

		while (exynos_cpu_power_state(core_id)

		       != S5P_CORE_LOCAL_PWR_EN) {

			if (timeout-- == 0)

			if (timeout == 0)

				break;



			timeout--;

			mdelay(1);

		}

arch/arm/mach-s3c24xx/mach-osiris-dvs.c

+4 −4
Original line number Diff line number Diff line
@@ -65,16 +65,16 @@ static int osiris_dvs_notify(struct notifier_block *nb, 


	switch (val) {

	case CPUFREQ_PRECHANGE:

		if (old_dvs & !new_dvs ||

		    cur_dvs & !new_dvs) {

		if ((old_dvs && !new_dvs) ||

		    (cur_dvs && !new_dvs)) {

			pr_debug("%s: exiting dvs\n", __func__);

			cur_dvs = false;

			gpio_set_value(OSIRIS_GPIO_DVS, 1);

		}

		break;

	case CPUFREQ_POSTCHANGE:

		if (!old_dvs & new_dvs ||

		    !cur_dvs & new_dvs) {

		if ((!old_dvs && new_dvs) ||

		    (!cur_dvs && new_dvs)) {

			pr_debug("entering dvs\n");

			cur_dvs = true;

			gpio_set_value(OSIRIS_GPIO_DVS, 0);