On Tue, Aug 28, 2012 at 01:48:20PM +0200, Sascha Hauer wrote:
> From: Philipp Zabel <p.za...@pengutronix.de>
>
> Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
> Signed-off-by: Sascha Hauer <s.ha...@pengutronix.de>
> ---
> drivers/pwm/pwm-imx.c | 25 +++++++++++++++++++------
> 1 file changed, 19 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
> index a689144..dfc1bae 100644
> --- a/drivers/pwm/pwm-imx.c
> +++ b/drivers/pwm/pwm-imx.c
> @@ -16,9 +16,9 @@
> #include <linux/clk.h>
> #include <linux/io.h>
> #include <linux/pwm.h>
> +#include <linux/of_device.h>
> #include <mach/hardware.h>
>
> -
> /* i.MX1 and i.MX21 share the same PWM function block: */
>
> #define MX1_PWMC 0x00 /* PWM Control Register */
> @@ -203,8 +203,17 @@ static struct pwm_ops imx_pwm_ops = {
> .owner = THIS_MODULE,
> };
>
> +static const struct of_device_id imx_pwm_dt_ids[] = {
> + { .compatible = "fsl,imx1-pwm", .data = &imx_pwm_config_v1, },
> + { .compatible = "fsl,imx27-pwm", .data = &imx_pwm_config_v2, },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, imx_pwm_of_match);
s/imx_pwm_of_match/imx_pwm_dt_ids
Regards,
Shawn
> +
> static int __devinit imx_pwm_probe(struct platform_device *pdev)
> {
> + const struct of_device_id *of_id =
> + of_match_device(imx_pwm_dt_ids, &pdev->dev);
> struct imx_chip *imx;
> struct resource *r;
> int ret = 0;
> @@ -235,12 +244,16 @@ static int __devinit imx_pwm_probe(struct
> platform_device *pdev)
> if (imx->mmio_base == NULL)
> return -EADDRNOTAVAIL;
>
> - if (cpu_is_mx1() || cpu_is_mx21()) {
> - imx->config = imx_pwm_config_v1;
> - imx->set_enable = imx_pwm_set_enable_v1;
> + if (of_id) {
> + imx->config = of_id->data;
> } else {
> - imx->config = imx_pwm_config_v2;
> - imx->set_enable = imx_pwm_set_enable_v2;
> + if (cpu_is_mx1() || cpu_is_mx21()) {
> + imx->config = imx_pwm_config_v1;
> + imx->set_enable = imx_pwm_set_enable_v1;
> + } else {
> + imx->config = imx_pwm_config_v2;
> + imx->set_enable = imx_pwm_set_enable_v2;
> + }
> }
>
> ret = pwmchip_add(&imx->chip);
> --
> 1.7.10.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
