From patchwork Mon Sep 9 15:52:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2862191 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CF1A09F499 for ; Mon, 9 Sep 2013 15:54:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B16EA2010B for ; Mon, 9 Sep 2013 15:54:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A1F32010A for ; Mon, 9 Sep 2013 15:54:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754280Ab3IIPyp (ORCPT ); Mon, 9 Sep 2013 11:54:45 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:53757 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754594Ab3IIPwN (ORCPT ); Mon, 9 Sep 2013 11:52:13 -0400 Received: from axis700.grange (dslb-178-006-084-108.pools.arcor-ip.net [178.6.84.108]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0Mddka-1Vbh6r1LGm-00PNCc; Mon, 09 Sep 2013 17:52:01 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id EDACC40BB4; Mon, 9 Sep 2013 17:52:00 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1VJ3ku-0002tL-M0; Mon, 09 Sep 2013 17:52:00 +0200 From: Guennadi Liakhovetski To: linux-kernel@vger.kernel.org Cc: Magnus Damm , linux-sh@vger.kernel.org, Mark Brown , devicetree@vger.kernel.org, Grant Likely , Rob Herring , Guennadi Liakhovetski Subject: [PATCH 2/2] regulator: da9210: add Device Tree support Date: Mon, 9 Sep 2013 17:52:00 +0200 Message-Id: <1378741920-11085-3-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1378741920-11085-1-git-send-email-g.liakhovetski@gmx.de> References: <1378741920-11085-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:RDA0xxyFWhxo15tKkXqQfqOLWDERG+dGFgwD0WdBtP8 drkFsjTlh+YqLNDKILh+LjCvUiuR0PeM5cLNwwJPKGqTLDAgOb J6B9k+muDjgH8PwdB2CrUTsyfbINZLXRWiNfPdfi8SMOIlAYJL oFXq7AsSsCFyTBH7y150yWHiJ4FrEN3t+QKKJql9N7oCznILHz aLnZP1rB0tcz0ROmIJSZP006xQBJKv3Jj+Ab27zyMihxHtYWMf MNcPHPmkaNt/VKGdq4wEkDQxvxdQJS+UO0R1HAGRe4+NGY8BZu 7s9PtHscjuWGlpS4yYJca6s7VEdtloOx1imfYM7d1WpVRDiEDb tzHi7EMc7tq1HKRKQjNlFbAn+P7cMH0GrtepiC+mIcq9ne5xZg UhFm0/mLqYhyA== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds basic Device Tree support to the da9210 regulator driver - with no special properties, since also driver's platform data only contains standard regulator initialisation parameters. Signed-off-by: Guennadi Liakhovetski --- drivers/regulator/da9210-regulator.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/da9210-regulator.c b/drivers/regulator/da9210-regulator.c index f0fe54b..f7ccff14 100644 --- a/drivers/regulator/da9210-regulator.c +++ b/drivers/regulator/da9210-regulator.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include "da9210-regulator.h" @@ -126,7 +127,8 @@ static int da9210_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct da9210 *chip; - struct da9210_pdata *pdata = i2c->dev.platform_data; + struct device *dev = &i2c->dev; + struct da9210_pdata *pdata = dev_get_platdata(dev); struct regulator_dev *rdev = NULL; struct regulator_config config = { }; int error; @@ -147,10 +149,11 @@ static int da9210_i2c_probe(struct i2c_client *i2c, } config.dev = &i2c->dev; - if (pdata) - config.init_data = &pdata->da9210_constraints; + config.init_data = pdata ? &pdata->da9210_constraints : + of_get_regulator_init_data(dev, dev->of_node); config.driver_data = chip; config.regmap = chip->regmap; + config.of_node = dev->of_node; rdev = regulator_register(&da9210_reg, &config); if (IS_ERR(rdev)) {