From patchwork Mon Apr 18 06:15:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: MAYURESH JANORKAR X-Patchwork-Id: 714291 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3I5xHZf024374 for ; Mon, 18 Apr 2011 05:59:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752631Ab1DRF7P (ORCPT ); Mon, 18 Apr 2011 01:59:15 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:42340 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751911Ab1DRF7P (ORCPT ); Mon, 18 Apr 2011 01:59:15 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id p3I5xEuk023223 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 18 Apr 2011 00:59:14 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id p3I5xCK9006145; Mon, 18 Apr 2011 00:59:12 -0500 (CDT) Received: from localhost (ldc-172024137131.apr.dhcp.ti.com [172.24.137.131]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id p3I5xAf25730; Mon, 18 Apr 2011 00:59:10 -0500 (CDT) From: Mayuresh Janorkar To: linux-omap@vger.kernel.org Cc: tomi.valkeinen@ti.com, Mayuresh Janorkar , Mythri P K Subject: [PATCH 4/7] OMAP: DSS: Add i2c client driver for picodlp Date: Mon, 18 Apr 2011 11:45:47 +0530 Message-Id: <1303107350-22747-5-git-send-email-mayur@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1303107350-22747-1-git-send-email-mayur@ti.com> References: <1303107350-22747-1-git-send-email-mayur@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 18 Apr 2011 05:59:18 +0000 (UTC) The configurations and data transfer with picodlp panel happens through i2c. An i2c client with name "picodlp_i2c_driver" is registered inside panel. Signed-off-by: Mythri P K Signed-off-by: Mayuresh Janorkar Signed-off-by: Mythri P K --- drivers/video/omap2/displays/panel-picodlp.c | 130 +++++++++++++++++++++++++- 1 files changed, 126 insertions(+), 4 deletions(-) diff --git a/drivers/video/omap2/displays/panel-picodlp.c b/drivers/video/omap2/displays/panel-picodlp.c index 4f12903..e361674 100644 --- a/drivers/video/omap2/displays/panel-picodlp.c +++ b/drivers/video/omap2/displays/panel-picodlp.c @@ -1,8 +1,10 @@ /* * picodlp panel driver + * picodlp_i2c_driver: i2c_client driver * * Copyright (C) 2009-2011 Texas Instruments * Author: Mythri P K + * Mayuresh Janorkar * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published by @@ -23,13 +25,29 @@ #include #include #include +#include #include +#include #include #include +#define DRIVER_NAME "picodlp_i2c_driver" struct picodlp_data { struct mutex lock; + struct i2c_client *picodlp_i2c_client; +}; + +static struct i2c_board_info picodlp_i2c_board_info = { + I2C_BOARD_INFO("picodlp_i2c_driver", 0x1b), +}; + +struct picodlp_i2c_data { + struct mutex xfer_lock; +}; + +struct i2c_device_id picodlp_i2c_id[] = { + { "picodlp_i2c_driver", 0 }, }; static struct omap_video_timings pico_ls_timings = { @@ -46,9 +64,57 @@ static struct omap_video_timings pico_ls_timings = { .vbp = 14, }; +static inline struct picodlp_panel_data + *get_panel_data(const struct omap_dss_device *dssdev) +{ + return (struct picodlp_panel_data *) dssdev->data; +} + +static int picodlp_i2c_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct picodlp_i2c_data *picodlp_i2c_data; + + picodlp_i2c_data = kzalloc(sizeof(struct picodlp_i2c_data), GFP_KERNEL); + + if (!picodlp_i2c_data) + return -ENOMEM; + + i2c_set_clientdata(client, picodlp_i2c_data); + + return 0; +} + +static int picodlp_i2c_remove(struct i2c_client *client) +{ + struct picodlp_i2c_data *picodlp_i2c_data = + i2c_get_clientdata(client); + + kfree(picodlp_i2c_data); + i2c_unregister_device(client); + return 0; +} + +static struct i2c_driver picodlp_i2c_driver = { + .driver = { + .name = "picodlp_i2c_driver", + }, + .probe = picodlp_i2c_probe, + .remove = picodlp_i2c_remove, + .id_table = picodlp_i2c_id, +}; + static int picodlp_panel_power_on(struct omap_dss_device *dssdev) { - int r; + int r = 0; + struct picodlp_data *picod = dev_get_drvdata(&dssdev->dev); + struct picodlp_panel_data *picodlp_pdata; + struct picodlp_i2c_data *picodlp_i2c_data; + + picodlp_pdata = get_panel_data(dssdev); + gpio_set_value(picodlp_pdata->display_sel_gpio, 1); + gpio_set_value(picodlp_pdata->park_gpio, 1); + gpio_set_value(picodlp_pdata->phy_reset_gpio, 1); if (dssdev->platform_enable) { r = dssdev->platform_enable(dssdev); @@ -65,8 +131,10 @@ static int picodlp_panel_power_on(struct omap_dss_device *dssdev) msleep(675); dssdev->state = OMAP_DSS_DISPLAY_ACTIVE; - return 0; + picodlp_i2c_data = + i2c_get_clientdata(picod->picodlp_i2c_client); + return r; err: if (dssdev->platform_disable) dssdev->platform_disable(dssdev); @@ -85,6 +153,11 @@ static void picodlp_panel_power_off(struct omap_dss_device *dssdev) static int picodlp_panel_probe(struct omap_dss_device *dssdev) { struct picodlp_data *picod; + struct picodlp_panel_data *picodlp_pdata; + struct i2c_adapter *adapter; + struct i2c_client *picodlp_i2c_client; + struct picodlp_i2c_data *picodlp_i2c_data; + int r = 0, picodlp_adapter_id; dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_ONOFF | OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IVS; @@ -96,8 +169,38 @@ static int picodlp_panel_probe(struct omap_dss_device *dssdev) return -ENOMEM; mutex_init(&picod->lock); + + picodlp_pdata = get_panel_data(dssdev); + picodlp_adapter_id = picodlp_pdata->picodlp_adapter_id; + + adapter = i2c_get_adapter(picodlp_adapter_id); + if (!adapter) { + dev_err(&dssdev->dev, "can't get i2c adapter\n"); + r = -ENODEV; + goto err; + } + + picodlp_i2c_client = i2c_new_device(adapter, &picodlp_i2c_board_info); + /* wait till i2c device creation is done */ + msleep(700); + if (!picodlp_i2c_client) { + dev_err(&dssdev->dev, "can't add i2c device::" + " picodlp_i2c_client is NULL\n"); + r = -ENODEV; + goto err; + } + + picod->picodlp_i2c_client = picodlp_i2c_client; + + picodlp_i2c_data = + i2c_get_clientdata(picod->picodlp_i2c_client); + + mutex_init(&picodlp_i2c_data->xfer_lock); dev_set_drvdata(&dssdev->dev, picod); - return 0; + return r; +err: + kfree(picod); + return r; } static void picodlp_panel_remove(struct omap_dss_device *dssdev) @@ -131,6 +234,11 @@ static int picodlp_panel_enable(struct omap_dss_device *dssdev) static void picodlp_panel_disable(struct omap_dss_device *dssdev) { struct picodlp_data *picod = dev_get_drvdata(&dssdev->dev); + struct picodlp_panel_data *picodlp_pdata; + + picodlp_pdata = get_panel_data(dssdev); + gpio_set_value(picodlp_pdata->phy_reset_gpio, 0); + gpio_set_value(picodlp_pdata->park_gpio, 0); mutex_lock(&picod->lock); /* Turn off DLP Power */ @@ -212,11 +320,25 @@ static struct omap_dss_driver picodlp_driver = { static int __init picodlp_init(void) { - return omap_dss_register_driver(&picodlp_driver); + int r = 0; + + r = i2c_add_driver(&picodlp_i2c_driver); + if (r < 0) { + printk(KERN_WARNING DRIVER_NAME + " driver registration failed\n"); + return r; + } + + r = omap_dss_register_driver(&picodlp_driver); + if (r) + i2c_del_driver(&picodlp_i2c_driver); + + return r; } static void __exit picodlp_exit(void) { + i2c_del_driver(&picodlp_i2c_driver); omap_dss_unregister_driver(&picodlp_driver); }