linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/2] iio: adc: mcp320x: Add compatible with vendor prefix and deprecate old ones
@ 2015-10-14 12:54 Javier Martinez Canillas
  2015-10-14 12:54 ` [PATCH 2/2] iio: adc: mcp320x: Add compatible with vendor prefix to OF table Javier Martinez Canillas
  0 siblings, 1 reply; 4+ messages in thread
From: Javier Martinez Canillas @ 2015-10-14 12:54 UTC (permalink / raw)
  To: linux-kernel
  Cc: Michael Welling, Javier Martinez Canillas, Andrea Galbusera,
	devicetree, linux-iio, Hartmut Knaack, Kumar Gala, Ian Campbell,
	Rob Herring, Lars-Peter Clausen, Pawel Moll, Manfred Schlaegl,
	Mark Rutland, Jonathan Cameron, Søren Andersen,
	Peter Meerwald

Hello,

When the patch "iio: adc: mcp320x: Set struct spi_driver .of_match_table" [0]
was posted, there was a discussion on how to solve the fact that the driver's
compatible strings don't have a vendor prefix and are already documented in
the DT binding doc.

Rob Herring suggested [1] to add new compatible strings with a vendor prefix
and mark the old ones as deprecated. This patch series take care of that.

[0]: https://lkml.org/lkml/2015/8/20/95
[1]: https://lkml.org/lkml/2015/8/23/120

Best regards,
Javier


Javier Martinez Canillas (2):
  iio: adc: mcp320x: Deprecated compatible strings with no vendor prefix
  iio: adc: mcp320x: Add compatible with vendor prefix to OF table

 .../devicetree/bindings/iio/adc/mcp320x.txt        | 30 +++++++++++++++-------
 drivers/iio/adc/mcp320x.c                          | 28 ++++++++++++++++++++
 2 files changed, 49 insertions(+), 9 deletions(-)

-- 
2.4.3


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 2/2] iio: adc: mcp320x: Add compatible with vendor prefix to OF table
  2015-10-14 12:54 [PATCH 0/2] iio: adc: mcp320x: Add compatible with vendor prefix and deprecate old ones Javier Martinez Canillas
@ 2015-10-14 12:54 ` Javier Martinez Canillas
  2015-10-14 15:27   ` Michael Welling
  0 siblings, 1 reply; 4+ messages in thread
From: Javier Martinez Canillas @ 2015-10-14 12:54 UTC (permalink / raw)
  To: linux-kernel
  Cc: Michael Welling, Javier Martinez Canillas, Andrea Galbusera,
	linux-iio, Peter Meerwald, Lars-Peter Clausen, Manfred Schlaegl,
	Jonathan Cameron, Hartmut Knaack

The driver Device Tree binding now documents compatible strings that have
a vendor prefix, so add these to the OF device ID table to match and mark
the old ones as deprecated explaining that should not be used anymore.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

 drivers/iio/adc/mcp320x.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c
index 41a21e986c1a..9fcb8b61e300 100644
--- a/drivers/iio/adc/mcp320x.c
+++ b/drivers/iio/adc/mcp320x.c
@@ -354,6 +354,7 @@ static int mcp320x_remove(struct spi_device *spi)
 
 #if defined(CONFIG_OF)
 static const struct of_device_id mcp320x_dt_ids[] = {
+	/* NOTE: The use of compatibles with no vendor prefix is deprecated. */
 	{
 		.compatible = "mcp3001",
 		.data = &mcp320x_chip_infos[mcp3001],
@@ -382,6 +383,33 @@ static const struct of_device_id mcp320x_dt_ids[] = {
 		.compatible = "mcp3301",
 		.data = &mcp320x_chip_infos[mcp3301],
 	}, {
+		.compatible = "microchip,mcp3001",
+		.data = &mcp320x_chip_infos[mcp3001],
+	}, {
+		.compatible = "microchip,mcp3002",
+		.data = &mcp320x_chip_infos[mcp3002],
+	}, {
+		.compatible = "microchip,mcp3004",
+		.data = &mcp320x_chip_infos[mcp3004],
+	}, {
+		.compatible = "microchip,mcp3008",
+		.data = &mcp320x_chip_infos[mcp3008],
+	}, {
+		.compatible = "microchip,mcp3201",
+		.data = &mcp320x_chip_infos[mcp3201],
+	}, {
+		.compatible = "microchip,mcp3202",
+		.data = &mcp320x_chip_infos[mcp3202],
+	}, {
+		.compatible = "microchip,mcp3204",
+		.data = &mcp320x_chip_infos[mcp3204],
+	}, {
+		.compatible = "microchip,mcp3208",
+		.data = &mcp320x_chip_infos[mcp3208],
+	}, {
+		.compatible = "microchip,mcp3301",
+		.data = &mcp320x_chip_infos[mcp3301],
+	}, {
 	}
 };
 MODULE_DEVICE_TABLE(of, mcp320x_dt_ids);
-- 
2.4.3


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] iio: adc: mcp320x: Add compatible with vendor prefix to OF table
  2015-10-14 12:54 ` [PATCH 2/2] iio: adc: mcp320x: Add compatible with vendor prefix to OF table Javier Martinez Canillas
