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
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
