mirror of
https://github.com/torvalds/linux.git
synced 2024-12-22 02:52:56 +00:00
da06a8d7be
A series of fixes (and in some cases, some cleanups): Via Tony Lindgren: - A collection of OMAP regression fixes, in particular because firmware no longer sets up all pin states before starting the kernel. - cpufreq fixes for OMAP (Rafael is on vacation and this was pre-agreed). - A longer series of misc regression fixes and cleanups, warning removals, etc for OMAP From Arnd Bergmann: - A series of warning fixes for various platforms (defconfig builds) Misc: - A couple of tegra fixes, one for i.MX, some vt8500 fixes, etc. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQdeoEAAoJEIwa5zzehBx3odkP/2Z7UwXYYja63dmUYErWSQJU CtPa5U7UlbM9hWVzuGplCBbNuDEmZ8PlUboiX0Q0ml0Jl4KtOYAbuq6st96Vmn9z z6VkApTzAmlo1p8C+Y/liEL3Kr9PKV4zWi4VMLDUgSiP65hVtbe/hEjRSty14iTC sF5Ao42YO0y8L1e7d2OSbK0DQyHCnk/cbOQJnzaX5fN31uE2GSM4nFY1ty5gb3aB +LyyGx6pd26LxsGYtLIzlpV+qkFeGcGAU16pJj10Xo4UNKUjwVfq2k1Nn0t4I06f 1gs+lGRqfj2ciVTIdJd+OUFb2gI0DfLhASzb6efQzggOTDHxNFyew8+Yve82muEA 0G2as/yW9GSGw1Zdkh4FCtr/1VgORTsXWEPCSx+oWn1hCOn5PtcGHYjYBpPh/drb EhYioL3s5ZzXT2+RhKf3JEfFNEupyPrTFsNpGtNSjB7b5XkSU39BcykXc/ghXmeB XOrcOO5cvsGVcEcKJjJaPtYznkULh/aU8mu+/D0AZFW24ke8ya1mR5t6W0+PBEnL sePinBHWKzLtswQrij0NKT781SqZAFwqvlAh+t5kwOo68m1E3Kt6afjZ0B4dsJlG XIcxUyHeE+LvJgy/IOIOJUflnmUgghvUtbsHL5SIjssmijHrzYpu/ikfYCt+Ti0f CAzGeHrS41sGAnN4vWit =vAh+ -----END PGP SIGNATURE----- Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC fixes from Olof Johansson: "A series of fixes (and in some cases, some cleanups): Via Tony Lindgren: - A collection of OMAP regression fixes, in particular because firmware no longer sets up all pin states before starting the kernel. - cpufreq fixes for OMAP (Rafael is on vacation and this was pre-agreed). - A longer series of misc regression fixes and cleanups, warning removals, etc for OMAP From Arnd Bergmann: - A series of warning fixes for various platforms (defconfig builds) Misc: - A couple of tegra fixes, one for i.MX, some vt8500 fixes, etc." * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits) ARM: pxa: armcore: fix PCI PIO warnings ARM: integrator: use __iomem pointers for MMIO, part 2 ARM: assabet: fix bogus warning in get_assabet_scr (again) ARM: shmobile: mark shmobile_init_late as __init ARM: integrator_cp: fix build failure ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling ARM: OMAP3: fix workaround for EMU clockdomain arm/omap: Replace board_ref_clock with enum values ARM: OMAP2+: remove duplicated include from board-omap3stalker.c arch/arm/plat-omap/omap-pm-noop.c: Remove unecessary semicolon arch/arm/mach-omap2: Remove unecessary semicolon arch/arm/mach-omap1/devices.c: Remove unecessary semicolon ARM/dts: omap5-evm: pinmux configuration for audio ARM/dts: Add pinctrl driver entries for omap5 ARM/dts: omap4-panda: pinmux configuration for audio ARM/dts: omap4-sdp: pinmux configuration for audio ARM/dts: omap5-evm: Disable unused McBSP3 ARM/dts: omap4-sdp: Disable unused McBSP3 ARM/dts: omap4-panda: Disable unused audio IPs ARM: OMAP: board-omap4panda: Pin mux configuration for audio needs ...
418 lines
11 KiB
C
418 lines
11 KiB
C
/*
|
|
* Copyright (C) 2010 Google, Inc.
|
|
*
|
|
* This software is licensed under the terms of the GNU General Public
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
* may be copied, distributed, and modified under those terms.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
#include <linux/err.h>
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/io.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/of_gpio.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/mmc/card.h>
|
|
#include <linux/mmc/host.h>
|
|
|
|
#include <asm/gpio.h>
|
|
|
|
#include <linux/platform_data/mmc-sdhci-tegra.h>
|
|
|
|
#include "sdhci-pltfm.h"
|
|
|
|
/* Tegra SDHOST controller vendor register definitions */
|
|
#define SDHCI_TEGRA_VENDOR_MISC_CTRL 0x120
|
|
#define SDHCI_MISC_CTRL_ENABLE_SDHCI_SPEC_300 0x20
|
|
|
|
#define NVQUIRK_FORCE_SDHCI_SPEC_200 BIT(0)
|
|
#define NVQUIRK_ENABLE_BLOCK_GAP_DET BIT(1)
|
|
#define NVQUIRK_ENABLE_SDHCI_SPEC_300 BIT(2)
|
|
|
|
struct sdhci_tegra_soc_data {
|
|
struct sdhci_pltfm_data *pdata;
|
|
u32 nvquirks;
|
|
};
|
|
|
|
struct sdhci_tegra {
|
|
const struct tegra_sdhci_platform_data *plat;
|
|
const struct sdhci_tegra_soc_data *soc_data;
|
|
};
|
|
|
|
static u32 tegra_sdhci_readl(struct sdhci_host *host, int reg)
|
|
{
|
|
u32 val;
|
|
|
|
if (unlikely(reg == SDHCI_PRESENT_STATE)) {
|
|
/* Use wp_gpio here instead? */
|
|
val = readl(host->ioaddr + reg);
|
|
return val | SDHCI_WRITE_PROTECT;
|
|
}
|
|
|
|
return readl(host->ioaddr + reg);
|
|
}
|
|
|
|
static u16 tegra_sdhci_readw(struct sdhci_host *host, int reg)
|
|
{
|
|
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
|
struct sdhci_tegra *tegra_host = pltfm_host->priv;
|
|
const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
|
|
|
|
if (unlikely((soc_data->nvquirks & NVQUIRK_FORCE_SDHCI_SPEC_200) &&
|
|
(reg == SDHCI_HOST_VERSION))) {
|
|
/* Erratum: Version register is invalid in HW. */
|
|
return SDHCI_SPEC_200;
|
|
}
|
|
|
|
return readw(host->ioaddr + reg);
|
|
}
|
|
|
|
static void tegra_sdhci_writel(struct sdhci_host *host, u32 val, int reg)
|
|
{
|
|
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
|
struct sdhci_tegra *tegra_host = pltfm_host->priv;
|
|
const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
|
|
|
|
/* Seems like we're getting spurious timeout and crc errors, so
|
|
* disable signalling of them. In case of real errors software
|
|
* timers should take care of eventually detecting them.
|
|
*/
|
|
if (unlikely(reg == SDHCI_SIGNAL_ENABLE))
|
|
val &= ~(SDHCI_INT_TIMEOUT|SDHCI_INT_CRC);
|
|
|
|
writel(val, host->ioaddr + reg);
|
|
|
|
if (unlikely((soc_data->nvquirks & NVQUIRK_ENABLE_BLOCK_GAP_DET) &&
|
|
(reg == SDHCI_INT_ENABLE))) {
|
|
/* Erratum: Must enable block gap interrupt detection */
|
|
u8 gap_ctrl = readb(host->ioaddr + SDHCI_BLOCK_GAP_CONTROL);
|
|
if (val & SDHCI_INT_CARD_INT)
|
|
gap_ctrl |= 0x8;
|
|
else
|
|
gap_ctrl &= ~0x8;
|
|
writeb(gap_ctrl, host->ioaddr + SDHCI_BLOCK_GAP_CONTROL);
|
|
}
|
|
}
|
|
|
|
static unsigned int tegra_sdhci_get_ro(struct sdhci_host *host)
|
|
{
|
|
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
|
struct sdhci_tegra *tegra_host = pltfm_host->priv;
|
|
const struct tegra_sdhci_platform_data *plat = tegra_host->plat;
|
|
|
|
if (!gpio_is_valid(plat->wp_gpio))
|
|
return -1;
|
|
|
|
return gpio_get_value(plat->wp_gpio);
|
|
}
|
|
|
|
static irqreturn_t carddetect_irq(int irq, void *data)
|
|
{
|
|
struct sdhci_host *sdhost = (struct sdhci_host *)data;
|
|
|
|
tasklet_schedule(&sdhost->card_tasklet);
|
|
return IRQ_HANDLED;
|
|
};
|
|
|
|
static void tegra_sdhci_reset_exit(struct sdhci_host *host, u8 mask)
|
|
{
|
|
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
|
struct sdhci_tegra *tegra_host = pltfm_host->priv;
|
|
const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
|
|
|
|
if (!(mask & SDHCI_RESET_ALL))
|
|
return;
|
|
|
|
/* Erratum: Enable SDHCI spec v3.00 support */
|
|
if (soc_data->nvquirks & NVQUIRK_ENABLE_SDHCI_SPEC_300) {
|
|
u32 misc_ctrl;
|
|
|
|
misc_ctrl = sdhci_readb(host, SDHCI_TEGRA_VENDOR_MISC_CTRL);
|
|
misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_SDHCI_SPEC_300;
|
|
sdhci_writeb(host, misc_ctrl, SDHCI_TEGRA_VENDOR_MISC_CTRL);
|
|
}
|
|
}
|
|
|
|
static int tegra_sdhci_8bit(struct sdhci_host *host, int bus_width)
|
|
{
|
|
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
|
struct sdhci_tegra *tegra_host = pltfm_host->priv;
|
|
const struct tegra_sdhci_platform_data *plat = tegra_host->plat;
|
|
u32 ctrl;
|
|
|
|
ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
|
|
if (plat->is_8bit && bus_width == MMC_BUS_WIDTH_8) {
|
|
ctrl &= ~SDHCI_CTRL_4BITBUS;
|
|
ctrl |= SDHCI_CTRL_8BITBUS;
|
|
} else {
|
|
ctrl &= ~SDHCI_CTRL_8BITBUS;
|
|
if (bus_width == MMC_BUS_WIDTH_4)
|
|
ctrl |= SDHCI_CTRL_4BITBUS;
|
|
else
|
|
ctrl &= ~SDHCI_CTRL_4BITBUS;
|
|
}
|
|
sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
|
|
return 0;
|
|
}
|
|
|
|
static struct sdhci_ops tegra_sdhci_ops = {
|
|
.get_ro = tegra_sdhci_get_ro,
|
|
.read_l = tegra_sdhci_readl,
|
|
.read_w = tegra_sdhci_readw,
|
|
.write_l = tegra_sdhci_writel,
|
|
.platform_8bit_width = tegra_sdhci_8bit,
|
|
.platform_reset_exit = tegra_sdhci_reset_exit,
|
|
};
|
|
|
|
#ifdef CONFIG_ARCH_TEGRA_2x_SOC
|
|
static struct sdhci_pltfm_data sdhci_tegra20_pdata = {
|
|
.quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
|
|
SDHCI_QUIRK_SINGLE_POWER_WRITE |
|
|
SDHCI_QUIRK_NO_HISPD_BIT |
|
|
SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC,
|
|
.ops = &tegra_sdhci_ops,
|
|
};
|
|
|
|
static struct sdhci_tegra_soc_data soc_data_tegra20 = {
|
|
.pdata = &sdhci_tegra20_pdata,
|
|
.nvquirks = NVQUIRK_FORCE_SDHCI_SPEC_200 |
|
|
NVQUIRK_ENABLE_BLOCK_GAP_DET,
|
|
};
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_TEGRA_3x_SOC
|
|
static struct sdhci_pltfm_data sdhci_tegra30_pdata = {
|
|
.quirks = SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
|
|
SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
|
|
SDHCI_QUIRK_SINGLE_POWER_WRITE |
|
|
SDHCI_QUIRK_NO_HISPD_BIT |
|
|
SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC,
|
|
.ops = &tegra_sdhci_ops,
|
|
};
|
|
|
|
static struct sdhci_tegra_soc_data soc_data_tegra30 = {
|
|
.pdata = &sdhci_tegra30_pdata,
|
|
.nvquirks = NVQUIRK_ENABLE_SDHCI_SPEC_300,
|
|
};
|
|
#endif
|
|
|
|
static const struct of_device_id sdhci_tegra_dt_match[] __devinitdata = {
|
|
#ifdef CONFIG_ARCH_TEGRA_3x_SOC
|
|
{ .compatible = "nvidia,tegra30-sdhci", .data = &soc_data_tegra30 },
|
|
#endif
|
|
#ifdef CONFIG_ARCH_TEGRA_2x_SOC
|
|
{ .compatible = "nvidia,tegra20-sdhci", .data = &soc_data_tegra20 },
|
|
#endif
|
|
{}
|
|
};
|
|
MODULE_DEVICE_TABLE(of, sdhci_dt_ids);
|
|
|
|
static struct tegra_sdhci_platform_data * __devinit sdhci_tegra_dt_parse_pdata(
|
|
struct platform_device *pdev)
|
|
{
|
|
struct tegra_sdhci_platform_data *plat;
|
|
struct device_node *np = pdev->dev.of_node;
|
|
u32 bus_width;
|
|
|
|
if (!np)
|
|
return NULL;
|
|
|
|
plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
|
|
if (!plat) {
|
|
dev_err(&pdev->dev, "Can't allocate platform data\n");
|
|
return NULL;
|
|
}
|
|
|
|
plat->cd_gpio = of_get_named_gpio(np, "cd-gpios", 0);
|
|
plat->wp_gpio = of_get_named_gpio(np, "wp-gpios", 0);
|
|
plat->power_gpio = of_get_named_gpio(np, "power-gpios", 0);
|
|
|
|
if (of_property_read_u32(np, "bus-width", &bus_width) == 0 &&
|
|
bus_width == 8)
|
|
plat->is_8bit = 1;
|
|
|
|
return plat;
|
|
}
|
|
|
|
static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
|
|
{
|
|
const struct of_device_id *match;
|
|
const struct sdhci_tegra_soc_data *soc_data;
|
|
struct sdhci_host *host;
|
|
struct sdhci_pltfm_host *pltfm_host;
|
|
struct tegra_sdhci_platform_data *plat;
|
|
struct sdhci_tegra *tegra_host;
|
|
struct clk *clk;
|
|
int rc;
|
|
|
|
match = of_match_device(sdhci_tegra_dt_match, &pdev->dev);
|
|
if (!match)
|
|
return -EINVAL;
|
|
soc_data = match->data;
|
|
|
|
host = sdhci_pltfm_init(pdev, soc_data->pdata);
|
|
if (IS_ERR(host))
|
|
return PTR_ERR(host);
|
|
|
|
pltfm_host = sdhci_priv(host);
|
|
|
|
plat = pdev->dev.platform_data;
|
|
|
|
if (plat == NULL)
|
|
plat = sdhci_tegra_dt_parse_pdata(pdev);
|
|
|
|
if (plat == NULL) {
|
|
dev_err(mmc_dev(host->mmc), "missing platform data\n");
|
|
rc = -ENXIO;
|
|
goto err_no_plat;
|
|
}
|
|
|
|
tegra_host = devm_kzalloc(&pdev->dev, sizeof(*tegra_host), GFP_KERNEL);
|
|
if (!tegra_host) {
|
|
dev_err(mmc_dev(host->mmc), "failed to allocate tegra_host\n");
|
|
rc = -ENOMEM;
|
|
goto err_no_plat;
|
|
}
|
|
|
|
tegra_host->plat = plat;
|
|
tegra_host->soc_data = soc_data;
|
|
|
|
pltfm_host->priv = tegra_host;
|
|
|
|
if (gpio_is_valid(plat->power_gpio)) {
|
|
rc = gpio_request(plat->power_gpio, "sdhci_power");
|
|
if (rc) {
|
|
dev_err(mmc_dev(host->mmc),
|
|
"failed to allocate power gpio\n");
|
|
goto err_power_req;
|
|
}
|
|
gpio_direction_output(plat->power_gpio, 1);
|
|
}
|
|
|
|
if (gpio_is_valid(plat->cd_gpio)) {
|
|
rc = gpio_request(plat->cd_gpio, "sdhci_cd");
|
|
if (rc) {
|
|
dev_err(mmc_dev(host->mmc),
|
|
"failed to allocate cd gpio\n");
|
|
goto err_cd_req;
|
|
}
|
|
gpio_direction_input(plat->cd_gpio);
|
|
|
|
rc = request_irq(gpio_to_irq(plat->cd_gpio), carddetect_irq,
|
|
IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
|
|
mmc_hostname(host->mmc), host);
|
|
|
|
if (rc) {
|
|
dev_err(mmc_dev(host->mmc), "request irq error\n");
|
|
goto err_cd_irq_req;
|
|
}
|
|
|
|
}
|
|
|
|
if (gpio_is_valid(plat->wp_gpio)) {
|
|
rc = gpio_request(plat->wp_gpio, "sdhci_wp");
|
|
if (rc) {
|
|
dev_err(mmc_dev(host->mmc),
|
|
"failed to allocate wp gpio\n");
|
|
goto err_wp_req;
|
|
}
|
|
gpio_direction_input(plat->wp_gpio);
|
|
}
|
|
|
|
clk = clk_get(mmc_dev(host->mmc), NULL);
|
|
if (IS_ERR(clk)) {
|
|
dev_err(mmc_dev(host->mmc), "clk err\n");
|
|
rc = PTR_ERR(clk);
|
|
goto err_clk_get;
|
|
}
|
|
clk_prepare_enable(clk);
|
|
pltfm_host->clk = clk;
|
|
|
|
host->mmc->pm_caps = plat->pm_flags;
|
|
|
|
if (plat->is_8bit)
|
|
host->mmc->caps |= MMC_CAP_8_BIT_DATA;
|
|
|
|
rc = sdhci_add_host(host);
|
|
if (rc)
|
|
goto err_add_host;
|
|
|
|
return 0;
|
|
|
|
err_add_host:
|
|
clk_disable_unprepare(pltfm_host->clk);
|
|
clk_put(pltfm_host->clk);
|
|
err_clk_get:
|
|
if (gpio_is_valid(plat->wp_gpio))
|
|
gpio_free(plat->wp_gpio);
|
|
err_wp_req:
|
|
if (gpio_is_valid(plat->cd_gpio))
|
|
free_irq(gpio_to_irq(plat->cd_gpio), host);
|
|
err_cd_irq_req:
|
|
if (gpio_is_valid(plat->cd_gpio))
|
|
gpio_free(plat->cd_gpio);
|
|
err_cd_req:
|
|
if (gpio_is_valid(plat->power_gpio))
|
|
gpio_free(plat->power_gpio);
|
|
err_power_req:
|
|
err_no_plat:
|
|
sdhci_pltfm_free(pdev);
|
|
return rc;
|
|
}
|
|
|
|
static int __devexit sdhci_tegra_remove(struct platform_device *pdev)
|
|
{
|
|
struct sdhci_host *host = platform_get_drvdata(pdev);
|
|
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
|
struct sdhci_tegra *tegra_host = pltfm_host->priv;
|
|
const struct tegra_sdhci_platform_data *plat = tegra_host->plat;
|
|
int dead = (readl(host->ioaddr + SDHCI_INT_STATUS) == 0xffffffff);
|
|
|
|
sdhci_remove_host(host, dead);
|
|
|
|
if (gpio_is_valid(plat->wp_gpio))
|
|
gpio_free(plat->wp_gpio);
|
|
|
|
if (gpio_is_valid(plat->cd_gpio)) {
|
|
free_irq(gpio_to_irq(plat->cd_gpio), host);
|
|
gpio_free(plat->cd_gpio);
|
|
}
|
|
|
|
if (gpio_is_valid(plat->power_gpio))
|
|
gpio_free(plat->power_gpio);
|
|
|
|
clk_disable_unprepare(pltfm_host->clk);
|
|
clk_put(pltfm_host->clk);
|
|
|
|
sdhci_pltfm_free(pdev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver sdhci_tegra_driver = {
|
|
.driver = {
|
|
.name = "sdhci-tegra",
|
|
.owner = THIS_MODULE,
|
|
.of_match_table = sdhci_tegra_dt_match,
|
|
.pm = SDHCI_PLTFM_PMOPS,
|
|
},
|
|
.probe = sdhci_tegra_probe,
|
|
.remove = __devexit_p(sdhci_tegra_remove),
|
|
};
|
|
|
|
module_platform_driver(sdhci_tegra_driver);
|
|
|
|
MODULE_DESCRIPTION("SDHCI driver for Tegra");
|
|
MODULE_AUTHOR("Google, Inc.");
|
|
MODULE_LICENSE("GPL v2");
|