Pull media updates from Mauro Carvalho Chehab: - the old V4L2 core videobuf kAPI was finally removed. All media drivers should now be using VB2 kAPI - new automotive driver: mgb4 - new platform video driver: npcm-video - new sensor driver: mt9m114 - new TI driver used in conjunction with Cadence CSI2RX IP to bridge TI-specific parts - ir-rx51 was removed and the N900 DT binding was moved to the pwm-ir-tx generic driver - drop atomisp-specific ov5693, using the upstream driver instead - the camss driver has gained RDI3 support for VFE 17x - the atomisp driver now detects ISP2400 or ISP2401 at run time. No need to set it up at build time anymore - lots of driver fixes, cleanups and improvements * tag 'media/v6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (377 commits) media: nuvoton: VIDEO_NPCM_VCD_ECE should depend on ARCH_NPCM media: venus: Fix firmware path for resources media: venus: hfi_cmds: Replace one-element array with flex-array member and use __counted_by media: venus: hfi_parser: Add check to keep the number of codecs within range media: venus: hfi: add checks to handle capabilities from firmware media: venus: hfi: fix the check to handle session buffer requirement media: venus: hfi: add checks to perform sanity on queue pointers media: platform: cadence: select MIPI_DPHY dependency media: MAINTAINERS: Fix path for J721E CSI2RX bindings media: cec: meson: always include meson sub-directory in Makefile media: videobuf2: Fix IS_ERR checking in vb2_dc_put_userptr() media: platform: mtk-mdp3: fix uninitialized variable in mdp_path_config() media: mediatek: vcodec: using encoder device to alloc/free encoder memory media: imx-jpeg: notify source chagne event when the first picture parsed media: cx231xx: Use EP5_BUF_SIZE macro media: siano: Drop unnecessary error check for debugfs_create_dir/file() media: mediatek: vcodec: Handle invalid encoder vsi media: aspeed: Drop unnecessary error check for debugfs_create_file() Documentation: media: buffer.rst: fix V4L2_BUF_FLAG_PREPARED Documentation: media: gen-errors.rst: fix confusing ENOTTY description ...
Showing the changes to include/linux/platform_data (1 of 505 files). Show all
Unified · Split
| @@ -4436,8 +4436,20 @@ struct ec_response_i2c_passthru_protect { · 4435 unmodified lines | ||
| 4436 | 4436 | * These commands are for sending and receiving message via HDMI CEC |
| 4437 | 4437 | */ |
| 4438 | 4438 | |
| 4439 | +#define EC_CEC_MAX_PORTS 16 | |
| 4440 | + | |
| 4439 | 4441 | #define MAX_CEC_MSG_LEN 16 |
| 4440 | 4442 | |
| 4443 | +/* | |
| 4444 | + * Helper macros for packing/unpacking cec_events. | |
| 4445 | + * bits[27:0] : bitmask of events from enum mkbp_cec_event | |
| 4446 | + * bits[31:28]: port number | |
| 4447 | + */ | |
| 4448 | +#define EC_MKBP_EVENT_CEC_PACK(events, port) \ | |
| 4449 | + (((events) & GENMASK(27, 0)) | (((port) & 0xf) << 28)) | |
| 4450 | +#define EC_MKBP_EVENT_CEC_GET_EVENTS(event) ((event) & GENMASK(27, 0)) | |
| 4451 | +#define EC_MKBP_EVENT_CEC_GET_PORT(event) (((event) >> 28) & 0xf) | |
| 4452 | + | |
| 4441 | 4453 | /* CEC message from the AP to be written on the CEC bus */ |
| 4442 | 4454 | #define EC_CMD_CEC_WRITE_MSG 0x00B8 |
| 4443 | 4455 | |
| @@ -4449,19 +4461,54 @@ struct ec_params_cec_write { · 5 unmodified lines | ||
| 4449 | 4461 | uint8_t msg[MAX_CEC_MSG_LEN]; |
| 4450 | 4462 | } __ec_align1; |
| 4451 | 4463 | |
| 4464 | +/** | |
| 4465 | + * struct ec_params_cec_write_v1 - Message to write to the CEC bus | |
| 4466 | + * @port: CEC port to write the message on | |
| 4467 | + * @msg_len: length of msg in bytes | |
| 4468 | + * @msg: message content to write to the CEC bus | |
| 4469 | + */ | |
| 4470 | +struct ec_params_cec_write_v1 { | |
| 4471 | + uint8_t port; | |
| 4472 | + uint8_t msg_len; | |
| 4473 | + uint8_t msg[MAX_CEC_MSG_LEN]; | |
| 4474 | +} __ec_align1; | |
| 4475 | + | |
| 4476 | +/* CEC message read from a CEC bus reported back to the AP */ | |
| 4477 | +#define EC_CMD_CEC_READ_MSG 0x00B9 | |
| 4478 | + | |
| 4479 | +/** | |
| 4480 | + * struct ec_params_cec_read - Read a message from the CEC bus | |
| 4481 | + * @port: CEC port to read a message on | |
| 4482 | + */ | |
| 4483 | +struct ec_params_cec_read { | |
| 4484 | + uint8_t port; | |
| 4485 | +} __ec_align1; | |
| 4486 | + | |
| 4487 | +/** | |
| 4488 | + * struct ec_response_cec_read - Message read from the CEC bus | |
| 4489 | + * @msg_len: length of msg in bytes | |
| 4490 | + * @msg: message content read from the CEC bus | |
| 4491 | + */ | |
| 4492 | +struct ec_response_cec_read { | |
| 4493 | + uint8_t msg_len; | |
| 4494 | + uint8_t msg[MAX_CEC_MSG_LEN]; | |
| 4495 | +} __ec_align1; | |
| 4496 | + | |
| 4452 | 4497 | /* Set various CEC parameters */ |
| 4453 | 4498 | #define EC_CMD_CEC_SET 0x00BA |
| 4454 | 4499 | |
| 4455 | 4500 | /** |
| 4456 | 4501 | * struct ec_params_cec_set - CEC parameters set |
| 4457 | 4502 | * @cmd: parameter type, can be CEC_CMD_ENABLE or CEC_CMD_LOGICAL_ADDRESS |
| 4503 | + * @port: CEC port to set the parameter on | |
| 4458 | 4504 | * @val: in case cmd is CEC_CMD_ENABLE, this field can be 0 to disable CEC |
| 4459 | 4505 | * or 1 to enable CEC functionality, in case cmd is |
| 4460 | 4506 | * CEC_CMD_LOGICAL_ADDRESS, this field encodes the requested logical |
| 4461 | 4507 | * address between 0 and 15 or 0xff to unregister |
| 4462 | 4508 | */ |
| 4463 | 4509 | struct ec_params_cec_set { |
| 4464 | − uint8_t cmd; /* enum cec_command */ | |
| 4510 | + uint8_t cmd : 4; /* enum cec_command */ | |
| 4511 | + uint8_t port : 4; | |
| 4465 | 4512 | uint8_t val; |
| 4466 | 4513 | } __ec_align1; |
| 4467 | 4514 | |
| @@ -4471,9 +4518,11 @@ struct ec_params_cec_set { · 3 unmodified lines | ||
| 4471 | 4518 | /** |
| 4472 | 4519 | * struct ec_params_cec_get - CEC parameters get |
| 4473 | 4520 | * @cmd: parameter type, can be CEC_CMD_ENABLE or CEC_CMD_LOGICAL_ADDRESS |
| 4521 | + * @port: CEC port to get the parameter on | |
| 4474 | 4522 | */ |
| 4475 | 4523 | struct ec_params_cec_get { |
| 4476 | − uint8_t cmd; /* enum cec_command */ | |
| 4524 | + uint8_t cmd : 4; /* enum cec_command */ | |
| 4525 | + uint8_t port : 4; | |
| 4477 | 4526 | } __ec_align1; |
| 4478 | 4527 | |
| 4479 | 4528 | /** |
| @@ -4487,6 +4536,17 @@ struct ec_response_cec_get { · 7 unmodified lines | ||
| 4487 | 4536 | uint8_t val; |
| 4488 | 4537 | } __ec_align1; |
| 4489 | 4538 | |
| 4539 | +/* Get the number of CEC ports */ | |
| 4540 | +#define EC_CMD_CEC_PORT_COUNT 0x00C1 | |
| 4541 | + | |
| 4542 | +/** | |
| 4543 | + * struct ec_response_cec_port_count - CEC port count response | |
| 4544 | + * @port_count: number of CEC ports | |
| 4545 | + */ | |
| 4546 | +struct ec_response_cec_port_count { | |
| 4547 | + uint8_t port_count; | |
| 4548 | +} __ec_align1; | |
| 4549 | + | |
| 4490 | 4550 | /* CEC parameters command */ |
| 4491 | 4551 | enum cec_command { |
| 4492 | 4552 | /* CEC reading, writing and events enable */ |
| @@ -4501,6 +4561,8 @@ enum mkbp_cec_event { · 8 unmodified lines | ||
| 4501 | 4561 | EC_MKBP_CEC_SEND_OK = BIT(0), |
| 4502 | 4562 | /* Outgoing message was not acknowledged */ |
| 4503 | 4563 | EC_MKBP_CEC_SEND_FAILED = BIT(1), |
| 4564 | + /* Incoming message can be read out by AP */ | |
| 4565 | + EC_MKBP_CEC_HAVE_DATA = BIT(2), | |
| 4504 | 4566 | }; |
| 4505 | 4567 | |
| 4506 | 4568 | /*****************************************************************************/ |