staging: wilc1000: modified 'clock-names' and 'compatible' property

Modified the 'clock-names' property by removing '_clk' from its name and
remove '_spi/sdio' from 'compatible' string.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Link: https://lore.kernel.org/r/20200307085523.7320-3-ajay.kathat@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/sdio.c b/drivers/staging/wilc1000/sdio.c
index 44b426874c1b686e3089ccdb5df4583ba4ec20dd..36eb589263bfd8deafc6cd42d71e15675c9ae2d0 100644 (file)
--- a/drivers/staging/wilc1000/sdio.c
+++ b/drivers/staging/wilc1000/sdio.c
@@ -150,7 +150,7 @@ static int wilc_sdio_probe(struct sdio_func *func,
        wilc->bus_data = sdio_priv;
        wilc->dev = &func->dev;
 
-       wilc->rtc_clk = devm_clk_get(&func->card->dev, "rtc_clk");
+       wilc->rtc_clk = devm_clk_get(&func->card->dev, "rtc");
        if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER)
                return -EPROBE_DEFER;
        else if (!IS_ERR(wilc->rtc_clk))
@@ -997,7 +997,7 @@ static int wilc_sdio_resume(struct device *dev)
 }
 
 static const struct of_device_id wilc_of_match[] = {
-       { .compatible = "microchip,wilc1000-sdio", },
+       { .compatible = "microchip,wilc1000", },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, wilc_of_match);

diff --git a/drivers/staging/wilc1000/spi.c b/drivers/staging/wilc1000/spi.c
index c87729e00b541468edf41893e100d9e01f3086e7..8d4b8c219c2fc634a93d4af33deb59afbbc277f0 100644 (file)
--- a/drivers/staging/wilc1000/spi.c
+++ b/drivers/staging/wilc1000/spi.c
@@ -189,7 +189,7 @@ static int wilc_bus_remove(struct spi_device *spi)
 }
 
 static const struct of_device_id wilc_of_match[] = {
-       { .compatible = "microchip,wilc1000-spi", },
+       { .compatible = "microchip,wilc1000", },
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, wilc_of_match);