]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/blobdiff - drivers/mfd/tps65912-spi.c
Merge tag 'usb-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
[mirror_ubuntu-bionic-kernel.git] / drivers / mfd / tps65912-spi.c
index d59aa55b14953f8a5457d1e6e93eb39b8300da5d..4aeba9b6942a78292ec62041290bebea6bdc1e5b 100644 (file)
 /*
- * tps65912-spi.c  --  SPI access for TI TPS65912x PMIC
+ * SPI access driver for TI TPS65912x PMICs
  *
- * Copyright 2011 Texas Instruments Inc.
+ * Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+ *     Andrew F. Davis <afd@ti.com>
  *
- * Author: Margarita Olaya Cabrera <magi@slimlogic.co.uk>
+ * 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.
  *
- *  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.
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether expressed or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License version 2 for more details.
  *
- *  This driver is based on wm8350 implementation.
+ * Based on the TPS65218 driver and the previous TPS65912 driver by
+ * Margarita Olaya Cabrera <magi@slimlogic.co.uk>
  */
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/gpio.h>
+#include <linux/regmap.h>
 #include <linux/spi/spi.h>
-#include <linux/mfd/core.h>
-#include <linux/mfd/tps65912.h>
-
-static int tps65912_spi_write(struct tps65912 *tps65912, u8 addr,
-                                                       int bytes, void *src)
-{
-       struct spi_device *spi = tps65912->control_data;
-       u8 *data = (u8 *) src;
-       int ret;
-       /* bit 23 is the read/write bit */
-       unsigned long spi_data = 1 << 23 | addr << 15 | *data;
-       struct spi_transfer xfer;
-       struct spi_message msg;
-       u32 tx_buf;
-
-       tx_buf = spi_data;
-
-       xfer.tx_buf     = &tx_buf;
-       xfer.rx_buf     = NULL;
-       xfer.len        = sizeof(unsigned long);
-       xfer.bits_per_word = 24;
-
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer, &msg);
-
-       ret = spi_sync(spi, &msg);
-       return ret;
-}
-
-static int tps65912_spi_read(struct tps65912 *tps65912, u8 addr,
-                                                       int bytes, void *dest)
-{
-       struct spi_device *spi = tps65912->control_data;
-       /* bit 23 is the read/write bit */
-       unsigned long spi_data = 0 << 23 | addr << 15;
-       struct spi_transfer xfer;
-       struct spi_message msg;
-       int ret;
-       u8 *data = (u8 *) dest;
-       u32 tx_buf, rx_buf;
-
-       tx_buf = spi_data;
-       rx_buf = 0;
 
-       xfer.tx_buf     = &tx_buf;
-       xfer.rx_buf     = &rx_buf;
-       xfer.len        = sizeof(unsigned long);
-       xfer.bits_per_word = 24;
-
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer, &msg);
-
-       if (spi == NULL)
-               return 0;
+#include <linux/mfd/tps65912.h>
 
-       ret = spi_sync(spi, &msg);
-       if (ret == 0)
-               *data = (u8) (rx_buf & 0xFF);
-       return ret;
-}
+static const struct of_device_id tps65912_spi_of_match_table[] = {
+       { .compatible = "ti,tps65912", },
+       { /* sentinel */ }
+};
 
 static int tps65912_spi_probe(struct spi_device *spi)
 {
-       struct tps65912 *tps65912;
+       struct tps65912 *tps;
 
-       tps65912 = devm_kzalloc(&spi->dev,
-                               sizeof(struct tps65912), GFP_KERNEL);
-       if (tps65912 == NULL)
+       tps = devm_kzalloc(&spi->dev, sizeof(*tps), GFP_KERNEL);
+       if (!tps)
                return -ENOMEM;
 
-       tps65912->dev = &spi->dev;
-       tps65912->control_data = spi;
-       tps65912->read = tps65912_spi_read;
-       tps65912->write = tps65912_spi_write;
+       spi_set_drvdata(spi, tps);
+       tps->dev = &spi->dev;
+       tps->irq = spi->irq;
 
-       spi_set_drvdata(spi, tps65912);
+       tps->regmap = devm_regmap_init_spi(spi, &tps65912_regmap_config);
+       if (IS_ERR(tps->regmap)) {
+               dev_err(tps->dev, "Failed to initialize register map\n");
+               return PTR_ERR(tps->regmap);
+       }
 
-       return tps65912_device_init(tps65912);
+       return tps65912_device_init(tps);
 }
 
-static int tps65912_spi_remove(struct spi_device *spi)
+static int tps65912_spi_remove(struct spi_device *client)
 {
-       struct tps65912 *tps65912 = spi_get_drvdata(spi);
+       struct tps65912 *tps = spi_get_drvdata(client);
 
-       tps65912_device_exit(tps65912);
-
-       return 0;
+       return tps65912_device_exit(tps);
 }
 
+static const struct spi_device_id tps65912_spi_id_table[] = {
+       { "tps65912", 0 },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(spi, tps65912_spi_id_table);
+
 static struct spi_driver tps65912_spi_driver = {
-       .driver = {
-               .name = "tps65912",
+       .driver         = {
+               .name   = "tps65912",
+               .of_match_table = tps65912_spi_of_match_table,
        },
-       .probe  = tps65912_spi_probe,
-       .remove = tps65912_spi_remove,
+       .probe          = tps65912_spi_probe,
+       .remove         = tps65912_spi_remove,
+       .id_table       = tps65912_spi_id_table,
 };
+module_spi_driver(tps65912_spi_driver);
 
-static int __init tps65912_spi_init(void)
-{
-       int ret;
-
-       ret = spi_register_driver(&tps65912_spi_driver);
-       if (ret != 0)
-               pr_err("Failed to register TPS65912 SPI driver: %d\n", ret);
-
-       return 0;
-}
-/* init early so consumer devices can complete system boot */
-subsys_initcall(tps65912_spi_init);
-
-static void __exit tps65912_spi_exit(void)
-{
-       spi_unregister_driver(&tps65912_spi_driver);
-}
-module_exit(tps65912_spi_exit);
-
-MODULE_AUTHOR("Margarita Olaya <magi@slimlogic.co.uk>");
-MODULE_DESCRIPTION("SPI support for TPS65912 chip family mfd");
-MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>");
+MODULE_DESCRIPTION("TPS65912x SPI Interface Driver");
+MODULE_LICENSE("GPL v2");