@ 2015-10-14 15:27   ` Michael Welling
  2015-10-25 12:37     ` Jonathan Cameron
  0 siblings, 1 reply; 4+ messages in thread
From: Michael Welling @ 2015-10-14 15:27 UTC (permalink / raw)
  To: Javier Martinez Canillas
  Cc: linux-kernel, Andrea Galbusera, linux-iio, Peter Meerwald,
	Lars-Peter Clausen, Manfred Schlaegl, Jonathan Cameron,
	Hartmut Knaack

On Wed, Oct 14, 2015 at 02:54:39PM +0200, Javier Martinez Canillas wrote:
> The driver Device Tree binding now documents compatible strings that have
> a vendor prefix, so add these to the OF device ID table to match and mark
> the old ones as deprecated explaining that should not be used anymore.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> 
> ---
> 
>  drivers/iio/adc/mcp320x.c | 28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
> 
> diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c
> index 41a21e986c1a..9fcb8b61e300 100644
> --- a/drivers/iio/adc/mcp320x.c
> +++ b/drivers/iio/adc/mcp320x.c
> @@ -354,6 +354,7 @@ static int mcp320x_remove(struct spi_device *spi)
>  
>  #if defined(CONFIG_OF)
>  static const struct of_device_id mcp320x_dt_ids[] = {
> +	/* NOTE: The use of compatibles with no vendor prefix is deprecated. */
>  	{
>  		.compatible = "mcp3001",
>  		.data = &mcp320x_chip_infos[mcp3001],
> @@ -382,6 +383,33 @@ static const struct of_device_id mcp320x_dt_ids[] = {
>  		.compatible = "mcp3301",
>  		.data = &mcp320x_chip_infos[mcp3301],
>  	}, {
> +		.compatible = "microchip,mcp3001",
> +		.data = &mcp320x_chip_infos[mcp3001],
> +	}, {
> +		.compatible = "microchip,mcp3002",
> +		.data = &mcp320x_chip_infos[mcp3002],
> +	}, {
> +		.compatible = "microchip,mcp3004",
> +		.data = &mcp320x_chip_infos[mcp3004],
> +	}, {
> +		.compatible = "microchip,mcp3008",
> +		.data = &mcp320x_chip_infos[mcp3008],
> +	}, {
> +		.compatible = "microchip,mcp3201",
> +		.data = &mcp320x_chip_infos[mcp3201],
> +	}, {
> +		.compatible = "microchip,mcp3202",
> +		.data = &mcp320x_chip_infos[mcp3202],
> +	}, {
> +		.compatible = "microchip,mcp3204",
> +		.data = &mcp320x_chip_infos[mcp3204],
> +	}, {
> +		.compatible = "microchip,mcp3208",
> +		.data = &mcp320x_chip_infos[mcp3208],
> +	}, {
> +		.compatible = "microchip,mcp3301",
> +		.data = &mcp320x_chip_infos[mcp3301],
> +	}, {

Acked-by: Michael Welling <mwelling@ieee.org>

>  	}
>  };
>  MODULE_DEVICE_TABLE(of, mcp320x_dt_ids);
> -- 
> 2.4.3
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] iio: adc: mcp320x: Add compatible with vendor prefix to OF table
  2015-10-14 15:27   ` Michael Welling
@ 2015-10-25 12:37     ` Jonathan Cameron
  0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2015-10-25 12:37 UTC (permalink / raw)
  To: Michael Welling, Javier Martinez Canillas
  Cc: linux-kernel, Andrea Galbusera, linux-iio, Peter Meerwald,
	Lars-Peter Clausen, Manfred Schlaegl, Hartmut Knaack

