OMAP4: DSS2: Rename hdmi_omap4_panel.c to hdmi_panel.c
authorMythri P K <mythripk@ti.com>
Thu, 8 Sep 2011 13:36:27 +0000 (19:06 +0530)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 30 Sep 2011 13:16:35 +0000 (16:16 +0300)
As the panel driver will remain generic across OMAP's renaming it to
hdmi_panel.c

Signed-off-by: Mythri P K <mythripk@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/omap2/dss/Makefile
drivers/video/omap2/dss/hdmi_omap4_panel.c [deleted file]
drivers/video/omap2/dss/hdmi_panel.c [new file with mode: 0644]

index 96278292724306f9ad482e81a3f5b487141fa150..bd34ac5b20264b21c94b58864b5239c5c3838fb3 100644 (file)
@@ -6,4 +6,4 @@ omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o
 omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o
 omapdss-$(CONFIG_OMAP2_DSS_DSI) += dsi.o
 omapdss-$(CONFIG_OMAP4_DSS_HDMI) += hdmi.o \
-                                   hdmi_omap4_panel.o ti_hdmi_4xxx_ip.o
+                                   hdmi_panel.o ti_hdmi_4xxx_ip.o
diff --git a/drivers/video/omap2/dss/hdmi_omap4_panel.c b/drivers/video/omap2/dss/hdmi_omap4_panel.c
deleted file mode 100644 (file)
index 7d4f2bd..0000000
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * hdmi_omap4_panel.c
- *
- * HDMI library support functions for TI OMAP4 processors.
- *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/
- * Authors:    Mythri P k <mythripk@ti.com>
- *
- * 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
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/kernel.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/mutex.h>
-#include <linux/module.h>
-#include <video/omapdss.h>
-
-#include "dss.h"
-
-static struct {
-       struct mutex hdmi_lock;
-} hdmi;
-
-
-static int hdmi_panel_probe(struct omap_dss_device *dssdev)
-{
-       DSSDBG("ENTER hdmi_panel_probe\n");
-
-       dssdev->panel.config = OMAP_DSS_LCD_TFT |
-                       OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS;
-
-       /*
-        * Initialize the timings to 640 * 480
-        * This is only for framebuffer update not for TV timing setting
-        * Setting TV timing will be done only on enable
-        */
-       dssdev->panel.timings.x_res = 640;
-       dssdev->panel.timings.y_res = 480;
-
-       DSSDBG("hdmi_panel_probe x_res= %d y_res = %d\n",
-               dssdev->panel.timings.x_res,
-               dssdev->panel.timings.y_res);
-       return 0;
-}
-
-static void hdmi_panel_remove(struct omap_dss_device *dssdev)
-{
-
-}
-
-static int hdmi_panel_enable(struct omap_dss_device *dssdev)
-{
-       int r = 0;
-       DSSDBG("ENTER hdmi_panel_enable\n");
-
-       mutex_lock(&hdmi.hdmi_lock);
-
-       if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
-               r = -EINVAL;
-               goto err;
-       }
-
-       r = omapdss_hdmi_display_enable(dssdev);
-       if (r) {
-               DSSERR("failed to power on\n");
-               goto err;
-       }
-
-       dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-
-err:
-       mutex_unlock(&hdmi.hdmi_lock);
-
-       return r;
-}
-
-static void hdmi_panel_disable(struct omap_dss_device *dssdev)
-{
-       mutex_lock(&hdmi.hdmi_lock);
-
-       if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
-               omapdss_hdmi_display_disable(dssdev);
-
-       dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
-
-       mutex_unlock(&hdmi.hdmi_lock);
-}
-
-static int hdmi_panel_suspend(struct omap_dss_device *dssdev)
-{
-       int r = 0;
-
-       mutex_lock(&hdmi.hdmi_lock);
-
-       if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
-               r = -EINVAL;
-               goto err;
-       }
-
-       dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
-
-       omapdss_hdmi_display_disable(dssdev);
-
-err:
-       mutex_unlock(&hdmi.hdmi_lock);
-
-       return r;
-}
-
-static int hdmi_panel_resume(struct omap_dss_device *dssdev)
-{
-       int r = 0;
-
-       mutex_lock(&hdmi.hdmi_lock);
-
-       if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED) {
-               r = -EINVAL;
-               goto err;
-       }
-
-       r = omapdss_hdmi_display_enable(dssdev);
-       if (r) {
-               DSSERR("failed to power on\n");
-               goto err;
-       }
-
-       dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
-
-err:
-       mutex_unlock(&hdmi.hdmi_lock);
-
-       return r;
-}
-
-static void hdmi_get_timings(struct omap_dss_device *dssdev,
-                       struct omap_video_timings *timings)
-{
-       mutex_lock(&hdmi.hdmi_lock);
-
-       *timings = dssdev->panel.timings;
-
-       mutex_unlock(&hdmi.hdmi_lock);
-}
-
-static void hdmi_set_timings(struct omap_dss_device *dssdev,
-                       struct omap_video_timings *timings)
-{
-       DSSDBG("hdmi_set_timings\n");
-
-       mutex_lock(&hdmi.hdmi_lock);
-
-       dssdev->panel.timings = *timings;
-
-       if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
-               /* turn the hdmi off and on to get new timings to use */
-               omapdss_hdmi_display_disable(dssdev);
-               omapdss_hdmi_display_set_timing(dssdev);
-       }
-
-       mutex_unlock(&hdmi.hdmi_lock);
-}
-
-static int hdmi_check_timings(struct omap_dss_device *dssdev,
-                       struct omap_video_timings *timings)
-{
-       int r = 0;
-
-       DSSDBG("hdmi_check_timings\n");
-
-       mutex_lock(&hdmi.hdmi_lock);
-
-       r = omapdss_hdmi_display_check_timing(dssdev, timings);
-       if (r) {
-               DSSERR("Timing cannot be applied\n");
-               goto err;
-       }
-err:
-       mutex_unlock(&hdmi.hdmi_lock);
-       return r;
-}
-
-static struct omap_dss_driver hdmi_driver = {
-       .probe          = hdmi_panel_probe,
-       .remove         = hdmi_panel_remove,
-       .enable         = hdmi_panel_enable,
-       .disable        = hdmi_panel_disable,
-       .suspend        = hdmi_panel_suspend,
-       .resume         = hdmi_panel_resume,
-       .get_timings    = hdmi_get_timings,
-       .set_timings    = hdmi_set_timings,
-       .check_timings  = hdmi_check_timings,
-       .driver                 = {
-               .name   = "hdmi_panel",
-               .owner  = THIS_MODULE,
-       },
-};
-
-int hdmi_panel_init(void)
-{
-       mutex_init(&hdmi.hdmi_lock);
-
-       omap_dss_register_driver(&hdmi_driver);
-
-       return 0;
-}
-
-void hdmi_panel_exit(void)
-{
-       omap_dss_unregister_driver(&hdmi_driver);
-
-}
diff --git a/drivers/video/omap2/dss/hdmi_panel.c b/drivers/video/omap2/dss/hdmi_panel.c
new file mode 100644 (file)
index 0000000..e30182f
--- /dev/null
@@ -0,0 +1,222 @@
+/*
+ * hdmi_panel.c
+ *
+ * HDMI library support functions for TI OMAP4 processors.
+ *
+ * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/
+ * Authors:    Mythri P k <mythripk@ti.com>
+ *
+ * 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
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/kernel.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/mutex.h>
+#include <linux/module.h>
+#include <video/omapdss.h>
+
+#include "dss.h"
+
+static struct {
+       struct mutex hdmi_lock;
+} hdmi;
+
+
+static int hdmi_panel_probe(struct omap_dss_device *dssdev)
+{
+       DSSDBG("ENTER hdmi_panel_probe\n");
+
+       dssdev->panel.config = OMAP_DSS_LCD_TFT |
+                       OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS;
+
+       /*
+        * Initialize the timings to 640 * 480
+        * This is only for framebuffer update not for TV timing setting
+        * Setting TV timing will be done only on enable
+        */
+       dssdev->panel.timings.x_res = 640;
+       dssdev->panel.timings.y_res = 480;
+
+       DSSDBG("hdmi_panel_probe x_res= %d y_res = %d\n",
+               dssdev->panel.timings.x_res,
+               dssdev->panel.timings.y_res);
+       return 0;
+}
+
+static void hdmi_panel_remove(struct omap_dss_device *dssdev)
+{
+
+}
+
+static int hdmi_panel_enable(struct omap_dss_device *dssdev)
+{
+       int r = 0;
+       DSSDBG("ENTER hdmi_panel_enable\n");
+
+       mutex_lock(&hdmi.hdmi_lock);
+
+       if (dssdev->state != OMAP_DSS_DISPLAY_DISABLED) {
+               r = -EINVAL;
+               goto err;
+       }
+
+       r = omapdss_hdmi_display_enable(dssdev);
+       if (r) {
+               DSSERR("failed to power on\n");
+               goto err;
+       }
+
+       dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+err:
+       mutex_unlock(&hdmi.hdmi_lock);
+
+       return r;
+}
+
+static void hdmi_panel_disable(struct omap_dss_device *dssdev)
+{
+       mutex_lock(&hdmi.hdmi_lock);
+
+       if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
+               omapdss_hdmi_display_disable(dssdev);
+
+       dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+
+       mutex_unlock(&hdmi.hdmi_lock);
+}
+
+static int hdmi_panel_suspend(struct omap_dss_device *dssdev)
+{
+       int r = 0;
+
+       mutex_lock(&hdmi.hdmi_lock);
+
+       if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) {
+               r = -EINVAL;
+               goto err;
+       }
+
+       dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+
+       omapdss_hdmi_display_disable(dssdev);
+
+err:
+       mutex_unlock(&hdmi.hdmi_lock);
+
+       return r;
+}
+
+static int hdmi_panel_resume(struct omap_dss_device *dssdev)
+{
+       int r = 0;
+
+       mutex_lock(&hdmi.hdmi_lock);
+
+       if (dssdev->state != OMAP_DSS_DISPLAY_SUSPENDED) {
+               r = -EINVAL;
+               goto err;
+       }
+
+       r = omapdss_hdmi_display_enable(dssdev);
+       if (r) {
+               DSSERR("failed to power on\n");
+               goto err;
+       }
+
+       dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+err:
+       mutex_unlock(&hdmi.hdmi_lock);
+
+       return r;
+}
+
+static void hdmi_get_timings(struct omap_dss_device *dssdev,
+                       struct omap_video_timings *timings)
+{
+       mutex_lock(&hdmi.hdmi_lock);
+
+       *timings = dssdev->panel.timings;
+
+       mutex_unlock(&hdmi.hdmi_lock);
+}
+
+static void hdmi_set_timings(struct omap_dss_device *dssdev,
+                       struct omap_video_timings *timings)
+{
+       DSSDBG("hdmi_set_timings\n");
+
+       mutex_lock(&hdmi.hdmi_lock);
+
+       dssdev->panel.timings = *timings;
+
+       if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
+               /* turn the hdmi off and on to get new timings to use */
+               omapdss_hdmi_display_disable(dssdev);
+               omapdss_hdmi_display_set_timing(dssdev);
+       }
+
+       mutex_unlock(&hdmi.hdmi_lock);
+}
+
+static int hdmi_check_timings(struct omap_dss_device *dssdev,
+                       struct omap_video_timings *timings)
+{
+       int r = 0;
+
+       DSSDBG("hdmi_check_timings\n");
+
+       mutex_lock(&hdmi.hdmi_lock);
+
+       r = omapdss_hdmi_display_check_timing(dssdev, timings);
+       if (r) {
+               DSSERR("Timing cannot be applied\n");
+               goto err;
+       }
+err:
+       mutex_unlock(&hdmi.hdmi_lock);
+       return r;
+}
+
+static struct omap_dss_driver hdmi_driver = {
+       .probe          = hdmi_panel_probe,
+       .remove         = hdmi_panel_remove,
+       .enable         = hdmi_panel_enable,
+       .disable        = hdmi_panel_disable,
+       .suspend        = hdmi_panel_suspend,
+       .resume         = hdmi_panel_resume,
+       .get_timings    = hdmi_get_timings,
+       .set_timings    = hdmi_set_timings,
+       .check_timings  = hdmi_check_timings,
+       .driver                 = {
+               .name   = "hdmi_panel",
+               .owner  = THIS_MODULE,
+       },
+};
+
+int hdmi_panel_init(void)
+{
+       mutex_init(&hdmi.hdmi_lock);
+
+       omap_dss_register_driver(&hdmi_driver);
+
+       return 0;
+}
+
+void hdmi_panel_exit(void)
+{
+       omap_dss_unregister_driver(&hdmi_driver);
+
+}