]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm: omapdrm: Remove dss_features.h
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Fri, 4 Aug 2017 22:44:19 +0000 (01:44 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 15 Aug 2017 12:18:25 +0000 (15:18 +0300)
The header file only contains four macros, two of which are never used.
Move the other two to dss.h and remove dss_features.h.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
12 files changed:
drivers/gpu/drm/omapdrm/dss/core.c
drivers/gpu/drm/omapdrm/dss/dispc.c
drivers/gpu/drm/omapdrm/dss/dpi.c
drivers/gpu/drm/omapdrm/dss/dsi.c
drivers/gpu/drm/omapdrm/dss/dss.c
drivers/gpu/drm/omapdrm/dss/dss.h
drivers/gpu/drm/omapdrm/dss/dss_features.h [deleted file]
drivers/gpu/drm/omapdrm/dss/hdmi4.c
drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
drivers/gpu/drm/omapdrm/dss/hdmi5.c
drivers/gpu/drm/omapdrm/dss/venc.c
drivers/gpu/drm/omapdrm/dss/video-pll.c

index 4f15f2d76ba021a42e19cda5723d9ae066451ae8..4dabe32c7098a73ccc2866259dae1aea93d98186 100644 (file)
@@ -35,7 +35,6 @@
 
 #include "omapdss.h"
 #include "dss.h"
-#include "dss_features.h"
 
 static struct {
        struct platform_device *pdev;
index 4160d11e09303b61e987be7a0a0b6ffc1469b3a0..0f4fdb221498e3144aa44a760a01fba0d9db5be1 100644 (file)
@@ -47,7 +47,6 @@
 
 #include "omapdss.h"
 #include "dss.h"
-#include "dss_features.h"
 #include "dispc.h"
 
 /* DISPC */
index d15d17ff16d14b6ac1612e5b275e5b4f4d2da737..daf286fc8a4082a7fc7f8f8bf6bf38ab74362c09 100644 (file)
@@ -36,7 +36,6 @@
 
 #include "omapdss.h"
 #include "dss.h"
-#include "dss_features.h"
 
 struct dpi_data {
        struct platform_device *pdev;
index 0b8409d9b74b079237b1ed436dee97b08eff398d..a66d2b1a6c74b17c1a81a01c5ebbac23b6ad176a 100644 (file)
@@ -50,7 +50,6 @@
 
 #include "omapdss.h"
 #include "dss.h"
-#include "dss_features.h"
 
 #define DSI_CATCH_MISSING_TE
 
index fa686070b6b084811b57a7caef3651b30b98dd8a..d1755f12236ba1d43f0b2266c58182993730908a 100644 (file)
@@ -48,7 +48,6 @@
 
 #include "omapdss.h"
 #include "dss.h"
-#include "dss_features.h"
 
 #define DSS_SZ_REGS                    SZ_512
 
index a46d8e8a9b4b0c4c339f1e06837e2226711801fd..085486024089f997f0580a2a5ab2dd25d7c4be26 100644 (file)
@@ -27,6 +27,9 @@
 
 #include "omapdss.h"
 
+#define MAX_DSS_LCD_MANAGERS   3
+#define MAX_NUM_DSI            2
+
 #ifdef pr_fmt
 #undef pr_fmt
 #endif
diff --git a/drivers/gpu/drm/omapdrm/dss/dss_features.h b/drivers/gpu/drm/omapdrm/dss/dss_features.h
deleted file mode 100644 (file)
index 058c302..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * linux/drivers/video/omap2/dss/dss_features.h
- *
- * Copyright (C) 2010 Texas Instruments
- * Author: Archit Taneja <archit@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/>.
- */
-
-#ifndef __OMAP2_DSS_FEATURES_H
-#define __OMAP2_DSS_FEATURES_H
-
-#define MAX_DSS_MANAGERS       4
-#define MAX_DSS_OVERLAYS       4
-#define MAX_DSS_LCD_MANAGERS   3
-#define MAX_NUM_DSI            2
-
-#endif
index 284b4942b9ac4826c0f55b870fc67b53f3d6c307..2a99b11c8b5e5afab1ff5daab3f55247fea82465 100644 (file)
@@ -40,7 +40,6 @@
 #include "omapdss.h"
 #include "hdmi4_core.h"
 #include "dss.h"
-#include "dss_features.h"
 #include "hdmi.h"
 
 static struct omap_hdmi hdmi;
index 5aef83c270dad6703cc2b561e39e4cd021994a2c..365cf07daa017e7aab854ba01017f1750b4ef698 100644 (file)
@@ -36,7 +36,6 @@
 #include <sound/asoundef.h>
 
 #include "hdmi4_core.h"
-#include "dss_features.h"
 
 #define HDMI_CORE_AV           0x500
 
index 441e1999d86a0b46122dda722ec9533135ba2bf1..5f5b0a06800d0b049b5f11b15983f7512b4696a6 100644 (file)
@@ -45,7 +45,6 @@
 #include "omapdss.h"
 #include "hdmi5_core.h"
 #include "dss.h"
-#include "dss_features.h"
 
 static struct omap_hdmi hdmi;
 
index b0a85b10fa381e3614321fe4903d6bb8c3075a57..5bd7788357b22d81b8143a906f136cda5f151c2e 100644 (file)
@@ -41,7 +41,6 @@
 
 #include "omapdss.h"
 #include "dss.h"
-#include "dss_features.h"
 
 /* Venc registers */
 #define VENC_REV_ID                            0x00
index fbd1263a29a4a474e6ec5096b9410a12238f17ee..f7ea02a88b1a80e0380780f9e75c9d12d098d487 100644 (file)
@@ -19,7 +19,6 @@
 
 #include "omapdss.h"
 #include "dss.h"
-#include "dss_features.h"
 
 struct dss_video_pll {
        struct dss_pll pll;