From: Haibo Chen <haibo.chen@freescale.com>
To: <robh+dt@kernel.org>, <pawel.moll@arm.com>, <mark.rutland@arm.com>,
        <ijc+devicetree@hellion.org.uk>, <galak@codeaurora.org>,
        <shawnguo@kernel.org>, <kernel@pengutronix.de>,
        <linux@arm.linux.org.uk>, <ulf.hansson@linaro.org>,
        <aisheng.dong@freescale.com>
CC: <johan.derycke@barco.com>, <haibo.chen@freescale.com>,
        <fabio.estevam@freescale.com>, <b29396@freescale.com>,
        <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <linux-arm-kernel@lists.infradead.org>, <linux-mmc@vger.kernel.org>
Subject: [PATCH v3 2/6] mmc: sdhci-esdhc-imx: add tuning-step seting support
Date: Wed, 29 Jul 2015 17:03:53 +0800
Message-ID: <1438160637-28061-3-git-send-email-haibo.chen@freescale.com>
In-Reply-To: <1438160637-28061-1-git-send-email-haibo.chen@freescale.com>
References: <1438160637-28061-1-git-send-email-haibo.chen@freescale.com>
MIME-Version: 1.0
Content-Type: text/plain
BY1PR03MB1385: X-MS-Exchange-Organization-RulesExecuted
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2015 09:01:16.9766
 (UTC)
X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1385
X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1403;2:a5EaFFomZjDLnqN2C8gIuA0L+noQvRGReNTUki3W4Vu8FQruW8XFTps4h8e8D07M;3:fPLfX7HAF6ZjWkPAFP++yg/QGO1GUzW/NyKrf9OYGfC2uLUY7AGtayrftq7iK8ZSD2nKtKzQO9zm5yQO+HlRkY+/37ifabKNSvVQWAEdowd8aUhUrnF3BtEZ3iKwkTVQVSQbgHt5nH8LDa5lJGVrZ2uMi+zMglhDSo53e/33f5j4Od9dH2Ru62CjtBsS+04yUKw7vMsG+0S283Z0tPrrBaLI4UkYEF0CENMs9Fov924=;25:C0pYqlOyJOcGNQbVGx8mqAsUFkDyGBcSqr8s7te44/WeMqw3aUddwIWDbkvrYksCjrccvbo5oo3eUuwInZT258hBX7wasQl5zXi1wgEyvV/PC1BF9+h0LUQjOIx/ykjs6s89xHiP9kRC904vr3Gdj1gNOZ9xzmUnBSZCFiRn4bqaL6WPfizJdHrQ0eVgCOd9dxehruFZGyRP3pWNLFxT4nLXUyMU2kpqa/awhAbfUkeHJVa2xNwien24pT15GA77;23:i4J9tevtXqGSlfSsHo+KF1671jkHbnD0zw+esEvK2sw1cYtQvFS5YiU1Dvt4PJID3hXeqNTPA8ogoEhmMM3jacmpvruk1/IyHcTKvEf280skBoQ/7jNLjs22opLjsXOP9wfVZZ0zFZ2RjN7MlucOGrxieYSOEEI7G63h3/VDz5/uXVqci6TdKHfELmW78SOYBWIbvLxk33xm5nCe3tZUIfrCN909oAH+lpsBcjKlWLP+FHDORPbnQ1vC2iUeRI3t
X-OriginatorOrg: freescale.com
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 3036
Lines: 74

tuning-step is the delay cell steps in tuning procedure. The default value
of tuning-step is 1. For imx6 series usdhc, tuning procedure can be passed
when the tuning-step value is 1. But imx7d usdhc need the tuning-step value
as 2, otherwise it can't pass the tuning procedure.

So this patch add the tuning-step setting in driver, so that user can set
the tuning-step value in dts.

Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
---
 drivers/mmc/host/sdhci-esdhc-imx.c          | 9 +++++++++
 include/linux/platform_data/mmc-esdhc-imx.h | 1 +
 2 files changed, 10 insertions(+)

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index b441eed..158f93b 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -75,6 +75,7 @@
 #define ESDHC_STD_TUNING_EN		(1 << 24)
 /* NOTE: the minimum valid tuning start tap for mx6sl is 1 */
 #define ESDHC_TUNING_START_TAP		0x1
+#define ESDHC_TUNING_STEP_SHIFT		16
 
 /* pinctrl state */
 #define ESDHC_PINCTRL_STATE_100MHZ	"state_100mhz"
@@ -472,6 +473,7 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
 		} else if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) {
 			u32 v = readl(host->ioaddr + SDHCI_ACMD12_ERR);
 			u32 m = readl(host->ioaddr + ESDHC_MIX_CTRL);
+			u32 tuning_ctrl;
 			if (val & SDHCI_CTRL_TUNED_CLK) {
 				v |= ESDHC_MIX_CTRL_SMPCLK_SEL;
 			} else {
@@ -482,6 +484,11 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
 			if (val & SDHCI_CTRL_EXEC_TUNING) {
 				v |= ESDHC_MIX_CTRL_EXE_TUNE;
 				m |= ESDHC_MIX_CTRL_FBCLK_SEL;
+				tuning_ctrl = readl(host->ioaddr + ESDHC_TUNING_CTRL);
+				tuning_ctrl |= ESDHC_STD_TUNING_EN | ESDHC_TUNING_START_TAP;
+				if (imx_data->boarddata.tuning_step)
+					tuning_ctrl |= imx_data->boarddata.tuning_step << ESDHC_TUNING_STEP_SHIFT;
+					writel(tuning_ctrl, host->ioaddr + ESDHC_TUNING_CTRL);
 			} else {
 				v &= ~ESDHC_MIX_CTRL_EXE_TUNE;
 			}
@@ -949,6 +956,8 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
 	if (gpio_is_valid(boarddata->wp_gpio))
 		boarddata->wp_type = ESDHC_WP_GPIO;
 
+	of_property_read_u32(np, "fsl,tuning-step", &boarddata->tuning_step);
+
 	if (of_find_property(np, "no-1-8-v", NULL))
 		boarddata->support_vsel = false;
 	else
diff --git a/include/linux/platform_data/mmc-esdhc-imx.h b/include/linux/platform_data/mmc-esdhc-imx.h
index e1571ef..95ccab3 100644
--- a/include/linux/platform_data/mmc-esdhc-imx.h
+++ b/include/linux/platform_data/mmc-esdhc-imx.h
@@ -45,5 +45,6 @@ struct esdhc_platform_data {
 	int max_bus_width;
 	bool support_vsel;
 	unsigned int delay_line;
+	unsigned int tuning_step;       /* The delay cell steps in tuning procedure */
 };
 #endif /* __ASM_ARCH_IMX_ESDHC_H */
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/