Commit 61aa258a authored by Sam Shih's avatar Sam Shih Committed by Thierry Reding

pwm: mediatek: Remove the has_clks field

We can use fixed clocks to repair mt7628 PWM during configure from
userspace. The SoC is legacy MIPS and has no complex clock tree. Because
we can get the clock frequency for period calculation from fixed clocks
specified in DT, we can remove the has_clock field, and directly use
devm_clk_get() and clk_get_rate().
Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarSam Shih <sam.shih@mediatek.com>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent e6c7c258
...@@ -57,7 +57,6 @@ static const char * const mtk_pwm_clk_name[MTK_CLK_MAX] = { ...@@ -57,7 +57,6 @@ static const char * const mtk_pwm_clk_name[MTK_CLK_MAX] = {
struct mtk_pwm_platform_data { struct mtk_pwm_platform_data {
unsigned int num_pwms; unsigned int num_pwms;
bool pwm45_fixup; bool pwm45_fixup;
bool has_clks;
}; };
/** /**
...@@ -87,9 +86,6 @@ static int mtk_pwm_clk_enable(struct pwm_chip *chip, struct pwm_device *pwm) ...@@ -87,9 +86,6 @@ static int mtk_pwm_clk_enable(struct pwm_chip *chip, struct pwm_device *pwm)
struct mtk_pwm_chip *pc = to_mtk_pwm_chip(chip); struct mtk_pwm_chip *pc = to_mtk_pwm_chip(chip);
int ret; int ret;
if (!pc->soc->has_clks)
return 0;
ret = clk_prepare_enable(pc->clks[MTK_CLK_TOP]); ret = clk_prepare_enable(pc->clks[MTK_CLK_TOP]);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -116,9 +112,6 @@ static void mtk_pwm_clk_disable(struct pwm_chip *chip, struct pwm_device *pwm) ...@@ -116,9 +112,6 @@ static void mtk_pwm_clk_disable(struct pwm_chip *chip, struct pwm_device *pwm)
{ {
struct mtk_pwm_chip *pc = to_mtk_pwm_chip(chip); struct mtk_pwm_chip *pc = to_mtk_pwm_chip(chip);
if (!pc->soc->has_clks)
return;
clk_disable_unprepare(pc->clks[MTK_CLK_PWM1 + pwm->hwpwm]); clk_disable_unprepare(pc->clks[MTK_CLK_PWM1 + pwm->hwpwm]);
clk_disable_unprepare(pc->clks[MTK_CLK_MAIN]); clk_disable_unprepare(pc->clks[MTK_CLK_MAIN]);
clk_disable_unprepare(pc->clks[MTK_CLK_TOP]); clk_disable_unprepare(pc->clks[MTK_CLK_TOP]);
...@@ -242,7 +235,7 @@ static int mtk_pwm_probe(struct platform_device *pdev) ...@@ -242,7 +235,7 @@ static int mtk_pwm_probe(struct platform_device *pdev)
if (IS_ERR(pc->regs)) if (IS_ERR(pc->regs))
return PTR_ERR(pc->regs); return PTR_ERR(pc->regs);
for (i = 0; i < pc->soc->num_pwms + 2 && pc->soc->has_clks; i++) { for (i = 0; i < pc->soc->num_pwms + 2; i++) {
pc->clks[i] = devm_clk_get(&pdev->dev, mtk_pwm_clk_name[i]); pc->clks[i] = devm_clk_get(&pdev->dev, mtk_pwm_clk_name[i]);
if (IS_ERR(pc->clks[i])) { if (IS_ERR(pc->clks[i])) {
dev_err(&pdev->dev, "clock: %s fail: %ld\n", dev_err(&pdev->dev, "clock: %s fail: %ld\n",
...@@ -277,31 +270,26 @@ static int mtk_pwm_remove(struct platform_device *pdev) ...@@ -277,31 +270,26 @@ static int mtk_pwm_remove(struct platform_device *pdev)
static const struct mtk_pwm_platform_data mt2712_pwm_data = { static const struct mtk_pwm_platform_data mt2712_pwm_data = {
.num_pwms = 8, .num_pwms = 8,
.pwm45_fixup = false, .pwm45_fixup = false,
.has_clks = true,
}; };
static const struct mtk_pwm_platform_data mt7622_pwm_data = { static const struct mtk_pwm_platform_data mt7622_pwm_data = {
.num_pwms = 6, .num_pwms = 6,
.pwm45_fixup = false, .pwm45_fixup = false,
.has_clks = true,
}; };
static const struct mtk_pwm_platform_data mt7623_pwm_data = { static const struct mtk_pwm_platform_data mt7623_pwm_data = {
.num_pwms = 5, .num_pwms = 5,
.pwm45_fixup = true, .pwm45_fixup = true,
.has_clks = true,
}; };
static const struct mtk_pwm_platform_data mt7628_pwm_data = { static const struct mtk_pwm_platform_data mt7628_pwm_data = {
.num_pwms = 4, .num_pwms = 4,
.pwm45_fixup = true, .pwm45_fixup = true,
.has_clks = false,
}; };
static const struct mtk_pwm_platform_data mt8516_pwm_data = { static const struct mtk_pwm_platform_data mt8516_pwm_data = {
.num_pwms = 5, .num_pwms = 5,
.pwm45_fixup = false, .pwm45_fixup = false,
.has_clks = true,
}; };
static const struct of_device_id mtk_pwm_of_match[] = { static const struct of_device_id mtk_pwm_of_match[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment