ASoC: sigmadsp: Restructure in preparation for fw v2 support

[cascardo/linux.git] / sound / soc / codecs / sigmadsp-i2c.c

diff --git a/sound/soc/codecs/sigmadsp-i2c.c b/sound/soc/codecs/sigmadsp-i2c.c
index 246081a..bf6a2be 100644 (file)
--- a/sound/soc/codecs/sigmadsp-i2c.c
+++ b/sound/soc/codecs/sigmadsp-i2c.c
@@ -6,29 +6,59 @@
  * Licensed under the GPL-2 or later.
  */
 
-#include <linux/i2c.h>
 #include <linux/export.h>
+#include <linux/i2c.h>
 #include <linux/module.h>
+#include <linux/slab.h>
+#include <asm/unaligned.h>
 
 #include "sigmadsp.h"
 
-static int sigma_action_write_i2c(void *control_data,
-       const struct sigma_action *sa, size_t len)
+static int sigmadsp_write_i2c(void *control_data,
+       unsigned int addr, const uint8_t data[], size_t len)
 {
-       return i2c_master_send(control_data, (const unsigned char *)&sa->addr,
-               len);
+       uint8_t *buf;
+       int ret;
+
+       buf = kzalloc(2 + len, GFP_KERNEL | GFP_DMA);
+       if (!buf)
+               return -ENOMEM;
+
+       put_unaligned_be16(addr, buf);
+       memcpy(buf + 2, data, len);
+
+       ret = i2c_master_send(control_data, buf, len + 2);
+
+       kfree(buf);
+
+       return ret;
 }
 
-int process_sigma_firmware(struct i2c_client *client, const char *name)
+/**
+ * devm_sigmadsp_init_i2c() - Initialize SigmaDSP instance
+ * @client: The parent I2C device
+ * @ops: The sigmadsp_ops to use for this instance
+ * @firmware_name: Name of the firmware file to load
+ *
+ * Allocates a SigmaDSP instance and loads the specified firmware file.
+ *
+ * Returns a pointer to a struct sigmadsp on success, or a PTR_ERR() on error.
+ */
+struct sigmadsp *devm_sigmadsp_init_i2c(struct i2c_client *client,
+       const struct sigmadsp_ops *ops, const char *firmware_name)
 {
-       struct sigma_firmware ssfw;
+       struct sigmadsp *sigmadsp;
+
+       sigmadsp = devm_sigmadsp_init(&client->dev, ops, firmware_name);
+       if (IS_ERR(sigmadsp))
+               return sigmadsp;
 
-       ssfw.control_data = client;
-       ssfw.write = sigma_action_write_i2c;
+       sigmadsp->control_data = client;
+       sigmadsp->write = sigmadsp_write_i2c;
 
-       return _process_sigma_firmware(&client->dev, &ssfw, name);
+       return sigmadsp;
 }
-EXPORT_SYMBOL(process_sigma_firmware);
+EXPORT_SYMBOL_GPL(devm_sigmadsp_init_i2c);
 
 MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
 MODULE_DESCRIPTION("SigmaDSP I2C firmware loader");