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

Commit 443d7920 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.3/soc-pt2' of... 

Merge tag 'omap-for-v4.3/soc-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Fix omap PM regression in Linux next and kill set_irq_flags usage
for GPMC.

* tag 'omap-for-v4.3/soc-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  memory: kill off set_irq_flags usage
  ARM: OMAP2+: Fix power domain operations regression caused by 81xx

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 207b504a ed293d1a

arch/arm/mach-omap2/powerdomains3xxx_data.c

+5 −1
Original line number Diff line number Diff line
@@ -580,7 +580,9 @@ void __init omap3xxx_powerdomains_init(void) 
	if (!cpu_is_omap34xx() && !cpu_is_ti81xx())

		return;



	pwrdm_register_platform_funcs(&ti81xx_pwrdm_operations);

	/* Only 81xx needs custom pwrdm_operations */

	if (!cpu_is_ti81xx())

		pwrdm_register_platform_funcs(&omap3_pwrdm_operations);;



	rev = omap_rev();
@@ -588,9 +590,11 @@ void __init omap3xxx_powerdomains_init(void) 
		pwrdm_register_pwrdms(powerdomains_am35x);

	} else if (rev == TI8148_REV_ES1_0 || rev == TI8148_REV_ES2_0 ||

		   rev == TI8148_REV_ES2_1) {

		pwrdm_register_platform_funcs(&ti81xx_pwrdm_operations);

		pwrdm_register_pwrdms(powerdomains_ti814x);

	} else if (rev == TI8168_REV_ES1_0 || rev == TI8168_REV_ES1_1

			|| rev == TI8168_REV_ES2_0 || rev == TI8168_REV_ES2_1) {

		pwrdm_register_platform_funcs(&ti81xx_pwrdm_operations);

		pwrdm_register_pwrdms(powerdomains_ti816x);

	} else {

		pwrdm_register_pwrdms(powerdomains_omap3430_common);

drivers/memory/omap-gpmc.c

+2 −3
Original line number Diff line number Diff line
@@ -1176,8 +1176,8 @@ static int gpmc_setup_irq(void) 
		gpmc_client_irq[i].irq = gpmc_irq_start + i;

		irq_set_chip_and_handler(gpmc_client_irq[i].irq,

					&gpmc_irq_chip, handle_simple_irq);

		set_irq_flags(gpmc_client_irq[i].irq,

				IRQF_VALID | IRQF_NOAUTOEN);

		irq_modify_status(gpmc_client_irq[i].irq, IRQ_NOREQUEST,

				  IRQ_NOAUTOEN);

	}



	/* Disable interrupts */
@@ -1200,7 +1200,6 @@ static int gpmc_free_irq(void) 
	for (i = 0; i < GPMC_NR_IRQ; i++) {

		irq_set_handler(gpmc_client_irq[i].irq, NULL);

		irq_set_chip(gpmc_client_irq[i].irq, &no_irq_chip);

		irq_modify_status(gpmc_client_irq[i].irq, 0, 0);

	}



	irq_free_descs(gpmc_irq_start, GPMC_NR_IRQ);