From patchwork Wed Aug 12 21:57:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 7004181 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 806C69F39D for ; Wed, 12 Aug 2015 21:57:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D7A12070E for ; Wed, 12 Aug 2015 21:57:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B63852071B for ; Wed, 12 Aug 2015 21:57:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751319AbbHLV5e (ORCPT ); Wed, 12 Aug 2015 17:57:34 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:48258 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751093AbbHLV5e (ORCPT ); Wed, 12 Aug 2015 17:57:34 -0400 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 48C0F140AFD; Wed, 12 Aug 2015 21:57:33 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 2A1C5140B01; Wed, 12 Aug 2015 21:57:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from [10.134.64.202] (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 184C7140AFD; Wed, 12 Aug 2015 21:57:31 +0000 (UTC) Message-ID: <55CBC14B.8000509@codeaurora.org> Date: Wed, 12 Aug 2015 14:57:31 -0700 From: Stephen Boyd User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: Bjorn Andersson CC: Rajendra Nayak , linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org, srinivas.kandagatla@linaro.org, linux-arm-kernel@lists.infradead.org, nrajan@codeaurora.org, lina.iyer@linaro.org Subject: Re: [PATCH 5/9] clk: qcom: gcc-msm8960: add child devices support. References: <1436348838-22671-1-git-send-email-rnayak@codeaurora.org> <1436348838-22671-6-git-send-email-rnayak@codeaurora.org> <20150811224902.GO2839@codeaurora.org> <20150812201855.GF13472@usrtlx11787.corpusers.net> In-Reply-To: <20150812201855.GF13472@usrtlx11787.corpusers.net> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 08/12/2015 01:18 PM, Bjorn Andersson wrote: > On Tue 11 Aug 15:49 PDT 2015, Stephen Boyd wrote: > >> On 07/08, Rajendra Nayak wrote: >>> diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c >>> index eb6a4f9..2c80d03 100644 >>> --- a/drivers/clk/qcom/gcc-msm8960.c >>> +++ b/drivers/clk/qcom/gcc-msm8960.c >>> @@ -15,6 +15,7 @@ >>> #include >>> #include >>> #include >>> +#include >>> #include >>> #include >>> #include >>> @@ -3520,7 +3521,8 @@ static int gcc_msm8960_probe(struct platform_device *pdev) >>> if (IS_ERR(clk)) >>> return PTR_ERR(clk); >>> >>> - return qcom_cc_probe(pdev, match->data); >>> + qcom_cc_probe(pdev, match->data); >>> + return of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); >> We just lost the error code from qcom_cc_probe()... >> >> Also, I don't like having a subnode in DT. Why can't we use the >> same node as the GCC node and create a virtual child device here >> for tsens? We can assign the same of_node that this platform >> device has so that DT keeps working correctly. >> > Can't we make the gcc driver support being a child of a simple-mfd by > having it attempting to acquire the regmap of the parent and falling > back to creating its own mmio regmap? So we would need to make a new device and driver for the simple-mfd parent? I'm confused about what you're suggesting and what benefit it has versus creating a child of the clock controller device. Here's the patch I'm suggesting. The device name is probably wrong, but you get the idea. Signed-off-by: Stephen Boyd ----8<---- diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c index aa294b1bad34..802e9794f76e 100644 --- a/drivers/clk/qcom/gcc-msm8960.c +++ b/drivers/clk/qcom/gcc-msm8960.c @@ -3505,7 +3505,9 @@ static int gcc_msm8960_probe(struct platform_device *pdev) { struct clk *clk; struct device *dev = &pdev->dev; + struct platform_device *tsens; const struct of_device_id *match; + int ret; match = of_match_device(gcc_msm8960_match_table, &pdev->dev); if (!match) @@ -3520,7 +3522,30 @@ static int gcc_msm8960_probe(struct platform_device *pdev) if (IS_ERR(clk)) return PTR_ERR(clk); - return qcom_cc_probe(pdev, match->data); + ret = qcom_cc_probe(pdev, match->data); + if (ret) + return ret; + + tsens = platform_device_alloc("tsens", -1); + if (!tsens) { + ret = -ENOMEM; + goto err_alloc; + } + + tsens->dev.parent = &pdev->dev; + tsens->dev.of_node = pdev->dev.of_node; + ret = platform_device_add(tsens); + if (ret) + goto err_add; + + return 0; + +err_add: + platform_device_put(tsens); +err_alloc: + qcom_cc_remove(pdev); + + return ret; } static int gcc_msm8960_remove(struct platform_device *pdev)