Commit 8dfaf859 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman

staging: wilc1000: change compatible string from atmel to microchip

Use 'microchip' in compatible string instead of 'atmel', also replace '_'
with '-' before the module. Remove 'wilc1000' prefix from device table
name.
Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4b6cfa87
...@@ -199,21 +199,28 @@ static int wilc_sdio_resume(struct device *dev) ...@@ -199,21 +199,28 @@ static int wilc_sdio_resume(struct device *dev)
return 0; return 0;
} }
static const struct of_device_id wilc_of_match[] = {
{ .compatible = "microchip,wilc1000-sdio", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, wilc_of_match);
static const struct dev_pm_ops wilc_sdio_pm_ops = { static const struct dev_pm_ops wilc_sdio_pm_ops = {
.suspend = wilc_sdio_suspend, .suspend = wilc_sdio_suspend,
.resume = wilc_sdio_resume, .resume = wilc_sdio_resume,
}; };
static struct sdio_driver wilc1000_sdio_driver = { static struct sdio_driver wilc_sdio_driver = {
.name = SDIO_MODALIAS, .name = SDIO_MODALIAS,
.id_table = wilc_sdio_ids, .id_table = wilc_sdio_ids,
.probe = linux_sdio_probe, .probe = linux_sdio_probe,
.remove = linux_sdio_remove, .remove = linux_sdio_remove,
.drv = { .drv = {
.pm = &wilc_sdio_pm_ops, .pm = &wilc_sdio_pm_ops,
.of_match_table = wilc_of_match,
} }
}; };
module_driver(wilc1000_sdio_driver, module_driver(wilc_sdio_driver,
sdio_register_driver, sdio_register_driver,
sdio_unregister_driver); sdio_unregister_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
......
...@@ -130,21 +130,21 @@ static int wilc_bus_remove(struct spi_device *spi) ...@@ -130,21 +130,21 @@ static int wilc_bus_remove(struct spi_device *spi)
return 0; return 0;
} }
static const struct of_device_id wilc1000_of_match[] = { static const struct of_device_id wilc_of_match[] = {
{ .compatible = "atmel,wilc_spi", }, { .compatible = "microchip,wilc1000-spi", },
{} { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, wilc1000_of_match); MODULE_DEVICE_TABLE(of, wilc_of_match);
static struct spi_driver wilc1000_spi_driver = { static struct spi_driver wilc_spi_driver = {
.driver = { .driver = {
.name = MODALIAS, .name = MODALIAS,
.of_match_table = wilc1000_of_match, .of_match_table = wilc_of_match,
}, },
.probe = wilc_bus_probe, .probe = wilc_bus_probe,
.remove = wilc_bus_remove, .remove = wilc_bus_remove,
}; };
module_spi_driver(wilc1000_spi_driver); module_spi_driver(wilc_spi_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int wilc_spi_tx(struct wilc *wilc, u8 *b, u32 len) static int wilc_spi_tx(struct wilc *wilc, u8 *b, u32 len)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment