From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932796AbcASJ5l (ORCPT ); Tue, 19 Jan 2016 04:57:41 -0500 Received: from lucky1.263xmail.com ([211.157.147.132]:60843 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932734AbcASJ5j (ORCPT ); Tue, 19 Jan 2016 04:57:39 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-MAE-MAIL_UID: 00569e08880decda@maes@5527e1a587b5e569 X-MAE-ID: 139.129.105.77 X-RL-SENDER: shawn.lin@rock-chips.com X-LOGIN-NAME: shawn.lin@rock-chips.com X-SENDER-IP: 58.22.7.114 From: Shawn Lin To: Jaehoon Chung , Ulf Hansson Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Shawn Lin , Heiko Stuebner Subject: [PATCH] mmc: dw_mmc-rockchip: add pinctrl support Date: Tue, 19 Jan 2016 17:52:45 +0800 Message-Id: <1453197165-20194-1-git-send-email-shawn.lin@rock-chips.com> X-Mailer: git-send-email 1.8.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Shawn Lin --- 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 #include +#include #include #include #include @@ -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