mirror of
https://github.com/torvalds/linux.git
synced 2024-12-20 18:11:47 +00:00
e6b5be2be4
Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlSOD20ACgkQMUfUDdst+ylLPACg2QrW1oHhdTMT9WI8jihlHVRM 53kAoLeteByQ3iVwWurwwseRPiWa8+MI =OVRS -----END PGP SIGNATURE----- Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core update from Greg KH: "Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while" * tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits) Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries" fs: debugfs: add forward declaration for struct device type firmware class: Deletion of an unnecessary check before the function call "vunmap" firmware loader: fix hung task warning dump devcoredump: provide a one-way disable function device: Add dev_<level>_once variants ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries ath: use seq_file api for ath9k debugfs files debugfs: add helper function to create device related seq_file drivers/base: cacheinfo: remove noisy error boot message Revert "core: platform: add warning if driver has no owner" drivers: base: support cpu cache information interface to userspace via sysfs drivers: base: add cpu_device_create to support per-cpu devices topology: replace custom attribute macros with standard DEVICE_ATTR* cpumask: factor out show_cpumap into separate helper function driver core: Fix unbalanced device reference in drivers_probe driver core: fix race with userland in device_add() sysfs/kernfs: make read requests on pre-alloc files use the buffer. sysfs/kernfs: allow attributes to request write buffer be pre-allocated. fs: sysfs: return EGBIG on write if offset is larger than file size ...
158 lines
3.5 KiB
C
158 lines
3.5 KiB
C
/*
|
|
* linux/drivers/mmc/host/tmio_mmc.c
|
|
*
|
|
* Copyright (C) 2007 Ian Molton
|
|
* Copyright (C) 2004 Ian Molton
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* Driver for the MMC / SD / SDIO cell found in:
|
|
*
|
|
* TC6393XB TC6391XB TC6387XB T7L66XB ASIC3
|
|
*/
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/mfd/core.h>
|
|
#include <linux/mfd/tmio.h>
|
|
#include <linux/mmc/host.h>
|
|
#include <linux/module.h>
|
|
#include <linux/pagemap.h>
|
|
#include <linux/scatterlist.h>
|
|
|
|
#include "tmio_mmc.h"
|
|
|
|
#ifdef CONFIG_PM_SLEEP
|
|
static int tmio_mmc_suspend(struct device *dev)
|
|
{
|
|
struct platform_device *pdev = to_platform_device(dev);
|
|
const struct mfd_cell *cell = mfd_get_cell(pdev);
|
|
int ret;
|
|
|
|
ret = pm_runtime_force_suspend(dev);
|
|
|
|
/* Tell MFD core it can disable us now.*/
|
|
if (!ret && cell->disable)
|
|
cell->disable(pdev);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int tmio_mmc_resume(struct device *dev)
|
|
{
|
|
struct platform_device *pdev = to_platform_device(dev);
|
|
const struct mfd_cell *cell = mfd_get_cell(pdev);
|
|
int ret = 0;
|
|
|
|
/* Tell the MFD core we are ready to be enabled */
|
|
if (cell->resume)
|
|
ret = cell->resume(pdev);
|
|
|
|
if (!ret)
|
|
ret = pm_runtime_force_resume(dev);
|
|
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
static int tmio_mmc_probe(struct platform_device *pdev)
|
|
{
|
|
const struct mfd_cell *cell = mfd_get_cell(pdev);
|
|
struct tmio_mmc_data *pdata;
|
|
struct tmio_mmc_host *host;
|
|
struct resource *res;
|
|
int ret = -EINVAL, irq;
|
|
|
|
if (pdev->num_resources != 2)
|
|
goto out;
|
|
|
|
pdata = pdev->dev.platform_data;
|
|
if (!pdata || !pdata->hclk)
|
|
goto out;
|
|
|
|
irq = platform_get_irq(pdev, 0);
|
|
if (irq < 0) {
|
|
ret = irq;
|
|
goto out;
|
|
}
|
|
|
|
/* Tell the MFD core we are ready to be enabled */
|
|
if (cell->enable) {
|
|
ret = cell->enable(pdev);
|
|
if (ret)
|
|
goto out;
|
|
}
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!res)
|
|
return -EINVAL;
|
|
|
|
/* SD control register space size is 0x200, 0x400 for bus_shift=1 */
|
|
pdata->bus_shift = resource_size(res) >> 10;
|
|
pdata->flags |= TMIO_MMC_HAVE_HIGH_REG;
|
|
|
|
ret = tmio_mmc_host_probe(&host, pdev, pdata);
|
|
if (ret)
|
|
goto cell_disable;
|
|
|
|
ret = request_irq(irq, tmio_mmc_irq, IRQF_TRIGGER_FALLING,
|
|
dev_name(&pdev->dev), host);
|
|
if (ret)
|
|
goto host_remove;
|
|
|
|
pr_info("%s at 0x%08lx irq %d\n", mmc_hostname(host->mmc),
|
|
(unsigned long)host->ctl, irq);
|
|
|
|
return 0;
|
|
|
|
host_remove:
|
|
tmio_mmc_host_remove(host);
|
|
cell_disable:
|
|
if (cell->disable)
|
|
cell->disable(pdev);
|
|
out:
|
|
return ret;
|
|
}
|
|
|
|
static int tmio_mmc_remove(struct platform_device *pdev)
|
|
{
|
|
const struct mfd_cell *cell = mfd_get_cell(pdev);
|
|
struct mmc_host *mmc = platform_get_drvdata(pdev);
|
|
|
|
if (mmc) {
|
|
struct tmio_mmc_host *host = mmc_priv(mmc);
|
|
free_irq(platform_get_irq(pdev, 0), host);
|
|
tmio_mmc_host_remove(host);
|
|
if (cell->disable)
|
|
cell->disable(pdev);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* ------------------- device registration ----------------------- */
|
|
|
|
static const struct dev_pm_ops tmio_mmc_dev_pm_ops = {
|
|
SET_SYSTEM_SLEEP_PM_OPS(tmio_mmc_suspend, tmio_mmc_resume)
|
|
SET_RUNTIME_PM_OPS(tmio_mmc_host_runtime_suspend,
|
|
tmio_mmc_host_runtime_resume,
|
|
NULL)
|
|
};
|
|
|
|
static struct platform_driver tmio_mmc_driver = {
|
|
.driver = {
|
|
.name = "tmio-mmc",
|
|
.pm = &tmio_mmc_dev_pm_ops,
|
|
},
|
|
.probe = tmio_mmc_probe,
|
|
.remove = tmio_mmc_remove,
|
|
};
|
|
|
|
module_platform_driver(tmio_mmc_driver);
|
|
|
|
MODULE_DESCRIPTION("Toshiba TMIO SD/MMC driver");
|
|
MODULE_AUTHOR("Ian Molton <spyro@f2s.com>");
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_ALIAS("platform:tmio-mmc");
|