On 14/10/15 16:27, Michael Welling wrote:
> On Wed, Oct 14, 2015 at 02:54:39PM +0200, Javier Martinez Canillas wrote:
>> The driver Device Tree binding now documents compatible strings that have
>> a vendor prefix, so add these to the OF device ID table to match and mark
>> the old ones as deprecated explaining that should not be used anymore.
>>
>> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
>>
>> ---
>>
>>  drivers/iio/adc/mcp320x.c | 28 ++++++++++++++++++++++++++++
>>  1 file changed, 28 insertions(+)
>>
>> diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c
>> index 41a21e986c1a..9fcb8b61e300 100644
>> --- a/drivers/iio/adc/mcp320x.c
>> +++ b/drivers/iio/adc/mcp320x.c
>> @@ -354,6 +354,7 @@ static int mcp320x_remove(struct spi_device *spi)
>>  
>>  #if defined(CONFIG_OF)
>>  static const struct of_device_id mcp320x_dt_ids[] = {
>> +	/* NOTE: The use of compatibles with no vendor prefix is deprecated. */
>>  	{
>>  		.compatible = "mcp3001",
>>  		.data = &mcp320x_chip_infos[mcp3001],
>> @@ -382,6 +383,33 @@ static const struct of_device_id mcp320x_dt_ids[] = {
>>  		.compatible = "mcp3301",
>>  		.data = &mcp320x_chip_infos[mcp3301],
>>  	}, {
>> +		.compatible = "microchip,mcp3001",
>> +		.data = &mcp320x_chip_infos[mcp3001],
>> +	}, {
>> +		.compatible = "microchip,mcp3002",
>> +		.data = &mcp320x_chip_infos[mcp3002],
>> +	}, {
>> +		.compatible = "microchip,mcp3004",
>> +		.data = &mcp320x_chip_infos[mcp3004],
>> +	}, {
>> +		.compatible = "microchip,mcp3008",
>> +		.data = &mcp320x_chip_infos[mcp3008],
>> +	}, {
>> +		.compatible = "microchip,mcp3201",
>> +		.data = &mcp320x_chip_infos[mcp3201],
>> +	}, {
>> +		.compatible = "microchip,mcp3202",
>> +		.data = &mcp320x_chip_infos[mcp3202],
>> +	}, {
>> +		.compatible = "microchip,mcp3204",
>> +		.data = &mcp320x_chip_infos[mcp3204],
>> +	}, {
>> +		.compatible = "microchip,mcp3208",
>> +		.data = &mcp320x_chip_infos[mcp3208],
>> +	}, {
>> +		.compatible = "microchip,mcp3301",
>> +		.data = &mcp320x_chip_infos[mcp3301],
>> +	}, {
> 
> Acked-by: Michael Welling <mwelling@ieee.org>
Applied to the togreg branch of iio.git - initially pushed out as
testing for the autobuilders to play with it.

Thanks,

Jonathan
> 
>>  	}
>>  };
>>  MODULE_DEVICE_TABLE(of, mcp320x_dt_ids);
>> -- 
>> 2.4.3
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-10-25 12:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-14 12:54 [PATCH 0/2] iio: adc: mcp320x: Add compatible with vendor prefix and deprecate old ones Javier Martinez Canillas
2015-10-14 12:54 ` [PATCH 2/2] iio: adc: mcp320x: Add compatible with vendor prefix to OF table Javier Martinez Canillas
2015-10-14 15:27   ` Michael Welling
2015-10-25 12:37     ` Jonathan Cameron

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).