change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/drivers/gpu/drm/omapdrm/dss/hdmi.h
..
..
@@ -1,19 +1,8 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  * HDMI driver definition for TI OMAP4 Processor.
3
4
  *
4
5
  * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/
5
- *
6
- * This program is free software; you can redistribute it and/or modify it
7
- * under the terms of the GNU General Public License version 2 as published by
8
- * the Free Software Foundation.
9
- *
10
- * This program is distributed in the hope that it will be useful, but WITHOUT
11
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
13
- * more details.
14
- *
15
- * You should have received a copy of the GNU General Public License along with
16
- * this program.  If not, see <http://www.gnu.org/licenses/>.
17
6
  */
18
7
 
19
8
 #ifndef _HDMI_H
..
..
@@ -25,6 +14,7 @@
25
14
 #include <linux/hdmi.h>
26
15
 #include <sound/omap-hdmi-audio.h>
27
16
 #include <media/cec.h>
17
+#include <drm/drm_bridge.h>
28
18
 
29
19
 #include "omapdss.h"
30
20
 #include "dss.h"
..
..
@@ -313,13 +303,13 @@
313
303
 int hdmi_wp_set_phy_pwr(struct hdmi_wp_data *wp, enum hdmi_phy_pwr val);
314
304
 int hdmi_wp_set_pll_pwr(struct hdmi_wp_data *wp, enum hdmi_pll_pwr val);
315
305
 void hdmi_wp_video_config_format(struct hdmi_wp_data *wp,
316
-		struct hdmi_video_format *video_fmt);
306
+		const struct hdmi_video_format *video_fmt);
317
307
 void hdmi_wp_video_config_interface(struct hdmi_wp_data *wp,
318
-		struct videomode *vm);
308
+		const struct videomode *vm);
319
309
 void hdmi_wp_video_config_timing(struct hdmi_wp_data *wp,
320
-		struct videomode *vm);
310
+		const struct videomode *vm);
321
311
 void hdmi_wp_init_vid_fmt_timings(struct hdmi_video_format *video_fmt,
322
-		struct videomode *vm, struct hdmi_config *param);
312
+		struct videomode *vm, const struct hdmi_config *param);
323
313
 int hdmi_wp_init(struct platform_device *pdev, struct hdmi_wp_data *wp,
324
314
 		 unsigned int version);
325
315
 phys_addr_t hdmi_wp_get_audio_dma_addr(struct hdmi_wp_data *wp);
..
..
@@ -375,6 +365,7 @@
375
365
 	bool core_enabled;
376
366
 
377
367
 	struct omap_dss_device output;
368
+	struct drm_bridge bridge;
378
369
 
379
370
 	struct platform_device *audio_pdev;
380
371
 	void (*audio_abort_cb)(struct device *dev);
..
..
@@ -389,6 +380,6 @@
389
380
 	bool display_enabled;
390
381
 };
391
382
 
392
-#define dssdev_to_hdmi(dssdev) container_of(dssdev, struct omap_hdmi, output)
383
+#define drm_bridge_to_hdmi(b) container_of(b, struct omap_hdmi, bridge)
393
384
 
394
385
 #endif