46c039d06b
Without this, we get failures like this when the kernel attempts to initialize a cx231xx device: [16046.153653] cx231xx 3-1.2:1.1: New device Hauppauge Hauppauge Device @ 480 Mbps (2040:c200) with 6 interfaces [16046.153900] cx231xx 3-1.2:1.1: can't change interface 3 alt no. to 3: Max. Pkt size = 0 [16046.153907] cx231xx 3-1.2:1.1: Identified as Hauppauge USB Live 2 (card=9) [16046.154350] i2c i2c-11: Added multiplexed i2c bus 13 [16046.154379] i2c i2c-11: Added multiplexed i2c bus 14 [16046.267194] cx25840 10-0044: cx23102 A/V decoder found @ 0x88 (cx231xx #0-0) [16048.424551] cx25840 10-0044: loaded v4l-cx231xx-avcore-01.fw firmware (16382 bytes) [16048.463224] cx231xx 3-1.2:1.1: v4l2 driver version 0.0.3 [16048.567878] cx231xx 3-1.2:1.1: Registered video device video2 [v4l2] [16048.568001] cx231xx 3-1.2:1.1: Registered VBI device vbi0 [16048.568419] cx231xx 3-1.2:1.1: audio EndPoint Addr 0x83, Alternate settings: 3 [16048.568425] cx231xx 3-1.2:1.1: video EndPoint Addr 0x84, Alternate settings: 5 [16048.568431] cx231xx 3-1.2:1.1: VBI EndPoint Addr 0x85, Alternate settings: 2 [16048.568436] cx231xx 3-1.2:1.1: sliced CC EndPoint Addr 0x86, Alternate settings: 2 [16048.568448] usb 3-1.2: couldn't get decoder output pad for V4L I/O [16048.568453] cx231xx 3-1.2:1.1: V4L2 device vbi0 deregistered [16048.568579] cx231xx 3-1.2:1.1: V4L2 device video2 deregistered [16048.569001] cx231xx: probe of 3-1.2:1.1 failed with error -22 Likely a regession since Commit9d6d20e652
("media: v4l2-mc: switch it to use the new approach to setup pipelines") (v4.19-rc1-100-g9d6d20e652c0), which introduced the use of PAD_SIGNAL_DV within v4l2_mc_create_media_graph(). This also modifies cx25840 to remove the VBI pad, matching the action taken in Commit092a37875a
("media: v4l2: remove VBI output pad"). Fixes:9d6d20e652
("media: v4l2-mc: switch it to use the new approach to setup pipelines") Cc: stable@vger.kernel.org Signed-off-by: Cody P Schafer <dev@codyps.com> Tested-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
186 lines
5.9 KiB
C
186 lines
5.9 KiB
C
/* cx25840 internal API header
|
|
*
|
|
* Copyright (C) 2003-2004 Chris Kennedy
|
|
*
|
|
* 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.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef _CX25840_CORE_H_
|
|
#define _CX25840_CORE_H_
|
|
|
|
|
|
#include <linux/videodev2.h>
|
|
#include <media/v4l2-device.h>
|
|
#include <media/v4l2-ctrls.h>
|
|
#include <linux/i2c.h>
|
|
|
|
struct cx25840_ir_state;
|
|
|
|
enum cx25840_model {
|
|
CX23885_AV,
|
|
CX23887_AV,
|
|
CX23888_AV,
|
|
CX2310X_AV,
|
|
CX25840,
|
|
CX25841,
|
|
CX25842,
|
|
CX25843,
|
|
CX25836,
|
|
CX25837,
|
|
};
|
|
|
|
enum cx25840_media_pads {
|
|
CX25840_PAD_INPUT,
|
|
CX25840_PAD_VID_OUT,
|
|
|
|
CX25840_NUM_PADS
|
|
};
|
|
|
|
/**
|
|
* struct cx25840_state - a device instance private data
|
|
* @c: i2c_client struct representing this device
|
|
* @sd: our V4L2 sub-device
|
|
* @hdl: our V4L2 control handler
|
|
* @volume: audio volume V4L2 control (non-cx2583x devices only)
|
|
* @mute: audio mute V4L2 control (non-cx2583x devices only)
|
|
* @pvr150_workaround: whether we enable workaround for Hauppauge PVR150
|
|
* hardware bug (audio dropping out)
|
|
* @radio: set if we are currently in the radio mode, otherwise
|
|
* the current mode is non-radio (that is, video)
|
|
* @std: currently set video standard
|
|
* @vid_input: currently set video input
|
|
* @aud_input: currently set audio input
|
|
* @audclk_freq: currently set audio sample rate
|
|
* @audmode: currently set audio mode (when in non-radio mode)
|
|
* @vbi_line_offset: vbi line number offset
|
|
* @id: exact device model
|
|
* @rev: raw device id read from the chip
|
|
* @is_initialized: whether we have already loaded firmware into the chip
|
|
* and initialized it
|
|
* @vbi_regs_offset: offset of vbi regs
|
|
* @fw_wait: wait queue to wake an initalization function up when
|
|
* firmware loading (on a separate workqueue) finishes
|
|
* @fw_work: a work that actually loads the firmware on a separate
|
|
* workqueue
|
|
* @ir_state: a pointer to chip IR controller private data
|
|
* @pads: array of supported chip pads (currently only a stub)
|
|
*/
|
|
struct cx25840_state {
|
|
struct i2c_client *c;
|
|
struct v4l2_subdev sd;
|
|
struct v4l2_ctrl_handler hdl;
|
|
struct {
|
|
/* volume cluster */
|
|
struct v4l2_ctrl *volume;
|
|
struct v4l2_ctrl *mute;
|
|
};
|
|
int pvr150_workaround;
|
|
int radio;
|
|
v4l2_std_id std;
|
|
enum cx25840_video_input vid_input;
|
|
enum cx25840_audio_input aud_input;
|
|
u32 audclk_freq;
|
|
int audmode;
|
|
int vbi_line_offset;
|
|
enum cx25840_model id;
|
|
u32 rev;
|
|
int is_initialized;
|
|
unsigned vbi_regs_offset;
|
|
wait_queue_head_t fw_wait;
|
|
struct work_struct fw_work;
|
|
struct cx25840_ir_state *ir_state;
|
|
#if defined(CONFIG_MEDIA_CONTROLLER)
|
|
struct media_pad pads[CX25840_NUM_PADS];
|
|
#endif
|
|
};
|
|
|
|
static inline struct cx25840_state *to_state(struct v4l2_subdev *sd)
|
|
{
|
|
return container_of(sd, struct cx25840_state, sd);
|
|
}
|
|
|
|
static inline struct v4l2_subdev *to_sd(struct v4l2_ctrl *ctrl)
|
|
{
|
|
return &container_of(ctrl->handler, struct cx25840_state, hdl)->sd;
|
|
}
|
|
|
|
static inline bool is_cx2583x(struct cx25840_state *state)
|
|
{
|
|
return state->id == CX25836 ||
|
|
state->id == CX25837;
|
|
}
|
|
|
|
static inline bool is_cx231xx(struct cx25840_state *state)
|
|
{
|
|
return state->id == CX2310X_AV;
|
|
}
|
|
|
|
static inline bool is_cx2388x(struct cx25840_state *state)
|
|
{
|
|
return state->id == CX23885_AV ||
|
|
state->id == CX23887_AV ||
|
|
state->id == CX23888_AV;
|
|
}
|
|
|
|
static inline bool is_cx23885(struct cx25840_state *state)
|
|
{
|
|
return state->id == CX23885_AV;
|
|
}
|
|
|
|
static inline bool is_cx23887(struct cx25840_state *state)
|
|
{
|
|
return state->id == CX23887_AV;
|
|
}
|
|
|
|
static inline bool is_cx23888(struct cx25840_state *state)
|
|
{
|
|
return state->id == CX23888_AV;
|
|
}
|
|
|
|
/* ----------------------------------------------------------------------- */
|
|
/* cx25850-core.c */
|
|
int cx25840_write(struct i2c_client *client, u16 addr, u8 value);
|
|
int cx25840_write4(struct i2c_client *client, u16 addr, u32 value);
|
|
u8 cx25840_read(struct i2c_client *client, u16 addr);
|
|
u32 cx25840_read4(struct i2c_client *client, u16 addr);
|
|
int cx25840_and_or(struct i2c_client *client, u16 addr, unsigned mask, u8 value);
|
|
int cx25840_and_or4(struct i2c_client *client, u16 addr, u32 and_mask,
|
|
u32 or_value);
|
|
void cx25840_std_setup(struct i2c_client *client);
|
|
|
|
/* ----------------------------------------------------------------------- */
|
|
/* cx25850-firmware.c */
|
|
int cx25840_loadfw(struct i2c_client *client);
|
|
|
|
/* ----------------------------------------------------------------------- */
|
|
/* cx25850-audio.c */
|
|
void cx25840_audio_set_path(struct i2c_client *client);
|
|
int cx25840_s_clock_freq(struct v4l2_subdev *sd, u32 freq);
|
|
|
|
extern const struct v4l2_ctrl_ops cx25840_audio_ctrl_ops;
|
|
|
|
/* ----------------------------------------------------------------------- */
|
|
/* cx25850-vbi.c */
|
|
int cx25840_s_raw_fmt(struct v4l2_subdev *sd, struct v4l2_vbi_format *fmt);
|
|
int cx25840_s_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_format *fmt);
|
|
int cx25840_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_format *fmt);
|
|
int cx25840_decode_vbi_line(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi);
|
|
|
|
/* ----------------------------------------------------------------------- */
|
|
/* cx25850-ir.c */
|
|
extern const struct v4l2_subdev_ir_ops cx25840_ir_ops;
|
|
int cx25840_ir_log_status(struct v4l2_subdev *sd);
|
|
int cx25840_ir_irq_handler(struct v4l2_subdev *sd, u32 status, bool *handled);
|
|
int cx25840_ir_probe(struct v4l2_subdev *sd);
|
|
int cx25840_ir_remove(struct v4l2_subdev *sd);
|
|
|
|
#endif
|