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

Commit 1fbece15 authored by David Brownell's avatar David Brownell Committed by Dominik Brodowski
Browse files

[PATCH] pcmcia: at91_cf update 



More correct AT91 CF wakeup logic ... only enable/disable the IRQ wakeup
capability, not the IRQ itself.  That way the we know that the IRQ will be
disabled correctly, in suspend/resume logic instead of ARM IRQ code.

Most of the pin multiplexing setup has moved to the devices.c setup code.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 9eed2867

drivers/pcmcia/at91_cf.c

+7 −18
Original line number Original line Diff line number Diff line
@@ -241,12 +241,6 @@ static int __init at91_cf_probe(struct platform_device *pdev) 
	csa = at91_sys_read(AT91_EBI_CSA);

	csa = at91_sys_read(AT91_EBI_CSA);

	at91_sys_write(AT91_EBI_CSA, csa | AT91_EBI_CS4A_SMC_COMPACTFLASH);

	at91_sys_write(AT91_EBI_CSA, csa | AT91_EBI_CS4A_SMC_COMPACTFLASH);





	/* force poweron defaults for these pins ... */

	(void) at91_set_A_periph(AT91_PIN_PC9, 0);	/* A25/CFRNW */

	(void) at91_set_A_periph(AT91_PIN_PC10, 0);	/* NCS4/CFCS */

	(void) at91_set_A_periph(AT91_PIN_PC11, 0);	/* NCS5/CFCE1 */

	(void) at91_set_A_periph(AT91_PIN_PC12, 0);	/* NCS6/CFCE2 */



	/* nWAIT is _not_ a default setting */

	/* nWAIT is _not_ a default setting */

	(void) at91_set_A_periph(AT91_PIN_PC6, 1);	/*  nWAIT */

	(void) at91_set_A_periph(AT91_PIN_PC6, 1);	/*  nWAIT */
@@ -322,6 +316,7 @@ static int __init at91_cf_probe(struct platform_device *pdev) 
	if (board->irq_pin)

	if (board->irq_pin)

		free_irq(board->irq_pin, cf);

		free_irq(board->irq_pin, cf);

fail0a:

fail0a:

	device_init_wakeup(&pdev->dev, 0);

	free_irq(board->det_pin, cf);

	free_irq(board->det_pin, cf);

	device_init_wakeup(&pdev->dev, 0);

	device_init_wakeup(&pdev->dev, 0);

fail0:

fail0:
@@ -360,26 +355,20 @@ static int at91_cf_suspend(struct platform_device *pdev, pm_message_t mesg) 
	struct at91_cf_data	*board = cf->board;

	struct at91_cf_data	*board = cf->board;





	pcmcia_socket_dev_suspend(&pdev->dev, mesg);

	pcmcia_socket_dev_suspend(&pdev->dev, mesg);

	if (device_may_wakeup(&pdev->dev))

	if (device_may_wakeup(&pdev->dev)) {

		enable_irq_wake(board->det_pin);

		enable_irq_wake(board->det_pin);

	else {

		if (board->irq_pin)

			enable_irq_wake(board->irq_pin);

	} else {

		disable_irq_wake(board->det_pin);

		disable_irq_wake(board->det_pin);

		disable_irq(board->det_pin);

	}

		if (board->irq_pin)

		if (board->irq_pin)

		disable_irq(board->irq_pin);

			disable_irq_wake(board->irq_pin);

	}

	return 0;

	return 0;

}

}





static int at91_cf_resume(struct platform_device *pdev)

static int at91_cf_resume(struct platform_device *pdev)

{

{

	struct at91_cf_socket	*cf = platform_get_drvdata(pdev);

	struct at91_cf_data	*board = cf->board;



	if (board->irq_pin)

		enable_irq(board->irq_pin);

	if (!device_may_wakeup(&pdev->dev))

		enable_irq(board->det_pin);

	pcmcia_socket_dev_resume(&pdev->dev);

	pcmcia_socket_dev_resume(&pdev->dev);

	return 0;

	return 0;

}

}