[PATCH 0/5] cec: add CEC_CAP_DEFAULTS define

[PATCH 0/5] cec: add CEC_CAP_DEFAULTS define

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

Four CEC capabilities are normally always used. So combine them
in a single CEC_CAP_DEFAULTS define. This also avoids missing one
of these caps as happened in the stih-cec driver.

Regards,

	Hans

Hans Verkuil (5):
  media/cec.h: add CEC_CAP_DEFAULTS
  adv*/vivid/pulse8/rainshadow: cec: use CEC_CAP_DEFAULTS
  s5p-cec: use CEC_CAP_DEFAULTS
  stih-cec: use CEC_CAP_DEFAULTS
  stm32-cec: use CEC_CAP_DEFAULTS

 drivers/media/i2c/adv7511.c                       | 3 +--
 drivers/media/i2c/adv7604.c                       | 3 +--
 drivers/media/i2c/adv7842.c                       | 3 +--
 drivers/media/platform/s5p-cec/s5p_cec.c          | 7 ++-----
 drivers/media/platform/sti/cec/stih-cec.c         | 4 +---
 drivers/media/platform/stm32/stm32-cec.c          | 4 +---
 drivers/media/platform/vivid/vivid-cec.c          | 3 +--
 drivers/media/usb/pulse8-cec/pulse8-cec.c         | 3 +--
 drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 3 +--
 include/media/cec.h                               | 3 +++
 10 files changed, 13 insertions(+), 23 deletions(-)

-- 
2.13.2

[PATCH 1/5] media/cec.h: add CEC_CAP_DEFAULTS

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

The CEC_CAP_LOG_ADDRS, CEC_CAP_TRANSMIT, CEC_CAP_PASSTHROUGH and
CEC_CAP_RC capabilities are normally always present.

Add a CEC_CAP_DEFAULTS define that ORs these four caps to simplify
drivers.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
 include/media/cec.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/media/cec.h b/include/media/cec.h
index 224a6e225c52..1bec7bde4792 100644
--- a/include/media/cec.h
+++ b/include/media/cec.h
@@ -31,6 +31,9 @@
 #include <media/rc-core.h>
 #include <media/cec-notifier.h>
 
+#define CEC_CAP_DEFAULTS (CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | \
+			  CEC_CAP_PASSTHROUGH | CEC_CAP_RC)
+
 /**
  * struct cec_devnode - cec device node
  * @dev:	cec device
-- 
2.13.2

Re: [PATCH 1/5] media/cec.h: add CEC_CAP_DEFAULTS

[Sylwester Nawrocki]

On 08/04/2017 12:41 PM, Hans Verkuil wrote:

> The CEC_CAP_LOG_ADDRS, CEC_CAP_TRANSMIT, CEC_CAP_PASSTHROUGH and
> CEC_CAP_RC capabilities are normally always present.
> 
> Add a CEC_CAP_DEFAULTS define that ORs these four caps to simplify
> drivers.
> 
> Signed-off-by: Hans Verkuil<hans.verkuil@cisco.com>

Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

Re: [PATCH 1/5] media/cec.h: add CEC_CAP_DEFAULTS

[Benjamin Gaignard]

2017-08-16 10:40 GMT+02:00 Sylwester Nawrocki <s.nawrocki@samsung.com>:
> On 08/04/2017 12:41 PM, Hans Verkuil wrote:
>
>> The CEC_CAP_LOG_ADDRS, CEC_CAP_TRANSMIT, CEC_CAP_PASSTHROUGH and
>> CEC_CAP_RC capabilities are normally always present.
>>
>> Add a CEC_CAP_DEFAULTS define that ORs these four caps to simplify
>> drivers.
>>
>> Signed-off-by: Hans Verkuil<hans.verkuil@cisco.com>
>
>
> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

[PATCH 2/5] adv*/vivid/pulse8/rainshadow: cec: use CEC_CAP_DEFAULTS

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

Use the new CEC_CAP_DEFAULTS define in the adv, vivid, pulse8 and
rainshadow CEC drivers.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
 drivers/media/i2c/adv7511.c                       | 3 +--
 drivers/media/i2c/adv7604.c                       | 3 +--
 drivers/media/i2c/adv7842.c                       | 3 +--
 drivers/media/platform/vivid/vivid-cec.c          | 3 +--
 drivers/media/usb/pulse8-cec/pulse8-cec.c         | 3 +--
 drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c
