Merge branch 'work' (21e2379b) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/media/dvb/frontends/dvb-pll.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -333,7 +333,7 @@ struct dvb_pll_desc dvb_pll_tbmv30111in = {
		.name = "Samsung TBMV30111IN",
		.min = 54000000,
		.max = 860000000,
		.count = 4,
		.count = 6,
		.entries = {
		{ 172000000, 44000000, 166666, 0xb4, 0x01 },
		{ 214000000, 44000000, 166666, 0xb4, 0x02 },

drivers/media/video/cx88/cx88-alsa.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -333,10 +333,10 @@ static snd_pcm_hardware_t snd_cx88_digital_hw = {
		.channels_min = 1,
		.channels_max = 2,
		.buffer_bytes_max = (2*2048),
		.period_bytes_min = 256,
		.period_bytes_min = 2048,
		.period_bytes_max = 2048,
		.periods_min = 2,
		.periods_max = 16,
		.periods_max = 2,
		};

		/*

drivers/media/video/em28xx/em28xx-input.c

+77 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,58 @@ static IR_KEYTAB_TYPE ir_codes_em_terratec[IR_KEYTAB_SIZE] = {
		[ 0x40 ] = KEY_ZOOM,
		};

		static IR_KEYTAB_TYPE ir_codes_em_pinnacle_usb[IR_KEYTAB_SIZE] = {
		[ 0x3a ] = KEY_KP0,
		[ 0x31 ] = KEY_KP1,
		[ 0x32 ] = KEY_KP2,
		[ 0x33 ] = KEY_KP3,
		[ 0x34 ] = KEY_KP4,
		[ 0x35 ] = KEY_KP5,
		[ 0x36 ] = KEY_KP6,
		[ 0x37 ] = KEY_KP7,
		[ 0x38 ] = KEY_KP8,
		[ 0x39 ] = KEY_KP9,

		[ 0x2f ] = KEY_POWER,

		[ 0x2e ] = KEY_P,
		[ 0x1f ] = KEY_L,
		[ 0x2b ] = KEY_I,

		[ 0x2d ] = KEY_ZOOM,
		[ 0x1e ] = KEY_ZOOM,
		[ 0x1b ] = KEY_VOLUMEUP,
		[ 0x0f ] = KEY_VOLUMEDOWN,
		[ 0x17 ] = KEY_CHANNELUP,
		[ 0x1c ] = KEY_CHANNELDOWN,
		[ 0x25 ] = KEY_INFO,

		[ 0x3c ] = KEY_MUTE,

		[ 0x3d ] = KEY_LEFT,
		[ 0x3b ] = KEY_RIGHT,

		[ 0x3f ] = KEY_UP,
		[ 0x3e ] = KEY_DOWN,
		[ 0x1a ] = KEY_PAUSE,

		[ 0x1d ] = KEY_MENU,
		[ 0x19 ] = KEY_PLAY,
		[ 0x16 ] = KEY_REWIND,
		[ 0x13 ] = KEY_FORWARD,
		[ 0x15 ] = KEY_PAUSE,
		[ 0x0e ] = KEY_REWIND,
		[ 0x0d ] = KEY_PLAY,
		[ 0x0b ] = KEY_STOP,
		[ 0x07 ] = KEY_FORWARD,
		[ 0x27 ] = KEY_RECORD,
		[ 0x26 ] = KEY_TUNER,
		[ 0x29 ] = KEY_TEXT,
		[ 0x2a ] = KEY_MEDIA,
		[ 0x18 ] = KEY_EPG,
		[ 0x27 ] = KEY_RECORD,
		};

		/* ----------------------------------------------------------------------- */

		static int get_key_terratec(struct IR_i2c ir, u32 ir_key, u32 *ir_raw)
		@@ -138,6 +190,28 @@ static int get_key_em_haup(struct IR_i2c ir, u32 ir_key, u32 *ir_raw)
		return 1;
		}

		static int get_key_pinnacle_usb(struct IR_i2c ir, u32 ir_key, u32 *ir_raw)
		{
		unsigned char buf[3];

		/* poll IR chip */

		if (3 != i2c_master_recv(&ir->c,buf,3)) {
		dprintk("read error\n");
		return -EIO;
		}

		dprintk("key %02x\n", buf[2]&0x3f);
		if (buf[0]!=0x00){
		return 0;
		}

		*ir_key = buf[2]&0x3f;
		*ir_raw = buf[2]&0x3f;

		return 1;
		}

		/* ----------------------------------------------------------------------- */
		void em28xx_set_ir(struct em28xx * dev,struct IR_i2c *ir)
		{
		@@ -159,6 +233,9 @@ void em28xx_set_ir(struct em28xx * dev,struct IR_i2c *ir)
		snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM28XX Terratec)");
		break;
		case (EM2820_BOARD_PINNACLE_USB_2):
		ir->ir_codes = ir_codes_em_pinnacle_usb;
		ir->get_key = get_key_pinnacle_usb;
		snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM28XX Pinnacle PCTV)");
		break;
		case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):
		ir->ir_codes = ir_codes_hauppauge_new;

drivers/media/video/msp3400-driver.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1031,8 +1031,8 @@ static int msp_command(struct i2c_client client, unsigned int cmd, void arg)
		}

		default:
		/* nothing */
		break;
		/* unknown */
		return -EINVAL;
		}
		return 0;
		}

drivers/media/video/msp3400.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -6,14 +6,6 @@

		/* ---------------------------------------------------------------------- */

		struct msp_matrix {
		int input;
		int output;
		};

		/* ioctl for MSP_SET_MATRIX will have to be registered */
		#define MSP_SET_MATRIX _IOW('m',17,struct msp_matrix)

		/* This macro is allowed for constants only, gcc must calculate it
		at compile time. Remember -- no floats in kernel mode */
		#define MSP_CARRIER(freq) ((int)((float)(freq / 18.432) * (1 << 24)))