Merge omapdss header refactoring

[linux-beck.git] / include / video / omapfb_dss.h

diff --git a/include/video/omapdss.h b/include/video/omapfb_dss.h
similarity index 93%
rename from include/video/omapdss.h
rename to include/video/omapfb_dss.h
index 6bd9d03b103080a0c09461785a222aad965d8799..1d38901d599d37f5a174c17d25416d8ca706bb8e 100644 (file)
--- a/include/video/omapdss.h
+++ b/include/video/omapfb_dss.h
@@ -1,27 +1,20 @@
 /*
- * Copyright (C) 2008 Nokia Corporation
- * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ * Copyright (C) 2016 Texas Instruments, Inc.
  *
- * 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/>.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  */
 
-#ifndef __OMAP_OMAPDSS_H
-#define __OMAP_OMAPDSS_H
+#ifndef __OMAPFB_DSS_H
+#define __OMAPFB_DSS_H
 
 #include <linux/list.h>
 #include <linux/kobject.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
+#include <linux/platform_data/omapdss.h>
 
 #include <video/videomode.h>
 
@@ -167,11 +160,6 @@ enum omap_dss_display_state {
        OMAP_DSS_DISPLAY_ACTIVE,
 };
 
-struct omap_dss_audio {
-       struct snd_aes_iec958 *iec;
-       struct snd_cea_861_aud_if *cea;
-};
-
 enum omap_dss_rotation_type {
        OMAP_DSS_ROT_DMA        = 1 << 0,
        OMAP_DSS_ROT_VRFB       = 1 << 1,
@@ -284,36 +272,6 @@ struct omap_dss_dsi_config {
        enum omap_dss_dsi_trans_mode trans_mode;
 };
 
-enum omapdss_version {
-       OMAPDSS_VER_UNKNOWN = 0,
-       OMAPDSS_VER_OMAP24xx,
-       OMAPDSS_VER_OMAP34xx_ES1,       /* OMAP3430 ES1.0, 2.0 */
-       OMAPDSS_VER_OMAP34xx_ES3,       /* OMAP3430 ES3.0+ */
-       OMAPDSS_VER_OMAP3630,
-       OMAPDSS_VER_AM35xx,
-       OMAPDSS_VER_OMAP4430_ES1,       /* OMAP4430 ES1.0 */
-       OMAPDSS_VER_OMAP4430_ES2,       /* OMAP4430 ES2.0, 2.1, 2.2 */
-       OMAPDSS_VER_OMAP4,              /* All other OMAP4s */
-       OMAPDSS_VER_OMAP5,
-       OMAPDSS_VER_AM43xx,
-       OMAPDSS_VER_DRA7xx,
-};
-
-/* Board specific data */
-struct omap_dss_board_info {
-       int num_devices;
-       struct omap_dss_device **devices;
-       struct omap_dss_device *default_device;
-       const char *default_display_name;
-       int (*dsi_enable_pads)(int dsi_id, unsigned lane_mask);
-       void (*dsi_disable_pads)(int dsi_id, unsigned lane_mask);
-       int (*set_min_bus_tput)(struct device *dev, unsigned long r);
-       enum omapdss_version version;
-};
-
-/* Init with the board info */
-extern int omap_display_init(struct omap_dss_board_info *board_data);
-
 struct omap_video_timings {
        /* Unit: pixels */
        u16 x_res;
@@ -899,4 +857,4 @@ omapdss_of_get_first_endpoint(const struct device_node *parent);
 struct omap_dss_device *
 omapdss_of_find_source_for_first_ep(struct device_node *node);
 
-#endif
+#endif /* __OMAPFB_DSS_H */