REMOVE OMAP LEGACY CODE: Reset mach-omap1/board-*.c files to mainline

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / board-nokia770.c

diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 7b28f4da214a63a907e637cf5888018698a3b8f5..af51e0b180f2867ed2947f09508057bcb550d718 100644 (file)
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -32,9 +32,7 @@
 #include <mach/keypad.h>
 #include <mach/common.h>
 #include <mach/dsp_common.h>
-#include <mach/aic23.h>
 #include <mach/omapfb.h>
-#include <mach/hwa742.h>
 #include <mach/lcd_mipid.h>
 #include <mach/mmc.h>
 
@@ -104,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);
        }
 }
@@ -126,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 = {
@@ -164,47 +162,6 @@ static struct spi_board_info nokia770_spi_board_info[] __initdata = {
        },
 };
 
-static struct {
-       struct clk *sys_ck;
-} hwa742;
-
-static int hwa742_get_clocks(void)
-{
-       hwa742.sys_ck = clk_get(NULL, "bclk");
-       if (IS_ERR(hwa742.sys_ck)) {
-               printk(KERN_ERR "can't get HWA742 clock\n");
-               return PTR_ERR(hwa742.sys_ck);
-       }
-       return 0;
-}
-
-static unsigned long hwa742_get_clock_rate(struct device *dev)
-{
-       return clk_get_rate(hwa742.sys_ck);
-}
-
-static void hwa742_power_up(struct device *dev)
-{
-       clk_enable(hwa742.sys_ck);
-}
-
-static void hwa742_power_down(struct device *dev)
-{
-       clk_disable(hwa742.sys_ck);
-}
-
-static struct hwa742_platform_data nokia770_hwa742_platform_data = {
-       .get_clock_rate = hwa742_get_clock_rate,
-       .power_up       = hwa742_power_up,
-       .power_down     = hwa742_power_down,
-       .te_connected   = 1,
-};
-
-static void hwa742_dev_init(void)
-{
-       hwa742_get_clocks();
-       omapfb_set_ctrl_platform_data(&nokia770_hwa742_platform_data);
-}
 
 /* assume no Mini-AB port */
 
@@ -303,6 +260,13 @@ static DEFINE_MUTEX(audio_pwr_lock);
  */
 static int audio_pwr_state = -1;
 
+static inline void aic23_power_up(void)
+{
+}
+static inline void aic23_power_down(void)
+{
+}
+
 /*
  * audio_pwr_up / down should be called under audio_pwr_lock
  */
@@ -313,9 +277,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");
@@ -335,7 +299,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 */
@@ -418,7 +382,6 @@ static void __init omap_nokia770_init(void)
        omap_serial_init();
        omap_register_i2c_bus(1, 100, NULL, 0);
        omap_dsp_init();
-       hwa742_dev_init();
        ads7846_dev_init();
        mipid_dev_init();
        nokia770_mmc_init();