Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/wilc1000/wilc_sdio.c

+9 −2
Original line number Diff line number Diff line
@@ -199,21 +199,28 @@ static int wilc_sdio_resume(struct device *dev) 
	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 = {

	.suspend = wilc_sdio_suspend,

	.resume = wilc_sdio_resume,

};



static struct sdio_driver wilc1000_sdio_driver = {

static struct sdio_driver wilc_sdio_driver = {

	.name		= SDIO_MODALIAS,

	.id_table	= wilc_sdio_ids,

	.probe		= linux_sdio_probe,

	.remove		= linux_sdio_remove,

	.drv = {

		.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_unregister_driver);

MODULE_LICENSE("GPL");

drivers/staging/wilc1000/wilc_spi.c

+7 −7
Original line number Diff line number Diff line
@@ -130,21 +130,21 @@ static int wilc_bus_remove(struct spi_device *spi) 
	return 0;

}



static const struct of_device_id wilc1000_of_match[] = {

	{ .compatible = "atmel,wilc_spi", },

	{}

static const struct of_device_id wilc_of_match[] = {

	{ .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 = {

		.name = MODALIAS,

		.of_match_table = wilc1000_of_match,

		.of_match_table = wilc_of_match,

	},

	.probe =  wilc_bus_probe,

	.remove = wilc_bus_remove,

};

module_spi_driver(wilc1000_spi_driver);

module_spi_driver(wilc_spi_driver);

MODULE_LICENSE("GPL");



static int wilc_spi_tx(struct wilc *wilc, u8 *b, u32 len)