change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/drivers/gpu/drm/omapdrm/omap_drv.h
..
..
@@ -1,18 +1,7 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
3
4
  * Author: Rob Clark <rob@ti.com>
4
- *
5
- * This program is free software; you can redistribute it and/or modify it
6
- * under the terms of the GNU General Public License version 2 as published by
7
- * the Free Software Foundation.
8
- *
9
- * This program is distributed in the hope that it will be useful, but WITHOUT
10
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
12
- * more details.
13
- *
14
- * You should have received a copy of the GNU General Public License along with
15
- * this program.  If not, see <http://www.gnu.org/licenses/>.
16
5
  */
17
6
 
18
7
 #ifndef __OMAPDRM_DRV_H__
..
..
@@ -22,12 +11,10 @@
22
11
 #include <linux/types.h>
23
12
 #include <linux/workqueue.h>
24
13
 
25
-#include <drm/drmP.h>
26
-#include <drm/drm_crtc_helper.h>
14
+#include "dss/omapdss.h"
15
+
27
16
 #include <drm/drm_gem.h>
28
17
 #include <drm/omap_drm.h>
29
-
30
-#include "dss/omapdss.h"
31
18
 
32
19
 #include "omap_connector.h"
33
20
 #include "omap_crtc.h"
..
..
@@ -38,12 +25,20 @@
38
25
 #include "omap_irq.h"
39
26
 #include "omap_plane.h"
40
27
 
41
-#define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__)
42
-#define VERB(fmt, ...) if (0) DRM_DEBUG(fmt, ##__VA_ARGS__) /* verbose debug */
28
+#define DBG(fmt, ...) DRM_DEBUG_DRIVER(fmt"\n", ##__VA_ARGS__)
29
+#define VERB(fmt, ...) if (0) DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__) /* verbose debug */
43
30
 
44
31
 #define MODULE_NAME     "omapdrm"
45
32
 
46
33
 struct omap_drm_usergart;
34
+
35
+struct omap_drm_pipeline {
36
+	struct drm_crtc *crtc;
37
+	struct drm_encoder *encoder;
38
+	struct drm_connector *connector;
39
+	struct omap_dss_device *output;
40
+	unsigned int alias_id;
41
+};
47
42
 
48
43
 struct omap_drm_private {
49
44
 	struct drm_device *ddev;
..
..
@@ -54,17 +49,12 @@
54
49
 	struct dispc_device *dispc;
55
50
 	const struct dispc_ops *dispc_ops;
56
51
 
57
-	unsigned int num_crtcs;
58
-	struct drm_crtc *crtcs[8];
52
+	unsigned int num_pipes;
53
+	struct omap_drm_pipeline pipes[8];
54
+	struct omap_drm_pipeline *channels[8];
59
55
 
60
56
 	unsigned int num_planes;
61
57
 	struct drm_plane *planes[8];
62
-
63
-	unsigned int num_encoders;
64
-	struct drm_encoder *encoders[8];
65
-
66
-	unsigned int num_connectors;
67
-	struct drm_connector *connectors[8];
68
58
 
69
59
 	struct drm_fb_helper *fbdev;
70
60
 
..
..
@@ -92,6 +82,6 @@
92
82
 };
93
83
 
94
84
 
95
-int omap_debugfs_init(struct drm_minor *minor);
85
+void omap_debugfs_init(struct drm_minor *minor);
96
86
 
97
87
 #endif /* __OMAPDRM_DRV_H__ */