From: "Clément Péron" <peron.clem@gmail.com> To: "Thierry Reding" <thierry.reding@gmail.com>, "'Uwe Kleine-König'" <u.kleine-koenig@pengutronix.de>, "Rob Herring" <robh+dt@kernel.org>, "Mark Rutland" <mark.rutland@arm.com>, "Maxime Ripard" <mripard@kernel.org>, "Chen-Yu Tsai" <wens@csie.org> Cc: linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Jernej Skrabec" <jernej.skrabec@siol.net>, "Clément Péron" <peron.clem@gmail.com> Subject: [PATCH v2 3/7] pwm: sun4i: Add an optional probe for bus clock Date: Sun, 3 Nov 2019 21:33:30 +0100 [thread overview] Message-ID: <20191103203334.10539-4-peron.clem@gmail.com> (raw) In-Reply-To: <20191103203334.10539-1-peron.clem@gmail.com> From: Jernej Skrabec <jernej.skrabec@siol.net> H6 PWM core needs bus clock to be enabled in order to work. Add an optional probe for it and a fallback for previous bindings without name on module clock. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Clément Péron <peron.clem@gmail.com> --- drivers/pwm/pwm-sun4i.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c index d194b8ebdb00..b5e7ac364f59 100644 --- a/drivers/pwm/pwm-sun4i.c +++ b/drivers/pwm/pwm-sun4i.c @@ -78,6 +78,7 @@ struct sun4i_pwm_data { struct sun4i_pwm_chip { struct pwm_chip chip; + struct clk *bus_clk; struct clk *clk; struct reset_control *rst; void __iomem *base; @@ -367,6 +368,31 @@ static int sun4i_pwm_probe(struct platform_device *pdev) if (IS_ERR(pwm->clk)) return PTR_ERR(pwm->clk); + /* Get all clocks and reset line */ + pwm->clk = devm_clk_get_optional(&pdev->dev, "mod"); + if (IS_ERR(pwm->clk)) { + dev_err(&pdev->dev, "get clock failed %ld\n", + PTR_ERR(pwm->clk)); + return PTR_ERR(pwm->clk); + } + + /* Fallback for old dtbs with a single clock and no name */ + if (!pwm->clk) { + pwm->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(pwm->clk)) { + dev_err(&pdev->dev, "get clock failed %ld\n", + PTR_ERR(pwm->clk)); + return PTR_ERR(pwm->clk); + } + } + + pwm->bus_clk = devm_clk_get_optional(&pdev->dev, "bus"); + if (IS_ERR(pwm->bus_clk)) { + dev_err(&pdev->dev, "get bus_clock failed %ld\n", + PTR_ERR(pwm->bus_clk)); + return PTR_ERR(pwm->bus_clk); + } + pwm->rst = devm_reset_control_get_optional(&pdev->dev, NULL); if (IS_ERR(pwm->rst)) { if (PTR_ERR(pwm->rst) == -EPROBE_DEFER) @@ -381,6 +407,13 @@ static int sun4i_pwm_probe(struct platform_device *pdev) return ret; } + /* Enable bus clock */ + ret = clk_prepare_enable(pwm->bus_clk); + if (ret) { + dev_err(&pdev->dev, "Cannot prepare_enable bus_clk\n"); + goto err_bus; + } + pwm->chip.dev = &pdev->dev; pwm->chip.ops = &sun4i_pwm_ops; pwm->chip.base = -1; @@ -401,6 +434,8 @@ static int sun4i_pwm_probe(struct platform_device *pdev) return 0; err_pwm_add: + clk_disable_unprepare(pwm->bus_clk); +err_bus: reset_control_assert(pwm->rst); return ret; @@ -415,6 +450,7 @@ static int sun4i_pwm_remove(struct platform_device *pdev) if (ret) return ret; + clk_disable_unprepare(pwm->bus_clk); reset_control_assert(pwm->rst); return 0; -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: "Clément Péron" <peron.clem@gmail.com> To: "Thierry Reding" <thierry.reding@gmail.com>, "'Uwe Kleine-König'" <u.kleine-koenig@pengutronix.de>, "Rob Herring" <robh+dt@kernel.org>, "Mark Rutland" <mark.rutland@arm.com>, "Maxime Ripard" <mripard@kernel.org>, "Chen-Yu Tsai" <wens@csie.org> Cc: linux-pwm@vger.kernel.org, "Jernej Skrabec" <jernej.skrabec@siol.net>, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, "Clément Péron" <peron.clem@gmail.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 3/7] pwm: sun4i: Add an optional probe for bus clock Date: Sun, 3 Nov 2019 21:33:30 +0100 [thread overview] Message-ID: <20191103203334.10539-4-peron.clem@gmail.com> (raw) In-Reply-To: <20191103203334.10539-1-peron.clem@gmail.com> From: Jernej Skrabec <jernej.skrabec@siol.net> H6 PWM core needs bus clock to be enabled in order to work. Add an optional probe for it and a fallback for previous bindings without name on module clock. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Clément Péron <peron.clem@gmail.com> --- drivers/pwm/pwm-sun4i.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c index d194b8ebdb00..b5e7ac364f59 100644 --- a/drivers/pwm/pwm-sun4i.c +++ b/drivers/pwm/pwm-sun4i.c @@ -78,6 +78,7 @@ struct sun4i_pwm_data { struct sun4i_pwm_chip { struct pwm_chip chip; + struct clk *bus_clk; struct clk *clk; struct reset_control *rst; void __iomem *base; @@ -367,6 +368,31 @@ static int sun4i_pwm_probe(struct platform_device *pdev) if (IS_ERR(pwm->clk)) return PTR_ERR(pwm->clk); + /* Get all clocks and reset line */ + pwm->clk = devm_clk_get_optional(&pdev->dev, "mod"); + if (IS_ERR(pwm->clk)) { + dev_err(&pdev->dev, "get clock failed %ld\n", + PTR_ERR(pwm->clk)); + return PTR_ERR(pwm->clk); + } + + /* Fallback for old dtbs with a single clock and no name */ + if (!pwm->clk) { + pwm->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(pwm->clk)) { + dev_err(&pdev->dev, "get clock failed %ld\n", + PTR_ERR(pwm->clk)); + return PTR_ERR(pwm->clk); + } + } + + pwm->bus_clk = devm_clk_get_optional(&pdev->dev, "bus"); + if (IS_ERR(pwm->bus_clk)) { + dev_err(&pdev->dev, "get bus_clock failed %ld\n", + PTR_ERR(pwm->bus_clk)); + return PTR_ERR(pwm->bus_clk); + } + pwm->rst = devm_reset_control_get_optional(&pdev->dev, NULL); if (IS_ERR(pwm->rst)) { if (PTR_ERR(pwm->rst) == -EPROBE_DEFER) @@ -381,6 +407,13 @@ static int sun4i_pwm_probe(struct platform_device *pdev) return ret; } + /* Enable bus clock */ + ret = clk_prepare_enable(pwm->bus_clk); + if (ret) { + dev_err(&pdev->dev, "Cannot prepare_enable bus_clk\n"); + goto err_bus; + } + pwm->chip.dev = &pdev->dev; pwm->chip.ops = &sun4i_pwm_ops; pwm->chip.base = -1; @@ -401,6 +434,8 @@ static int sun4i_pwm_probe(struct platform_device *pdev) return 0; err_pwm_add: + clk_disable_unprepare(pwm->bus_clk); +err_bus: reset_control_assert(pwm->rst); return ret; @@ -415,6 +450,7 @@ static int sun4i_pwm_remove(struct platform_device *pdev) if (ret) return ret; + clk_disable_unprepare(pwm->bus_clk); reset_control_assert(pwm->rst); return 0; -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-11-03 20:34 UTC|newest] Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-03 20:33 [PATCH v2 0/7] Add support for H6 PWM Clément Péron 2019-11-03 20:33 ` Clément Péron 2019-11-03 20:33 ` [PATCH v2 1/7] dt-bindings: pwm: allwinner: Add H6 PWM description Clément Péron 2019-11-03 20:33 ` Clément Péron 2019-11-04 8:03 ` Uwe Kleine-König 2019-11-04 8:03 ` Uwe Kleine-König 2019-11-04 17:49 ` Clément Péron 2019-11-04 17:49 ` Clément Péron 2019-11-05 11:11 ` Maxime Ripard 2019-11-05 11:11 ` Maxime Ripard 2019-11-05 12:34 ` Clément Péron 2019-11-05 12:34 ` Clément Péron 2019-11-05 17:32 ` Maxime Ripard 2019-11-05 17:32 ` Maxime Ripard 2019-11-06 9:25 ` Clément Péron 2019-11-06 9:25 ` Clément Péron 2019-11-03 20:33 ` [PATCH v2 2/7] pwm: sun4i: Add an optional probe for reset line Clément Péron 2019-11-03 20:33 ` Clément Péron 2019-11-04 8:11 ` Uwe Kleine-König 2019-11-04 8:11 ` Uwe Kleine-König 2019-11-04 17:50 ` Clément Péron 2019-11-04 17:50 ` Clément Péron 2019-11-05 7:01 ` Philipp Zabel 2019-11-05 7:01 ` Philipp Zabel 2019-11-05 13:03 ` Clément Péron 2019-11-05 13:03 ` Clément Péron 2019-11-03 20:33 ` Clément Péron [this message] 2019-11-03 20:33 ` [PATCH v2 3/7] pwm: sun4i: Add an optional probe for bus clock Clément Péron 2019-11-04 8:24 ` Uwe Kleine-König 2019-11-04 8:24 ` Uwe Kleine-König 2019-11-04 18:07 ` Clément Péron 2019-11-04 18:07 ` Clément Péron 2019-11-04 20:10 ` Uwe Kleine-König 2019-11-04 20:10 ` Uwe Kleine-König 2019-11-04 20:10 ` Uwe Kleine-König 2019-11-04 20:19 ` Jernej Škrabec 2019-11-04 20:19 ` Jernej Škrabec 2019-11-04 20:27 ` Clément Péron 2019-11-04 20:27 ` Clément Péron 2019-11-04 20:38 ` Jernej Škrabec 2019-11-04 20:38 ` Jernej Škrabec 2019-11-03 20:33 ` [PATCH v2 4/7] pwm: sun4i: Add support to output source clock directly Clément Péron 2019-11-03 20:33 ` Clément Péron 2019-11-03 22:30 ` kbuild test robot 2019-11-03 22:30 ` kbuild test robot 2019-11-03 22:30 ` kbuild test robot 2019-11-03 22:30 ` kbuild test robot 2019-11-03 22:41 ` Clément Péron 2019-11-03 22:41 ` Clément Péron 2019-11-03 22:58 ` kbuild test robot 2019-11-03 22:58 ` kbuild test robot 2019-11-03 22:58 ` kbuild test robot 2019-11-03 22:58 ` kbuild test robot 2019-11-04 8:38 ` Uwe Kleine-König 2019-11-04 8:38 ` Uwe Kleine-König 2019-11-04 21:28 ` Clément Péron 2019-11-04 21:28 ` Clément Péron 2019-11-05 7:29 ` Uwe Kleine-König 2019-11-05 7:29 ` Uwe Kleine-König 2019-11-05 12:58 ` Clément Péron 2019-11-05 12:58 ` Clément Péron 2019-11-05 13:12 ` Uwe Kleine-König 2019-11-05 13:12 ` Uwe Kleine-König 2019-11-05 13:12 ` Clément Péron 2019-11-05 13:12 ` Clément Péron 2019-11-03 20:33 ` [PATCH v2 5/7] pwm: sun4i: Add support for H6 PWM Clément Péron 2019-11-03 20:33 ` Clément Péron 2019-11-03 20:33 ` [PATCH v2 6/7] arm64: dts: allwinner: h6: Add PWM node Clément Péron 2019-11-03 20:33 ` Clément Péron 2019-11-03 20:33 ` [PATCH v2 7/7] [DO NOT MERGE] arm64: allwinner: h6: enable Beelink GS1 PWM Clément Péron 2019-11-03 20:33 ` Clément Péron
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191103203334.10539-4-peron.clem@gmail.com \ --to=peron.clem@gmail.com \ --cc=devicetree@vger.kernel.org \ --cc=jernej.skrabec@siol.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pwm@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mripard@kernel.org \ --cc=robh+dt@kernel.org \ --cc=thierry.reding@gmail.com \ --cc=u.kleine-koenig@pengutronix.de \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.