spmi: Rename qpnp library to be part of the spmi framework
It turns out that the only use cases for the qpnp library use
the existing spmi data structures. As such, there's really
no justification for having the library not be called 'spmi'.
There is nothing Qualcomm specific about this code.
Also cleanup some inconsistencies in the Kernel Doc comments
while we're here.
Change-Id: I1c73c88be740b6f5d38ba2de62de1737981b30fa
Signed-off-by: Michael Bohan <mbohan@codeaurora.org>
diff --git a/drivers/spmi/Kconfig b/drivers/spmi/Kconfig
index 84fd462..7026ee8 100644
--- a/drivers/spmi/Kconfig
+++ b/drivers/spmi/Kconfig
@@ -19,18 +19,11 @@
This is required for communicating with Qualcomm PMICs and
other devices that have the SPMI interface.
-config MSM_QPNP
- depends on ARCH_MSMCOPPER
- depends on OF_SPMI
- bool "MSM QPNP"
- help
- Say 'y' here to include support for the Qualcomm QPNP
-
config MSM_QPNP_INT
depends on SPARSE_IRQ
depends on ARCH_MSMCOPPER
+ depends on SPMI
depends on OF_SPMI
- depends on MSM_QPNP
bool "MSM QPNP INT"
help
Say 'y' here to include support for the Qualcomm QPNP interrupt
diff --git a/drivers/spmi/Makefile b/drivers/spmi/Makefile
index d59a610..becd823 100644
--- a/drivers/spmi/Makefile
+++ b/drivers/spmi/Makefile
@@ -1,7 +1,6 @@
#
# Makefile for kernel SPMI framework.
#
-obj-$(CONFIG_SPMI) += spmi.o
+obj-$(CONFIG_SPMI) += spmi.o spmi-resources.o
obj-$(CONFIG_SPMI_MSM_PMIC_ARB) += spmi-pmic-arb.o
-obj-$(CONFIG_MSM_QPNP) += qpnp.o
obj-$(CONFIG_MSM_QPNP_INT) += qpnp-int.o
diff --git a/drivers/spmi/qpnp.c b/drivers/spmi/spmi-resources.c
similarity index 65%
rename from drivers/spmi/qpnp.c
rename to drivers/spmi/spmi-resources.c
index a164efb..b692f82 100644
--- a/drivers/spmi/qpnp.c
+++ b/drivers/spmi/spmi-resources.c
@@ -15,15 +15,19 @@
*/
#include <linux/export.h>
-#include <mach/qpnp.h>
+#include <linux/spmi.h>
/**
- * qpnp_get_resource - get a resource for a device
- * @dev: qpnp device
+ * spmi_get_resource - get a resource for a device
+ * @dev: spmi device
+ * @node_idx: dev_node index
* @type: resource type
- * @num: resource index
+ * @res_num: resource index
+ *
+ * Returns
+ * NULL on failure.
*/
-struct resource *qpnp_get_resource(struct spmi_device *dev,
+struct resource *spmi_get_resource(struct spmi_device *dev,
unsigned int node_idx, unsigned int type,
unsigned int res_num)
{
@@ -37,20 +41,24 @@
}
return NULL;
}
-EXPORT_SYMBOL_GPL(qpnp_get_resource);
+EXPORT_SYMBOL_GPL(spmi_get_resource);
/**
- * qpnp_get_irq - get an IRQ for a device
- * @dev: qpnp device
- * @num: IRQ number index
+ * spmi_get_irq - get an IRQ for a device
+ * @dev: spmi device
+ * @node_idx: dev_node index
+ * @res_num: IRQ number index
+ *
+ * Returns
+ * -ENXIO on failure.
*/
-int qpnp_get_irq(struct spmi_device *dev, unsigned int node_idx,
+int spmi_get_irq(struct spmi_device *dev, unsigned int node_idx,
unsigned int res_num)
{
- struct resource *r = qpnp_get_resource(dev, node_idx,
+ struct resource *r = spmi_get_resource(dev, node_idx,
IORESOURCE_IRQ, res_num);
return r ? r->start : -ENXIO;
}
-EXPORT_SYMBOL_GPL(qpnp_get_irq);
+EXPORT_SYMBOL_GPL(spmi_get_irq);