2015-05-25 09:39:32

by Charles Keepax

Subject: [PATCH 1/2] mfd: arizona: Add convience defines for micd_rate/micd_bias_starttime

Signed-off-by: Charles Keepax <[email protected]>
---
include/dt-bindings/mfd/arizona.h | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/include/dt-bindings/mfd/arizona.h b/include/dt-bindings/mfd/arizona.h
index c7af7c7..5556099 100644
--- a/include/dt-bindings/mfd/arizona.h
+++ b/include/dt-bindings/mfd/arizona.h
@@ -90,4 +90,18 @@
#define ARIZONA_INMODE_SE 1
#define ARIZONA_INMODE_DMIC 2

+#define ARIZONA_MICD_TIME_CONTINUOUS 0
+#define ARIZONA_MICD_TIME_250US 1
+#define ARIZONA_MICD_TIME_500US 2
+#define ARIZONA_MICD_TIME_1MS 3
+#define ARIZONA_MICD_TIME_2MS 4
+#define ARIZONA_MICD_TIME_4MS 5
+#define ARIZONA_MICD_TIME_8MS 6
+#define ARIZONA_MICD_TIME_16MS 7
+#define ARIZONA_MICD_TIME_32MS 8
+#define ARIZONA_MICD_TIME_64MS 9
+#define ARIZONA_MICD_TIME_128MS 10
+#define ARIZONA_MICD_TIME_256MS 11
+#define ARIZONA_MICD_TIME_512MS 12
+
#endif
--
1.7.2.5

2015-05-25 09:39:34

by Charles Keepax

Subject: [PATCH 2/2] mfd: arizona: Add DT/ACPI u32 helper functions

Add helpers to read u32's and arrays of u32's from device tree or ACPI
using the new device properties API.

Signed-off-by: Charles Keepax <[email protected]>
---
drivers/mfd/arizona-core.c | 39 ++++++++++++++++++++++++++++++++++++++
include/linux/mfd/arizona/core.h | 5 ++++
2 files changed, 44 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index bebf58a..fb55769 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -20,6 +20,7 @@
#include <linux/of_device.h>
#include <linux/of_gpio.h>
#include <linux/pm_runtime.h>
+#include <linux/property.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
#include <linux/regulator/machine.h>
@@ -746,6 +747,44 @@ int arizona_of_get_named_gpio(struct arizona *arizona, const char *prop,
}
EXPORT_SYMBOL_GPL(arizona_of_get_named_gpio);

+int arizona_device_read_u32_array(struct arizona *arizona,
+ const char *prop, bool mandatory,
+ u32 *data, size_t num)
+{
+ int ret;
+
+ ret = device_property_read_u32_array(arizona->dev, prop, data, num);
+ switch (ret) {
+ case 0:
+ break;
+ case -EINVAL:
+ if (!mandatory)
+ break;
+
+ dev_err(arizona->dev, "Mandatory property %s is missing\n",
+ prop);
+ break;
+ default:
+ dev_err(arizona->dev, "Property %s is malformed: %d\n",
+ prop, ret);
+ break;
+ }
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(arizona_device_read_u32_array);
+
+unsigned int arizona_device_read_u32(struct arizona *arizona,
+ const char *prop, bool mandatory)
+{
+ u32 data = 0;
+
+ arizona_device_read_u32_array(arizona, prop, mandatory, &data, 1);
+
+ return data;
+}
+EXPORT_SYMBOL_GPL(arizona_device_read_u32);
+
static int arizona_of_get_core_pdata(struct arizona *arizona)
{
struct arizona_pdata *pdata = &arizona->pdata;
diff --git a/include/linux/mfd/arizona/core.h b/include/linux/mfd/arizona/core.h
index 847bdaf..1c3d39d 100644
--- a/include/linux/mfd/arizona/core.h
+++ b/include/linux/mfd/arizona/core.h
@@ -160,5 +160,10 @@ int wm8997_patch(struct arizona *arizona);

extern int arizona_of_get_named_gpio(struct arizona *arizona, const char *prop,
bool mandatory);
+extern int arizona_device_read_u32_array(struct arizona *arizona,
+ const char *prop, bool mandatory,
+ u32 *data, size_t num);
+extern unsigned int arizona_device_read_u32(struct arizona *arizona,
+ const char *prop, bool mandatory);

#endif
--
1.7.2.5