|
@@ -239,7 +239,14 @@ static void imx_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
|
|
clk_disable_unprepare(imx->clk_per);
|
|
clk_disable_unprepare(imx->clk_per);
|
|
}
|
|
}
|
|
|
|
|
|
-static const struct pwm_ops imx_pwm_ops = {
|
|
|
|
|
|
+static const struct pwm_ops imx_pwm_ops_v1 = {
|
|
|
|
+ .enable = imx_pwm_enable,
|
|
|
|
+ .disable = imx_pwm_disable,
|
|
|
|
+ .config = imx_pwm_config,
|
|
|
|
+ .owner = THIS_MODULE,
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static const struct pwm_ops imx_pwm_ops_v2 = {
|
|
.enable = imx_pwm_enable,
|
|
.enable = imx_pwm_enable,
|
|
.disable = imx_pwm_disable,
|
|
.disable = imx_pwm_disable,
|
|
.config = imx_pwm_config,
|
|
.config = imx_pwm_config,
|
|
@@ -250,16 +257,19 @@ struct imx_pwm_data {
|
|
int (*config)(struct pwm_chip *chip,
|
|
int (*config)(struct pwm_chip *chip,
|
|
struct pwm_device *pwm, int duty_ns, int period_ns);
|
|
struct pwm_device *pwm, int duty_ns, int period_ns);
|
|
void (*set_enable)(struct pwm_chip *chip, bool enable);
|
|
void (*set_enable)(struct pwm_chip *chip, bool enable);
|
|
|
|
+ const struct pwm_ops *ops;
|
|
};
|
|
};
|
|
|
|
|
|
static struct imx_pwm_data imx_pwm_data_v1 = {
|
|
static struct imx_pwm_data imx_pwm_data_v1 = {
|
|
.config = imx_pwm_config_v1,
|
|
.config = imx_pwm_config_v1,
|
|
.set_enable = imx_pwm_set_enable_v1,
|
|
.set_enable = imx_pwm_set_enable_v1,
|
|
|
|
+ .ops = &imx_pwm_ops_v1,
|
|
};
|
|
};
|
|
|
|
|
|
static struct imx_pwm_data imx_pwm_data_v2 = {
|
|
static struct imx_pwm_data imx_pwm_data_v2 = {
|
|
.config = imx_pwm_config_v2,
|
|
.config = imx_pwm_config_v2,
|
|
.set_enable = imx_pwm_set_enable_v2,
|
|
.set_enable = imx_pwm_set_enable_v2,
|
|
|
|
+ .ops = &imx_pwm_ops_v2,
|
|
};
|
|
};
|
|
|
|
|
|
static const struct of_device_id imx_pwm_dt_ids[] = {
|
|
static const struct of_device_id imx_pwm_dt_ids[] = {
|
|
@@ -281,6 +291,8 @@ static int imx_pwm_probe(struct platform_device *pdev)
|
|
if (!of_id)
|
|
if (!of_id)
|
|
return -ENODEV;
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
+ data = of_id->data;
|
|
|
|
+
|
|
imx = devm_kzalloc(&pdev->dev, sizeof(*imx), GFP_KERNEL);
|
|
imx = devm_kzalloc(&pdev->dev, sizeof(*imx), GFP_KERNEL);
|
|
if (imx == NULL)
|
|
if (imx == NULL)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
@@ -292,7 +304,7 @@ static int imx_pwm_probe(struct platform_device *pdev)
|
|
return PTR_ERR(imx->clk_per);
|
|
return PTR_ERR(imx->clk_per);
|
|
}
|
|
}
|
|
|
|
|
|
- imx->chip.ops = &imx_pwm_ops;
|
|
|
|
|
|
+ imx->chip.ops = data->ops;
|
|
imx->chip.dev = &pdev->dev;
|
|
imx->chip.dev = &pdev->dev;
|
|
imx->chip.base = -1;
|
|
imx->chip.base = -1;
|
|
imx->chip.npwm = 1;
|
|
imx->chip.npwm = 1;
|
|
@@ -303,7 +315,6 @@ static int imx_pwm_probe(struct platform_device *pdev)
|
|
if (IS_ERR(imx->mmio_base))
|
|
if (IS_ERR(imx->mmio_base))
|
|
return PTR_ERR(imx->mmio_base);
|
|
return PTR_ERR(imx->mmio_base);
|
|
|
|
|
|
- data = of_id->data;
|
|
|
|
imx->config = data->config;
|
|
imx->config = data->config;
|
|
imx->set_enable = data->set_enable;
|
|
imx->set_enable = data->set_enable;
|
|
|
|
|