From: Lad, Prabhakar <[email protected]>
add OF support for the mt9p031 sensor driver.
Alongside this patch sorts the header inclusion alphabetically.
Signed-off-by: Lad, Prabhakar <[email protected]>
Cc: Hans Verkuil <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Mauro Carvalho Chehab <[email protected]>
Cc: Guennadi Liakhovetski <[email protected]>
Cc: Sylwester Nawrocki <[email protected]>
Cc: Sakari Ailus <[email protected]>
Cc: Grant Likely <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Rob Landley <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
Changes for v2:
1: Used '-' instead of '_' for device properties.
2: Specified gpio reset pin as phandle in device node.
3: Handle platform data properly even if kernel is compiled with
devicetree support.
4: Used dev_* for messages in drivers instead of pr_*.
5: Changed compatible property to "aptina,mt9p031" and "aptina,mt9p031m".
6: Sorted the header inclusion alphabetically and fixed some minor code nits.
Changes for v3:
1: Dropped check if gpio-reset is valid.
2: Fixed some code nits.
3: Included a reference to the V4L2 DT bindings documentation.
.../devicetree/bindings/media/i2c/mt9p031.txt | 40 +++++++++++++
drivers/media/i2c/mt9p031.c | 60 +++++++++++++++++++-
2 files changed, 97 insertions(+), 3 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/i2c/mt9p031.txt
diff --git a/Documentation/devicetree/bindings/media/i2c/mt9p031.txt b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt
new file mode 100644
index 0000000..e740541
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt
@@ -0,0 +1,40 @@
+* Aptina 1/2.5-Inch 5Mp CMOS Digital Image Sensor
+
+The Aptina MT9P031 is a 1/2.5-inch CMOS active pixel digital image sensor with
+an active array size of 2592H x 1944V. It is programmable through a simple
+two-wire serial interface.
+
+Required Properties :
+- compatible : value should be either one among the following
+ (a) "aptina,mt9p031" for mt9p031 sensor
+ (b) "aptina,mt9p031m" for mt9p031m sensor
+
+- input-clock-frequency : Input clock frequency.
+
+- pixel-clock-frequency : Pixel clock frequency.
+
+Optional Properties :
+-gpio-reset: Chip reset GPIO
+
+For further reading of port node refer Documentation/devicetree/bindings/media/
+video-interfaces.txt.
+
+Example:
+
+ i2c0@1c22000 {
+ ...
+ ...
+ mt9p031@5d {
+ compatible = "aptina,mt9p031";
+ reg = <0x5d>;
+ gpio-reset = <&gpio3 30 0>;
+
+ port {
+ mt9p031_1: endpoint {
+ input-clock-frequency = <6000000>;
+ pixel-clock-frequency = <96000000>;
+ };
+ };
+ };
+ ...
+ };
diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c
index 28cf95b..4514f8f 100644
--- a/drivers/media/i2c/mt9p031.c
+++ b/drivers/media/i2c/mt9p031.c
@@ -16,9 +16,11 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/gpio.h>
-#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/log2.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/of_gpio.h>
#include <linux/pm.h>
#include <linux/regulator/consumer.h>
#include <linux/slab.h>
@@ -28,6 +30,7 @@
#include <media/v4l2-chip-ident.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
+#include <media/v4l2-of.h>
#include <media/v4l2-subdev.h>
#include "aptina-pll.h"
@@ -928,10 +931,50 @@ static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = {
* Driver initialization and probing
*/
+static struct mt9p031_platform_data *
+mt9p031_get_pdata(struct i2c_client *client)
+{
+ struct device_node *np;
+ struct mt9p031_platform_data *pdata;
+
+ if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node)
+ return client->dev.platform_data;
+
+ np = v4l2_of_get_next_endpoint(client->dev.of_node, NULL);
+ if (!np)
+ return NULL;
+
+ pdata = devm_kzalloc(&client->dev, sizeof(struct mt9p031_platform_data),
+ GFP_KERNEL);
+ if (!pdata)
+ return NULL;
+
+ pdata->reset = of_get_named_gpio(client->dev.of_node, "gpio-reset", 0);
+ of_property_read_u32(np, "input-clock-frequency", &pdata->ext_freq);
+ of_property_read_u32(np, "pixel-clock-frequency", &pdata->target_freq);
+
+ return pdata;
+}
+
+#if IS_ENABLED(CONFIG_OF)
+static const struct of_device_id mt9p031_of_match[] = {
+ {
+ .compatible = "aptina,mt9p031",
+ .data = (void *)MT9P031_MODEL_COLOR,
+ }, {
+ .compatible = "aptina,mt9p031m",
+ .data = (void *)MT9P031_MODEL_MONOCHROME,
+ }, {
+ /* sentinel */
+ },
+};
+MODULE_DEVICE_TABLE(of, mt9p031_of_match);
+#endif
+
static int mt9p031_probe(struct i2c_client *client,
const struct i2c_device_id *did)
{
- struct mt9p031_platform_data *pdata = client->dev.platform_data;
+ struct mt9p031_platform_data *pdata = mt9p031_get_pdata(client);
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
struct mt9p031 *mt9p031;
unsigned int i;
@@ -955,7 +998,17 @@ static int mt9p031_probe(struct i2c_client *client,
mt9p031->pdata = pdata;
mt9p031->output_control = MT9P031_OUTPUT_CONTROL_DEF;
mt9p031->mode2 = MT9P031_READ_MODE_2_ROW_BLC;
- mt9p031->model = did->driver_data;
+
+ if (!client->dev.of_node) {
+ mt9p031->model = (enum mt9p031_model)did->driver_data;
+ } else {
+ const struct of_device_id *of_id;
+
+ of_id = of_match_device(of_match_ptr(mt9p031_of_match),
+ &client->dev);
+ if (of_id)
+ mt9p031->model = (enum mt9p031_model)of_id->data;
+ }
mt9p031->reset = -1;
mt9p031->vaa = devm_regulator_get(&client->dev, "vaa");
@@ -1072,6 +1125,7 @@ MODULE_DEVICE_TABLE(i2c, mt9p031_id);
static struct i2c_driver mt9p031_i2c_driver = {
.driver = {
+ .of_match_table = of_match_ptr(mt9p031_of_match),
.name = "mt9p031",
},
.probe = mt9p031_probe,
--
1.7.4.1
On Friday 03 May 2013, Prabhakar Lad wrote:
>
> +static struct mt9p031_platform_data *
> +mt9p031_get_pdata(struct i2c_client *client)
> +{
> + struct device_node *np;
> + struct mt9p031_platform_data *pdata;
> +
> + if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node)
> + return client->dev.platform_data;
> +
> + np = v4l2_of_get_next_endpoint(client->dev.of_node, NULL);
> + if (!np)
> + return NULL;
> +
> + pdata = devm_kzalloc(&client->dev, sizeof(struct mt9p031_platform_data),
> + GFP_KERNEL);
> + if (!pdata)
> + return NULL;
> +
> + pdata->reset = of_get_named_gpio(client->dev.of_node, "gpio-reset", 0);
> + of_property_read_u32(np, "input-clock-frequency", &pdata->ext_freq);
> + of_property_read_u32(np, "pixel-clock-frequency", &pdata->target_freq);
> +
> + return pdata;
> +}
Ok, good.
> @@ -955,7 +998,17 @@ static int mt9p031_probe(struct i2c_client *client,
> mt9p031->pdata = pdata;
> mt9p031->output_control = MT9P031_OUTPUT_CONTROL_DEF;
> mt9p031->mode2 = MT9P031_READ_MODE_2_ROW_BLC;
> - mt9p031->model = did->driver_data;
> +
> + if (!client->dev.of_node) {
> + mt9p031->model = (enum mt9p031_model)did->driver_data;
> + } else {
> + const struct of_device_id *of_id;
> +
> + of_id = of_match_device(of_match_ptr(mt9p031_of_match),
> + &client->dev);
> + if (of_id)
> + mt9p031->model = (enum mt9p031_model)of_id->data;
> + }
> mt9p031->reset = -1;
Is this actually required? I thought the i2c core just compared the
part of the "compatible" value after the first comma to the string, so
"mt9p031->model = (enum mt9p031_model)did->driver_data" should work
in both cases.
Arnd
Hi Arnd,
On Fri, May 3, 2013 at 8:04 PM, Arnd Bergmann <[email protected]> wrote:
> On Friday 03 May 2013, Prabhakar Lad wrote:
>>
[snip]
>> +}
>
> Ok, good.
>
>> @@ -955,7 +998,17 @@ static int mt9p031_probe(struct i2c_client *client,
>> mt9p031->pdata = pdata;
>> mt9p031->output_control = MT9P031_OUTPUT_CONTROL_DEF;
>> mt9p031->mode2 = MT9P031_READ_MODE_2_ROW_BLC;
>> - mt9p031->model = did->driver_data;
>> +
>> + if (!client->dev.of_node) {
>> + mt9p031->model = (enum mt9p031_model)did->driver_data;
>> + } else {
>> + const struct of_device_id *of_id;
>> +
>> + of_id = of_match_device(of_match_ptr(mt9p031_of_match),
>> + &client->dev);
>> + if (of_id)
>> + mt9p031->model = (enum mt9p031_model)of_id->data;
>> + }
>> mt9p031->reset = -1;
>
> Is this actually required? I thought the i2c core just compared the
> part of the "compatible" value after the first comma to the string, so
> "mt9p031->model = (enum mt9p031_model)did->driver_data" should work
> in both cases.
>
I am OK with "mt9p031->model = (enum mt9p031_model)did->driver_data"
but I see still few drivers doing this, I am not sure for what reason.
If everyone is
OK with it I can drop the above change.
Laurent, Sascha what do you suggest ?
Regards,
--Prabhakar Lad
Hi Arnd,
On Mon, May 6, 2013 at 8:29 PM, Prabhakar Lad
<[email protected]> wrote:
> Hi Arnd,
>
> On Fri, May 3, 2013 at 8:04 PM, Arnd Bergmann <[email protected]> wrote:
>> On Friday 03 May 2013, Prabhakar Lad wrote:
>>>
> [snip]
>>> +}
>>
>> Ok, good.
>>
>>> @@ -955,7 +998,17 @@ static int mt9p031_probe(struct i2c_client *client,
>>> mt9p031->pdata = pdata;
>>> mt9p031->output_control = MT9P031_OUTPUT_CONTROL_DEF;
>>> mt9p031->mode2 = MT9P031_READ_MODE_2_ROW_BLC;
>>> - mt9p031->model = did->driver_data;
>>> +
>>> + if (!client->dev.of_node) {
>>> + mt9p031->model = (enum mt9p031_model)did->driver_data;
>>> + } else {
>>> + const struct of_device_id *of_id;
>>> +
>>> + of_id = of_match_device(of_match_ptr(mt9p031_of_match),
>>> + &client->dev);
>>> + if (of_id)
>>> + mt9p031->model = (enum mt9p031_model)of_id->data;
>>> + }
>>> mt9p031->reset = -1;
>>
>> Is this actually required? I thought the i2c core just compared the
>> part of the "compatible" value after the first comma to the string, so
>> "mt9p031->model = (enum mt9p031_model)did->driver_data" should work
>> in both cases.
>>
> I am OK with "mt9p031->model = (enum mt9p031_model)did->driver_data"
> but I see still few drivers doing this, I am not sure for what reason.
> If everyone is
> OK with it I can drop the above change.
>
My bad, while booting with DT the i2c_device_id ie did in this case
will be NULL,
so the above changes are required :-)
Regards,
--Prabhakar Lad
Hi Prabhakar,
Thank you for the patch.
On Friday 03 May 2013 12:21:59 Prabhakar Lad wrote:
> From: Lad, Prabhakar <[email protected]>
>
> add OF support for the mt9p031 sensor driver.
> Alongside this patch sorts the header inclusion alphabetically.
>
> Signed-off-by: Lad, Prabhakar <[email protected]>
> Cc: Hans Verkuil <[email protected]>
> Cc: Laurent Pinchart <[email protected]>
> Cc: Mauro Carvalho Chehab <[email protected]>
> Cc: Guennadi Liakhovetski <[email protected]>
> Cc: Sylwester Nawrocki <[email protected]>
> Cc: Sakari Ailus <[email protected]>
> Cc: Grant Likely <[email protected]>
> Cc: Sascha Hauer <[email protected]>
> Cc: Rob Herring <[email protected]>
> Cc: Rob Landley <[email protected]>
> Cc: Arnd Bergmann <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> Changes for v2:
> 1: Used '-' instead of '_' for device properties.
> 2: Specified gpio reset pin as phandle in device node.
> 3: Handle platform data properly even if kernel is compiled with
> devicetree support.
> 4: Used dev_* for messages in drivers instead of pr_*.
> 5: Changed compatible property to "aptina,mt9p031" and "aptina,mt9p031m".
> 6: Sorted the header inclusion alphabetically and fixed some minor code
> nits.
>
> Changes for v3:
> 1: Dropped check if gpio-reset is valid.
> 2: Fixed some code nits.
> 3: Included a reference to the V4L2 DT bindings documentation.
>
> .../devicetree/bindings/media/i2c/mt9p031.txt | 40 +++++++++++++
> drivers/media/i2c/mt9p031.c | 60 ++++++++++++++++-
> 2 files changed, 97 insertions(+), 3 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/media/i2c/mt9p031.txt
>
> diff --git a/Documentation/devicetree/bindings/media/i2c/mt9p031.txt
> b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt new file mode
> 100644
> index 0000000..e740541
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt
> @@ -0,0 +1,40 @@
> +* Aptina 1/2.5-Inch 5Mp CMOS Digital Image Sensor
> +
> +The Aptina MT9P031 is a 1/2.5-inch CMOS active pixel digital image sensor
> with +an active array size of 2592H x 1944V. It is programmable through a
> simple +two-wire serial interface.
> +
> +Required Properties :
> +- compatible : value should be either one among the following
> + (a) "aptina,mt9p031" for mt9p031 sensor
> + (b) "aptina,mt9p031m" for mt9p031m sensor
> +
> +- input-clock-frequency : Input clock frequency.
> +
> +- pixel-clock-frequency : Pixel clock frequency.
> +
> +Optional Properties :
> +-gpio-reset: Chip reset GPIO
According to Documentation/devicetree/bindings/gpio/gpio.txt, this should be
"gpios" or "reset-gpios".
> +
> +For further reading of port node refer
> Documentation/devicetree/bindings/media/ +video-interfaces.txt.
> +
> +Example:
> +
> + i2c0@1c22000 {
> + ...
> + ...
> + mt9p031@5d {
> + compatible = "aptina,mt9p031";
> + reg = <0x5d>;
> + gpio-reset = <&gpio3 30 0>;
> +
> + port {
> + mt9p031_1: endpoint {
> + input-clock-frequency = <6000000>;
> + pixel-clock-frequency = <96000000>;
> + };
> + };
> + };
> + ...
> + };
--
Regards,
Laurent Pinchart
Hi Prabhakar,
On Tuesday 07 May 2013 15:10:36 Prabhakar Lad wrote:
> On Mon, May 6, 2013 at 8:29 PM, Prabhakar Lad wrote:
> > On Fri, May 3, 2013 at 8:04 PM, Arnd Bergmann <[email protected]> wrote:
> >> On Friday 03 May 2013, Prabhakar Lad wrote:
> > [snip]
> >
> >>> +}
> >>
> >> Ok, good.
> >>
> >>> @@ -955,7 +998,17 @@ static int mt9p031_probe(struct i2c_client *client,
> >>>
> >>> mt9p031->pdata = pdata;
> >>> mt9p031->output_control = MT9P031_OUTPUT_CONTROL_DEF;
> >>> mt9p031->mode2 = MT9P031_READ_MODE_2_ROW_BLC;
> >>>
> >>> - mt9p031->model = did->driver_data;
> >>> +
> >>> + if (!client->dev.of_node) {
> >>> + mt9p031->model = (enum mt9p031_model)did->driver_data;
> >>> + } else {
> >>> + const struct of_device_id *of_id;
> >>> +
> >>> + of_id = of_match_device(of_match_ptr(mt9p031_of_match),
> >>> + &client->dev);
> >>> + if (of_id)
> >>> + mt9p031->model = (enum
> >>> mt9p031_model)of_id->data;
> >>> + }
> >>>
> >>> mt9p031->reset = -1;
> >>
> >> Is this actually required? I thought the i2c core just compared the
> >> part of the "compatible" value after the first comma to the string, so
> >> "mt9p031->model = (enum mt9p031_model)did->driver_data" should work
> >> in both cases.
> >
> > I am OK with "mt9p031->model = (enum mt9p031_model)did->driver_data"
> > but I see still few drivers doing this, I am not sure for what reason.
> > If everyone is
> > OK with it I can drop the above change.
>
> My bad, while booting with DT the i2c_device_id ie did in this case will be
> NULL, so the above changes are required :-)
I've just tested your patch, and did isn't NULL when booting my Beagleboard
with DT (on v3.9-rc5).
--
Regards,
Laurent Pinchart
HI Laurent,
On Wed, May 8, 2013 at 7:31 AM, Laurent Pinchart
<[email protected]> wrote:
> Hi Prabhakar,
>
> Thank you for the patch.
>
> On Friday 03 May 2013 12:21:59 Prabhakar Lad wrote:
>> From: Lad, Prabhakar <[email protected]>
>>
>> add OF support for the mt9p031 sensor driver.
>> Alongside this patch sorts the header inclusion alphabetically.
>>
>> Signed-off-by: Lad, Prabhakar <[email protected]>
>> Cc: Hans Verkuil <[email protected]>
>> Cc: Laurent Pinchart <[email protected]>
>> Cc: Mauro Carvalho Chehab <[email protected]>
>> Cc: Guennadi Liakhovetski <[email protected]>
>> Cc: Sylwester Nawrocki <[email protected]>
>> Cc: Sakari Ailus <[email protected]>
>> Cc: Grant Likely <[email protected]>
>> Cc: Sascha Hauer <[email protected]>
>> Cc: Rob Herring <[email protected]>
>> Cc: Rob Landley <[email protected]>
>> Cc: Arnd Bergmann <[email protected]>
>> Cc: [email protected]
>> Cc: [email protected]
>> Cc: [email protected]
>> Cc: [email protected]
>> ---
>> Changes for v2:
>> 1: Used '-' instead of '_' for device properties.
>> 2: Specified gpio reset pin as phandle in device node.
>> 3: Handle platform data properly even if kernel is compiled with
>> devicetree support.
>> 4: Used dev_* for messages in drivers instead of pr_*.
>> 5: Changed compatible property to "aptina,mt9p031" and "aptina,mt9p031m".
>> 6: Sorted the header inclusion alphabetically and fixed some minor code
>> nits.
>>
>> Changes for v3:
>> 1: Dropped check if gpio-reset is valid.
>> 2: Fixed some code nits.
>> 3: Included a reference to the V4L2 DT bindings documentation.
>>
>> .../devicetree/bindings/media/i2c/mt9p031.txt | 40 +++++++++++++
>> drivers/media/i2c/mt9p031.c | 60 ++++++++++++++++-
>> 2 files changed, 97 insertions(+), 3 deletions(-)
>> create mode 100644 Documentation/devicetree/bindings/media/i2c/mt9p031.txt
>>
>> diff --git a/Documentation/devicetree/bindings/media/i2c/mt9p031.txt
>> b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt new file mode
>> 100644
>> index 0000000..e740541
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt
>> @@ -0,0 +1,40 @@
>> +* Aptina 1/2.5-Inch 5Mp CMOS Digital Image Sensor
>> +
>> +The Aptina MT9P031 is a 1/2.5-inch CMOS active pixel digital image sensor
>> with +an active array size of 2592H x 1944V. It is programmable through a
>> simple +two-wire serial interface.
>> +
>> +Required Properties :
>> +- compatible : value should be either one among the following
>> + (a) "aptina,mt9p031" for mt9p031 sensor
>> + (b) "aptina,mt9p031m" for mt9p031m sensor
>> +
>> +- input-clock-frequency : Input clock frequency.
>> +
>> +- pixel-clock-frequency : Pixel clock frequency.
>> +
>> +Optional Properties :
>> +-gpio-reset: Chip reset GPIO
>
> According to Documentation/devicetree/bindings/gpio/gpio.txt, this should be
> "gpios" or "reset-gpios".
>
OK I'll make it as "reset-gpios"
Regards,
--Prabhakar Lad
Hi Laurent,
On Wed, May 8, 2013 at 7:32 AM, Laurent Pinchart
<[email protected]> wrote:
> Hi Prabhakar,
>
> On Tuesday 07 May 2013 15:10:36 Prabhakar Lad wrote:
>> On Mon, May 6, 2013 at 8:29 PM, Prabhakar Lad wrote:
>> > On Fri, May 3, 2013 at 8:04 PM, Arnd Bergmann <[email protected]> wrote:
>> >> On Friday 03 May 2013, Prabhakar Lad wrote:
>> > [snip]
>> >
>> >>> +}
>> >>
>> >> Ok, good.
>> >>
>> >>> @@ -955,7 +998,17 @@ static int mt9p031_probe(struct i2c_client *client,
>> >>>
>> >>> mt9p031->pdata = pdata;
>> >>> mt9p031->output_control = MT9P031_OUTPUT_CONTROL_DEF;
>> >>> mt9p031->mode2 = MT9P031_READ_MODE_2_ROW_BLC;
>> >>>
>> >>> - mt9p031->model = did->driver_data;
>> >>> +
>> >>> + if (!client->dev.of_node) {
>> >>> + mt9p031->model = (enum mt9p031_model)did->driver_data;
>> >>> + } else {
>> >>> + const struct of_device_id *of_id;
>> >>> +
>> >>> + of_id = of_match_device(of_match_ptr(mt9p031_of_match),
>> >>> + &client->dev);
>> >>> + if (of_id)
>> >>> + mt9p031->model = (enum
>> >>> mt9p031_model)of_id->data;
>> >>> + }
>> >>>
>> >>> mt9p031->reset = -1;
>> >>
>> >> Is this actually required? I thought the i2c core just compared the
>> >> part of the "compatible" value after the first comma to the string, so
>> >> "mt9p031->model = (enum mt9p031_model)did->driver_data" should work
>> >> in both cases.
>> >
>> > I am OK with "mt9p031->model = (enum mt9p031_model)did->driver_data"
>> > but I see still few drivers doing this, I am not sure for what reason.
>> > If everyone is
>> > OK with it I can drop the above change.
>>
>> My bad, while booting with DT the i2c_device_id ie did in this case will be
>> NULL, so the above changes are required :-)
>
> I've just tested your patch, and did isn't NULL when booting my Beagleboard
> with DT (on v3.9-rc5).
>
I am pretty much sure you tested it compatible property as "aptina,mt9p031"
if the compatible property is set to "aptina,mt9p031m" the did will be NULL.
Regards,
--Prabhakar Lad
Hi Prabhakar,
On Wednesday 08 May 2013 10:19:57 Prabhakar Lad wrote:
> On Wed, May 8, 2013 at 7:32 AM, Laurent Pinchart wrote:
> > On Tuesday 07 May 2013 15:10:36 Prabhakar Lad wrote:
> >> On Mon, May 6, 2013 at 8:29 PM, Prabhakar Lad wrote:
> >> > On Fri, May 3, 2013 at 8:04 PM, Arnd Bergmann <[email protected]> wrote:
> >> >> On Friday 03 May 2013, Prabhakar Lad wrote:
> >> > [snip]
> >> >
> >> >>> +}
> >> >>
> >> >> Ok, good.
> >> >>
> >> >>> @@ -955,7 +998,17 @@ static int mt9p031_probe(struct i2c_client
> >> >>> *client,
> >> >>>
> >> >>> mt9p031->pdata = pdata;
> >> >>> mt9p031->output_control = MT9P031_OUTPUT_CONTROL_DEF;
> >> >>> mt9p031->mode2 = MT9P031_READ_MODE_2_ROW_BLC;
> >> >>>
> >> >>> - mt9p031->model = did->driver_data;
> >> >>> +
> >> >>> + if (!client->dev.of_node) {
> >> >>> + mt9p031->model = (enum
> >> >>> mt9p031_model)did->driver_data;
> >> >>> + } else {
> >> >>> + const struct of_device_id *of_id;
> >> >>> +
> >> >>> + of_id =
> >> >>> of_match_device(of_match_ptr(mt9p031_of_match),
> >> >>> + &client->dev);
> >> >>> + if (of_id)
> >> >>> + mt9p031->model = (enum
> >> >>> mt9p031_model)of_id->data;
> >> >>> + }
> >> >>>
> >> >>> mt9p031->reset = -1;
> >> >>
> >> >> Is this actually required? I thought the i2c core just compared the
> >> >> part of the "compatible" value after the first comma to the string, so
> >> >> "mt9p031->model = (enum mt9p031_model)did->driver_data" should work
> >> >> in both cases.
> >> >
> >> > I am OK with "mt9p031->model = (enum mt9p031_model)did->driver_data"
> >> > but I see still few drivers doing this, I am not sure for what reason.
> >> > If everyone is OK with it I can drop the above change.
> >>
> >> My bad, while booting with DT the i2c_device_id ie did in this case will
> >> be NULL, so the above changes are required :-)
> >
> > I've just tested your patch, and did isn't NULL when booting my
> > Beagleboard with DT (on v3.9-rc5).
>
> I am pretty much sure you tested it compatible property as "aptina,mt9p031"
> if the compatible property is set to "aptina,mt9p031m" the did will be NULL.
I've tested both :-)
--
Regards,
Laurent Pinchart
Hi Laurent,
On Wed, May 8, 2013 at 4:07 PM, Laurent Pinchart
<[email protected]> wrote:
> Hi Prabhakar,
>
> On Wednesday 08 May 2013 10:19:57 Prabhakar Lad wrote:
>> On Wed, May 8, 2013 at 7:32 AM, Laurent Pinchart wrote:
>> > On Tuesday 07 May 2013 15:10:36 Prabhakar Lad wrote:
>> >> On Mon, May 6, 2013 at 8:29 PM, Prabhakar Lad wrote:
>> >> > On Fri, May 3, 2013 at 8:04 PM, Arnd Bergmann <[email protected]> wrote:
>> >> >> On Friday 03 May 2013, Prabhakar Lad wrote:
>> >> > [snip]
>> >> >
>> >> >>> +}
>> >> >>
>> >> >> Ok, good.
>> >> >>
>> >> >>> @@ -955,7 +998,17 @@ static int mt9p031_probe(struct i2c_client
>> >> >>> *client,
>> >> >>>
>> >> >>> mt9p031->pdata = pdata;
>> >> >>> mt9p031->output_control = MT9P031_OUTPUT_CONTROL_DEF;
>> >> >>> mt9p031->mode2 = MT9P031_READ_MODE_2_ROW_BLC;
>> >> >>>
>> >> >>> - mt9p031->model = did->driver_data;
>> >> >>> +
>> >> >>> + if (!client->dev.of_node) {
>> >> >>> + mt9p031->model = (enum
>> >> >>> mt9p031_model)did->driver_data;
>> >> >>> + } else {
>> >> >>> + const struct of_device_id *of_id;
>> >> >>> +
>> >> >>> + of_id =
>> >> >>> of_match_device(of_match_ptr(mt9p031_of_match),
>> >> >>> + &client->dev);
>> >> >>> + if (of_id)
>> >> >>> + mt9p031->model = (enum
>> >> >>> mt9p031_model)of_id->data;
>> >> >>> + }
>> >> >>>
>> >> >>> mt9p031->reset = -1;
>> >> >>
>> >> >> Is this actually required? I thought the i2c core just compared the
>> >> >> part of the "compatible" value after the first comma to the string, so
>> >> >> "mt9p031->model = (enum mt9p031_model)did->driver_data" should work
>> >> >> in both cases.
>> >> >
>> >> > I am OK with "mt9p031->model = (enum mt9p031_model)did->driver_data"
>> >> > but I see still few drivers doing this, I am not sure for what reason.
>> >> > If everyone is OK with it I can drop the above change.
>> >>
>> >> My bad, while booting with DT the i2c_device_id ie did in this case will
>> >> be NULL, so the above changes are required :-)
>> >
>> > I've just tested your patch, and did isn't NULL when booting my
>> > Beagleboard with DT (on v3.9-rc5).
>>
>> I am pretty much sure you tested it compatible property as "aptina,mt9p031"
>> if the compatible property is set to "aptina,mt9p031m" the did will be NULL.
>
> I've tested both :-)
>
Thanks for the testing :-) I'll remove this changes in the next version.
Regards,
--Prabhakar Lad
On Wed, May 08, 2013 at 12:37:29PM +0200, Laurent Pinchart wrote:
> Hi Prabhakar,
>
> On Wednesday 08 May 2013 10:19:57 Prabhakar Lad wrote:
> > On Wed, May 8, 2013 at 7:32 AM, Laurent Pinchart wrote:
> > > On Tuesday 07 May 2013 15:10:36 Prabhakar Lad wrote:
> > >> On Mon, May 6, 2013 at 8:29 PM, Prabhakar Lad wrote:
> > >> > On Fri, May 3, 2013 at 8:04 PM, Arnd Bergmann <[email protected]> wrote:
> > >> >> On Friday 03 May 2013, Prabhakar Lad wrote:
> > >> > [snip]
> > >> >
> > >> >>> +}
> > >> >>
> > >> >> Ok, good.
> > >> >>
> > >> >>> @@ -955,7 +998,17 @@ static int mt9p031_probe(struct i2c_client
> > >> >>> *client,
> > >> >>>
> > >> >>> mt9p031->pdata = pdata;
> > >> >>> mt9p031->output_control = MT9P031_OUTPUT_CONTROL_DEF;
> > >> >>> mt9p031->mode2 = MT9P031_READ_MODE_2_ROW_BLC;
> > >> >>>
> > >> >>> - mt9p031->model = did->driver_data;
> > >> >>> +
> > >> >>> + if (!client->dev.of_node) {
> > >> >>> + mt9p031->model = (enum
> > >> >>> mt9p031_model)did->driver_data;
> > >> >>> + } else {
> > >> >>> + const struct of_device_id *of_id;
> > >> >>> +
> > >> >>> + of_id =
> > >> >>> of_match_device(of_match_ptr(mt9p031_of_match),
> > >> >>> + &client->dev);
> > >> >>> + if (of_id)
> > >> >>> + mt9p031->model = (enum
> > >> >>> mt9p031_model)of_id->data;
> > >> >>> + }
> > >> >>>
> > >> >>> mt9p031->reset = -1;
> > >> >>
> > >> >> Is this actually required? I thought the i2c core just compared the
> > >> >> part of the "compatible" value after the first comma to the string, so
> > >> >> "mt9p031->model = (enum mt9p031_model)did->driver_data" should work
> > >> >> in both cases.
At least on v3.8 I just checked that 'did' is indeed NULL for the
devicetree case. Also I see no indication that i2c starts comparing
after the first comma in the string.
> > >> >
> > >> > I am OK with "mt9p031->model = (enum mt9p031_model)did->driver_data"
> > >> > but I see still few drivers doing this, I am not sure for what reason.
> > >> > If everyone is OK with it I can drop the above change.
> > >>
> > >> My bad, while booting with DT the i2c_device_id ie did in this case will
> > >> be NULL, so the above changes are required :-)
> > >
> > > I've just tested your patch, and did isn't NULL when booting my
> > > Beagleboard with DT (on v3.9-rc5).
> >
> > I am pretty much sure you tested it compatible property as "aptina,mt9p031"
> > if the compatible property is set to "aptina,mt9p031m" the did will be NULL.
>
> I've tested both :-)
Sorry to nag, but did you use "aptina,mt9p031[m]" as a compatible string or did
you use "mt9p031[m]". With "aptina,..." 'did' should really be NULL.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Hi Sascha,
On Monday 13 May 2013 12:46:04 Sascha Hauer wrote:
> On Wed, May 08, 2013 at 12:37:29PM +0200, Laurent Pinchart wrote:
> > Hi Prabhakar,
> >
> > On Wednesday 08 May 2013 10:19:57 Prabhakar Lad wrote:
> > > On Wed, May 8, 2013 at 7:32 AM, Laurent Pinchart wrote:
> > > > On Tuesday 07 May 2013 15:10:36 Prabhakar Lad wrote:
> > > >> On Mon, May 6, 2013 at 8:29 PM, Prabhakar Lad wrote:
> > > >> > On Fri, May 3, 2013 at 8:04 PM, Arnd Bergmann wrote:
> > > >> >> On Friday 03 May 2013, Prabhakar Lad wrote:
> > > >> > [snip]
> > > >> >
> > > >> >>> +}
> > > >> >>
> > > >> >> Ok, good.
> > > >> >>
> > > >> >>> @@ -955,7 +998,17 @@ static int mt9p031_probe(struct i2c_client
> > > >> >>> *client,
> > > >> >>>
> > > >> >>> mt9p031->pdata = pdata;
> > > >> >>> mt9p031->output_control = MT9P031_OUTPUT_CONTROL_DEF;
> > > >> >>> mt9p031->mode2 = MT9P031_READ_MODE_2_ROW_BLC;
> > > >> >>>
> > > >> >>> - mt9p031->model = did->driver_data;
> > > >> >>> +
> > > >> >>> + if (!client->dev.of_node) {
> > > >> >>> + mt9p031->model = (enum
> > > >> >>> mt9p031_model)did->driver_data;
> > > >> >>> + } else {
> > > >> >>> + const struct of_device_id *of_id;
> > > >> >>> +
> > > >> >>> + of_id =
> > > >> >>> of_match_device(of_match_ptr(mt9p031_of_match),
> > > >> >>> + &client->dev);
> > > >> >>> + if (of_id)
> > > >> >>> + mt9p031->model = (enum
> > > >> >>> mt9p031_model)of_id->data;
> > > >> >>> + }
> > > >> >>>
> > > >> >>> mt9p031->reset = -1;
> > > >> >>
> > > >> >> Is this actually required? I thought the i2c core just compared
> > > >> >> the
> > > >> >> part of the "compatible" value after the first comma to the
> > > >> >> string, so
> > > >> >> "mt9p031->model = (enum mt9p031_model)did->driver_data" should
> > > >> >> work
> > > >> >> in both cases.
>
> At least on v3.8 I just checked that 'did' is indeed NULL for the
> devicetree case. Also I see no indication that i2c starts comparing
> after the first comma in the string.
>
> > > >> > I am OK with "mt9p031->model = (enum
> > > >> > mt9p031_model)did->driver_data"
> > > >> > but I see still few drivers doing this, I am not sure for what
> > > >> > reason.
> > > >> > If everyone is OK with it I can drop the above change.
> > > >>
> > > >> My bad, while booting with DT the i2c_device_id ie did in this case
> > > >> will
> > > >> be NULL, so the above changes are required :-)
> > > >
> > > > I've just tested your patch, and did isn't NULL when booting my
> > > > Beagleboard with DT (on v3.9-rc5).
> > >
> > > I am pretty much sure you tested it compatible property as
> > > "aptina,mt9p031"
> > > if the compatible property is set to "aptina,mt9p031m" the did will be
> > > NULL.>
> > I've tested both :-)
>
> Sorry to nag, but did you use "aptina,mt9p031[m]" as a compatible string or
> did you use "mt9p031[m]". With "aptina,..." 'did' should really be NULL.
I've used "aptina,mt9p031[m]".
Please see the of_modalias_node() call in of_i2c_register_devices()
(drivers/of/of-i2c.c), that's where the I2C device type name should be
initialized.
--
Regards,
Laurent Pinchart
On Tue, May 14, 2013 at 12:59:27AM +0200, Laurent Pinchart wrote:
> Hi Sascha,
>
> On Monday 13 May 2013 12:46:04 Sascha Hauer wrote:
> > On Wed, May 08, 2013 at 12:37:29PM +0200, Laurent Pinchart wrote:
> > > Hi Prabhakar,
> > >
> > > On Wednesday 08 May 2013 10:19:57 Prabhakar Lad wrote:
> > > > On Wed, May 8, 2013 at 7:32 AM, Laurent Pinchart wrote:
> > > > > On Tuesday 07 May 2013 15:10:36 Prabhakar Lad wrote:
> > > > >> On Mon, May 6, 2013 at 8:29 PM, Prabhakar Lad wrote:
> > > > >> > On Fri, May 3, 2013 at 8:04 PM, Arnd Bergmann wrote:
> > > > >> >> On Friday 03 May 2013, Prabhakar Lad wrote:
> > > > >> > [snip]
> > > > >> >
> > > > >> >>> +}
> > > > >> >>
> > > > >> >> Ok, good.
> > > > >> >>
> > > > >> >>> @@ -955,7 +998,17 @@ static int mt9p031_probe(struct i2c_client
> > > > >> >>> *client,
> > > > >> >>>
> > > > >> >>> mt9p031->pdata = pdata;
> > > > >> >>> mt9p031->output_control = MT9P031_OUTPUT_CONTROL_DEF;
> > > > >> >>> mt9p031->mode2 = MT9P031_READ_MODE_2_ROW_BLC;
> > > > >> >>>
> > > > >> >>> - mt9p031->model = did->driver_data;
> > > > >> >>> +
> > > > >> >>> + if (!client->dev.of_node) {
> > > > >> >>> + mt9p031->model = (enum
> > > > >> >>> mt9p031_model)did->driver_data;
> > > > >> >>> + } else {
> > > > >> >>> + const struct of_device_id *of_id;
> > > > >> >>> +
> > > > >> >>> + of_id =
> > > > >> >>> of_match_device(of_match_ptr(mt9p031_of_match),
> > > > >> >>> + &client->dev);
> > > > >> >>> + if (of_id)
> > > > >> >>> + mt9p031->model = (enum
> > > > >> >>> mt9p031_model)of_id->data;
> > > > >> >>> + }
> > > > >> >>>
> > > > >> >>> mt9p031->reset = -1;
> > > > >> >>
> > > > >> >> Is this actually required? I thought the i2c core just compared
> > > > >> >> the
> > > > >> >> part of the "compatible" value after the first comma to the
> > > > >> >> string, so
> > > > >> >> "mt9p031->model = (enum mt9p031_model)did->driver_data" should
> > > > >> >> work
> > > > >> >> in both cases.
> >
> > At least on v3.8 I just checked that 'did' is indeed NULL for the
> > devicetree case. Also I see no indication that i2c starts comparing
> > after the first comma in the string.
> >
> > > > >> > I am OK with "mt9p031->model = (enum
> > > > >> > mt9p031_model)did->driver_data"
> > > > >> > but I see still few drivers doing this, I am not sure for what
> > > > >> > reason.
> > > > >> > If everyone is OK with it I can drop the above change.
> > > > >>
> > > > >> My bad, while booting with DT the i2c_device_id ie did in this case
> > > > >> will
> > > > >> be NULL, so the above changes are required :-)
> > > > >
> > > > > I've just tested your patch, and did isn't NULL when booting my
> > > > > Beagleboard with DT (on v3.9-rc5).
> > > >
> > > > I am pretty much sure you tested it compatible property as
> > > > "aptina,mt9p031"
> > > > if the compatible property is set to "aptina,mt9p031m" the did will be
> > > > NULL.>
> > > I've tested both :-)
> >
> > Sorry to nag, but did you use "aptina,mt9p031[m]" as a compatible string or
> > did you use "mt9p031[m]". With "aptina,..." 'did' should really be NULL.
>
> I've used "aptina,mt9p031[m]".
>
> Please see the of_modalias_node() call in of_i2c_register_devices()
> (drivers/of/of-i2c.c), that's where the I2C device type name should be
> initialized.
Ok, got it. I still had the older aptina,mt9p031m-sensor binding in my
patch.
Sorry for the noise.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |