From patchwork Mon Feb 14 07:13:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Rakity X-Patchwork-Id: 554221 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1E7HWFV018191 for ; Mon, 14 Feb 2011 07:18:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751861Ab1BNHSH (ORCPT ); Mon, 14 Feb 2011 02:18:07 -0500 Received: from na3sys009aog109.obsmtp.com ([74.125.149.201]:60017 "EHLO na3sys009aog109.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751721Ab1BNHSH convert rfc822-to-8bit (ORCPT ); Mon, 14 Feb 2011 02:18:07 -0500 Received: from source ([65.219.4.130]) (using TLSv1) by na3sys009aob109.postini.com ([74.125.148.12]) with SMTP ID DSNKTVjXLj0PHPe5nylQPRP/npPnIwmrjWUO@postini.com; Sun, 13 Feb 2011 23:18:06 PST Received: from SC-vEXCH3.marvell.com ([10.93.76.133]) by sc-owa02.marvell.com ([10.93.76.22]) with mapi; Sun, 13 Feb 2011 23:13:40 -0800 From: Philip Rakity To: "linux-mmc@vger.kernel.org" CC: Mark Brown Date: Sun, 13 Feb 2011 23:13:37 -0800 Subject: [PATCH] mmc: rename ddr to uhs in ios structure to indicate usage Thread-Topic: [PATCH] mmc: rename ddr to uhs in ios structure to indicate usage Thread-Index: AcvMFrQOfLX6KtmPT6i8TU0zxvKDOg== Message-ID: <52D7AFC3-31CF-4938-90EC-3BB4B701CCD4@marvell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 14 Feb 2011 07:18:08 +0000 (UTC) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index d9fb0d3..cc67a37 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -712,13 +712,13 @@ void mmc_set_bus_mode(struct mmc_host *host, unsigned int mode) } /* - * Change data bus width and DDR mode of a host. + * Change data bus width and UHS mode of a host. */ -void mmc_set_bus_width_ddr(struct mmc_host *host, unsigned int width, - unsigned int ddr) +void mmc_set_bus_width_uhs(struct mmc_host *host, unsigned int width, + unsigned int uhs) { host->ios.bus_width = width; - host->ios.ddr = ddr; + host->ios.uhs = uhs; mmc_set_ios(host); } @@ -727,7 +727,7 @@ void mmc_set_bus_width_ddr(struct mmc_host *host, unsigned int width, */ void mmc_set_bus_width(struct mmc_host *host, unsigned int width) { - mmc_set_bus_width_ddr(host, width, MMC_SDR_MODE); + mmc_set_bus_width_uhs(host, width, MMC_SDR_MODE); } /** diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h index 20b1c08..2c9f456 100644 --- a/drivers/mmc/core/core.h +++ b/drivers/mmc/core/core.h @@ -38,7 +38,7 @@ void mmc_ungate_clock(struct mmc_host *host); void mmc_set_ungated(struct mmc_host *host); void mmc_set_bus_mode(struct mmc_host *host, unsigned int mode); void mmc_set_bus_width(struct mmc_host *host, unsigned int width); -void mmc_set_bus_width_ddr(struct mmc_host *host, unsigned int width, +void mmc_set_bus_width_uhs(struct mmc_host *host, unsigned int width, unsigned int ddr); u32 mmc_select_voltage(struct mmc_host *host, u32 ocr); void mmc_set_timing(struct mmc_host *host, unsigned int timing); diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 6c5d3d4..00b9cb5 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -640,7 +640,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, EXT_CSD_BUS_WIDTH, ext_csd_bits[idx][0]); if (!err) { - mmc_set_bus_width_ddr(card->host, + mmc_set_bus_width_uhs(card->host, bus_width, MMC_SDR_MODE); /* * If controller can't handle bus width test, @@ -667,7 +667,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, goto free_card; } else if (ddr) { mmc_card_set_ddr_mode(card); - mmc_set_bus_width_ddr(card->host, bus_width, ddr); + mmc_set_bus_width_uhs(card->host, bus_width, ddr); } } diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index bcb793e..f11307e 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -51,7 +51,7 @@ struct mmc_ios { #define MMC_TIMING_MMC_HS 1 #define MMC_TIMING_SD_HS 2 - unsigned char ddr; /* dual data rate used */ + unsigned char uhs; /* uhs mode used (ddr - sdr) */ #define MMC_SDR_MODE 0 #define MMC_1_2V_DDR_MODE 1