ARM: OMAP: Switch to gpio_request/free calls
Switch to gpio_request/free calls Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:

committed by
Tony Lindgren

parent
e031ab23de
commit
f2d18fea8b
@@ -168,7 +168,7 @@ static inline void __init sdp2430_init_smc91x(void)
|
||||
sdp2430_smc91x_resources[0].end = cs_mem_base + 0x30f;
|
||||
udelay(100);
|
||||
|
||||
if (omap_request_gpio(OMAP24XX_ETHR_GPIO_IRQ) < 0) {
|
||||
if (gpio_request(OMAP24XX_ETHR_GPIO_IRQ, "SMC91x irq") < 0) {
|
||||
printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n",
|
||||
OMAP24XX_ETHR_GPIO_IRQ);
|
||||
gpmc_cs_free(eth_cs);
|
||||
|
@@ -236,7 +236,7 @@ static inline void __init apollon_init_smc91x(void)
|
||||
udelay(100);
|
||||
|
||||
omap_cfg_reg(W4__24XX_GPIO74);
|
||||
if (omap_request_gpio(APOLLON_ETHR_GPIO_IRQ) < 0) {
|
||||
if (gpio_request(APOLLON_ETHR_GPIO_IRQ, "SMC91x irq") < 0) {
|
||||
printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n",
|
||||
APOLLON_ETHR_GPIO_IRQ);
|
||||
gpmc_cs_free(APOLLON_ETH_CS);
|
||||
@@ -359,7 +359,7 @@ static void __init apollon_usb_init(void)
|
||||
/* USB device */
|
||||
/* DEVICE_SUSPEND */
|
||||
omap_cfg_reg(P21_242X_GPIO12);
|
||||
omap_request_gpio(12);
|
||||
gpio_request(12, "USB suspend");
|
||||
gpio_direction_output(12, 0);
|
||||
}
|
||||
|
||||
|
@@ -12,11 +12,11 @@
|
||||
#include <linux/errno.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/gpio.h>
|
||||
|
||||
#include <linux/usb/musb.h>
|
||||
|
||||
#include <mach/gpmc.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <mach/mux.h>
|
||||
|
||||
|
||||
@@ -292,7 +292,7 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data,
|
||||
);
|
||||
|
||||
/* IRQ */
|
||||
status = omap_request_gpio(irq);
|
||||
status = gpio_request(irq, "TUSB6010 irq");
|
||||
if (status < 0) {
|
||||
printk(error, 3, status);
|
||||
return status;
|
||||
|
Reference in New Issue
Block a user