From patchwork Wed Nov 28 18:48:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10703155 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 4321E16B1 for ; Wed, 28 Nov 2018 18:49:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 352DE2D86E for ; Wed, 28 Nov 2018 18:49:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 28F3C2D925; Wed, 28 Nov 2018 18:49:24 +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 D02612D86E for ; Wed, 28 Nov 2018 18:49:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726648AbeK2Fv7 (ORCPT ); Thu, 29 Nov 2018 00:51:59 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:43524 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726478AbeK2Fv7 (ORCPT ); Thu, 29 Nov 2018 00:51:59 -0500 Received: by mail-pl1-f193.google.com with SMTP id gn14so17825962plb.10 for ; Wed, 28 Nov 2018 10:49:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eIAgi7flrHP9j2TT5g7TAEqMEq30Wos3dnpqumwDaGE=; b=JKxAaEooIyUOB/Y3XRv1BG08e4wGkOC/d+4nNcoAr+hb3VSQVOnPUNB9r+9PpllcBC 8QD1TauTfJKT2/KFNgBIxnPFJo4J0iDps7VPMgWKuvEGm8L9zHqabhiDGroxSw1rCf4g yXn2vjte2S+BCI/mqqTyJrRydkToN3xH6p/5w= 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=eIAgi7flrHP9j2TT5g7TAEqMEq30Wos3dnpqumwDaGE=; b=Olm1XIkxFKx75myjWoB95gYKYjInHbvBcowUg17YaI21k02SzA2wrK5tWYHJNrBC9Q DWZQ9S28P5QgzmhM6r8Jwi0D6FS0IUVqYScRXLYZhPdoScOqTY4Ina0Ov/CawQHTG77l YDdB5UBpuSbBSX9wS6VrebibXQQuKe98bwC1KKbdFcpO3xRWgew8jpQM3cm2UdioJf9H W6iEiW8X12jr0tPHV/wWgA+o7SoODN2ay6VG+FseGNn7/FFT3PESeGLBHfzOz0WMVx52 dQinwLoNJBe37oDjuEG19o4bl0d3V8wG7Y9FM+krzNKHHeL9tVnCXzp4dkveB87DIdbo Nueg== X-Gm-Message-State: AA+aEWZX8/hGgGTHgg67YMTAH62f8GScWuuY9Ts7oR5u4l4VQjUv+3zH HpLZY0eyQYBM4SlKLg2PwZFE/A== X-Google-Smtp-Source: AFSGD/W7+2XiOfvTSlUhMYGhXpyF34gCltsGx7JpW/O6tjP9R1+8cbeKvzXKBJMroopHUFpy2H56xA== X-Received: by 2002:a17:902:76c2:: with SMTP id j2mr38620374plt.339.1543430962589; Wed, 28 Nov 2018 10:49:22 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:c8e0:70d7:4be7:a36]) by smtp.gmail.com with ESMTPSA id e86sm10765672pfb.6.2018.11.28.10.49.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Nov 2018 10:49:21 -0800 (PST) From: Douglas Anderson To: Stephen Boyd Cc: Taniya Das , "Kristian H . Kristensen" , Jordan Crouse , Amit Nischal , Douglas Anderson , Michael Turquette , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Gross , David Brown , linux-soc@vger.kernel.org, linux-clk@vger.kernel.org Subject: [PATCH] clk: qcom: gpu_cc_gmu_clk_src has 5 parents, not 6 Date: Wed, 28 Nov 2018 10:48:59 -0800 Message-Id: <20181128184859.70476-1-dianders@chromium.org> X-Mailer: git-send-email 2.20.0.rc0.387.gc7a69e6b6c-goog MIME-Version: 1.0 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In an earlier version of commit 453361cdd757 ("clk: qcom: Add graphics clock controller driver for SDM845") there were 6 listed parents for "gpu_cc_gmu_clk_src". In the version that landed there were 5. ...but "num_parents" was still left at 6. On my system this goes boom at bootup. Fixes: 453361cdd757 ("clk: qcom: Add graphics clock controller driver for SDM845") Signed-off-by: Douglas Anderson --- drivers/clk/qcom/gpucc-sdm845.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/qcom/gpucc-sdm845.c b/drivers/clk/qcom/gpucc-sdm845.c index 80898cea259a..e40efba1bf7d 100644 --- a/drivers/clk/qcom/gpucc-sdm845.c +++ b/drivers/clk/qcom/gpucc-sdm845.c @@ -85,7 +85,7 @@ static struct clk_rcg2 gpu_cc_gmu_clk_src = { .clkr.hw.init = &(struct clk_init_data){ .name = "gpu_cc_gmu_clk_src", .parent_names = gpu_cc_parent_names_0, - .num_parents = 6, + .num_parents = 5, .ops = &clk_rcg2_shared_ops, }, };