index ec100fbf7c4d..0cdfc2b14121 100644
--- a/drivers/media/i2c/adv7511.c
+++ b/drivers/media/i2c/adv7511.c
@@ -1927,8 +1927,7 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id *
 
 #if IS_ENABLED(CONFIG_VIDEO_ADV7511_CEC)
 	state->cec_adap = cec_allocate_adapter(&adv7511_cec_adap_ops,
-		state, dev_name(&client->dev), CEC_CAP_TRANSMIT |
-		CEC_CAP_LOG_ADDRS | CEC_CAP_PASSTHROUGH | CEC_CAP_RC,
+		state, dev_name(&client->dev), CEC_CAP_DEFAULTS,
 		ADV7511_MAX_ADDRS);
 	if (IS_ERR(state->cec_adap)) {
 		err = PTR_ERR(state->cec_adap);
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index de0207b3d63d..1430b706cdf1 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -3515,8 +3515,7 @@ static int adv76xx_probe(struct i2c_client *client,
 #if IS_ENABLED(CONFIG_VIDEO_ADV7604_CEC)
 	state->cec_adap = cec_allocate_adapter(&adv76xx_cec_adap_ops,
 		state, dev_name(&client->dev),
-		CEC_CAP_TRANSMIT | CEC_CAP_LOG_ADDRS |
-		CEC_CAP_PASSTHROUGH | CEC_CAP_RC, ADV76XX_MAX_ADDRS);
+		CEC_CAP_DEFAULTS, ADV76XX_MAX_ADDRS);
 	if (IS_ERR(state->cec_adap)) {
 		err = PTR_ERR(state->cec_adap);
 		goto err_entity;
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index 6d01f9c82b8f..63ac5a09c587 100644
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -3568,8 +3568,7 @@ static int adv7842_probe(struct i2c_client *client,
 #if IS_ENABLED(CONFIG_VIDEO_ADV7842_CEC)
 	state->cec_adap = cec_allocate_adapter(&adv7842_cec_adap_ops,
 		state, dev_name(&client->dev),
-		CEC_CAP_TRANSMIT | CEC_CAP_LOG_ADDRS |
-		CEC_CAP_PASSTHROUGH | CEC_CAP_RC, ADV7842_MAX_ADDRS);
+		CEC_CAP_DEFAULTS, ADV7842_MAX_ADDRS);
 	if (IS_ERR(state->cec_adap)) {
 		err = PTR_ERR(state->cec_adap);
 		goto err_entity;
diff --git a/drivers/media/platform/vivid/vivid-cec.c b/drivers/media/platform/vivid/vivid-cec.c
index e15705758969..43992fa92a88 100644
--- a/drivers/media/platform/vivid/vivid-cec.c
+++ b/drivers/media/platform/vivid/vivid-cec.c
@@ -219,8 +219,7 @@ struct cec_adapter *vivid_cec_alloc_adap(struct vivid_dev *dev,
 					 bool is_source)
 {
 	char name[sizeof(dev->vid_out_dev.name) + 2];
-	u32 caps = CEC_CAP_TRANSMIT | CEC_CAP_LOG_ADDRS |
-		CEC_CAP_PASSTHROUGH | CEC_CAP_RC | CEC_CAP_MONITOR_ALL;
+	u32 caps = CEC_CAP_DEFAULTS | CEC_CAP_MONITOR_ALL;
 
 	snprintf(name, sizeof(name), "%s%d",
 		 is_source ? dev->vid_out_dev.name : dev->vid_cap_dev.name,
diff --git a/drivers/media/usb/pulse8-cec/pulse8-cec.c b/drivers/media/usb/pulse8-cec/pulse8-cec.c
index 3b0ee8c9bc26..7d880441b0eb 100644
--- a/drivers/media/usb/pulse8-cec/pulse8-cec.c
+++ b/drivers/media/usb/pulse8-cec/pulse8-cec.c
@@ -642,8 +642,7 @@ static const struct cec_adap_ops pulse8_cec_adap_ops = {
 
 static int pulse8_connect(struct serio *serio, struct serio_driver *drv)
 {
-	u32 caps = CEC_CAP_TRANSMIT | CEC_CAP_LOG_ADDRS | CEC_CAP_PHYS_ADDR |
-		CEC_CAP_PASSTHROUGH | CEC_CAP_RC | CEC_CAP_MONITOR_ALL;
+	u32 caps = CEC_CAP_DEFAULTS | CEC_CAP_PHYS_ADDR | CEC_CAP_MONITOR_ALL;
 	struct pulse8 *pulse8;
 	int err = -ENOMEM;
 	struct cec_log_addrs log_addrs = {};
diff --git a/drivers/media/usb/rainshadow-cec/rainshadow-cec.c b/drivers/media/usb/rainshadow-cec/rainshadow-cec.c
index c63f318752fd..650eab7e79b2 100644
--- a/drivers/media/usb/rainshadow-cec/rainshadow-cec.c
+++ b/drivers/media/usb/rainshadow-cec/rainshadow-cec.c
@@ -309,8 +309,7 @@ static const struct cec_adap_ops rain_cec_adap_ops = {
 
 static int rain_connect(struct serio *serio, struct serio_driver *drv)
 {
-	u32 caps = CEC_CAP_TRANSMIT | CEC_CAP_LOG_ADDRS | CEC_CAP_PHYS_ADDR |
-		CEC_CAP_PASSTHROUGH | CEC_CAP_RC | CEC_CAP_MONITOR_ALL;
+	u32 caps = CEC_CAP_DEFAULTS | CEC_CAP_PHYS_ADDR | CEC_CAP_MONITOR_ALL;
 	struct rain *rain;
 	int err = -ENOMEM;
 	struct cec_log_addrs log_addrs = {};
-- 
2.13.2

[PATCH 3/5] s5p-cec: use CEC_CAP_DEFAULTS

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

Use the new CEC_CAP_DEFAULTS define in the s5p-cec driver.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
 drivers/media/platform/s5p-cec/s5p_cec.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/media/platform/s5p-cec/s5p_cec.c b/drivers/media/platform/s5p-cec/s5p_cec.c
index b2a5694192fa..0347d1740c27 100644
--- a/drivers/media/platform/s5p-cec/s5p_cec.c
+++ b/drivers/media/platform/s5p-cec/s5p_cec.c
@@ -219,11 +219,8 @@ static int s5p_cec_probe(struct platform_device *pdev)
 	if (IS_ERR(cec->notifier))
 		return PTR_ERR(cec->notifier);
 
-	cec->adap = cec_allocate_adapter(&s5p_cec_adap_ops, cec,
-		CEC_NAME,
-		CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT |
-		CEC_CAP_PASSTHROUGH | CEC_CAP_RC |
-		(needs_hpd ? CEC_CAP_NEEDS_HPD : 0), 1);
+	cec->adap = cec_allocate_adapter(&s5p_cec_adap_ops, cec, CEC_NAME,
+		CEC_CAP_DEFAULTS | (needs_hpd ? CEC_CAP_NEEDS_HPD : 0), 1);
 	if (IS_ERR(cec->adap))
 		return PTR_ERR(cec->adap);
 
-- 
2.13.2

Re: [PATCH 3/5] s5p-cec: use CEC_CAP_DEFAULTS

[Sylwester Nawrocki]

On 08/04/2017 12:41 PM, Hans Verkuil wrote:

> Use the new CEC_CAP_DEFAULTS define in the s5p-cec driver.
> 
> Signed-off-by: Hans Verkuil<hans.verkuil@cisco.com>

Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

[PATCH 4/5] stih-cec: use CEC_CAP_DEFAULTS

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

Use the new CEC_CAP_DEFAULTS define in this driver.
This also adds the CEC_CAP_RC capability which was missing here
(and this is also the reason for this new define, to avoid missing
such capabilities).

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
 drivers/media/platform/sti/cec/stih-cec.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/media/platform/sti/cec/stih-cec.c b/drivers/media/platform/sti/cec/stih-cec.c
index ce7964c71b50..dc221527fd05 100644
--- a/drivers/media/platform/sti/cec/stih-cec.c
+++ b/drivers/media/platform/sti/cec/stih-cec.c
@@ -351,9 +351,7 @@ static int stih_cec_probe(struct platform_device *pdev)
 	}
 
 	cec->adap = cec_allocate_adapter(&sti_cec_adap_ops, cec,
-			CEC_NAME,
-			CEC_CAP_LOG_ADDRS | CEC_CAP_PASSTHROUGH |
-			CEC_CAP_TRANSMIT, CEC_MAX_LOG_ADDRS);
+			CEC_NAME, CEC_CAP_DEFAULTS, CEC_MAX_LOG_ADDRS);
 	if (IS_ERR(cec->adap))
 		return PTR_ERR(cec->adap);
 
-- 
2.13.2

Re: [PATCH 4/5] stih-cec: use CEC_CAP_DEFAULTS

[Hans Verkuil]

Benjamin,

Can you please review this patch and the stm32-cec patch?

Thanks!

	Hans

On 08/04/2017 12:41 PM, Hans Verkuil wrote:
> From: Hans Verkuil <hans.verkuil@cisco.com>
> 
> Use the new CEC_CAP_DEFAULTS define in this driver.
> This also adds the CEC_CAP_RC capability which was missing here
> (and this is also the reason for this new define, to avoid missing
> such capabilities).
> 
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
> ---
>  drivers/media/platform/sti/cec/stih-cec.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/media/platform/sti/cec/stih-cec.c b/drivers/media/platform/sti/cec/stih-cec.c
> index ce7964c71b50..dc221527fd05 100644
> --- a/drivers/media/platform/sti/cec/stih-cec.c
> +++ b/drivers/media/platform/sti/cec/stih-cec.c
> @@ -351,9 +351,7 @@ static int stih_cec_probe(struct platform_device *pdev)
>  	}
>  
>  	cec->adap = cec_allocate_adapter(&sti_cec_adap_ops, cec,
> -			CEC_NAME,
> -			CEC_CAP_LOG_ADDRS | CEC_CAP_PASSTHROUGH |
> -			CEC_CAP_TRANSMIT, CEC_MAX_LOG_ADDRS);
> +			CEC_NAME, CEC_CAP_DEFAULTS, CEC_MAX_LOG_ADDRS);
>  	if (IS_ERR(cec->adap))
>  		return PTR_ERR(cec->adap);
>  
> 

Re: [PATCH 4/5] stih-cec: use CEC_CAP_DEFAULTS

[Benjamin Gaignard]

2017-08-04 12:41 GMT+02:00 Hans Verkuil <hverkuil@xs4all.nl>:
> From: Hans Verkuil <hans.verkuil@cisco.com>
>
> Use the new CEC_CAP_DEFAULTS define in this driver.
> This also adds the CEC_CAP_RC capability which was missing here
> (and this is also the reason for this new define, to avoid missing
> such capabilities).
>
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

> ---
>  drivers/media/platform/sti/cec/stih-cec.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/media/platform/sti/cec/stih-cec.c b/drivers/media/platform/sti/cec/stih-cec.c
> index ce7964c71b50..dc221527fd05 100644
> --- a/drivers/media/platform/sti/cec/stih-cec.c
> +++ b/drivers/media/platform/sti/cec/stih-cec.c
> @@ -351,9 +351,7 @@ static int stih_cec_probe(struct platform_device *pdev)
>         }
>
>         cec->adap = cec_allocate_adapter(&sti_cec_adap_ops, cec,
> -                       CEC_NAME,
> -                       CEC_CAP_LOG_ADDRS | CEC_CAP_PASSTHROUGH |
> -                       CEC_CAP_TRANSMIT, CEC_MAX_LOG_ADDRS);
> +                       CEC_NAME, CEC_CAP_DEFAULTS, CEC_MAX_LOG_ADDRS);
>         if (IS_ERR(cec->adap))
>                 return PTR_ERR(cec->adap);
>
> --
> 2.13.2
>



-- 
Benjamin Gaignard

Graphic Study Group

Linaro.org │ Open source software for ARM SoCs

Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 4/5] stih-cec: use CEC_CAP_DEFAULTS

[Hans Verkuil]

On 08/20/2017 03:11 PM, Benjamin Gaignard wrote:
> 2017-08-04 12:41 GMT+02:00 Hans Verkuil <hverkuil@xs4all.nl>:
>> From: Hans Verkuil <hans.verkuil@cisco.com>
>>
>> Use the new CEC_CAP_DEFAULTS define in this driver.
>> This also adds the CEC_CAP_RC capability which was missing here
>> (and this is also the reason for this new define, to avoid missing
>> such capabilities).
>>
>> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
> 
> Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

Thanks!

Just in time for 4.14. Will make another pull request for cec fixes
tomorrow.

Regards,

	Hans

> 
>> ---
>>  drivers/media/platform/sti/cec/stih-cec.c | 4 +---
>>  1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/drivers/media/platform/sti/cec/stih-cec.c b/drivers/media/platform/sti/cec/stih-cec.c
>> index ce7964c71b50..dc221527fd05 100644
>> --- a/drivers/media/platform/sti/cec/stih-cec.c
>> +++ b/drivers/media/platform/sti/cec/stih-cec.c
>> @@ -351,9 +351,7 @@ static int stih_cec_probe(struct platform_device *pdev)
>>         }
>>
>>         cec->adap = cec_allocate_adapter(&sti_cec_adap_ops, cec,
>> -                       CEC_NAME,
>> -                       CEC_CAP_LOG_ADDRS | CEC_CAP_PASSTHROUGH |
>> -                       CEC_CAP_TRANSMIT, CEC_MAX_LOG_ADDRS);
>> +                       CEC_NAME, CEC_CAP_DEFAULTS, CEC_MAX_LOG_ADDRS);
>>         if (IS_ERR(cec->adap))
>>                 return PTR_ERR(cec->adap);
>>
>> --
>> 2.13.2
>>
> 
> 
> 

