From patchwork Wed Jul 25 20:34:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10544649 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 860E19093 for ; Wed, 25 Jul 2018 20:35:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76A402AB3D for ; Wed, 25 Jul 2018 20:35:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B4762AB4D; Wed, 25 Jul 2018 20:35:53 +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 2AA702AB3D for ; Wed, 25 Jul 2018 20:35:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F2926E45C; Wed, 25 Jul 2018 20:35:52 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yb0-x244.google.com (mail-yb0-x244.google.com [IPv6:2607:f8b0:4002:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 644086E3F1 for ; Wed, 25 Jul 2018 20:35:50 +0000 (UTC) Received: by mail-yb0-x244.google.com with SMTP id e84-v6so3519560ybb.0 for ; Wed, 25 Jul 2018 13:35:50 -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; bh=MlyuJVDQeAUxfZ1k6RXnMoxz17jBygBu1WOVxhRzWkU=; b=hBYJ2/nqUKoEhAnLeCuJjCh1kd0wRlAp/G8Sy5+KbWWMzMGxqhSIkW5MeUVaA7vuTD APJTT4juAtZEkCqMucXaXoVOFUkv3xgnjZat5aV9YcVS2ZBhKF7v/+c/mdj+zdm8CAJb ALhUQCjnFTof2py+OLM/VlIfmbeHbv6KKQcqp22RTQGgzFc7FaBOMoe18uSShdfQysnu AXHtDb/ksdi+q133FOxdAo3bX8PVB3ACl0ny3XZLJuZ57aZT3jMoT56N8dNwcdGlBK9C aXv5/wU3SmIrb+zTp3pUeZ/0iPRxsOrY2JrzkJAEgWvVpqpnU3hbtcjmX4kjzRAVZRrI QTGQ== X-Gm-Message-State: AOUpUlFl9gIst9j+Pj0AxrOhJ+gmBmUln1WizwVEf+VDWT2SBnNyXd5n UKswC3a5BmLDNsfIDj2+nVuB9w== X-Google-Smtp-Source: AAOMgpewY7scfiQI0n7rW2B50JWQEf/TxdbL9tvtOCNLSsj7WNriV2hmCLaJgO4fSvf4uq1LzI7fag== X-Received: by 2002:a25:9d0d:: with SMTP id i13-v6mr12377359ybp.104.1532550949697; Wed, 25 Jul 2018 13:35:49 -0700 (PDT) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:ad55:b1db:adfe:3b9f]) by smtp.gmail.com with ESMTPSA id f137-v6sm14692568ywb.52.2018.07.25.13.35.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jul 2018 13:35:49 -0700 (PDT) From: Sean Paul To: Subject: [PATCH 2/3] drm/msm: dpu: Use clock-names instead of assigned-clock-names Date: Wed, 25 Jul 2018 16:34:44 -0400 Message-Id: <20180725203529.164928-2-seanpaul@chromium.org> X-Mailer: git-send-email 2.18.0.233.g985f88cf7e-goog In-Reply-To: <20180725203529.164928-1-seanpaul@chromium.org> References: <20180725203529.164928-1-seanpaul@chromium.org> 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: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP In these cases, we want to enumerate _all_ clocks, not just the ones that are assigned a rate. Signed-off-by: Sean Paul --- drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c index 8d907faa7496..c1d7eac4fa25 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c @@ -147,8 +147,7 @@ int msm_dss_parse_clock(struct platform_device *pdev, return -EINVAL; mp->num_clk = 0; - num_clk = of_property_count_strings(pdev->dev.of_node, - "assigned-clock-names"); + num_clk = of_property_count_strings(pdev->dev.of_node, "clock-names"); if (num_clk <= 0) { pr_debug("clocks are not defined\n"); return 0; @@ -162,7 +161,7 @@ int msm_dss_parse_clock(struct platform_device *pdev, for (i = 0; i < num_clk; i++) { rc = of_property_read_string_index(pdev->dev.of_node, - "assigned-clock-names", i, + "clock-names", i, &clock_name); if (rc) { dev_err(&pdev->dev, "Failed to get clock name for %d\n",