#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>
{
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);
}
}
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 = {
},
};
-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;
-}
+/* assume no Mini-AB port */
-static unsigned long hwa742_get_clock_rate(struct device *dev)
-{
- return clk_get_rate(hwa742.sys_ck);
-}
+static struct omap_usb_config nokia770_usb_config __initdata = {
+ .otg = 1,
+ .register_host = 1,
+ .register_dev = 1,
+ .hmc_mode = 16,
+ .pins[0] = 6,
+};
+
+#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
+
+#define NOKIA770_GPIO_MMC_POWER 41
+#define NOKIA770_GPIO_MMC_SWITCH 23
-static void hwa742_power_up(struct device *dev)
+static int nokia770_mmc_set_power(struct device *dev, int slot, int power_on,
+ int vdd)
{
- clk_enable(hwa742.sys_ck);
+ if (power_on)
+ gpio_set_value(NOKIA770_GPIO_MMC_POWER, 1);
+ else
+ gpio_set_value(NOKIA770_GPIO_MMC_POWER, 0);
+
+ return 0;
}
-static void hwa742_power_down(struct device *dev)
+static int nokia770_mmc_get_cover_state(struct device *dev, int slot)
{
- clk_disable(hwa742.sys_ck);
+ return gpio_get_value(NOKIA770_GPIO_MMC_SWITCH);
}
-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 struct omap_mmc_platform_data nokia770_mmc2_data = {
+ .nr_slots = 1,
+ .dma_mask = 0xffffffff,
+ .slots[0] = {
+ .set_power = nokia770_mmc_set_power,
+ .get_cover_state = nokia770_mmc_get_cover_state,
+ .name = "mmcblk",
+ },
};
-static void hwa742_dev_init(void)
+static struct omap_mmc_platform_data *nokia770_mmc_data[OMAP16XX_NR_MMC];
+
+static void __init nokia770_mmc_init(void)
{
- hwa742_get_clocks();
- omapfb_set_ctrl_platform_data(&nokia770_hwa742_platform_data);
-}
+ int ret;
-/* assume no Mini-AB port */
+ ret = gpio_request(NOKIA770_GPIO_MMC_POWER, "MMC power");
+ if (ret < 0)
+ return;
+ gpio_direction_output(NOKIA770_GPIO_MMC_POWER, 0);
-static struct omap_usb_config nokia770_usb_config __initdata = {
- .otg = 1,
- .register_host = 1,
- .register_dev = 1,
- .hmc_mode = 16,
- .pins[0] = 6,
-};
+ ret = gpio_request(NOKIA770_GPIO_MMC_SWITCH, "MMC cover");
+ if (ret < 0) {
+ gpio_free(NOKIA770_GPIO_MMC_POWER);
+ return;
+ }
+ gpio_direction_input(NOKIA770_GPIO_MMC_SWITCH);
-static struct omap_mmc_platform_data nokia770_mmc_data = {
- .nr_slots = 2,
- .slots[0] = {
- .enabled = 0,
- .wire4 = 0,
- .wp_pin = -1,
- .power_pin = -1,
- .switch_pin = -1,
- .name = "mmcblk",
- },
- .slots[1] = {
- .enabled = 0,
- .wire4 = 0,
- .wp_pin = -1,
- .power_pin = -1,
- .switch_pin = -1,
- .name = "mmcblk",
- },
+ /* Only the second MMC controller is used */
+ nokia770_mmc_data[1] = &nokia770_mmc2_data;
+ omap1_init_mmc(nokia770_mmc_data, OMAP16XX_NR_MMC);
+}
-};
+#else
+static inline void nokia770_mmc_init(void)
+{
+}
+#endif
static struct omap_board_config_kernel nokia770_config[] __initdata = {
{ OMAP_TAG_USB, NULL },
*/
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
*/
/* 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");
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 */
omap_serial_init();
omap_register_i2c_bus(1, 100, NULL, 0);
omap_dsp_init();
- hwa742_dev_init();
ads7846_dev_init();
mipid_dev_init();
- omap1_init_mmc(&nokia770_mmc_data);
+ nokia770_mmc_init();
}
static void __init omap_nokia770_map_io(void)