[PATCH 5/5] stm32-cec: use CEC_CAP_DEFAULTS

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

Use the new CEC_CAP_DEFAULTS define in this driver.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
 drivers/media/platform/stm32/stm32-cec.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/media/platform/stm32/stm32-cec.c b/drivers/media/platform/stm32/stm32-cec.c
index 89904096d0a9..ed332a1a39b1 100644
--- a/drivers/media/platform/stm32/stm32-cec.c
+++ b/drivers/media/platform/stm32/stm32-cec.c
@@ -246,9 +246,7 @@ static const struct regmap_config stm32_cec_regmap_cfg = {
 
 static int stm32_cec_probe(struct platform_device *pdev)
 {
-	u32 caps = CEC_CAP_LOG_ADDRS | CEC_CAP_PASSTHROUGH |
-		   CEC_CAP_TRANSMIT | CEC_CAP_RC | CEC_CAP_PHYS_ADDR |
-		   CEC_MODE_MONITOR_ALL;
+	u32 caps = CEC_CAP_DEFAULTS | CEC_CAP_PHYS_ADDR | CEC_MODE_MONITOR_ALL;
 	struct resource *res;
 	struct stm32_cec *cec;
 	void __iomem *mmio;
-- 
2.13.2

Re: [PATCH 5/5] stm32-cec: use CEC_CAP_DEFAULTS

[Benjamin Gaignard]

2017-08-04 12:41 GMT+02:00 Hans Verkuil <hverkuil@xs4all.nl>:
> From: Hans Verkuil <hans.verkuil@cisco.com>
>
> Use the new CEC_CAP_DEFAULTS define in this driver.
>
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

> ---
>  drivers/media/platform/stm32/stm32-cec.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/media/platform/stm32/stm32-cec.c b/drivers/media/platform/stm32/stm32-cec.c
> index 89904096d0a9..ed332a1a39b1 100644
> --- a/drivers/media/platform/stm32/stm32-cec.c
> +++ b/drivers/media/platform/stm32/stm32-cec.c
> @@ -246,9 +246,7 @@ static const struct regmap_config stm32_cec_regmap_cfg = {
>
>  static int stm32_cec_probe(struct platform_device *pdev)
>  {
> -       u32 caps = CEC_CAP_LOG_ADDRS | CEC_CAP_PASSTHROUGH |
> -                  CEC_CAP_TRANSMIT | CEC_CAP_RC | CEC_CAP_PHYS_ADDR |
> -                  CEC_MODE_MONITOR_ALL;
> +       u32 caps = CEC_CAP_DEFAULTS | CEC_CAP_PHYS_ADDR | CEC_MODE_MONITOR_ALL;
>         struct resource *res;
>         struct stm32_cec *cec;
>         void __iomem *mmio;
> --
> 2.13.2
>