disable pwm7

hc

2024-05-10 23fa18eaa71266feff7ba8d83022d9e1cc83c65a

 kernel/drivers/video/fbdev/omap2/omapfb/dss/venc.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * linux/drivers/video/omap2/dss/venc.c
3
4
  *
..
..
@@ -5,18 +6,6 @@
5
6
  * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
6
7
  *
7
8
  * VENC settings from TI's DSS driver
8
- *
9
- * This program is free software; you can redistribute it and/or modify it
10
- * under the terms of the GNU General Public License version 2 as published by
11
- * the Free Software Foundation.
12
- *
13
- * This program is distributed in the hope that it will be useful, but WITHOUT
14
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
15
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
16
- * more details.
17
- *
18
- * You should have received a copy of the GNU General Public License along with
19
- * this program.  If not, see <http://www.gnu.org/licenses/>.
20
9
  */
21
10
 
22
11
 #define DSS_SUBSYS_NAME "VENC"
..
..
@@ -218,49 +207,6 @@
218
207
 	.tvdetgp_int_start_stop_x		= 0x00140001,
219
208
 	.tvdetgp_int_start_stop_y		= 0x00010001,
220
209
 	.gen_ctrl				= 0x00F90000,
221
-};
222
-
223
-static const struct venc_config venc_config_pal_bdghi = {
224
-	.f_control				= 0,
225
-	.vidout_ctrl				= 0,
226
-	.sync_ctrl				= 0,
227
-	.hfltr_ctrl				= 0,
228
-	.x_color				= 0,
229
-	.line21					= 0,
230
-	.ln_sel					= 21,
231
-	.htrigger_vtrigger			= 0,
232
-	.tvdetgp_int_start_stop_x		= 0x00140001,
233
-	.tvdetgp_int_start_stop_y		= 0x00010001,
234
-	.gen_ctrl				= 0x00FB0000,
235
-
236
-	.llen					= 864-1,
237
-	.flens					= 625-1,
238
-	.cc_carr_wss_carr			= 0x2F7625ED,
239
-	.c_phase				= 0xDF,
240
-	.gain_u					= 0x111,
241
-	.gain_v					= 0x181,
242
-	.gain_y					= 0x140,
243
-	.black_level				= 0x3e,
244
-	.blank_level				= 0x3e,
245
-	.m_control				= 0<<2 | 1<<1,
246
-	.bstamp_wss_data			= 0x42,
247
-	.s_carr					= 0x2a098acb,
248
-	.l21__wc_ctl				= 0<<13 | 0x16<<8 | 0<<0,
249
-	.savid__eavid				= 0x06A70108,
250
-	.flen__fal				= 23<<16 | 624<<0,
251
-	.lal__phase_reset			= 2<<17 | 310<<0,
252
-	.hs_int_start_stop_x			= 0x00920358,
253
-	.hs_ext_start_stop_x			= 0x000F035F,
254
-	.vs_int_start_x				= 0x1a7<<16,
255
-	.vs_int_stop_x__vs_int_start_y		= 0x000601A7,
256
-	.vs_int_stop_y__vs_ext_start_x		= 0x01AF0036,
257
-	.vs_ext_stop_x__vs_ext_start_y		= 0x27101af,
258
-	.vs_ext_stop_y				= 0x05,
259
-	.avid_start_stop_x			= 0x03530082,
260
-	.avid_start_stop_y			= 0x0270002E,
261
-	.fid_int_start_x__fid_int_start_y	= 0x0005008A,
262
-	.fid_int_offset_y__fid_ext_start_x	= 0x002E0138,
263
-	.fid_ext_start_y__fid_ext_offset_y	= 0x01380005,
264
210
 };
265
211
 
266
212
 const struct omap_video_timings omap_dss_pal_timings = {
..
..
@@ -841,7 +787,7 @@
841
787
 		venc.type = OMAP_DSS_VENC_TYPE_SVIDEO;
842
788
 		break;
843
789
 	default:
844
-		dev_err(&pdev->dev, "bad channel propert '%d'\n", channels);
790
+		dev_err(&pdev->dev, "bad channel property '%d'\n", channels);
845
791
 		r = -EINVAL;
846
792
 		goto err;
847
793
 	}