From patchwork Mon Dec 26 18:11:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 89050 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp4784200qgi; Mon, 26 Dec 2016 18:12:25 -0800 (PST) X-Received: by 10.84.211.7 with SMTP id b7mr61489213pli.83.1482804745559; Mon, 26 Dec 2016 18:12:25 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e11si44764036pgp.204.2016.12.26.18.12.24; Mon, 26 Dec 2016 18:12:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756609AbcL0CME (ORCPT + 25 others); Mon, 26 Dec 2016 21:12:04 -0500 Received: from mail-pg0-f41.google.com ([74.125.83.41]:33137 "EHLO mail-pg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756420AbcL0CLt (ORCPT ); Mon, 26 Dec 2016 21:11:49 -0500 Received: by mail-pg0-f41.google.com with SMTP id g1so100296751pgn.0 for ; Mon, 26 Dec 2016 18:11:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BXN9tG3uVmd/4XJxaC+UcRYlVqHPXXyD5KNJ4XRhWQo=; b=i33dAwCcjPExXN0amS98pjqCLarf+xdKovVNFh0YqRQNZnMl9Oyu1WL9d13LX261yw PET3xg3dsqrA2aYrvN/nu0Ygz3iGD4zz39lVHXOkFfp+y3NIqPHnFWpMTyJ52lsYG1kB 25eQFOzGZcqHc0ZXNHlQkLYstkQNQSrNxzkzA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BXN9tG3uVmd/4XJxaC+UcRYlVqHPXXyD5KNJ4XRhWQo=; b=dn09x5Pw0O5MBmrh4ItaF0QiblvIQgY5Lf4b6XtTtB/4K32kM2M01tSqcPHfMG5r4S gdsyGyCegSTQCqvjJ6D8oUu+JZZ3IOJOlFsy/Tdr+B4P2fhmOUDUbcevwAJssvoNQlJN PjH66XljPHMzEiMxoyN3CSXHERYLWXcV9D+aJFjnQ1qQ1Hs0piu3IyANbY/G/sHgfnjj 7EKzChnCTbM+bMc9lLBHGmmsRwTRFmHd6iZDF1f9z5yKTZzjJLgO1mTV0t1JSgOdyIxk aaQGT90IGUXsXy9Zwo8j/cRRlT8jaOaleifheE8bUEzBn/T//ft1Ibd7ZIFdnH37mhpB 6sHA== X-Gm-Message-State: AIkVDXLDqqsq/m/zP2kdej/FO+/omFIPEsdHOxcuJ++9el798nJIyUceTBLOHGL2MwOIzdWS X-Received: by 10.84.213.144 with SMTP id g16mr62278046pli.134.1482804708675; Mon, 26 Dec 2016 18:11:48 -0800 (PST) Received: from localhost.localdomain (ip68-111-223-48.sd.sd.cox.net. [68.111.223.48]) by smtp.gmail.com with ESMTPSA id g82sm84886867pfb.43.2016.12.26.18.11.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Dec 2016 18:11:47 -0800 (PST) From: Bjorn Andersson To: Lee Jones Cc: Rob Herring , Mark Rutland , Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Richard Purdie , Jacek Anaszewski , Pavel Machek , Jingoo Han , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, linux-leds@vger.kernel.org, Bjorn Andersson Subject: [PATCH v4 2/5] mfd: lm3533: Support initialization from Device Tree Date: Mon, 26 Dec 2016 10:11:50 -0800 Message-Id: <20161226181153.11271-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161226181153.11271-1-bjorn.andersson@linaro.org> References: <20161226181153.11271-1-bjorn.andersson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Andersson Implement support for initialization of the lm3533 driver core and probing child devices from Device Tree. Signed-off-by: Bjorn Andersson Signed-off-by: Bjorn Andersson --- Changes since v3: - Moved parsing of child of nodes into each child driver - Use of_platform_populate() to instanciate child devices drivers/mfd/lm3533-core.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) -- 2.11.0 diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c index 5abcbb2e8849..f147677f05ff 100644 --- a/drivers/mfd/lm3533-core.c +++ b/drivers/mfd/lm3533-core.c @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include #include #include @@ -512,6 +514,11 @@ static int lm3533_device_init(struct lm3533 *lm3533) lm3533_device_bl_init(lm3533); lm3533_device_led_init(lm3533); + if (lm3533->dev->of_node) { + of_platform_populate(lm3533->dev->of_node, NULL, NULL, + lm3533->dev); + } + ret = sysfs_create_group(&lm3533->dev->kobj, &lm3533_attribute_group); if (ret < 0) { dev_err(lm3533->dev, "failed to create sysfs attributes\n"); @@ -588,10 +595,73 @@ static const struct regmap_config regmap_config = { .precious_reg = lm3533_precious_register, }; +static int lm3533_of_parse_enum(struct device *dev, const char *propname, + const unsigned int *match, size_t num_matches) +{ + size_t i; + int ret; + u32 val; + + ret = of_property_read_u32(dev->of_node, propname, &val); + if (ret < 0) { + dev_err(dev, "failed to parse %s\n", propname); + return ret; + } + + for (i = 0; i < num_matches; i++) { + if (val == match[i]) + return i; + } + + dev_err(dev, "unsupported value of %s\n", propname); + return -EINVAL; +} + +static int lm3533_pdata_from_of_node(struct device *dev) +{ + struct lm3533_platform_data *pdata; + int ret; + const unsigned int freqs[] = { + [LM3533_BOOST_FREQ_500KHZ] = 500000, + [LM3533_BOOST_FREQ_1000KHZ] = 1000000, + }; + const unsigned int ovps[] = { + [LM3533_BOOST_OVP_16V] = 16000, + [LM3533_BOOST_OVP_24V] = 24000, + [LM3533_BOOST_OVP_32V] = 32000, + [LM3533_BOOST_OVP_40V] = 40000, + }; + + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return -ENOMEM; + + pdata->gpio_hwen = of_get_named_gpio(dev->of_node, "hwen-gpios", 0); + if (pdata->gpio_hwen < 0) + return pdata->gpio_hwen; + + ret = lm3533_of_parse_enum(dev, "ti,boost-freq-hz", + freqs, ARRAY_SIZE(freqs)); + if (ret < 0) + return ret; + pdata->boost_freq = ret; + + ret = lm3533_of_parse_enum(dev, "ti,boost-ovp-mv", + ovps, ARRAY_SIZE(ovps)); + if (ret < 0) + return ret; + pdata->boost_ovp = ret; + + dev->platform_data = pdata; + + return 0; +} + static int lm3533_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct lm3533 *lm3533; + int ret; dev_dbg(&i2c->dev, "%s\n", __func__); @@ -608,6 +678,12 @@ static int lm3533_i2c_probe(struct i2c_client *i2c, lm3533->dev = &i2c->dev; lm3533->irq = i2c->irq; + if (i2c->dev.of_node) { + ret = lm3533_pdata_from_of_node(lm3533->dev); + if (ret < 0) + return ret; + } + return lm3533_device_init(lm3533); }