From patchwork Fri Oct 10 14:06:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 38587 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 182AA205D8 for ; Fri, 10 Oct 2014 14:06:53 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id b15sf2261177eek.4 for ; Fri, 10 Oct 2014 07:06:52 -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=yMaYzDPX+TSPmqXXu2m3nQMd2/XdRSpb+sKbdMaUUbE=; b=CdDgj5Jsst8eN6SBL+xteMV2qesBtc5+Dr9r4zfHO3l79YZG5a/kCd8ENMo7yKhAsz mItLwewJRDafUrrXz2dFDykFfe38yTyloM1+flhQqWRiwse/RR26rfT+ceIPfDdDDdWm TegLVaNVYIwlEASKyXewaK7ykmRcyMtHkiWm55T3PLcmGV8Dn/ouFNqaH12DVeQvBv5w vjDpOz3NnPAmWuRfMVMFpouy2zdudIWuJ0Wsni3l0BWUuUIRjJHNUf6qS2jDRi8EhExg SCEbz34Fcy49Yw853YSDVpYoXmOmAURhVUNjNW6IIUj9tKCWB1ThTFjI1jByORNx3u6Y N+dg== X-Gm-Message-State: ALoCoQk9RyC9PmDbGjwiP4+19BWcppw2Y6VUPRHZoRnHxX9yVybImGPy7anyeE7M26FVnW7hJDeS X-Received: by 10.152.37.229 with SMTP id b5mr5737lak.9.1412950012147; Fri, 10 Oct 2014 07:06:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.66 with SMTP id h2ls108322laa.58.gmail; Fri, 10 Oct 2014 07:06:52 -0700 (PDT) X-Received: by 10.112.166.6 with SMTP id zc6mr4981255lbb.31.1412950012004; Fri, 10 Oct 2014 07:06:52 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by mx.google.com with ESMTPS id m1si7178278laj.133.2014.10.10.07.06.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 10 Oct 2014 07:06:51 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id z11so3062113lbi.41 for ; Fri, 10 Oct 2014 07:06:51 -0700 (PDT) X-Received: by 10.112.190.69 with SMTP id go5mr5043787lbc.32.1412950011262; Fri, 10 Oct 2014 07:06:51 -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 c5csp434585lbz; Fri, 10 Oct 2014 07:06:50 -0700 (PDT) X-Received: by 10.68.111.99 with SMTP id ih3mr5514043pbb.124.1412950009528; Fri, 10 Oct 2014 07:06:49 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r15si3867414pdj.62.2014.10.10.07.06.48 for ; Fri, 10 Oct 2014 07:06:49 -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 S1752664AbaJJOGs (ORCPT + 5 others); Fri, 10 Oct 2014 10:06:48 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:49929 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751957AbaJJOGr (ORCPT ); Fri, 10 Oct 2014 10:06:47 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s9AE6Nqs027413; Fri, 10 Oct 2014 09:06:23 -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 s9AE6NUt009958; Fri, 10 Oct 2014 09:06:23 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Fri, 10 Oct 2014 09:06:23 -0500 Received: from sokoban.home (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s9AE6GQs024942; Fri, 10 Oct 2014 09:06:21 -0500 From: Tero Kristo To: , , , , CC: Subject: [REPOST PATCH 2/2] regulator: twl: use platform data in the DT based boot also Date: Fri, 10 Oct 2014 17:06:29 +0300 Message-ID: <1412949989-20186-3-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1412949989-20186-1-git-send-email-t-kristo@ti.com> References: <1412949989-20186-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.182 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 Cc: Liam Girdwood Cc: 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);