diff options
author | Andrew Victor <andrew@sanpeople.com> | 2006-09-27 04:44:11 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-28 06:52:05 -0400 |
commit | 72729910c38ca5b4736032c15dc3f9d48fe4f68a (patch) | |
tree | e7461ec8e0ff07d1634d7d7a467cb8454135a5c8 /drivers/usb/gadget/at91_udc.c | |
parent | 26f908186f923291999833e9d563259834bdca06 (diff) |
[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>
Diffstat (limited to 'drivers/usb/gadget/at91_udc.c')
-rw-r--r-- | drivers/usb/gadget/at91_udc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index cfebca05ead5..043744f1ab72 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c | |||
@@ -1658,7 +1658,7 @@ static int __devinit at91udc_probe(struct platform_device *pdev) | |||
1658 | return -ENODEV; | 1658 | return -ENODEV; |
1659 | } | 1659 | } |
1660 | 1660 | ||
1661 | if (!request_mem_region(AT91_BASE_UDP, SZ_16K, driver_name)) { | 1661 | if (!request_mem_region(AT91RM9200_BASE_UDP, SZ_16K, driver_name)) { |
1662 | DBG("someone's using UDC memory\n"); | 1662 | DBG("someone's using UDC memory\n"); |
1663 | return -EBUSY; | 1663 | return -EBUSY; |
1664 | } | 1664 | } |
@@ -1720,7 +1720,7 @@ static int __devinit at91udc_probe(struct platform_device *pdev) | |||
1720 | fail1: | 1720 | fail1: |
1721 | device_unregister(&udc->gadget.dev); | 1721 | device_unregister(&udc->gadget.dev); |
1722 | fail0: | 1722 | fail0: |
1723 | release_mem_region(AT91_BASE_UDP, SZ_16K); | 1723 | release_mem_region(AT91RM9200_BASE_UDP, SZ_16K); |
1724 | DBG("%s probe failed, %d\n", driver_name, retval); | 1724 | DBG("%s probe failed, %d\n", driver_name, retval); |
1725 | return retval; | 1725 | return retval; |
1726 | } | 1726 | } |
@@ -1742,7 +1742,7 @@ static int __devexit at91udc_remove(struct platform_device *pdev) | |||
1742 | free_irq(udc->board.vbus_pin, udc); | 1742 | free_irq(udc->board.vbus_pin, udc); |
1743 | free_irq(udc->udp_irq, udc); | 1743 | free_irq(udc->udp_irq, udc); |
1744 | device_unregister(&udc->gadget.dev); | 1744 | device_unregister(&udc->gadget.dev); |
1745 | release_mem_region(AT91_BASE_UDP, SZ_16K); | 1745 | release_mem_region(AT91RM9200_BASE_UDP, SZ_16K); |
1746 | 1746 | ||
1747 | clk_put(udc->iclk); | 1747 | clk_put(udc->iclk); |
1748 | clk_put(udc->fclk); | 1748 | clk_put(udc->fclk); |