diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-02 04:45:08 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-02 04:45:08 +0300 |
commit | 73d21a3579818aa0e39de207474a39ca35c7d8cb (patch) | |
tree | ae723d1026a6f39aa22bbcb3e82d3966ac7f5dcc /drivers/media/usb/gspca/gl860/gl860-mi1320.c | |
parent | 6f2b76a4a384e05ac8d3349831f29dff5de1e1e2 (diff) | |
parent | 57c3b9f55ba875a6f6295fa59f0bdc0a01c544f8 (diff) | |
download | linux-73d21a3579818aa0e39de207474a39ca35c7d8cb.tar.xz |
Merge tag 'media/v5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab:
- New driver for SK Hynix Hi-846 8M pixel camera
- New driver for the ov13b10 camera
- New driver for Renesas R-Car ISP
- mtk-vcodec gained support for version 2 of decoder firmware ABI
- The legacy sir_ir driver got removed
- videobuf2: the vb2_mem_ops kAPI had some improvements
- lots of cleanups, fixes and new features at device drivers
* tag 'media/v5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (328 commits)
media: venus: core: Add sdm660 DT compatible and resource struct
media: dt-bindings: media: venus: Add sdm660 dt schema
media: venus: vdec: decoded picture buffer handling during reconfig sequence
media: venus: Handle fatal errors during encoding and decoding
media: venus: helpers: Add helper to mark fatal vb2 error
media: venus: hfi: Check for sys error on session hfi functions
media: venus: Make sys_error flag an atomic bitops
media: venus: venc: Use pmruntime autosuspend
media: allegro: write vui parameters for HEVC
media: allegro: nal-hevc: implement generator for vui
media: allegro: write correct colorspace into SPS
media: allegro: extract nal value lookup functions to header
media: allegro: correctly scale the bit rate in SPS
media: allegro: remove external QP table
media: allegro: fix row and column in response message
media: allegro: add control to disable encoder buffer
media: allegro: add encoder buffer support
media: allegro: add pm_runtime support
media: allegro: lookup VCU settings
media: allegro: fix module removal if initialization failed
...
Diffstat (limited to 'drivers/media/usb/gspca/gl860/gl860-mi1320.c')
-rw-r--r-- | drivers/media/usb/gspca/gl860/gl860-mi1320.c | 87 |
1 files changed, 57 insertions, 30 deletions
diff --git a/drivers/media/usb/gspca/gl860/gl860-mi1320.c b/drivers/media/usb/gspca/gl860/gl860-mi1320.c index 0749fe13160f..d6a540ed378c 100644 --- a/drivers/media/usb/gspca/gl860/gl860-mi1320.c +++ b/drivers/media/usb/gspca/gl860/gl860-mi1320.c @@ -50,42 +50,69 @@ static struct validx tbl_post_unset_alt[] = { }; static u8 *tbl_1280[] = { - "\x0d\x80\xf1\x08\x03\x04\xf1\x00" "\x04\x05\xf1\x02\x05\x00\xf1\xf1" - "\x06\x00\xf1\x0d\x20\x01\xf1\x00" "\x21\x84\xf1\x00\x0d\x00\xf1\x08" - "\xf0\x00\xf1\x01\x34\x00\xf1\x00" "\x9b\x43\xf1\x00\xa6\x05\xf1\x00" - "\xa9\x04\xf1\x00\xa1\x05\xf1\x00" "\xa4\x04\xf1\x00\xae\x0a\xf1\x08" - , - "\xf0\x00\xf1\x02\x3a\x05\xf1\xf1" "\x3c\x05\xf1\xf1\x59\x01\xf1\x47" - "\x5a\x01\xf1\x88\x5c\x0a\xf1\x06" "\x5d\x0e\xf1\x0a\x64\x5e\xf1\x1c" - "\xd2\x00\xf1\xcf\xcb\x00\xf1\x01" - , - "\xd3\x02\xd4\x28\xd5\x01\xd0\x02" "\xd1\x18\xd2\xc1" + (u8[]){ + 0x0d, 0x80, 0xf1, 0x08, 0x03, 0x04, 0xf1, 0x00, + 0x04, 0x05, 0xf1, 0x02, 0x05, 0x00, 0xf1, 0xf1, + 0x06, 0x00, 0xf1, 0x0d, 0x20, 0x01, 0xf1, 0x00, + 0x21, 0x84, 0xf1, 0x00, 0x0d, 0x00, 0xf1, 0x08, + 0xf0, 0x00, 0xf1, 0x01, 0x34, 0x00, 0xf1, 0x00, + 0x9b, 0x43, 0xf1, 0x00, 0xa6, 0x05, 0xf1, 0x00, + 0xa9, 0x04, 0xf1, 0x00, 0xa1, 0x05, 0xf1, 0x00, + 0xa4, 0x04, 0xf1, 0x00, 0xae, 0x0a, 0xf1, 0x08 + }, (u8[]){ + 0xf0, 0x00, 0xf1, 0x02, 0x3a, 0x05, 0xf1, 0xf1, + 0x3c, 0x05, 0xf1, 0xf1, 0x59, 0x01, 0xf1, 0x47, + 0x5a, 0x01, 0xf1, 0x88, 0x5c, 0x0a, 0xf1, 0x06, + 0x5d, 0x0e, 0xf1, 0x0a, 0x64, 0x5e, 0xf1, 0x1c, + 0xd2, 0x00, 0xf1, 0xcf, 0xcb, 0x00, 0xf1, 0x01 + }, (u8[]){ + 0xd3, 0x02, 0xd4, 0x28, 0xd5, 0x01, 0xd0, 0x02, + 0xd1, 0x18, 0xd2, 0xc1 + } }; static u8 *tbl_800[] = { - "\x0d\x80\xf1\x08\x03\x03\xf1\xc0" "\x04\x05\xf1\x02\x05\x00\xf1\xf1" - "\x06\x00\xf1\x0d\x20\x01\xf1\x00" "\x21\x84\xf1\x00\x0d\x00\xf1\x08" - "\xf0\x00\xf1\x01\x34\x00\xf1\x00" "\x9b\x43\xf1\x00\xa6\x05\xf1\x00" - "\xa9\x03\xf1\xc0\xa1\x03\xf1\x20" "\xa4\x02\xf1\x5a\xae\x0a\xf1\x08" - , - "\xf0\x00\xf1\x02\x3a\x05\xf1\xf1" "\x3c\x05\xf1\xf1\x59\x01\xf1\x47" - "\x5a\x01\xf1\x88\x5c\x0a\xf1\x06" "\x5d\x0e\xf1\x0a\x64\x5e\xf1\x1c" - "\xd2\x00\xf1\xcf\xcb\x00\xf1\x01" - , - "\xd3\x02\xd4\x18\xd5\x21\xd0\x02" "\xd1\x10\xd2\x59" + (u8[]){ + 0x0d, 0x80, 0xf1, 0x08, 0x03, 0x03, 0xf1, 0xc0, + 0x04, 0x05, 0xf1, 0x02, 0x05, 0x00, 0xf1, 0xf1, + 0x06, 0x00, 0xf1, 0x0d, 0x20, 0x01, 0xf1, 0x00, + 0x21, 0x84, 0xf1, 0x00, 0x0d, 0x00, 0xf1, 0x08, + 0xf0, 0x00, 0xf1, 0x01, 0x34, 0x00, 0xf1, 0x00, + 0x9b, 0x43, 0xf1, 0x00, 0xa6, 0x05, 0xf1, 0x00, + 0xa9, 0x03, 0xf1, 0xc0, 0xa1, 0x03, 0xf1, 0x20, + 0xa4, 0x02, 0xf1, 0x5a, 0xae, 0x0a, 0xf1, 0x08 + }, (u8[]){ + 0xf0, 0x00, 0xf1, 0x02, 0x3a, 0x05, 0xf1, 0xf1, + 0x3c, 0x05, 0xf1, 0xf1, 0x59, 0x01, 0xf1, 0x47, + 0x5a, 0x01, 0xf1, 0x88, 0x5c, 0x0a, 0xf1, 0x06, + 0x5d, 0x0e, 0xf1, 0x0a, 0x64, 0x5e, 0xf1, 0x1c, + 0xd2, 0x00, 0xf1, 0xcf, 0xcb, 0x00, 0xf1, 0x01 + }, (u8[]){ + 0xd3, 0x02, 0xd4, 0x18, 0xd5, 0x21, 0xd0, 0x02, + 0xd1, 0x10, 0xd2, 0x59 + } }; static u8 *tbl_640[] = { - "\x0d\x80\xf1\x08\x03\x04\xf1\x04" "\x04\x05\xf1\x02\x07\x01\xf1\x7c" - "\x08\x00\xf1\x0e\x21\x80\xf1\x00" "\x0d\x00\xf1\x08\xf0\x00\xf1\x01" - "\x34\x10\xf1\x10\x3a\x43\xf1\x00" "\xa6\x05\xf1\x02\xa9\x04\xf1\x04" - "\xa7\x02\xf1\x81\xaa\x01\xf1\xe2" "\xae\x0c\xf1\x09" - , - "\xf0\x00\xf1\x02\x39\x03\xf1\xfc" "\x3b\x04\xf1\x04\x57\x01\xf1\xb6" - "\x58\x02\xf1\x0d\x5c\x1f\xf1\x19" "\x5d\x24\xf1\x1e\x64\x5e\xf1\x1c" - "\xd2\x00\xf1\x00\xcb\x00\xf1\x01" - , - "\xd3\x02\xd4\x10\xd5\x81\xd0\x02" "\xd1\x08\xd2\xe1" + (u8[]){ + 0x0d, 0x80, 0xf1, 0x08, 0x03, 0x04, 0xf1, 0x04, + 0x04, 0x05, 0xf1, 0x02, 0x07, 0x01, 0xf1, 0x7c, + 0x08, 0x00, 0xf1, 0x0e, 0x21, 0x80, 0xf1, 0x00, + 0x0d, 0x00, 0xf1, 0x08, 0xf0, 0x00, 0xf1, 0x01, + 0x34, 0x10, 0xf1, 0x10, 0x3a, 0x43, 0xf1, 0x00, + 0xa6, 0x05, 0xf1, 0x02, 0xa9, 0x04, 0xf1, 0x04, + 0xa7, 0x02, 0xf1, 0x81, 0xaa, 0x01, 0xf1, 0xe2, + 0xae, 0x0c, 0xf1, 0x09 + }, (u8[]){ + 0xf0, 0x00, 0xf1, 0x02, 0x39, 0x03, 0xf1, 0xfc, + 0x3b, 0x04, 0xf1, 0x04, 0x57, 0x01, 0xf1, 0xb6, + 0x58, 0x02, 0xf1, 0x0d, 0x5c, 0x1f, 0xf1, 0x19, + 0x5d, 0x24, 0xf1, 0x1e, 0x64, 0x5e, 0xf1, 0x1c, + 0xd2, 0x00, 0xf1, 0x00, 0xcb, 0x00, 0xf1, 0x01 + }, (u8[]){ + 0xd3, 0x02, 0xd4, 0x10, 0xd5, 0x81, 0xd0, 0x02, + 0xd1, 0x08, 0xd2, 0xe1 + } }; static s32 tbl_sat[] = {0x25, 0x1d, 0x15, 0x0d, 0x05, 0x4d, 0x55, 0x5d, 0x2d}; |