From patchwork Sun Jan 6 08:09:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 10749475 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E828F17E1 for ; Sun, 6 Jan 2019 08:10:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA855288A0 for ; Sun, 6 Jan 2019 08:10:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CED90288AC; Sun, 6 Jan 2019 08:10:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88C38288A0 for ; Sun, 6 Jan 2019 08:10:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726516AbfAFIK0 (ORCPT ); Sun, 6 Jan 2019 03:10:26 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:37630 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726507AbfAFIKZ (ORCPT ); Sun, 6 Jan 2019 03:10:25 -0500 Received: by mail-pg1-f195.google.com with SMTP id c25so19342978pgb.4 for ; Sun, 06 Jan 2019 00:10:25 -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=6eOA+KowDamTwt9THtkpVEpyZ4rKdyAZPpHHkjZU05U=; b=H11IiDTlL5rZfxXSyBdWWhB7DFh/XlD+/c/114NySGh8MmITVRdvbhjs6E7FsSaaff fM5tHLsRhilrX4qaIoz/I+0ftniQ8xlVkxAVonc86P9QFkX1MdlwgvtmG7LXrgyWGDUW qRJVsc4czoqwwMSTQtlpVz8r46GlA0DNiYF84= 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=6eOA+KowDamTwt9THtkpVEpyZ4rKdyAZPpHHkjZU05U=; b=DQAeketiBTF4uf+B828WGrjCxSXqnUZeQcXvD0PT5rUNOsBJ8Nv3dSkgHpBEMpbwf7 oNNvJDJkZuFvcPQspkzemY56uakpUTckd0mDy37cu/oPDLeizcb8fgGo6+3qBd83Aqo6 BL3zvhdevHqDSr/vaHMQF9muPn/0yvDh/je3+QNkRryfDXLQjsNnDVJdZpEEPisbleG8 JkWjw1TBXuUyXDlv00o2L8brBQQb9TkIjugzIloPF1lnFbRCnA8ft1QOoxZqiZxUPt9s XnKDlDCfXFxieDRh+xxsoeNZ155YWQaqGlIezY0tqAHqEdkhUtRA9Uqnr7kdhQGST24K Qw7A== X-Gm-Message-State: AJcUukcK9mF1TMAvpF9lYGNZK8MZMbu85PzLAyrXql0WGJFLpHqYstxl 3y8jKrYYsDB70XLIn+xDesF9/Q== X-Google-Smtp-Source: ALg8bN4PZSvgdLvZr0uS63gR6uO3wJrxRf7Ob0na3sw+AJmzFqr2Nhb2tMaJpyfnlyq1SQJcVTERlw== X-Received: by 2002:a63:a064:: with SMTP id u36mr7136362pgn.145.1546762224050; Sun, 06 Jan 2019 00:10:24 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id v190sm90763364pfv.26.2019.01.06.00.10.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Jan 2019 00:10:23 -0800 (PST) From: Bjorn Andersson To: Russell King , Ulf Hansson Cc: Andy Gross , David Brown , Rob Herring , Mark Rutland , Arun Kumar Neelakantam , linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/7] amba: Allow pclk to be controlled by power domain Date: Sun, 6 Jan 2019 00:09:14 -0800 Message-Id: <20190106080915.4493-7-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190106080915.4493-1-bjorn.andersson@linaro.org> References: <20190106080915.4493-1-bjorn.andersson@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On the Qualcomm SDM845 platform the apb_pclk is controlled as part of the QDSS power/clock domain. Handle this by allowing amba to operate without direct apb_pclk control, when a powerdomain is attached and no clock is described. Signed-off-by: Bjorn Andersson --- Changes since v1: - New patch drivers/amba/bus.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 41b706403ef7..3e13050c6d59 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -219,8 +219,13 @@ static int amba_get_enable_pclk(struct amba_device *pcdev) int ret; pcdev->pclk = clk_get(&pcdev->dev, "apb_pclk"); - if (IS_ERR(pcdev->pclk)) - return PTR_ERR(pcdev->pclk); + if (IS_ERR(pcdev->pclk)) { + /* Continue with no clock specified, but pm_domain attached */ + if (PTR_ERR(pcdev->pclk) == -ENOENT && pcdev->dev.pm_domain) + pcdev->pclk = NULL; + else + return PTR_ERR(pcdev->pclk); + } ret = clk_prepare_enable(pcdev->pclk); if (ret)