Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: - Missing MAINTAINERS entries were added for several drivers - Adds V4L2 support for DMABUF handling, allowing zero-copy buffer sharing between V4L2 devices and GPU - Got rid of all warnings when compiling with W=1 on x86 - Add a new driver for Exynos hardware (s3c-camif) - Several bug fixes, cleanups and driver improvements * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (243 commits) [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check [media] omap3isp: Prepare/unprepare clocks before/after enable/disable [media] omap3isp: preview: Add support for 8-bit formats at the sink pad [media] omap3isp: Replace printk with dev_* [media] omap3isp: Find source pad from external entity [media] omap3isp: Configure CSI-2 phy based on platform data [media] omap3isp: Add PHY routing configuration [media] omap3isp: Add CSI configuration registers from control block to ISP resources [media] omap3isp: Remove unneeded module memory address definitions [media] omap3isp: Use monotonic timestamps for statistics buffers [media] uvcvideo: Fix control value clamping for unsigned integer controls [media] uvcvideo: Mark first output terminal as default video node [media] uvcvideo: Add VIDIOC_[GS]_PRIORITY support [media] uvcvideo: Return -ENOTTY for unsupported ioctls [media] uvcvideo: Set device_caps in VIDIOC_QUERYCAP [media] uvcvideo: Don't fail when an unsupported format is requested [media] uvcvideo: Return -EACCES when trying to access a read/write-only control [media] uvcvideo: Set error_idx properly for extended controls API failures [media] rtl28xxu: add NOXON DAB/DAB+ USB dongle rev 2 [media] fc2580: write some registers conditionally ...
Esse commit está contido em:
@@ -65,16 +65,6 @@ static bool IsQAM(struct drxk_state *state)
|
||||
state->m_OperationMode == OM_QAM_ITU_C;
|
||||
}
|
||||
|
||||
bool IsA1WithPatchCode(struct drxk_state *state)
|
||||
{
|
||||
return state->m_DRXK_A1_PATCH_CODE;
|
||||
}
|
||||
|
||||
bool IsA1WithRomCode(struct drxk_state *state)
|
||||
{
|
||||
return state->m_DRXK_A1_ROM_CODE;
|
||||
}
|
||||
|
||||
#define NOA1ROM 0
|
||||
|
||||
#define DRXDAP_FASI_SHORT_FORMAT(addr) (((addr) & 0xFC30FF80) == 0)
|
||||
@@ -189,7 +179,7 @@ static inline u32 MulDiv32(u32 a, u32 b, u32 c)
|
||||
return (u32) tmp64;
|
||||
}
|
||||
|
||||
inline u32 Frac28a(u32 a, u32 c)
|
||||
static inline u32 Frac28a(u32 a, u32 c)
|
||||
{
|
||||
int i = 0;
|
||||
u32 Q1 = 0;
|
||||
@@ -587,7 +577,7 @@ static int write_block(struct drxk_state *state, u32 Address,
|
||||
#define DRXK_MAX_RETRIES_POWERUP 20
|
||||
#endif
|
||||
|
||||
int PowerUpDevice(struct drxk_state *state)
|
||||
static int PowerUpDevice(struct drxk_state *state)
|
||||
{
|
||||
int status;
|
||||
u8 data = 0;
|
||||
@@ -720,11 +710,6 @@ static int init_state(struct drxk_state *state)
|
||||
|
||||
state->m_bPowerDown = (ulPowerDown != 0);
|
||||
|
||||
state->m_DRXK_A1_PATCH_CODE = false;
|
||||
state->m_DRXK_A1_ROM_CODE = false;
|
||||
state->m_DRXK_A2_ROM_CODE = false;
|
||||
state->m_DRXK_A3_ROM_CODE = false;
|
||||
state->m_DRXK_A2_PATCH_CODE = false;
|
||||
state->m_DRXK_A3_PATCH_CODE = false;
|
||||
|
||||
/* Init AGC and PGA parameters */
|
||||
@@ -921,7 +906,7 @@ static int GetDeviceCapabilities(struct drxk_state *state)
|
||||
status = write16(state, SCU_RAM_GPIO__A, SCU_RAM_GPIO_HW_LOCK_IND_DISABLE);
|
||||
if (status < 0)
|
||||
goto error;
|
||||
status = write16(state, SIO_TOP_COMM_KEY__A, 0xFABA);
|
||||
status = write16(state, SIO_TOP_COMM_KEY__A, SIO_TOP_COMM_KEY_KEY);
|
||||
if (status < 0)
|
||||
goto error;
|
||||
status = read16(state, SIO_PDR_OHW_CFG__A, &sioPdrOhwCfg);
|
||||
@@ -1217,7 +1202,7 @@ static int MPEGTSConfigurePins(struct drxk_state *state, bool mpegEnable)
|
||||
goto error;
|
||||
|
||||
/* MPEG TS pad configuration */
|
||||
status = write16(state, SIO_TOP_COMM_KEY__A, 0xFABA);
|
||||
status = write16(state, SIO_TOP_COMM_KEY__A, SIO_TOP_COMM_KEY_KEY);
|
||||
if (status < 0)
|
||||
goto error;
|
||||
|
||||
@@ -5461,6 +5446,7 @@ static int QAMDemodulatorCommand(struct drxk_state *state,
|
||||
} else {
|
||||
printk(KERN_WARNING "drxk: Unknown QAM demodulator parameter "
|
||||
"count %d\n", numberOfParameters);
|
||||
status = -EINVAL;
|
||||
}
|
||||
|
||||
error:
|
||||
|
Referência em uma nova issue
Block a user