From patchwork Thu Nov 19 13:57:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Djakov X-Patchwork-Id: 56991 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp3194710lbb; Thu, 19 Nov 2015 05:58:18 -0800 (PST) X-Received: by 10.66.192.193 with SMTP id hi1mr10757452pac.110.1447941498044; Thu, 19 Nov 2015 05:58:18 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ip2si12373382pbd.176.2015.11.19.05.58.17; Thu, 19 Nov 2015 05:58:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934170AbbKSN6N (ORCPT + 28 others); Thu, 19 Nov 2015 08:58:13 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:38180 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933902AbbKSN6J (ORCPT ); Thu, 19 Nov 2015 08:58:09 -0500 Received: by wmec201 with SMTP id c201so118931002wme.1 for ; Thu, 19 Nov 2015 05:58:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6wIlx7ACWbUcgTQlcKq01YtrSJUXTZTxuVrF2ikr3bw=; b=DkceSF45oDAs98WEEbSVa+aOhrz5RLMm5dN1lAczZSNXgWBsWG98qSZccff0mcmJcB 6+kdpkRy8XijXNskrEQ4SJ4644EBuwp2GoSdfNZooNLEzdaRBCGABb742micxwQ3ewgx ur1VmuHP4X+4DWk+fUJR6lrSKpnUi3OSAt5p7VOtYtvKg8SYnPRD4YHuCvQPNvnikx5p DDACoO3X+j0zF/HWAhhS76Cih6kHFJE7+j4K+vJbDUg76uJWszo+A3g0iY5ngqvEXs9m aaLtY5Wrl2CHPGdqimGbLNgZrOFcACo9Ajtyt/4TvzCUiyCDEF+I8ThA5VI74Wbp0aS2 Z4JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6wIlx7ACWbUcgTQlcKq01YtrSJUXTZTxuVrF2ikr3bw=; b=Kwyz1E3ctTHl+dmB6NGLo/HtiOqQrs9N8hKoxqMU5Vh9AA70XWA+sFNhW3kILxYX8A BE1NatcyCVsK8qxIC9zxDUtUxMU9k83qNTjuXT5AgFxU5ybMmXKy3xiO3JXlVeP5POkP JzDHSuXUmrdGFYzy1Pi1zUCqAqT64lzKF0wpV7f1cE/QxS5SFAYqc97lfcI5DH74Df6l 5oAVAWdSl5KkaS+ZE6alvxvlWvErvAe2iZCNaKFXVtaUdc9SmMLIqOkGMhuucC39WFgA WiSvXADyfIWXB8hog59ZkLiYaFaKoO9qkWf7U4qAoPiqs9zBS/ogsm5ep7zHYarPoCPK XVLw== X-Gm-Message-State: ALoCoQlUDSxHPAlC1OzYlFeHBnzv4VIEp+4pPOcAi+X2Ni34DXzGpt6u0LcQYkClFpT8epIW9Oey X-Received: by 10.28.179.8 with SMTP id c8mr15192152wmf.51.1447941488684; Thu, 19 Nov 2015 05:58:08 -0800 (PST) Received: from mms.qualcomm.mm-sol.com ([37.157.136.206]) by smtp.googlemail.com with ESMTPSA id kj3sm8078904wjb.19.2015.11.19.05.58.07 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Nov 2015 05:58:07 -0800 (PST) From: Georgi Djakov To: sboyd@codeaurora.org, agross@codeaurora.org Cc: mturquette@baylibre.com, linux-clk@vger.kernel.org, bjorn.andersson@sonymobile.com, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org Subject: [PATCH v4 1/5] clk: qcom: msm8916: Move xo and sleep clocks into DT Date: Thu, 19 Nov 2015 15:57:56 +0200 Message-Id: <1447941480-27487-2-git-send-email-georgi.djakov@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1447941480-27487-1-git-send-email-georgi.djakov@linaro.org> References: <1447941480-27487-1-git-send-email-georgi.djakov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move the xo and sleep clocks to device-tree, instead of hard-coding them in the driver. This allows us to insert the RPM clocks (if they are enabled) in between the on-board oscillators and the actual clock. Signed-off-by: Georgi Djakov --- drivers/clk/qcom/gcc-msm8916.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/clk/qcom/gcc-msm8916.c b/drivers/clk/qcom/gcc-msm8916.c index d0a0313d6bef..8cc9b2868b41 100644 --- a/drivers/clk/qcom/gcc-msm8916.c +++ b/drivers/clk/qcom/gcc-msm8916.c @@ -3356,18 +3356,16 @@ MODULE_DEVICE_TABLE(of, gcc_msm8916_match_table); static int gcc_msm8916_probe(struct platform_device *pdev) { - struct clk *clk; + int ret; struct device *dev = &pdev->dev; - /* Temporary until RPM clocks supported */ - clk = clk_register_fixed_rate(dev, "xo", NULL, CLK_IS_ROOT, 19200000); - if (IS_ERR(clk)) - return PTR_ERR(clk); + ret = qcom_cc_register_board_clk(dev, "xo_board", "xo", 19200000); + if (ret) + return ret; - clk = clk_register_fixed_rate(dev, "sleep_clk_src", NULL, - CLK_IS_ROOT, 32768); - if (IS_ERR(clk)) - return PTR_ERR(clk); + ret = qcom_cc_register_sleep_clk(dev); + if (ret) + return ret; return qcom_cc_probe(pdev, &gcc_msm8916_desc); }