Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Side by Side Diff: drivers/mmc/host/sdhci-tegra.c

Issue 6474032: mach-tegra: Adding MMC_KEEP_POWER to support suspend/resume for wifi SDIO slot (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/kernel-next.git@chromeos-2.6.37
Patch Set: always assign pm_cap Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « arch/arm/mach-tegra/include/mach/sdhci.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 The Chromium OS Authors <chromium-os-dev@chromium.org> 2 * Copyright (C) 2010 The Chromium OS Authors <chromium-os-dev@chromium.org>
3 * 3 *
4 * This software is licensed under the terms of the GNU General Public 4 * This software is licensed under the terms of the GNU General Public
5 * License version 2, as published by the Free Software Foundation, and 5 * License version 2, as published by the Free Software Foundation, and
6 * may be copied, distributed, and modified under those terms. 6 * may be copied, distributed, and modified under those terms.
7 * 7 *
8 * This program is distributed in the hope that it will be useful, 8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 177
178 clk = clk_get(mmc_dev(host->mmc), NULL); 178 clk = clk_get(mmc_dev(host->mmc), NULL);
179 if (IS_ERR(clk)) { 179 if (IS_ERR(clk)) {
180 dev_err(mmc_dev(host->mmc), "clk err\n"); 180 dev_err(mmc_dev(host->mmc), "clk err\n");
181 rc = PTR_ERR(clk); 181 rc = PTR_ERR(clk);
182 goto out_wp; 182 goto out_wp;
183 } 183 }
184 clk_enable(clk); 184 clk_enable(clk);
185 pltfm_host->clk = clk; 185 pltfm_host->clk = clk;
186 186
187 host->mmc->pm_caps = plat->pm_flags;
188
187 if (plat->is_8bit) 189 if (plat->is_8bit)
188 host->mmc->caps |= MMC_CAP_8_BIT_DATA; 190 host->mmc->caps |= MMC_CAP_8_BIT_DATA;
189 191
190 return 0; 192 return 0;
191 193
192 out_wp: 194 out_wp:
193 if (gpio_is_valid(plat->wp_gpio)) { 195 if (gpio_is_valid(plat->wp_gpio)) {
194 tegra_gpio_disable(plat->wp_gpio); 196 tegra_gpio_disable(plat->wp_gpio);
195 gpio_free(plat->wp_gpio); 197 gpio_free(plat->wp_gpio);
196 } 198 }
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 250
249 struct sdhci_pltfm_data sdhci_tegra_pdata = { 251 struct sdhci_pltfm_data sdhci_tegra_pdata = {
250 .quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL | 252 .quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
251 SDHCI_QUIRK_SINGLE_POWER_WRITE | 253 SDHCI_QUIRK_SINGLE_POWER_WRITE |
252 SDHCI_QUIRK_NO_HISPD_BIT | 254 SDHCI_QUIRK_NO_HISPD_BIT |
253 SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC, 255 SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC,
254 .ops = &tegra_sdhci_ops, 256 .ops = &tegra_sdhci_ops,
255 .init = tegra_sdhci_pltfm_init, 257 .init = tegra_sdhci_pltfm_init,
256 .exit = tegra_sdhci_pltfm_exit, 258 .exit = tegra_sdhci_pltfm_exit,
257 }; 259 };
OLDNEW
« no previous file with comments | « arch/arm/mach-tegra/include/mach/sdhci.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698