From patchwork Fri Oct 10 13:40:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 38586 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6DD1E205D8 for ; Fri, 10 Oct 2014 13:41:04 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id w7sf2125520lbi.2 for ; Fri, 10 Oct 2014 06:40:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=F9c3tE4S7GfZCGcp1zPC/w2rV2/mx+ekEDuHUfAWTxs=; b=EesL5kNqaORyOZ+A0EHnCeqABvGPXU7DaimaiJUA0uJ5jdgzn2Hqy60MiMTcTawwPD 6j3uIeHp1CTX1xISt3IR/NpN/amBGvcn1UTiy8L4fn9XXJlFO8WfHGQyeSW1E46qRN3n e2WjMjcxcVDfcwvti/LAL7MZauXqtbirc+a6Fjya8fl4lYhSr59fAU1eb/CWlVH4OFOr csAZoVxjYzP0jVIbfwOOizjwh9iogSsna884ygGMjPXCif65hvibX1tRe0bnR+UyOlzU NNmJcgLM5isjFq6H6Jd+Oldx6ajmPNrh/RLUlBOmsFBMYqcMwolh/vmOGVPRRvrsyrKA 9yRA== X-Gm-Message-State: ALoCoQkm5DE4YG6aPiWs8L6tffPxAd2gBFC2xrNw6ZImgS1SNWSnbABANpg7E4mijhJwIV+HVsgR X-Received: by 10.181.28.169 with SMTP id jp9mr1069018wid.6.1412948458910; Fri, 10 Oct 2014 06:40:58 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.224.161 with SMTP id rd1ls286247lac.95.gmail; Fri, 10 Oct 2014 06:40:58 -0700 (PDT) X-Received: by 10.112.205.39 with SMTP id ld7mr4894918lbc.40.1412948458720; Fri, 10 Oct 2014 06:40:58 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com [209.85.217.177]) by mx.google.com with ESMTPS id xe3si1246655lbb.114.2014.10.10.06.40.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 06:40:58 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id w7so3045957lbi.8 for ; Fri, 10 Oct 2014 06:40:58 -0700 (PDT) X-Received: by 10.112.62.200 with SMTP id a8mr4894293lbs.34.1412948458422; Fri, 10 Oct 2014 06:40:58 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp430765lbz; Fri, 10 Oct 2014 06:40:57 -0700 (PDT) X-Received: by 10.68.161.197 with SMTP id xu5mr2574590pbb.160.1412948456664; Fri, 10 Oct 2014 06:40:56 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q5si3800118pdf.63.2014.10.10.06.40.55 for ; Fri, 10 Oct 2014 06:40:56 -0700 (PDT) Received-SPF: none (google.com: linux-omap-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753897AbaJJNkz (ORCPT + 5 others); Fri, 10 Oct 2014 09:40:55 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:45786 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753879AbaJJNky (ORCPT ); Fri, 10 Oct 2014 09:40:54 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s9ADeWuK024432; Fri, 10 Oct 2014 08:40:32 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s9ADeWam022313; Fri, 10 Oct 2014 08:40:32 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Fri, 10 Oct 2014 08:40:32 -0500 Received: from sokoban.home (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s9ADeR8r021407; Fri, 10 Oct 2014 08:40:31 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 2/2] regulator: twl: use platform data in the DT based boot also Date: Fri, 10 Oct 2014 16:40:42 +0300 Message-ID: <1412948442-19896-3-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1412948442-19896-1-git-send-email-t-kristo@ti.com> References: <1412948442-19896-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: t-kristo@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This allows to pass platform information during a DT boot also, currently this is completely ignored. Needed for supporting the platform specific regulator set_voltage / get_voltage ops for the SMPS regulators. Signed-off-by: Tero Kristo To: Liam Girdwood To: Mark Brown --- drivers/regulator/twl-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c index 0b4f866..2c4fa06 100644 --- a/drivers/regulator/twl-regulator.c +++ b/drivers/regulator/twl-regulator.c @@ -1103,9 +1103,9 @@ static int twlreg_probe(struct platform_device *pdev) if (match) { template = match->data; id = template->desc.id; + drvdata = dev_get_platdata(&pdev->dev); initdata = of_get_regulator_init_data(&pdev->dev, pdev->dev.of_node); - drvdata = NULL; } else { id = pdev->id; initdata = dev_get_platdata(&pdev->dev);