| Message ID | 20171218035751.20661-1-wens@csie.org (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
On Mon, 2017-12-18 at 11:57 +0800, Chen-Yu Tsai wrote: > Our MMC host driver now issues a reset, instead of just deasserting > the reset control, since commit c34eda69ad4c ("mmc: sunxi: Reset the > device at probe time"). The sun9i-mmc clock driver does not support > this, and will fail, which results in MMC not probing. > > This patch implements the reset callback by asserting the reset control, > then deasserting it after a small delay. > > Fixes: 7a6fca879f59 ("clk: sunxi: Add driver for A80 MMC config clocks/resets") > Cc: <stable@vger.kernel.org> # 4.14.x > Signed-off-by: Chen-Yu Tsai <wens@csie.org> Acked-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp
On Mon, Dec 18, 2017 at 11:57:51AM +0800, Chen-Yu Tsai wrote: > Our MMC host driver now issues a reset, instead of just deasserting > the reset control, since commit c34eda69ad4c ("mmc: sunxi: Reset the > device at probe time"). The sun9i-mmc clock driver does not support > this, and will fail, which results in MMC not probing. > > This patch implements the reset callback by asserting the reset control, > then deasserting it after a small delay. > > Fixes: 7a6fca879f59 ("clk: sunxi: Add driver for A80 MMC config clocks/resets") > Cc: <stable@vger.kernel.org> # 4.14.x > Signed-off-by: Chen-Yu Tsai <wens@csie.org> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Thanks! Maxime
On 12/18, Chen-Yu Tsai wrote: > Our MMC host driver now issues a reset, instead of just deasserting > the reset control, since commit c34eda69ad4c ("mmc: sunxi: Reset the > device at probe time"). The sun9i-mmc clock driver does not support > this, and will fail, which results in MMC not probing. > > This patch implements the reset callback by asserting the reset control, > then deasserting it after a small delay. > > Fixes: 7a6fca879f59 ("clk: sunxi: Add driver for A80 MMC config clocks/resets") > Cc: <stable@vger.kernel.org> # 4.14.x > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > --- Did you want us to pick this up into clk-fixes? It seems to be causing MMC to not work for some time? That sounds annoying enough.
On Mon, Dec 18, 2017 at 01:07:09PM -0800, Stephen Boyd wrote: > On 12/18, Chen-Yu Tsai wrote: > > Our MMC host driver now issues a reset, instead of just deasserting > > the reset control, since commit c34eda69ad4c ("mmc: sunxi: Reset the > > device at probe time"). The sun9i-mmc clock driver does not support > > this, and will fail, which results in MMC not probing. > > > > This patch implements the reset callback by asserting the reset control, > > then deasserting it after a small delay. > > > > Fixes: 7a6fca879f59 ("clk: sunxi: Add driver for A80 MMC config clocks/resets") > > Cc: <stable@vger.kernel.org> # 4.14.x > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > > --- > > Did you want us to pick this up into clk-fixes? It seems to be > causing MMC to not work for some time? That sounds annoying > enough. That would be great, thanks! Maxime
Quoting Maxime Ripard (2017-12-19 00:32:28) > On Mon, Dec 18, 2017 at 01:07:09PM -0800, Stephen Boyd wrote: > > On 12/18, Chen-Yu Tsai wrote: > > > Our MMC host driver now issues a reset, instead of just deasserting > > > the reset control, since commit c34eda69ad4c ("mmc: sunxi: Reset the > > > device at probe time"). The sun9i-mmc clock driver does not support > > > this, and will fail, which results in MMC not probing. > > > > > > This patch implements the reset callback by asserting the reset control, > > > then deasserting it after a small delay. > > > > > > Fixes: 7a6fca879f59 ("clk: sunxi: Add driver for A80 MMC config clocks/resets") > > > Cc: <stable@vger.kernel.org> # 4.14.x > > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > > > --- > > > > Did you want us to pick this up into clk-fixes? It seems to be > > causing MMC to not work for some time? That sounds annoying > > enough. > > That would be great, thanks! Applied to clk-fixes. Regards, Mike > Maxime > > -- > Maxime Ripard, Free Electrons > Embedded Linux and Kernel engineering > http://free-electrons.com
diff --git a/drivers/clk/sunxi/clk-sun9i-mmc.c b/drivers/clk/sunxi/clk-sun9i-mmc.c index a1a634253d6f..f00d8758ba24 100644 --- a/drivers/clk/sunxi/clk-sun9i-mmc.c +++ b/drivers/clk/sunxi/clk-sun9i-mmc.c @@ -16,6 +16,7 @@ #include <linux/clk.h> #include <linux/clk-provider.h> +#include <linux/delay.h> #include <linux/init.h> #include <linux/of.h> #include <linux/of_device.h> @@ -83,9 +84,20 @@ static int sun9i_mmc_reset_deassert(struct reset_controller_dev *rcdev, return 0; } +static int sun9i_mmc_reset_reset(struct reset_controller_dev *rcdev, + unsigned long id) +{ + sun9i_mmc_reset_assert(rcdev, id); + udelay(10); + sun9i_mmc_reset_deassert(rcdev, id); + + return 0; +} + static const struct reset_control_ops sun9i_mmc_reset_ops = { .assert = sun9i_mmc_reset_assert, .deassert = sun9i_mmc_reset_deassert, + .reset = sun9i_mmc_reset_reset, }; static int sun9i_a80_mmc_config_clk_probe(struct platform_device *pdev)
Our MMC host driver now issues a reset, instead of just deasserting the reset control, since commit c34eda69ad4c ("mmc: sunxi: Reset the device at probe time"). The sun9i-mmc clock driver does not support this, and will fail, which results in MMC not probing. This patch implements the reset callback by asserting the reset control, then deasserting it after a small delay. Fixes: 7a6fca879f59 ("clk: sunxi: Add driver for A80 MMC config clocks/resets") Cc: <stable@vger.kernel.org> # 4.14.x Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- drivers/clk/sunxi/clk-sun9i-mmc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)