Commit 4786b0d6 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: cec: add support for 5V signal testing 



Add support for the new 5V CEC events

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent f48a534a

drivers/media/cec/cec-adap.c

+17 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ void cec_queue_event_fh(struct cec_fh *fh, 
			const struct cec_event *new_ev, u64 ts)

{

	static const u16 max_events[CEC_NUM_EVENTS] = {

		1, 1, 800, 800, 8, 8,

		1, 1, 800, 800, 8, 8, 8, 8

	};

	struct cec_event_entry *entry;

	unsigned int ev_idx = new_ev->event - 1;
@@ -176,6 +176,22 @@ void cec_queue_pin_hpd_event(struct cec_adapter *adap, bool is_high, ktime_t ts) 
}

EXPORT_SYMBOL_GPL(cec_queue_pin_hpd_event);



/* Notify userspace that the 5V pin changed state at the given time. */

void cec_queue_pin_5v_event(struct cec_adapter *adap, bool is_high, ktime_t ts)

{

	struct cec_event ev = {

		.event = is_high ? CEC_EVENT_PIN_5V_HIGH :

				   CEC_EVENT_PIN_5V_LOW,

	};

	struct cec_fh *fh;



	mutex_lock(&adap->devnode.lock);

	list_for_each_entry(fh, &adap->devnode.fhs, list)

		cec_queue_event_fh(fh, &ev, ktime_to_ns(ts));

	mutex_unlock(&adap->devnode.lock);

}

EXPORT_SYMBOL_GPL(cec_queue_pin_5v_event);



/*

 * Queue a new message for this filehandle.

 *

drivers/media/cec/cec-api.c

+8 −0
Original line number Diff line number Diff line
@@ -579,6 +579,14 @@ static int cec_open(struct inode *inode, struct file *filp) 
			cec_queue_event_fh(fh, &ev, 0);

		}

	}

	if (adap->pin && adap->pin->ops->read_5v) {

		err = adap->pin->ops->read_5v(adap);

		if (err >= 0) {

			ev.event = err ? CEC_EVENT_PIN_5V_HIGH :

					 CEC_EVENT_PIN_5V_LOW;

			cec_queue_event_fh(fh, &ev, 0);

		}

	}

#endif



	list_add(&fh->list, &devnode->fhs);

include/media/cec-pin.h

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
 * @read_hpd:	read the HPD pin. Return true if high, false if low or

 *		an error if negative. If NULL or -ENOTTY is returned,

 *		then this is not supported.

 * @read_5v:	read the 5V pin. Return true if high, false if low or

 *		an error if negative. If NULL or -ENOTTY is returned,

 *		then this is not supported.

 *

 * These operations are used by the cec pin framework to manipulate

 * the CEC pin.
@@ -38,6 +41,7 @@ struct cec_pin_ops { 
	void (*free)(struct cec_adapter *adap);

	void (*status)(struct cec_adapter *adap, struct seq_file *file);

	int  (*read_hpd)(struct cec_adapter *adap);

	int  (*read_5v)(struct cec_adapter *adap);

};



/**

include/media/cec.h

+11 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct cec_event_entry { 
};



#define CEC_NUM_CORE_EVENTS 2

#define CEC_NUM_EVENTS CEC_EVENT_PIN_HPD_HIGH

#define CEC_NUM_EVENTS CEC_EVENT_PIN_5V_HIGH



struct cec_fh {

	struct list_head	list;
@@ -308,6 +308,16 @@ void cec_queue_pin_cec_event(struct cec_adapter *adap, bool is_high, 
 */

void cec_queue_pin_hpd_event(struct cec_adapter *adap, bool is_high, ktime_t ts);



/**

 * cec_queue_pin_5v_event() - queue a pin event with a given timestamp.

 *

 * @adap:	pointer to the cec adapter

 * @is_high:	when true the 5V pin is high, otherwise it is low

 * @ts:		the timestamp for this event

 *

 */

void cec_queue_pin_5v_event(struct cec_adapter *adap, bool is_high, ktime_t ts);



/**

 * cec_get_edid_phys_addr() - find and return the physical address

 *