linux-kernel - [PATCH] mmc: dw_mmc-rockchip: add pinctrl support

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1453197165-20194-1-git-send-email-shawn.lin@rock-chips.com>
Date:	Tue, 19 Jan 2016 17:52:45 +0800
From:	Shawn Lin <shawn.lin@...k-chips.com>
To:	Jaehoon Chung <jh80.chung@...sung.com>,
	Ulf Hansson <ulf.hansson@...aro.org>
Cc:	linux-mmc@...r.kernel.org, linux-kernel@...r.kernel.org,
	Shawn Lin <shawn.lin@...k-chips.com>,
	Heiko Stuebner <heiko@...ech.de>
Subject: [PATCH] mmc: dw_mmc-rockchip: add pinctrl support

We find rk3368 fail to enumerate sd card since
the default state is gpio function. Meahwhile, lots of
rockchip platform dts file assign pinctrl to dw_mmc but actually
dw_mmc never use it. Fortunately, those platforms' default io
state is sdmmc function, but no always right for all.

Cc: Heiko Stuebner <heiko@...ech.de>
Signed-off-by: Shawn Lin <shawn.lin@...k-chips.com>
---

 drivers/mmc/host/dw_mmc-rockchip.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index d9c92f3..308b424 100644
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -9,6 +9,7 @@
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/clk.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/dw_mmc.h>
@@ -21,6 +22,8 @@
 #define RK3288_CLKGEN_DIV       2
 
 struct dw_mci_rockchip_priv_data {
+	struct pinctrl		*pinctrl;
+	struct pinctrl_state	*pins_default;
 	struct clk		*drv_clk;
 	struct clk		*sample_clk;
 	int			default_sample_phase;
@@ -78,6 +81,10 @@ static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios)
 	/* Make sure we use phases which we can enumerate with */
 	if (!IS_ERR(priv->sample_clk))
 		clk_set_phase(priv->sample_clk, priv->default_sample_phase);
+
+	/* Make sure we use correct pinctrl which we can enumerate with */
+	if (!IS_ERR(priv->pinctrl) && !IS_ERR(priv->pins_default))
+		pinctrl_select_state(priv->pinctrl, priv->pins_default);
 }
 
 #define NUM_PHASES			360
@@ -223,6 +230,14 @@ static int dw_mci_rk3288_parse_dt(struct dw_mci *host)
 	if (IS_ERR(priv->sample_clk))
 		dev_dbg(host->dev, "ciu_sample not available\n");
 
+	priv->pinctrl = devm_pinctrl_get(host->dev);
+	if (!IS_ERR(priv->pinctrl)) {
+		priv->pins_default = pinctrl_lookup_state(priv->pinctrl,
+							  "default");
+		if (IS_ERR(priv->pins_default))
+			dev_dbg(host->dev, "pinctrl not available\n");
+	}
+
 	host->priv = priv;
 
 	return 0;
-- 
2.3.7