Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752289AbbEYJje (ORCPT ); Mon, 25 May 2015 05:39:34 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:57441 "EHLO opensource.wolfsonmicro.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752241AbbEYJja (ORCPT ); Mon, 25 May 2015 05:39:30 -0400 From: Charles Keepax To: lee.jones@linaro.org Cc: sameo@linux.intel.com, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] mfd: arizona: Add DT/ACPI u32 helper functions Date: Mon, 25 May 2015 10:28:35 +0100 Message-Id: <1432546115-5685-2-git-send-email-ckeepax@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1432546115-5685-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> References: <1432546115-5685-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2733 Lines: 89 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 --- 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 #include #include +#include #include #include #include @@ -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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/