From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934283AbbHKLi2 (ORCPT ); Tue, 11 Aug 2015 07:38:28 -0400 Received: from mail-bn1bn0108.outbound.protection.outlook.com ([157.56.110.108]:60282 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S964831AbbHKLgZ (ORCPT ); Tue, 11 Aug 2015 07:36:25 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; vger.kernel.org; dkim=none (message not signed) header.d=none; From: Haibo Chen To: , , , , , , , , , CC: , , , , , , , Subject: [PATCH v6 2/6] mmc: sdhci-esdhc-imx: add tuning-step setting support Date: Tue, 11 Aug 2015 19:38:27 +0800 Message-ID: <1439293111-21077-3-git-send-email-haibo.chen@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439293111-21077-1-git-send-email-haibo.chen@freescale.com> References: <1439293111-21077-1-git-send-email-haibo.chen@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD044;1:FlM5UYxIf48w6GvTAg8HEWPNj6XaLrl91m0PKBYSschven4v7b5oTOdjUHRnRbJ6PrZat8y7kPLVkn+r/hx93S/h4gxg/HMM2zeSAvpa8z5f3N65LBZpzLwN03xN5ke2iMzVnBIFB7ZoKg8ntFEwpx0EGoZiWCIWRIr0Nzvkh73cWmsyrHKS+f/fzJIVSVJEsHeHL2lOE4rrbNgtLHQcYlu414LDlxGhldYlSXubFw8b9v2dWmv0HawWA/RakcWp9jLjDtYyCwA9mVLDk82B7G3d1d6P1UJrfnN3K8CsWDdvKB+C1sjM4fVfXr0Tcp4ZHffUsIeHZ4j7EB0822Pb3pVa3lndJz1YDQ7hbvqLYZmoc8UjXOLMJS/EixZUSZBZ X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(339900001)(3050300001)(199003)(189002)(19580395003)(189998001)(105606002)(62966003)(33646002)(50226001)(97736004)(77156002)(2201001)(230783001)(229853001)(48376002)(104016003)(5001960100002)(77096005)(5003940100001)(46102003)(76176999)(68736005)(50466002)(50986999)(86362001)(64706001)(85426001)(19580405001)(92566002)(5001920100001)(5001860100001)(47776003)(6806004)(4001450100002)(2950100001)(87936001)(81156007)(5001770100001)(4001540100001)(106466001)(36756003)(5001830100001)(921003)(1121003);DIR:OUT;SFP:1102;SCL:1;SRVR:BY1PR0301MB1303;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB1303;2:ly+/YnkqyAgh4iEU3fxKP7bw8GtORwTzmlF6Mty7jr7F3hswpawfyYjgKyrOhRRHaQF93M9MRr70ZTRBLo/NH8tmFGL0k89653F3kA2yKvjXVaIo11Vo8jl3w43GWF4TRoEG5wo8YCZbPZIyWd/KN5zPTloA8rATTypcoOHHL60=;3:d6VVXz9FEg47g4QpHDBv+MgXMxIbwReD/xC4MCHcyGvKlq0HPy+dJYXZg2Ab6BEXiIMDXhwYkWHZz+DsaZBf7c5FRiyEblflWdzDWD9NmG77nnpAZB5icOBO5dvyH1QcMA9ucJkaD3DcRbY6QhV68IChWcNPwKTy+qELGxbbEJzxLVxEl+3Fx5TsPoGj4XBUZu6HvY/jFnlPjnI09F5CcceYZEN3f4AGK9VnTEiQ+Ws=;25:GiDfgHrLp3qN5S5BdGIMVWe0X01WTD933Vf/xAfYG95OP2a7gzNRo6NEY73l9V6Ea0H16+n88vaFfENPWtGXnJKRBNntOeE49reBLakRiECJnv2ly3nLOJ4m1ocsMkdIjDTBOsL+fbTEHfjDlU3D9Ll0QlpsFyUW3QJb0mAwQflEEm3E6UkPJOU+tlViXYzgai6PuaXKlDQ0Ui2clyWB0dC6MY1zalNg2fWPAC3BJUvOPOj3XmG2f8fz6MzbYiNN X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1303; X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB1303;20:9Dy+rpfJvM0AQeRwtZ9ThFHWKSBxP5LJwMYMDvIDaJHxNJExdPwYz4Gok/b9ljGI/UvaMDNwS40kpC6MF2QIQbhVPr0jstSULvzEUrVvyf8Job2BegowM2+3x1F5B8+ZD+bqbSz4FbCaEWeLm5XZKdEvvoTSPiumavuB8xOS32wxPm7NwzakDYv6Y6KB8JNcBQnol9y8kDotd+SqNOLMV2VvZN6n5tkCQyhJHzwiUKQzi/AzkDFWmXHYlXBCTjr/6abXcrgLeOfYk8nRfuWJiwFLk4lfDeRfxORDy14xrMWnheK5ZlGw5c+cJbIyjzwGMd6eSYwok+XhmWfB1le7rLYjLaoEAv6qcyPlvGtFAL0=;4:7wWe+OmU3DF/zQkQ2QLW9nHaok3RaiPCN/mscQcK99bswVhpLJfIKDMnNQJNDtbqF8bGooIKWGtWK8NShB1qEjd1mhyp8Rl4FAFv00UC72aYiE8QfmUd36LcxnJBj3P3jhorOYbrhfXZlLEMzPaOh/ujQ3hj3HvOSKm2JJx7bOVZRjGhcB7K4jSu7W7MKzAAI7BonOE2nKLOJZIQdV+gg1JNGMcLYJ2xosM6OTFqdT0d7Z3U6lqh1Qw5i6kTM0fqs6MC5GBn5bxsN/qIQrudOS9cGiWBZ47on3gMGQdk8gg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:BY1PR0301MB1303;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1303; X-Forefront-PRVS: 066517B35B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY1PR0301MB1303;23:JsCUiuqah6hFyJ+KVgR0t5XnxQ1y9iDZZv1Z/qe?= =?us-ascii?Q?DbZB4nk/3AzsrBoDOVnNBm6q9cUgMwaQ5k8sTKVUg4i9w07WzeG7H1eYdjMD?= =?us-ascii?Q?xp9CEL8TkAX9knjvb6SpSZwt3Bs7o7a56ntf/wrs6H+VgXvs2oz4PuSTzSiA?= =?us-ascii?Q?mnRY0mIZLGu/A/eFYXc8Z7jYgCulZMVtMDk43jFu6iWPRUFR4g0/TUYuLHlz?= =?us-ascii?Q?1pbkl49SYyge+52hFm//k8TqA2b2EGNnQu8zDm+tXXqvSpfuDZc3COWC9mVx?= =?us-ascii?Q?jCM0OoMFYwgpRH4tDmzilLR2tOvkbQd2VuOh4/NmEzWYqsX/BB0xWZu+8bt3?= =?us-ascii?Q?NBXWEnncteux9o57apvEJjs9+IYMcM0bFhaqWrOaBSVWFCAseiZCAFUxgDdl?= =?us-ascii?Q?OuIsqI4MyMljWTHxTlfGzjTzrkZbtf/PEHpgWVlWm9eSvwMp4wjVWnkCopY5?= =?us-ascii?Q?LGpDzqEmQVPRUjJFfFOo0SmYhBkGHcevG6dyGvEfxMCXHEg1ndqL/5zD7+Vh?= =?us-ascii?Q?naKfTnyRJklBhYLu83wEGmrxqcSInzismLbipugqO9p4B9WWRgE+RPg9SQ0b?= =?us-ascii?Q?0B78Xo/QsFazKSr40/iCm193h9wNoMnnHKCJvLAyGSvALH7zBWrsgqQnSnRP?= =?us-ascii?Q?FRf9gxRDuUrqiziBPdZwb/BWBS9iorcDY7RvaJKS4qPcru816uoguorSQ0ce?= =?us-ascii?Q?P0nTIoOqhlW31uQkHQ6cj3UW/20t0lnpAQOsDhicPR5IqpDoPcIKiQNGG6tA?= =?us-ascii?Q?CPpu/ccP8PCy5JXr6L+59HikIcY1ykI3wZje2tlS38m18KzL2Iscs2oS/snG?= =?us-ascii?Q?QK3FQZgtqtI44kTR7fexao0O35/tAzanmNpzM+wGnsYIKgb+RnCarcGQTH22?= =?us-ascii?Q?nMbOtSa2jECQX/6VfdDzRMzq5s77bK1B2OgdFOvW3EZsF0yft2fDO39XIkYT?= =?us-ascii?Q?su1xhNR2k8GPk0CHFKyftONpHK8KKYfkV6t6LuCLUowfWNVy+V32wpDB5qES?= =?us-ascii?Q?Fya0ivTbKloiKu1XIEJQY74X0NX5ISlqxPfmQKQ3mXGMwurkybfFvjTvLIxL?= =?us-ascii?Q?VaZbkWXCwwLCoe7MEgLw8JTLusfH7QjKvwjZzun/r1kjmwXbZy9iylYs44Fe?= =?us-ascii?Q?LSiRF9lTnAV6IqsF3CtvH6BLzFBg+sIeZJgwh426xoF3xNZSEkoM5ZhjG2fZ?= =?us-ascii?Q?yt5UjSwzaZUn/Z08iHAP9A5e/vvcFp8rc3TnEbdREpVnbQzsExG9ii1BIobi?= =?us-ascii?Q?Q62kNwt0rlZKYKnve0T0=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB1303;5:1X0xlj9jGC65LTxdDednjOw7CS8yGzcGrqlMShug6aoUewKi/YUF2/DJz6HnDS65xIz6RA4sXAaXKoBTvq/oJdLAEH1HIYyOI1pj0b6b+p94awVEbUIrhc7AbeNqN8b/UKvG8bATkqA79iJOR+OXVg==;24:shcSaKgSvVvRJIgjjDwIks1BYxz7+5eX4PQevnd2WSRHJMjouwxQaTfMeWhxNyOLYbnHOyDl64jG12FZVS9FMxAm3Mzr6j3S7rHdNw6sSRI=;20:nSZMZtcBHWoIhrL9S7+z5AQasFK/goNc/BXOGqE4SkQSzvCed2/123kDmMFZVUWoiRS2ssNP2YA2fYQxwXzucQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2015 11:36:19.6116 (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: BY1PR0301MB1303 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org tuning-step is the delay cell steps in tuning procedure. The default value of tuning-step is 1. Some boards or cards need another value to pass the tuning procedure. For example, imx7d-sdb board 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 --- 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 b8b7e88..298551d 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" @@ -474,6 +475,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 { @@ -484,6 +486,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; } @@ -963,6 +970,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