Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel

20 files changed, 165 insertions, 137 deletions

diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index db789461fca4..30308294e7c1 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -205,7 +205,7 @@ static struct platform_device *devices[] __initdata = {
 
 static int nand_dev_ready(struct omap_nand_platform_data *data)
 {
-        return omap_get_gpio_datain(P2_NAND_RB_GPIO_PIN);
+        return gpio_get_value(P2_NAND_RB_GPIO_PIN);
 }
 
 static struct omap_uart_config fsample_uart_config __initdata = {
@@ -223,8 +223,9 @@ static struct omap_board_config_kernel fsample_config[] = {
 
 static void __init omap_fsample_init(void)
 {
-        if (!(omap_request_gpio(P2_NAND_RB_GPIO_PIN)))
-                nand_data.dev_ready = nand_dev_ready;
+        if (gpio_request(P2_NAND_RB_GPIO_PIN, "NAND ready") < 0)
+                BUG();
+        nand_data.dev_ready = nand_dev_ready;
 
         omap_cfg_reg(L3_1610_FLASH_CS2B_OE);
         omap_cfg_reg(M8_1610_FLASH_CS2B_WE);
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 3b65914b9141..c5b4a3b718cf 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -250,11 +250,8 @@ static struct platform_device h2_kp_device = {
 #if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
 static int h2_transceiver_mode(struct device *dev, int state)
 {
-        if (state & IR_SIRMODE)
-                omap_set_gpio_dataout(H2_IRDA_FIRSEL_GPIO_PIN, 0);
-        else    /* MIR/FIR */
-                omap_set_gpio_dataout(H2_IRDA_FIRSEL_GPIO_PIN, 1);
-
+        /* SIR when low, else MIR/FIR when HIGH */
+        gpio_set_value(H2_IRDA_FIRSEL_GPIO_PIN, !(state & IR_SIRMODE));
         return 0;
 }
 #endif
@@ -342,7 +339,7 @@ static struct platform_device *h2_devices[] __initdata = {
 
 static void __init h2_init_smc91x(void)
 {
-        if ((omap_request_gpio(0)) < 0) {
+        if (gpio_request(0, "SMC91x irq") < 0) {
                 printk("Error requesting gpio 0 for smc91x irq\n");
                 return;
         }
@@ -409,7 +406,7 @@ static struct omap_board_config_kernel h2_config[] __initdata = {
 
 static int h2_nand_dev_ready(struct omap_nand_platform_data *data)
 {
-        return omap_get_gpio_datain(H2_NAND_RB_GPIO_PIN);
+        return gpio_get_value(H2_NAND_RB_GPIO_PIN);
 }
 
 static void __init h2_init(void)
@@ -428,8 +425,9 @@ static void __init h2_init(void)
 
         h2_nand_resource.end = h2_nand_resource.start = OMAP_CS2B_PHYS;
         h2_nand_resource.end += SZ_4K - 1;
-        if (!(omap_request_gpio(H2_NAND_RB_GPIO_PIN)))
-                h2_nand_data.dev_ready = h2_nand_dev_ready;
+        if (gpio_request(H2_NAND_RB_GPIO_PIN, "NAND ready") < 0)
+                BUG();
+        gpio_direction_input(H2_NAND_RB_GPIO_PIN);
 
         omap_cfg_reg(L3_1610_FLASH_CS2B_OE);
         omap_cfg_reg(M8_1610_FLASH_CS2B_WE);
@@ -441,10 +439,10 @@ static void __init h2_init(void)
         /* Irda */
 #if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
         omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);
-        if (!(omap_request_gpio(H2_IRDA_FIRSEL_GPIO_PIN))) {
-                omap_set_gpio_direction(H2_IRDA_FIRSEL_GPIO_PIN, 0);
-                h2_irda_data.transceiver_mode = h2_transceiver_mode;
-        }
+        if (gpio_request(H2_IRDA_FIRSEL_GPIO_PIN, "IRDA mode") < 0)
+                BUG();
+        gpio_direction_output(H2_IRDA_FIRSEL_GPIO_PIN, 0);
+        h2_irda_data.transceiver_mode = h2_transceiver_mode;
 #endif
 
         platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index adfcd7b51393..0332203bd53d 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -498,7 +498,7 @@ static struct omap_gpio_switch h3_gpio_switches[] __initdata = {
 
 static int nand_dev_ready(struct omap_nand_platform_data *data)
 {
-        return omap_get_gpio_datain(H3_NAND_RB_GPIO_PIN);
+        return gpio_get_value(H3_NAND_RB_GPIO_PIN);
 }
 
 static void __init h3_init(void)
@@ -516,8 +516,9 @@ static void __init h3_init(void)
 
         nand_resource.end = nand_resource.start = OMAP_CS2B_PHYS;
         nand_resource.end += SZ_4K - 1;
-        if (!(omap_request_gpio(H3_NAND_RB_GPIO_PIN)))
-                nand_data.dev_ready = nand_dev_ready;
+        if (gpio_request(H3_NAND_RB_GPIO_PIN, "NAND ready") < 0)
+                BUG();
+        nand_data.dev_ready = nand_dev_ready;
 
         /* GPIO10 Func_MUX_CTRL reg bit 29:27, Configure V2 to mode1 as GPIO */
         /* GPIO10 pullup/down register, Enable pullup on GPIO10 */
@@ -537,7 +538,7 @@ static void __init h3_init(void)
 static void __init h3_init_smc91x(void)
 {
         omap_cfg_reg(W15_1710_GPIO40);
-        if (omap_request_gpio(40) < 0) {
+        if (gpio_request(40, "SMC91x irq") < 0) {
                 printk("Error requesting gpio 40 for smc91x irq\n");
                 return;
         }
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index cbc11be5cd2a..a21e365a7a87 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -301,7 +301,7 @@ static void __init innovator_init_smc91x(void)
                            OMAP1510_FPGA_RST);
                 udelay(750);
         } else {
-                if ((omap_request_gpio(0)) < 0) {
+                if (gpio_request(0, "SMC91x irq") < 0) {
                         printk("Error requesting gpio 0 for smc91x irq\n");
                         return;
                 }
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 38d9783ac6d6..b26782471e59 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -102,7 +102,7 @@ static void mipid_shutdown(struct mipid_platform_data *pdata)
 {
         if (pdata->nreset_gpio != -1) {
                 printk(KERN_INFO "shutdown LCD\n");
-                omap_set_gpio_dataout(pdata->nreset_gpio, 0);
+                gpio_set_value(pdata->nreset_gpio, 0);
                 msleep(120);
         }
 }
@@ -124,13 +124,13 @@ static void mipid_dev_init(void)
 
 static void ads7846_dev_init(void)
 {
-        if (omap_request_gpio(ADS7846_PENDOWN_GPIO) < 0)
+        if (gpio_request(ADS7846_PENDOWN_GPIO, "ADS7846 pendown") < 0)
                 printk(KERN_ERR "can't get ads7846 pen down GPIO\n");
 }
 
 static int ads7846_get_pendown_state(void)
 {
-        return !omap_get_gpio_datain(ADS7846_PENDOWN_GPIO);
+        return !gpio_get_value(ADS7846_PENDOWN_GPIO);
 }
 
 static struct ads7846_platform_data nokia770_ads7846_platform_data __initdata = {
@@ -228,9 +228,9 @@ static void nokia770_audio_pwr_up(void)
         /* Turn on codec */
         aic23_power_up();
 
-        if (omap_get_gpio_datain(HEADPHONE_GPIO))
+        if (gpio_get_value(HEADPHONE_GPIO))
                 /* HP not connected, turn on amplifier */
-                omap_set_gpio_dataout(AMPLIFIER_CTRL_GPIO, 1);
+                gpio_set_value(AMPLIFIER_CTRL_GPIO, 1);
         else
                 /* HP connected, do not turn on amplifier */
                 printk("HP connected\n");
@@ -250,7 +250,7 @@ static DECLARE_DELAYED_WORK(codec_power_down_work, codec_delayed_power_down);
 static void nokia770_audio_pwr_down(void)
 {
         /* Turn off amplifier */
-        omap_set_gpio_dataout(AMPLIFIER_CTRL_GPIO, 0);
+        gpio_set_value(AMPLIFIER_CTRL_GPIO, 0);
 
         /* Turn off codec: schedule delayed work */
         schedule_delayed_work(&codec_power_down_work, HZ / 20); /* 50ms */
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 3e766e49f7cc..ff9e67baa5c9 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -188,7 +188,8 @@ static struct gpio_led tps_leds[] = {
         /* NOTE:  D9 and D2 have hardware blink support.
          * Also, D9 requires non-battery power.
          */
-        { .gpio = OSK_TPS_GPIO_LED_D9, .name = "d9", },
+        { .gpio = OSK_TPS_GPIO_LED_D9, .name = "d9",
+                        .default_trigger = "ide-disk", },
         { .gpio = OSK_TPS_GPIO_LED_D2, .name = "d2", },
         { .gpio = OSK_TPS_GPIO_LED_D3, .name = "d3", .active_low = 1,
                         .default_trigger = "heartbeat", },
@@ -260,7 +261,6 @@ static struct i2c_board_info __initdata osk_i2c_board_info[] = {
         },
         /* TODO when driver support is ready:
          *  - aic23 audio chip at 0x1a
-         *  - on Mistral, 24c04 eeprom at 0x50
          *  - optionally on Mistral, ov9640 camera sensor at 0x30
          */
 };
@@ -288,7 +288,7 @@ static void __init osk_init_cf(void)
                 return;
         }
         /* the CF I/O IRQ is really active-low */
-        set_irq_type(OMAP_GPIO_IRQ(62), IRQ_TYPE_EDGE_FALLING);
+        set_irq_type(gpio_to_irq(62), IRQ_TYPE_EDGE_FALLING);
 }
 
 static void __init osk_init_irq(void)
@@ -337,11 +337,28 @@ static struct omap_board_config_kernel osk_config[] __initdata = {
 #ifdef  CONFIG_OMAP_OSK_MISTRAL
 
 #include <linux/input.h>
+#include <linux/i2c/at24.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
 #include <mach/keypad.h>
 
+static struct at24_platform_data at24c04 = {
+        .byte_len       = SZ_4K / 8,
+        .page_size      = 16,
+};
+
+static struct i2c_board_info __initdata mistral_i2c_board_info[] = {
+        {
+                /* NOTE:  powered from LCD supply */
+                I2C_BOARD_INFO("24c04", 0x50),
+                .platform_data  = &at24c04,
+        },
+        /* TODO when driver support is ready:
+         *  - optionally ov9640 camera sensor at 0x30
+         */
+};
+
 static const int osk_keymap[] = {
         /* KEY(col, row, code) */
         KEY(0, 0, KEY_F1),              /* SW4 */
@@ -483,23 +500,30 @@ static void __init osk_mistral_init(void)
         omap_cfg_reg(P20_1610_GPIO4);   /* PENIRQ */
         gpio_request(4, "ts_int");
         gpio_direction_input(4);
-        set_irq_type(OMAP_GPIO_IRQ(4), IRQ_TYPE_EDGE_FALLING);
+        set_irq_type(gpio_to_irq(4), IRQ_TYPE_EDGE_FALLING);
 
         spi_register_board_info(mistral_boardinfo,
                         ARRAY_SIZE(mistral_boardinfo));
 
-        /* the sideways button (SW1) is for use as a "wakeup" button */
+        /* the sideways button (SW1) is for use as a "wakeup" button
+         *
+         * NOTE:  The Mistral board has the wakeup button (SW1) wired
+         * to the LCD 3.3V rail, which is powered down during suspend.
+         * To allow this button to wake up the omap, work around this
+         * HW bug by rewiring SW1 to use the main 3.3V rail.
+         */
         omap_cfg_reg(N15_1610_MPUIO2);
         if (gpio_request(OMAP_MPUIO(2), "wakeup") == 0) {
                 int ret = 0;
+                int irq = gpio_to_irq(OMAP_MPUIO(2));
 
                 gpio_direction_input(OMAP_MPUIO(2));
-                set_irq_type(OMAP_GPIO_IRQ(OMAP_MPUIO(2)), IRQ_TYPE_EDGE_RISING);
+                set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
 #ifdef  CONFIG_PM
                 /* share the IRQ in case someone wants to use the
                  * button for more than wakeup from system sleep.
                  */
-                ret = request_irq(OMAP_GPIO_IRQ(OMAP_MPUIO(2)),
+                ret = request_irq(irq,
                                 &osk_mistral_wake_interrupt,
                                 IRQF_SHARED, "mistral_wakeup",
                                 &osk_mistral_wake_interrupt);
@@ -508,7 +532,7 @@ static void __init osk_mistral_init(void)
                         printk(KERN_ERR "OSK+Mistral: no wakeup irq, %d?\n",
                                 ret);
                 } else
-                        enable_irq_wake(OMAP_GPIO_IRQ(OMAP_MPUIO(2)));
+                        enable_irq_wake(irq);
 #endif
         } else
                 printk(KERN_ERR "OSK+Mistral: wakeup button is awol\n");
@@ -520,6 +544,9 @@ static void __init osk_mistral_init(void)
         if (gpio_request(2, "lcd_pwr") == 0)
                 gpio_direction_output(2, 1);
 
+        i2c_register_board_info(1, mistral_i2c_board_info,
+                        ARRAY_SIZE(mistral_i2c_board_info));
+
         platform_add_devices(mistral_devices, ARRAY_SIZE(mistral_devices));
 }
 #else
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index b58043644a6f..4141e3917d7c 100644
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -255,7 +255,7 @@ static void palmte_get_power_status(struct apm_power_info *info, int *battery)
 {
         int charging, batt, hi, lo, mid;
 
-        charging = !omap_get_gpio_datain(PALMTE_DC_GPIO);
+        charging = !gpio_get_value(PALMTE_DC_GPIO);
         batt = battery[0];
         if (charging)
                 batt -= 60;
@@ -335,11 +335,11 @@ static void palmte_headphones_detect(void *data, int state)
 {
         if (state) {
                 /* Headphones connected, disable speaker */
-                omap_set_gpio_dataout(PALMTE_SPEAKER_GPIO, 0);
+                gpio_set_value(PALMTE_SPEAKER_GPIO, 0);
                 printk(KERN_INFO "PM: speaker off\n");
         } else {
                 /* Headphones unplugged, re-enable speaker */
-                omap_set_gpio_dataout(PALMTE_SPEAKER_GPIO, 1);
+                gpio_set_value(PALMTE_SPEAKER_GPIO, 1);
                 printk(KERN_INFO "PM: speaker on\n");
         }
 }
@@ -347,18 +347,18 @@ static void palmte_headphones_detect(void *data, int state)
 static void __init palmte_misc_gpio_setup(void)
 {
         /* Set TSC2102 PINTDAV pin as input (used by TSC2102 driver) */
-        if (omap_request_gpio(PALMTE_PINTDAV_GPIO)) {
+        if (gpio_request(PALMTE_PINTDAV_GPIO, "TSC2102 PINTDAV") < 0) {
                 printk(KERN_ERR "Could not reserve PINTDAV GPIO!\n");
                 return;
         }
-        omap_set_gpio_direction(PALMTE_PINTDAV_GPIO, 1);
+        gpio_direction_input(PALMTE_PINTDAV_GPIO);
 
         /* Set USB-or-DC-IN pin as input (unused) */
-        if (omap_request_gpio(PALMTE_USB_OR_DC_GPIO)) {
+        if (gpio_request(PALMTE_USB_OR_DC_GPIO, "USB/DC-IN") < 0) {
                 printk(KERN_ERR "Could not reserve cable signal GPIO!\n");
                 return;
         }
-        omap_set_gpio_direction(PALMTE_USB_OR_DC_GPIO, 1);
+        gpio_direction_input(PALMTE_USB_OR_DC_GPIO);
 }
 
 static void __init omap_palmte_init(void)
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c
index 40f9860a09df..5c001afe8062 100644
--- a/arch/arm/mach-omap1/board-palmtt.c
+++ b/arch/arm/mach-omap1/board-palmtt.c
@@ -268,7 +268,7 @@ static struct platform_device *palmtt_devices[] __initdata = {
 
 static int palmtt_get_pendown_state(void)
 {
-        return !omap_get_gpio_datain(6);
+        return !gpio_get_value(6);
 }
 
 static const struct ads7846_platform_data palmtt_ts_info = {
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index e719294250b1..801fb5f62ed7 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -239,7 +239,7 @@ static struct platform_device *devices[] __initdata = {
 static int
 palmz71_get_pendown_state(void)
 {
-        return !omap_get_gpio_datain(PALMZ71_PENIRQ_GPIO);
+        return !gpio_get_value(PALMZ71_PENIRQ_GPIO);
 }
 
 static const struct ads7846_platform_data palmz71_ts_info = {
@@ -295,13 +295,13 @@ static struct omap_board_config_kernel palmz71_config[] __initdata = {
 static irqreturn_t
 palmz71_powercable(int irq, void *dev_id)
 {
-        if (omap_get_gpio_datain(PALMZ71_USBDETECT_GPIO)) {
+        if (gpio_get_value(PALMZ71_USBDETECT_GPIO)) {
                 printk(KERN_INFO "PM: Power cable connected\n");
-                set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO),
+                set_irq_type(gpio_to_irq(PALMZ71_USBDETECT_GPIO),
                                 IRQ_TYPE_EDGE_FALLING);
         } else {
                 printk(KERN_INFO "PM: Power cable disconnected\n");
-                set_irq_type(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO),
+                set_irq_type(gpio_to_irq(PALMZ71_USBDETECT_GPIO),
                                 IRQ_TYPE_EDGE_RISING);
         }
         return IRQ_HANDLED;
@@ -323,29 +323,28 @@ palmz71_gpio_setup(int early)
 {
         if (early) {
                 /* Only set GPIO1 so we have a working serial */
-                omap_set_gpio_dataout(1, 1);
-                omap_set_gpio_direction(1, 0);
+                gpio_direction_output(1, 1);
         } else {
                 /* Set MMC/SD host WP pin as input */
-                if (omap_request_gpio(PALMZ71_MMC_WP_GPIO)) {
+                if (gpio_request(PALMZ71_MMC_WP_GPIO, "MMC WP") < 0) {
                         printk(KERN_ERR "Could not reserve WP GPIO!\n");
                         return;
                 }
-                omap_set_gpio_direction(PALMZ71_MMC_WP_GPIO, 1);
+                gpio_direction_input(PALMZ71_MMC_WP_GPIO);
 
                 /* Monitor the Power-cable-connected signal */
-                if (omap_request_gpio(PALMZ71_USBDETECT_GPIO)) {
+                if (gpio_request(PALMZ71_USBDETECT_GPIO, "USB detect") < 0) {
                         printk(KERN_ERR
                                 "Could not reserve cable signal GPIO!\n");
                         return;
                 }
-                omap_set_gpio_direction(PALMZ71_USBDETECT_GPIO, 1);
-                if (request_irq(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO),
+                gpio_direction_input(PALMZ71_USBDETECT_GPIO);
+                if (request_irq(gpio_to_irq(PALMZ71_USBDETECT_GPIO),
                                 palmz71_powercable, IRQF_SAMPLE_RANDOM,
                                 "palmz71-cable", 0))
                         printk(KERN_ERR
                                         "IRQ request for power cable failed!\n");
-                palmz71_powercable(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), 0);
+                palmz71_powercable(gpio_to_irq(PALMZ71_USBDETECT_GPIO), 0);
         }
 }
 
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index b715917bfdaf..3b9f907aa899 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -205,7 +205,7 @@ static struct platform_device *devices[] __initdata = {
 
 static int nand_dev_ready(struct omap_nand_platform_data *data)
 {
-        return omap_get_gpio_datain(P2_NAND_RB_GPIO_PIN);
+        return gpio_get_value(P2_NAND_RB_GPIO_PIN);
 }
 
 static struct omap_uart_config perseus2_uart_config __initdata = {
@@ -223,8 +223,9 @@ static struct omap_board_config_kernel perseus2_config[] __initdata = {
 
 static void __init omap_perseus2_init(void)
 {
-        if (!(omap_request_gpio(P2_NAND_RB_GPIO_PIN)))
-                nand_data.dev_ready = nand_dev_ready;
+        if (gpio_request(P2_NAND_RB_GPIO_PIN, "NAND ready") < 0)
+                BUG();
+        nand_data.dev_ready = nand_dev_ready;
 
         omap_cfg_reg(L3_1610_FLASH_CS2B_OE);
         omap_cfg_reg(M8_1610_FLASH_CS2B_WE);
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 130bcc6fd082..93bd395b9972 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -436,14 +436,9 @@ static void __init omap_sx1_init(void)
         omap_request_gpio(1);   /* A_IRDA_OFF */
         omap_request_gpio(11);  /* A_SWITCH */
         omap_request_gpio(15);  /* A_USB_ON */
-        omap_set_gpio_direction(1, 0);/* gpio1 -> output */
-        omap_set_gpio_direction(11, 0);/* gpio11 -> output */
-        omap_set_gpio_direction(15, 0);/* gpio15 -> output */
-        /* set GPIO data */
-        omap_set_gpio_dataout(1, 1);/*A_IRDA_OFF = 1 */
-        omap_set_gpio_dataout(11, 0);/*A_SWITCH = 0 */
-        omap_set_gpio_dataout(15, 0);/*A_USB_ON = 0 */
-
+        gpio_direction_output(1, 1);    /*A_IRDA_OFF = 1 */
+        gpio_direction_output(11, 0);   /*A_SWITCH = 0 */
+        gpio_direction_output(15, 0);   /*A_USB_ON = 0 */
 }
 /*----------------------------------------*/
 static void __init omap_sx1_init_irq(void)
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 45a01311669a..92c9de1090a9 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -168,29 +168,27 @@ static void __init voiceblue_init_irq(void)
 static void __init voiceblue_init(void)
 {
         /* Watchdog */
-        omap_request_gpio(0);
+        gpio_request(0, "Watchdog");
         /* smc91x reset */
-        omap_request_gpio(7);
-        omap_set_gpio_direction(7, 0);
-        omap_set_gpio_dataout(7, 1);
+        gpio_request(7, "SMC91x reset");
+        gpio_direction_output(7, 1);
         udelay(2);      /* wait at least 100ns */
-        omap_set_gpio_dataout(7, 0);
+        gpio_set_value(7, 0);
         mdelay(50);     /* 50ms until PHY ready */
         /* smc91x interrupt pin */
-        omap_request_gpio(8);
+        gpio_request(8, "SMC91x irq");
         /* 16C554 reset*/
-        omap_request_gpio(6);
-        omap_set_gpio_direction(6, 0);
-        omap_set_gpio_dataout(6, 0);
+        gpio_request(6, "16C554 reset");
+        gpio_direction_output(6, 0);
         /* 16C554 interrupt pins */
-        omap_request_gpio(12);
-        omap_request_gpio(13);
-        omap_request_gpio(14);
-        omap_request_gpio(15);
-        set_irq_type(OMAP_GPIO_IRQ(12), IRQ_TYPE_EDGE_RISING);
-        set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING);
-        set_irq_type(OMAP_GPIO_IRQ(14), IRQ_TYPE_EDGE_RISING);
-        set_irq_type(OMAP_GPIO_IRQ(15), IRQ_TYPE_EDGE_RISING);
+        gpio_request(12, "16C554 irq");
+        gpio_request(13, "16C554 irq");
+        gpio_request(14, "16C554 irq");
+        gpio_request(15, "16C554 irq");
+        set_irq_type(gpio_to_irq(12), IRQ_TYPE_EDGE_RISING);
+        set_irq_type(gpio_to_irq(13), IRQ_TYPE_EDGE_RISING);
+        set_irq_type(gpio_to_irq(14), IRQ_TYPE_EDGE_RISING);
+        set_irq_type(gpio_to_irq(15), IRQ_TYPE_EDGE_RISING);
 
         platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices));
         omap_board_config = voiceblue_config;
@@ -244,19 +242,18 @@ static int wdt_gpio_state;
 
 void voiceblue_wdt_enable(void)
 {
-        omap_set_gpio_direction(0, 0);
-        omap_set_gpio_dataout(0, 0);
-        omap_set_gpio_dataout(0, 1);
-        omap_set_gpio_dataout(0, 0);
+        gpio_direction_output(0, 0);
+        gpio_set_value(0, 1);
+        gpio_set_value(0, 0);
         wdt_gpio_state = 0;
 }
 
 void voiceblue_wdt_disable(void)
 {
-        omap_set_gpio_dataout(0, 0);
-        omap_set_gpio_dataout(0, 1);
-        omap_set_gpio_dataout(0, 0);
-        omap_set_gpio_direction(0, 1);
+        gpio_set_value(0, 0);
+        gpio_set_value(0, 1);
+        gpio_set_value(0, 0);
+        gpio_direction_input(0);
 }
 
 void voiceblue_wdt_ping(void)
@@ -265,7 +262,7 @@ void voiceblue_wdt_ping(void)
                 return;
 
         wdt_gpio_state = !wdt_gpio_state;
-        omap_set_gpio_dataout(0, wdt_gpio_state);
+        gpio_set_value(0, wdt_gpio_state);
 }
 
 void voiceblue_reset(void)
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c
index 04995381aa5c..4f2b8a7adb19 100644
--- a/arch/arm/mach-omap1/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
@@ -177,9 +177,9 @@ void omap1510_fpga_init_irq(void)
          * NOTE: For general GPIO/MPUIO access and interrupts, please see
          * gpio.[ch]
          */
-        omap_request_gpio(13);
-        omap_set_gpio_direction(13, 1);
-        set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING);
+        gpio_request(13, "FPGA irq");
+        gpio_direction_input(13);
+        set_irq_type(gpio_to_irq(13), IRQ_TYPE_EDGE_RISING);
         set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux);
 }
 
diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c
index 13083d7e692d..89bb8756f450 100644
--- a/arch/arm/mach-omap1/id.c
+++ b/arch/arm/mach-omap1/id.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <mach/cpu.h>
 
 #define OMAP_DIE_ID_0           0xfffe1800
 #define OMAP_DIE_ID_1           0xfffe1804
@@ -30,6 +31,8 @@ struct omap_id {
         u32     type;           /* Cpu id bits [31:08], cpu class bits [07:00] */
 };
 
+static unsigned int omap_revision;
+
 /* Register values to detect the OMAP version */
 static struct omap_id omap_ids[] __initdata = {
         { .jtag_id = 0xb574, .die_rev = 0x2, .omap_id = 0x03310315, .type = 0x03100000},
@@ -53,6 +56,12 @@ static struct omap_id omap_ids[] __initdata = {
         { .jtag_id = 0xb5f7, .die_rev = 0x2, .omap_id = 0x03330100, .type = 0x17100000},
 };
 
+unsigned int omap_rev(void)
+{
+        return omap_revision;
+}
+EXPORT_SYMBOL(omap_rev);
+
 /*
  * Get OMAP type from PROD_ID.
  * 1710 has the PROD_ID in bits 15:00, not in 16:01 as documented in TRM.
@@ -121,17 +130,18 @@ void __init omap_check_revision(void)
         omap_id = omap_readl(OMAP32_ID_0);
 
 #ifdef DEBUG
-        printk("OMAP_DIE_ID_0: 0x%08x\n", omap_readl(OMAP_DIE_ID_0));
-        printk("OMAP_DIE_ID_1: 0x%08x DIE_REV: %i\n",
+        printk(KERN_DEBUG "OMAP_DIE_ID_0: 0x%08x\n", omap_readl(OMAP_DIE_ID_0));
+        printk(KERN_DEBUG "OMAP_DIE_ID_1: 0x%08x DIE_REV: %i\n",
                 omap_readl(OMAP_DIE_ID_1),
                (omap_readl(OMAP_DIE_ID_1) >> 17) & 0xf);
-        printk("OMAP_PRODUCTION_ID_0: 0x%08x\n", omap_readl(OMAP_PRODUCTION_ID_0));
-        printk("OMAP_PRODUCTION_ID_1: 0x%08x JTAG_ID: 0x%04x\n",
+        printk(KERN_DEBUG "OMAP_PRODUCTION_ID_0: 0x%08x\n",
+                omap_readl(OMAP_PRODUCTION_ID_0));
+        printk(KERN_DEBUG "OMAP_PRODUCTION_ID_1: 0x%08x JTAG_ID: 0x%04x\n",
                 omap_readl(OMAP_PRODUCTION_ID_1),
                 omap_readl(OMAP_PRODUCTION_ID_1) & 0xffff);
-        printk("OMAP32_ID_0: 0x%08x\n", omap_readl(OMAP32_ID_0));
-        printk("OMAP32_ID_1: 0x%08x\n", omap_readl(OMAP32_ID_1));
-        printk("JTAG_ID: 0x%04x DIE_REV: %i\n", jtag_id, die_rev);
+        printk(KERN_DEBUG "OMAP32_ID_0: 0x%08x\n", omap_readl(OMAP32_ID_0));
+        printk(KERN_DEBUG "OMAP32_ID_1: 0x%08x\n", omap_readl(OMAP32_ID_1));
+        printk(KERN_DEBUG "JTAG_ID: 0x%04x DIE_REV: %i\n", jtag_id, die_rev);
 #endif
 
         system_serial_high = omap_readl(OMAP_DIE_ID_0);
@@ -140,7 +150,7 @@ void __init omap_check_revision(void)
         /* First check only the major version in a safe way */
         for (i = 0; i < ARRAY_SIZE(omap_ids); i++) {
                 if (jtag_id == (omap_ids[i].jtag_id)) {
-                        system_rev = omap_ids[i].type;
+                        omap_revision = omap_ids[i].type;
                         break;
                 }
         }
@@ -148,7 +158,7 @@ void __init omap_check_revision(void)
         /* Check if we can find the die revision */
         for (i = 0; i < ARRAY_SIZE(omap_ids); i++) {
                 if (jtag_id == omap_ids[i].jtag_id && die_rev == omap_ids[i].die_rev) {
-                        system_rev = omap_ids[i].type;
+                        omap_revision = omap_ids[i].type;
                         break;
                 }
         }
@@ -158,38 +168,35 @@ void __init omap_check_revision(void)
                 if (jtag_id == omap_ids[i].jtag_id
                     && die_rev == omap_ids[i].die_rev
                     && omap_id == omap_ids[i].omap_id) {
-                        system_rev = omap_ids[i].type;
+                        omap_revision = omap_ids[i].type;
                         break;
                 }
         }
 
         /* Add the cpu class info (7xx, 15xx, 16xx, 24xx) */
-        cpu_type = system_rev >> 24;
+        cpu_type = omap_revision >> 24;
 
         switch (cpu_type) {
         case 0x07:
-                system_rev |= 0x07;
+                omap_revision |= 0x07;
                 break;
         case 0x03:
         case 0x15:
-                system_rev |= 0x15;
+                omap_revision |= 0x15;
                 break;
         case 0x16:
         case 0x17:
-                system_rev |= 0x16;
-                break;
-        case 0x24:
-                system_rev |= 0x24;
+                omap_revision |= 0x16;
                 break;
         default:
-                printk("Unknown OMAP cpu type: 0x%02x\n", cpu_type);
+                printk(KERN_INFO "Unknown OMAP cpu type: 0x%02x\n", cpu_type);
         }
 
-        printk("OMAP%04x", system_rev >> 16);
-        if ((system_rev >> 8) & 0xff)
-                printk("%x", (system_rev >> 8) & 0xff);
-        printk(" revision %i handled as %02xxx id: %08x%08x\n",
-               die_rev, system_rev & 0xff, system_serial_low,
+        printk(KERN_INFO "OMAP%04x", omap_revision >> 16);
+        if ((omap_revision >> 8) & 0xff)
+                printk(KERN_INFO "%x", (omap_revision >> 8) & 0xff);
+        printk(KERN_INFO " revision %i handled as %02xxx id: %08x%08x\n",
+               die_rev, omap_revision & 0xff, system_serial_low,
                system_serial_high);
 }
 
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
index b3bd8ca85118..4c3e582f3d3c 100644
--- a/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@ -128,7 +128,7 @@ void __init omap1_map_common_io(void)
  * Common low-level hardware init for omap1. This should only get called from
  * board specific init.
  */
-void __init omap1_init_common_hw()
+void __init omap1_init_common_hw(void)
 {
         /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort
          * on a Posted Write in the TIPB Bridge".
diff --git a/arch/arm/mach-omap1/leds-h2p2-debug.c b/arch/arm/mach-omap1/leds-h2p2-debug.c
index 71fe2cc7f7cf..17c9d0e04216 100644
--- a/arch/arm/mach-omap1/leds-h2p2-debug.c
+++ b/arch/arm/mach-omap1/leds-h2p2-debug.c
@@ -65,8 +65,8 @@ void h2p2_dbg_leds_event(led_event_t evt)
                 /* all leds off during suspend or shutdown */
 
                 if (! machine_is_omap_perseus2()) {
-                        omap_set_gpio_dataout(GPIO_TIMER, 0);
-                        omap_set_gpio_dataout(GPIO_IDLE, 0);
+                        gpio_set_value(GPIO_TIMER, 0);
+                        gpio_set_value(GPIO_IDLE, 0);
                 }
 
                 __raw_writew(~0, &fpga->leds);
@@ -94,7 +94,7 @@ void h2p2_dbg_leds_event(led_event_t evt)
                 if (machine_is_omap_perseus2())
                         hw_led_state ^= H2P2_DBG_FPGA_P2_LED_TIMER;
                 else {
-                        omap_set_gpio_dataout(GPIO_TIMER, led_state & LED_TIMER_ON);
+                        gpio_set_value(GPIO_TIMER, led_state & LED_TIMER_ON);
                         goto done;
                 }
 
@@ -106,7 +106,7 @@ void h2p2_dbg_leds_event(led_event_t evt)
                 if (machine_is_omap_perseus2())
                         hw_led_state |= H2P2_DBG_FPGA_P2_LED_IDLE;
                 else {
-                        omap_set_gpio_dataout(GPIO_IDLE, 1);
+                        gpio_set_value(GPIO_IDLE, 1);
                         goto done;
                 }
 
@@ -116,7 +116,7 @@ void h2p2_dbg_leds_event(led_event_t evt)
                 if (machine_is_omap_perseus2())
                         hw_led_state &= ~H2P2_DBG_FPGA_P2_LED_IDLE;
                 else {
-                        omap_set_gpio_dataout(GPIO_IDLE, 0);
+                        gpio_set_value(GPIO_IDLE, 0);
                         goto done;
                 }
 
diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c
index 98e789622dfd..499d7ad8697d 100644
--- a/arch/arm/mach-omap1/leds-osk.c
+++ b/arch/arm/mach-omap1/leds-osk.c
@@ -44,8 +44,8 @@ static void mistral_setled(void)
                 green = 1;
         /* else both sides are disabled */
 
-        omap_set_gpio_dataout(GPIO_LED_GREEN, green);
-        omap_set_gpio_dataout(GPIO_LED_RED, red);
+        gpio_set_value(GPIO_LED_GREEN, green);
+        gpio_set_value(GPIO_LED_RED, red);
 }
 
 #endif
diff --git a/arch/arm/mach-omap1/leds.c b/arch/arm/mach-omap1/leds.c
index 6cdad93c4a00..8cbf2562dcaa 100644
--- a/arch/arm/mach-omap1/leds.c
+++ b/arch/arm/mach-omap1/leds.c
@@ -47,14 +47,14 @@ omap_leds_init(void)
                  * that's a different kind of LED (just one color at a time).
                  */
                 omap_cfg_reg(P18_1610_GPIO3);
-                if (omap_request_gpio(3) == 0)
-                        omap_set_gpio_direction(3, 0);
+                if (gpio_request(3, "LED red") == 0)
+                        gpio_direction_output(3, 1);
                 else
                         printk(KERN_WARNING "LED: can't get GPIO3/red?\n");
 
                 omap_cfg_reg(MPUIO4);
-                if (omap_request_gpio(OMAP_MPUIO(4)) == 0)
-                        omap_set_gpio_direction(OMAP_MPUIO(4), 0);
+                if (gpio_request(OMAP_MPUIO(4), "LED green") == 0)
+                        gpio_direction_output(OMAP_MPUIO(4), 1);
                 else
                         printk(KERN_WARNING "LED: can't get MPUIO4/green?\n");
         }
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 770d256c790b..9774c1f5311e 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -226,7 +226,8 @@ void omap_pm_suspend(void)
 {
         unsigned long arg0 = 0, arg1 = 0;
 
-        printk("PM: OMAP%x is trying to enter deep sleep...\n", system_rev);
+        printk(KERN_INFO "PM: OMAP%x is trying to enter deep sleep...\n",
+                omap_rev());
 
         omap_serial_wake_trigger(1);
 
@@ -421,7 +422,8 @@ void omap_pm_suspend(void)
 
         omap_serial_wake_trigger(0);
 
-        printk("PM: OMAP%x is re-starting from deep sleep...\n", system_rev);
+        printk(KERN_INFO "PM: OMAP%x is re-starting from deep sleep...\n",
+                omap_rev());
 }
 
 #if defined(DEBUG) && defined(CONFIG_PROC_FS)
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 528691d5cb51..0002084e0655 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -244,22 +244,22 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr)
 {
         int ret;
 
-        ret = omap_request_gpio(gpio_nr);
+        ret = gpio_request(gpio_nr, "UART wake");
         if (ret < 0) {
                 printk(KERN_ERR "Could not request UART wake GPIO: %i\n",
                        gpio_nr);
                 return;
         }
-        omap_set_gpio_direction(gpio_nr, 1);
-        ret = request_irq(OMAP_GPIO_IRQ(gpio_nr), &omap_serial_wake_interrupt,
+        gpio_direction_input(gpio_nr);
+        ret = request_irq(gpio_to_irq(gpio_nr), &omap_serial_wake_interrupt,
                           IRQF_TRIGGER_RISING, "serial wakeup", NULL);
         if (ret) {
-                omap_free_gpio(gpio_nr);
+                gpio_free(gpio_nr);
                 printk(KERN_ERR "No interrupt for UART wake GPIO: %i\n",
                        gpio_nr);
                 return;
         }
-        enable_irq_wake(OMAP_GPIO_IRQ(gpio_nr));
+        enable_irq_wake(gpio_to_irq(gpio_nr));
 }
 
 static int __init omap_serial_wakeup_init(void)