On 12/20/2011 10:27 AM, Benoit Cousson wrote:
> Add initial DT support to retrieve the frequency using a
> DT attribute instead of the pdata pointer if of_node exist.
> 
> Add documentation for omap i2c controller binding.
> 
> Based on original patches from Manju and Grant.
> 
> Signed-off-by: Benoit Cousson <[email protected]>
> Cc: Ben Dooks <[email protected]>
> Cc: Kevin Hilman <[email protected]>

One issue below, otherwise:

Reviewed-by: Rob Herring <[email protected]>


> @@ -1001,15 +1019,24 @@ omap_i2c_probe(struct platform_device *pdev)
>               goto err_release_region;
>       }
>  
> -     if (pdata != NULL) {
> -             speed = pdata->clkrate;
> +     match = of_match_device(omap_i2c_of_match, &pdev->dev);
> +     if (match) {
> +             u32 freq = 100000; /* default to 100000 Hz */
> +
> +             pdata = match->data;
> +             dev->dtrev = pdata->rev;
> +             dev->flags = pdata->flags;
> +
> +             of_property_read_u32(node, "clock-frequency", &freq);
> +             /* convert DT freq value in Hz into kHz for speed */
> +             dev->speed = freq / 1000;
> +     } else if (pdata != NULL) {
> +             dev->speed = pdata->clkrate;
> +             dev->flags = pdata->flags;
>               dev->set_mpu_wkup_lat = pdata->set_mpu_wkup_lat;
> -     } else {
> -             speed = 100;    /* Default speed */
> -             dev->set_mpu_wkup_lat = NULL;
> +             dev->dtrev = pdata->rev;

If you get here, pdata is NULL.

Rob
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to