[ARM] 3865/1: AT91RM9200 header updates
This is more preparation for adding support for the new Atmel AT91SAM9 processors. Changes include: - Replace AT91_BASE_* with AT91RM9200_BASE_* - Replace AT91_ID_* with AT91RM9200_ID_* - ROM, SRAM and UHP address definitions moved to at91rm9200.h. - The raw AT91_P[ABCD]_* definitions are now depreciated in favour of the GPIO API. Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
committed by
Russell King
parent
26f908186f
commit
72729910c3
@ -850,7 +850,7 @@ static int at91_mci_probe(struct platform_device *pdev)
|
||||
/*
|
||||
* Allocate the MCI interrupt
|
||||
*/
|
||||
ret = request_irq(AT91_ID_MCI, at91_mci_irq, IRQF_SHARED, DRIVER_NAME, host);
|
||||
ret = request_irq(AT91RM9200_ID_MCI, at91_mci_irq, IRQF_SHARED, DRIVER_NAME, host);
|
||||
if (ret) {
|
||||
printk(KERN_ERR "Failed to request MCI interrupt\n");
|
||||
clk_disable(mci_clk);
|
||||
@ -906,7 +906,7 @@ static int at91_mci_remove(struct platform_device *pdev)
|
||||
|
||||
mmc_remove_host(mmc);
|
||||
at91_mci_disable();
|
||||
free_irq(AT91_ID_MCI, host);
|
||||
free_irq(AT91RM9200_ID_MCI, host);
|
||||
mmc_free_host(mmc);
|
||||
|
||||
clk_disable(mci_clk); /* Disable the peripheral clock */
|
||||
|
Reference in New Issue
Block a user