From patchwork Fri Nov 2 21:45:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10666235 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 77AE217D5 for ; Fri, 2 Nov 2018 21:45:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68CD62BF84 for ; Fri, 2 Nov 2018 21:45:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C4912C38A; Fri, 2 Nov 2018 21:45:59 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0D4D62BF84 for ; Fri, 2 Nov 2018 21:45:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2573989804; Fri, 2 Nov 2018 21:45:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by gabe.freedesktop.org (Postfix) with ESMTPS id 374B089861 for ; Fri, 2 Nov 2018 21:45:55 +0000 (UTC) Received: by mail-pl1-x642.google.com with SMTP id x6-v6so1585893pln.0 for ; Fri, 02 Nov 2018 14:45:55 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=/218tbqYfFYsBPGuhJ4jRp/KJJyqAyXjQYUAJueIJAw=; b=svvm3iU7CRJS4THuy/Nn9K/chs6glUsDA7PQA5+wnoKKMSmA+oa5ZNgX6VllRI62JA Pnm9cS69hEmJHUAHWV9p2TnVUjMYPFFn3QrJFVhHq0n9E7csrSS19U51hs5TFjx0RG3I bZ9WiAxtXobDKsaOib0p14eA14IqYFaGmWTOiD8YhtPXtXTfDzyWmRyj14rSICN7RJl2 T96dQXOH7gSgdl6yaKCz/3CGVn2UD0lBo53e9a7Zhcikg0bNfOKVLK+29Y8apiZaexXl Bq6DJgq3y6wJ9RlLqomWIQESWXr7X6Akxqs6qbpnJTjDYyi7xPHD8QFV5i8fucNyBo1b /Hlw== X-Gm-Message-State: AGRZ1gKoKySOnTyD/QQ94CifFEGHbGrFcOW1BrlxRyIXptLauiEuksgJ NIv7ZKwJtGv2BANVeUjm8tLIAw== X-Google-Smtp-Source: AJdET5dfIGnnDzIpt0LuWmctxVcZrO+0fVanfeejho0Wf24FbzURFwVe7dYwqoTJsMusQuoq19tr4A== X-Received: by 2002:a17:902:a50e:: with SMTP id s14-v6mr13316568plq.78.1541195154784; Fri, 02 Nov 2018 14:45:54 -0700 (PDT) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:b6af:f85:ed6c:ac6a]) by smtp.gmail.com with ESMTPSA id q25-v6sm58332871pfk.154.2018.11.02.14.45.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 14:45:54 -0700 (PDT) From: Matthias Kaehlcke To: Rob Clark , David Airlie , Rob Herring , Mark Rutland Subject: [PATCH 1/2] dt-bindings: msm/dsi: Add ref clock for 10nm PHY Date: Fri, 2 Nov 2018 14:45:33 -0700 Message-Id: <20181102214534.184593-1-mka@chromium.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Rajesh Yadav , linux-arm-msm@vger.kernel.org, Douglas Anderson , dri-devel@lists.freedesktop.org, Stephen Boyd , Matthias Kaehlcke , Sean Paul , freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Allow the 10nm PHY driver to get the ref clock from the DT. Signed-off-by: Matthias Kaehlcke --- Documentation/devicetree/bindings/display/msm/dsi.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/display/msm/dsi.txt b/Documentation/devicetree/bindings/display/msm/dsi.txt index dfc743219bd88..d0d2046ceff69 100644 --- a/Documentation/devicetree/bindings/display/msm/dsi.txt +++ b/Documentation/devicetree/bindings/display/msm/dsi.txt @@ -105,6 +105,10 @@ Required properties: - power-domains: Should be <&mmcc MDSS_GDSC>. - clocks: Phandles to device clocks. See [1] for details on clock bindings. - clock-names: the following clocks are required: + For 10nm PHY: + * "iface" + * "ref" + For other PHYs: * "iface" For 28nm HPM/LP, 28nm 8960 PHYs: - vddio-supply: phandle to vdd-io regulator device node From patchwork Fri Nov 2 21:45:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10666239 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 6F95315E9 for ; Fri, 2 Nov 2018 21:46:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 607852BF84 for ; Fri, 2 Nov 2018 21:46:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 548902C183; Fri, 2 Nov 2018 21:46:01 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1147A2BF84 for ; Fri, 2 Nov 2018 21:46:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 43A376E601; Fri, 2 Nov 2018 21:45:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by gabe.freedesktop.org (Postfix) with ESMTPS id 237496E600 for ; Fri, 2 Nov 2018 21:45:56 +0000 (UTC) Received: by mail-pl1-x643.google.com with SMTP id s5-v6so1558097plq.11 for ; Fri, 02 Nov 2018 14:45:56 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=IpjGYI017Uw4/g661hwo8OEcZ5+umgzP90a+AYk8Kow=; b=E5M/T6bzzo4EenzZAwNs5sNhQCxmPZyYRefalhxucSk4B+Nez0IuLQYC1vEHDQ9AuE OYBp7hlNnpYxonWxU0zs5ioXrRIbX3B5xy/CMV8Ei0qIpQYlAheWMpIoBQa0uHvsE3Ud gZUDjhHkLPdEbKmMUWuXVYywFZ3io/Fzf7CJyIEALmVwsT8deRESbCas/KsNTb+QRm5x Zju42ac42NWy89MHoyuoLU1gzhGmoXrzRyrzp30ZXaQWk2X1xm40F4m82rhVP1GXUH4x kNe6Pi9JeVtEyVIxTcXOz1nhErkTxWYj25iR/RTDD8OrZ6bSx7ndmH0FUDWH4lp4u/RZ 9Rpg== X-Gm-Message-State: AGRZ1gKvIwZHadggNAAYWb6hN66ffjAdylXc5/FYx0TjliGdafSJZw1y jSksjYmyjkAQtA3lGyqVCZlLQw== X-Google-Smtp-Source: AJdET5eExMX6CUYOEm4v8C7BzMEx/3g2dtKpaSSwWe4Fi9RnQHrhTo0vYggJKm08abjpxUnJmE29tw== X-Received: by 2002:a17:902:4683:: with SMTP id p3-v6mr13398776pld.215.1541195155698; Fri, 02 Nov 2018 14:45:55 -0700 (PDT) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:b6af:f85:ed6c:ac6a]) by smtp.gmail.com with ESMTPSA id q25-v6sm58332871pfk.154.2018.11.02.14.45.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 14:45:55 -0700 (PDT) From: Matthias Kaehlcke To: Rob Clark , David Airlie , Rob Herring , Mark Rutland Subject: [PATCH 2/2] drm/msm/dsi: Get PHY ref clock from the DT Date: Fri, 2 Nov 2018 14:45:34 -0700 Message-Id: <20181102214534.184593-2-mka@chromium.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog In-Reply-To: <20181102214534.184593-1-mka@chromium.org> References: <20181102214534.184593-1-mka@chromium.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Rajesh Yadav , linux-arm-msm@vger.kernel.org, Douglas Anderson , dri-devel@lists.freedesktop.org, Stephen Boyd , Matthias Kaehlcke , Sean Paul , freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Get the PHY ref clock from the device tree instead of hardcoding its name and rate. Signed-off-by: Matthias Kaehlcke --- drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c index 4c03f0b7343ed..1016eb50df8f5 100644 --- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c +++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c @@ -91,6 +91,8 @@ struct dsi_pll_10nm { void __iomem *phy_cmn_mmio; void __iomem *mmio; + struct clk *vco_ref_clk; + u64 vco_ref_clk_rate; u64 vco_current_rate; @@ -630,7 +632,8 @@ static int pll_10nm_register(struct dsi_pll_10nm *pll_10nm) char clk_name[32], parent[32], vco_name[32]; char parent2[32], parent3[32], parent4[32]; struct clk_init_data vco_init = { - .parent_names = (const char *[]){ "xo" }, + .parent_names = (const char *[]){ + __clk_get_name(pll_10nm->vco_ref_clk) }, .num_parents = 1, .name = vco_name, .flags = CLK_IGNORE_UNUSED, @@ -786,6 +789,12 @@ struct msm_dsi_pll *msm_dsi_pll_10nm_init(struct platform_device *pdev, int id) pll_10nm->id = id; pll_10nm_list[id] = pll_10nm; + pll_10nm->vco_ref_clk = devm_clk_get(&pdev->dev, "ref"); + if (IS_ERR(pll_10nm->vco_ref_clk)) { + dev_err(&pdev->dev, "couldn't get 'ref' clock\n"); + return (void *)pll_10nm->vco_ref_clk; + } + pll_10nm->phy_cmn_mmio = msm_ioremap(pdev, "dsi_phy", "DSI_PHY"); if (IS_ERR_OR_NULL(pll_10nm->phy_cmn_mmio)) { dev_err(&pdev->dev, "failed to map CMN PHY base\n");