mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-20 02:34:23 +08:00
cff2f741b8
Here's the large driver core updates for 3.8-rc1. The biggest thing here is the various __dev* marking removals. This is going to be a pain for the merge with different subsystem trees, I know, but all of the patches included here have been ACKed by their various subsystem maintainers, as they wanted them to go through here. If this is too much of a pain, I can pull all of them out of this tree and just send you one with the other fixes/updates and then, after 3.8-rc1 is out, do the rest of the removals to ensure we catch them all, it's up to you. The merges should all be trivial, and Stephen has been doing them all in linux-next for a few weeks now quite easily. Other than the __dev* marking removals, there's nothing major here, some firmware loading updates and other minor things in the driver core. All of these have (much to Stephen's annoyance), been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlDHkPkACgkQMUfUDdst+ykaWgCfW7AM30cv0nzoVO08ax6KjlG1 KVYAn3z/KYazvp4B6LMvrW9y0G34Wmad =yvVr -----END PGP SIGNATURE----- Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core updates from Greg Kroah-Hartman: "Here's the large driver core updates for 3.8-rc1. The biggest thing here is the various __dev* marking removals. This is going to be a pain for the merge with different subsystem trees, I know, but all of the patches included here have been ACKed by their various subsystem maintainers, as they wanted them to go through here. If this is too much of a pain, I can pull all of them out of this tree and just send you one with the other fixes/updates and then, after 3.8-rc1 is out, do the rest of the removals to ensure we catch them all, it's up to you. The merges should all be trivial, and Stephen has been doing them all in linux-next for a few weeks now quite easily. Other than the __dev* marking removals, there's nothing major here, some firmware loading updates and other minor things in the driver core. All of these have (much to Stephen's annoyance), been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fixed up trivial conflicts in drivers/gpio/gpio-{em,stmpe}.c due to gpio update. * tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (93 commits) modpost.c: Stop checking __dev* section mismatches init.h: Remove __dev* sections from the kernel acpi: remove use of __devinit PCI: Remove __dev* markings PCI: Always build setup-bus when PCI is enabled PCI: Move pci_uevent into pci-driver.c PCI: Remove CONFIG_HOTPLUG ifdefs unicore32/PCI: Remove CONFIG_HOTPLUG ifdefs sh/PCI: Remove CONFIG_HOTPLUG ifdefs powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs mips/PCI: Remove CONFIG_HOTPLUG ifdefs microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs dma: remove use of __devinit dma: remove use of __devexit_p firewire: remove use of __devinitdata firewire: remove use of __devinit leds: remove use of __devexit leds: remove use of __devinit leds: remove use of __devexit_p mmc: remove use of __devexit ...
148 lines
3.4 KiB
C
148 lines
3.4 KiB
C
/*
|
|
* Synopsys DesignWare Multimedia Card PCI Interface driver
|
|
*
|
|
* Copyright (C) 2012 Vayavya Labs Pvt. Ltd.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#include <linux/interrupt.h>
|
|
#include <linux/module.h>
|
|
#include <linux/io.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/mmc/host.h>
|
|
#include <linux/mmc/mmc.h>
|
|
#include <linux/mmc/dw_mmc.h>
|
|
#include "dw_mmc.h"
|
|
|
|
#define PCI_BAR_NO 2
|
|
#define COMPLETE_BAR 0
|
|
#define SYNOPSYS_DW_MCI_VENDOR_ID 0x700
|
|
#define SYNOPSYS_DW_MCI_DEVICE_ID 0x1107
|
|
/* Defining the Capabilities */
|
|
#define DW_MCI_CAPABILITIES (MMC_CAP_4_BIT_DATA | MMC_CAP_MMC_HIGHSPEED |\
|
|
MMC_CAP_SD_HIGHSPEED | MMC_CAP_8_BIT_DATA |\
|
|
MMC_CAP_SDIO_IRQ)
|
|
|
|
static struct dw_mci_board pci_board_data = {
|
|
.num_slots = 1,
|
|
.caps = DW_MCI_CAPABILITIES,
|
|
.bus_hz = 33 * 1000 * 1000,
|
|
.detect_delay_ms = 200,
|
|
.fifo_depth = 32,
|
|
};
|
|
|
|
static int dw_mci_pci_probe(struct pci_dev *pdev,
|
|
const struct pci_device_id *entries)
|
|
{
|
|
struct dw_mci *host;
|
|
int ret;
|
|
|
|
ret = pci_enable_device(pdev);
|
|
if (ret)
|
|
return ret;
|
|
if (pci_request_regions(pdev, "dw_mmc_pci")) {
|
|
ret = -ENODEV;
|
|
goto err_disable_dev;
|
|
}
|
|
|
|
host = kzalloc(sizeof(struct dw_mci), GFP_KERNEL);
|
|
if (!host) {
|
|
ret = -ENOMEM;
|
|
goto err_release;
|
|
}
|
|
|
|
host->irq = pdev->irq;
|
|
host->irq_flags = IRQF_SHARED;
|
|
host->dev = &pdev->dev;
|
|
host->pdata = &pci_board_data;
|
|
|
|
host->regs = pci_iomap(pdev, PCI_BAR_NO, COMPLETE_BAR);
|
|
if (!host->regs) {
|
|
ret = -EIO;
|
|
goto err_unmap;
|
|
}
|
|
|
|
pci_set_drvdata(pdev, host);
|
|
ret = dw_mci_probe(host);
|
|
if (ret)
|
|
goto err_probe_failed;
|
|
return ret;
|
|
|
|
err_probe_failed:
|
|
pci_iounmap(pdev, host->regs);
|
|
err_unmap:
|
|
kfree(host);
|
|
err_release:
|
|
pci_release_regions(pdev);
|
|
err_disable_dev:
|
|
pci_disable_device(pdev);
|
|
return ret;
|
|
}
|
|
|
|
static void dw_mci_pci_remove(struct pci_dev *pdev)
|
|
{
|
|
struct dw_mci *host = pci_get_drvdata(pdev);
|
|
|
|
dw_mci_remove(host);
|
|
pci_set_drvdata(pdev, NULL);
|
|
pci_release_regions(pdev);
|
|
pci_iounmap(pdev, host->regs);
|
|
kfree(host);
|
|
pci_disable_device(pdev);
|
|
}
|
|
|
|
#ifdef CONFIG_PM_SLEEP
|
|
static int dw_mci_pci_suspend(struct device *dev)
|
|
{
|
|
int ret;
|
|
struct pci_dev *pdev = to_pci_dev(dev);
|
|
struct dw_mci *host = pci_get_drvdata(pdev);
|
|
|
|
ret = dw_mci_suspend(host);
|
|
return ret;
|
|
}
|
|
|
|
static int dw_mci_pci_resume(struct device *dev)
|
|
{
|
|
int ret;
|
|
struct pci_dev *pdev = to_pci_dev(dev);
|
|
struct dw_mci *host = pci_get_drvdata(pdev);
|
|
|
|
ret = dw_mci_resume(host);
|
|
return ret;
|
|
}
|
|
#else
|
|
#define dw_mci_pci_suspend NULL
|
|
#define dw_mci_pci_resume NULL
|
|
#endif /* CONFIG_PM_SLEEP */
|
|
|
|
static SIMPLE_DEV_PM_OPS(dw_mci_pci_pmops, dw_mci_pci_suspend, dw_mci_pci_resume);
|
|
|
|
static DEFINE_PCI_DEVICE_TABLE(dw_mci_pci_id) = {
|
|
{ PCI_DEVICE(SYNOPSYS_DW_MCI_VENDOR_ID, SYNOPSYS_DW_MCI_DEVICE_ID) },
|
|
{}
|
|
};
|
|
MODULE_DEVICE_TABLE(pci, dw_mci_pci_id);
|
|
|
|
static struct pci_driver dw_mci_pci_driver = {
|
|
.name = "dw_mmc_pci",
|
|
.id_table = dw_mci_pci_id,
|
|
.probe = dw_mci_pci_probe,
|
|
.remove = __devexit_p(dw_mci_pci_remove),
|
|
.driver = {
|
|
.pm = &dw_mci_pci_pmops
|
|
},
|
|
};
|
|
|
|
module_pci_driver(dw_mci_pci_driver);
|
|
|
|
MODULE_DESCRIPTION("DW Multimedia Card PCI Interface driver");
|
|
MODULE_AUTHOR("Shashidhar Hiremath <shashidharh@vayavyalabs.com>");
|
|
MODULE_LICENSE("GPL v2");
|