* [PATCH] mmc: meson-gx: add device reset
@ 2018-04-26 10:38 Jerome Brunet
2018-04-26 13:54 ` Ulf Hansson
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jerome Brunet @ 2018-04-26 10:38 UTC (permalink / raw)
To: Ulf Hansson, Carlo Caione, Kevin Hilman
Cc: Jerome Brunet, linux-mmc, devicetree, linux-amlogic, linux-kernel
Trigger the reset line of the mmc controller while probing, if available
The reset should be optional for now, at least until all related DT node
have the reset property
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt | 2 ++
drivers/mmc/host/meson-gx-mmc.c | 6 ++++++
2 files changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt
index 5add8d7d855f..ba434375e7f2 100644
--- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt
+++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt
@@ -20,6 +20,7 @@ Required properties:
"clkin1" - Other parent clock of internal mux
The driver has an internal mux clock which switches between clkin0 and clkin1 depending on the
clock rate requested by the MMC core.
+- reset : phandle of the internal reset line
Example:
@@ -30,4 +31,5 @@ Example:
clocks = <&clkc CLKID_SD_EMMC_A>, <&xtal>, <&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
pinctrl-0 = <&emmc_pins>;
+ resets = <&reset RESET_SD_EMMC_A>;
};
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index 55bbd67177df..9d214622c8cf 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -35,6 +35,7 @@
#include <linux/clk.h>
#include <linux/clk-provider.h>
#include <linux/regulator/consumer.h>
+#include <linux/reset.h>
#include <linux/interrupt.h>
#include <linux/bitfield.h>
#include <linux/pinctrl/consumer.h>
@@ -1212,6 +1213,11 @@ static int meson_mmc_probe(struct platform_device *pdev)
goto free_host;
}
+ ret = device_reset_optional(&pdev->dev);
+ if (ret)
+ if (ret != -EPROBE_DEFER)
+ dev_err(&pdev->dev, "device reset failed: %d\n", ret);
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
host->regs = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(host->regs)) {
--
2.14.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] mmc: meson-gx: add device reset
2018-04-26 10:38 [PATCH] mmc: meson-gx: add device reset Jerome Brunet
@ 2018-04-26 13:54 ` Ulf Hansson
2018-04-26 23:35 ` Kevin Hilman
2018-05-01 14:43 ` Rob Herring
2 siblings, 0 replies; 4+ messages in thread
From: Ulf Hansson @ 2018-04-26 13:54 UTC (permalink / raw)
To: Jerome Brunet
Cc: Carlo Caione, Kevin Hilman, linux-mmc@vger.kernel.org, devicetree,
open list:ARM/Amlogic Meson..., Linux Kernel Mailing List
On 26 April 2018 at 12:38, Jerome Brunet <jbrunet@baylibre.com> wrote:
> Trigger the reset line of the mmc controller while probing, if available
> The reset should be optional for now, at least until all related DT node
> have the reset property
>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
> Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt | 2 ++
Please move DT doc changes into separate patches. And make the DT
maintainers are in to field as well.
Otherwise, this looks good to me.
Kind regards
Uffe
> drivers/mmc/host/meson-gx-mmc.c | 6 ++++++
> 2 files changed, 8 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt
> index 5add8d7d855f..ba434375e7f2 100644
> --- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt
> +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt
> @@ -20,6 +20,7 @@ Required properties:
> "clkin1" - Other parent clock of internal mux
> The driver has an internal mux clock which switches between clkin0 and clkin1 depending on the
> clock rate requested by the MMC core.
> +- reset : phandle of the internal reset line
>
> Example:
>
> @@ -30,4 +31,5 @@ Example:
> clocks = <&clkc CLKID_SD_EMMC_A>, <&xtal>, <&clkc CLKID_FCLK_DIV2>;
> clock-names = "core", "clkin0", "clkin1";
> pinctrl-0 = <&emmc_pins>;
> + resets = <&reset RESET_SD_EMMC_A>;
> };
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index 55bbd67177df..9d214622c8cf 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -35,6 +35,7 @@
> #include <linux/clk.h>
> #include <linux/clk-provider.h>
> #include <linux/regulator/consumer.h>
> +#include <linux/reset.h>
> #include <linux/interrupt.h>
> #include <linux/bitfield.h>
> #include <linux/pinctrl/consumer.h>
> @@ -1212,6 +1213,11 @@ static int meson_mmc_probe(struct platform_device *pdev)
> goto free_host;
> }
>
> + ret = device_reset_optional(&pdev->dev);
> + if (ret)
> + if (ret != -EPROBE_DEFER)
> + dev_err(&pdev->dev, "device reset failed: %d\n", ret);
> +
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> host->regs = devm_ioremap_resource(&pdev->dev, res);
> if (IS_ERR(host->regs)) {
> --
> 2.14.3
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] mmc: meson-gx: add device reset
2018-04-26 10:38 [PATCH] mmc: meson-gx: add device reset Jerome Brunet
2018-04-26 13:54 ` Ulf Hansson
@ 2018-04-26 23:35 ` Kevin Hilman
2018-05-01 14:43 ` Rob Herring
2 siblings, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2018-04-26 23:35 UTC (permalink / raw)
To: Jerome Brunet
Cc: Ulf Hansson, Carlo Caione, linux-mmc, devicetree, linux-amlogic,
linux-kernel
Jerome Brunet <jbrunet@baylibre.com> writes:
> Trigger the reset line of the mmc controller while probing, if available
> The reset should be optional for now, at least until all related DT node
> have the reset property
>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mmc: meson-gx: add device reset
2018-04-26 10:38 [PATCH] mmc: meson-gx: add device reset Jerome Brunet
2018-04-26 13:54 ` Ulf Hansson
2018-04-26 23:35 ` Kevin Hilman
@ 2018-05-01 14:43 ` Rob Herring
2 siblings, 0 replies; 4+ messages in thread
From: Rob Herring @ 2018-05-01 14:43 UTC (permalink / raw)
To: Jerome Brunet
Cc: Ulf Hansson, Carlo Caione, Kevin Hilman, linux-mmc, devicetree,
linux-amlogic, linux-kernel
On Thu, Apr 26, 2018 at 12:38:17PM +0200, Jerome Brunet wrote:
> Trigger the reset line of the mmc controller while probing, if available
> The reset should be optional for now, at least until all related DT node
> have the reset property
>
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
> Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt | 2 ++
> drivers/mmc/host/meson-gx-mmc.c | 6 ++++++
> 2 files changed, 8 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt
> index 5add8d7d855f..ba434375e7f2 100644
> --- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt
> +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt
> @@ -20,6 +20,7 @@ Required properties:
> "clkin1" - Other parent clock of internal mux
> The driver has an internal mux clock which switches between clkin0 and clkin1 depending on the
> clock rate requested by the MMC core.
> +- reset : phandle of the internal reset line
resets
>
> Example:
>
> @@ -30,4 +31,5 @@ Example:
> clocks = <&clkc CLKID_SD_EMMC_A>, <&xtal>, <&clkc CLKID_FCLK_DIV2>;
> clock-names = "core", "clkin0", "clkin1";
> pinctrl-0 = <&emmc_pins>;
> + resets = <&reset RESET_SD_EMMC_A>;
> };
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-05-01 14:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-26 10:38 [PATCH] mmc: meson-gx: add device reset Jerome Brunet
2018-04-26 13:54 ` Ulf Hansson
2018-04-26 23:35 ` Kevin Hilman
2018-05-01 14:43 ` Rob Herring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).