Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1899655pxb; Thu, 16 Sep 2021 19:33:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEQH8tWLHXNMksZ57fZvBsWh4Zuq3IFsQx81UYobG47LzVKIZgqaskc7I8OHGsJF0NVryi X-Received: by 2002:a5d:8b8d:: with SMTP id p13mr2772294iol.216.1631846013608; Thu, 16 Sep 2021 19:33:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631846013; cv=none; d=google.com; s=arc-20160816; b=CCFD2r3SxqL7q/yk3a1qhdx3xYVcQVDdACpK5bvo++PtN6TnexIYriZxiiFM/xWABj hJJcMbTQg7ue0WUExhtC21Q5pfNWpXpkOvoN+rLn+1MDgnC/UXwCKY38wvxwVHygOor0 t5oxyP3+4WaCq9ZpO4J+Byz03kqygEj5gETu36mo1SeX+5ednO8rCS0/uo/yE/ua063C zX8viDADH1fhTHCSxBT2OH8aTLsCfBW+kGC7zzaWt2w1AZo7piK8b6PSrlt3rmTk8jo5 /bMg7HHqOuahH8mR4IBjlMcN8Hr44dNfebLLhxYr/VchaFh9PjAhYRFCqXyTTizeJ03x Djgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9jnZo51B91SM1x7Dhyo5t/N7pjZbW3jF9ggzdS8OY/I=; b=aMJUpzBeVSEtFD0J83b16JPw0QnPI3Pd7kJD9Oc39wP/do4BCOuWHSwHtYy3jXkFoH vpEWcYD5z4VPfa3UIQzXbYIU4YqPWpv7AybpFCI6C6clDG6vW9m6uQyzDI5liFWJejBq ch6ehC6vcWnzW2XFHN1/Q/oniVtsLCEBBJnXpyMQ3F9V4WoqojmnuqoJqVvJMS0xoVOx PJVwEOzeRjSMupFbPsHuFh4dEkUEuJTp4W4l/XYGGT1/yEG/AGMiowDk0C1hT93fluhO Kms1IiZStfAbDdO/9UT7NxokQkaJlN1cwp31zRJjqOiK/fQozGklnE2uUKF/jYItiqld J6xA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=miE5pSre; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d9si4338381ilv.97.2021.09.16.19.33.08; Thu, 16 Sep 2021 19:33:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=miE5pSre; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245749AbhIPRRE (ORCPT + 99 others); Thu, 16 Sep 2021 13:17:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:37134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350154AbhIPRJV (ORCPT ); Thu, 16 Sep 2021 13:09:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 242C261B40; Thu, 16 Sep 2021 16:36:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631810219; bh=szLksIY6Ch1woieb4w6JYLrB6BgT+cHFbmRaknwToZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=miE5pSre4NMgfRf1Yie1MBTzkjmR/9QeF3ac9g9TZkgAZrIZL/gl+n82WZbAf+Sqi cmKI2d5ZVhEZj0PPU2Fr1PrbKO9J5Ri1lxzUCGAMWmbm5rQ2bentRCmWA7DJyAACxV 1Ds2DkMw3hpwwax2mII5A4XpFbj2ZW9tvdUmeQwo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kris Chaplin , Dinh Nguyen , Stephen Boyd Subject: [PATCH 5.14 028/432] clk: socfpga: agilex: fix up s2f_user0_clk representation Date: Thu, 16 Sep 2021 17:56:17 +0200 Message-Id: <20210916155811.774578827@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155810.813340753@linuxfoundation.org> References: <20210916155810.813340753@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinh Nguyen commit f817c132db679d492d96c60993fa2f2c67ab18d0 upstream. Correct the s2f_user0_mux clock representation. Fixes: 80c6b7a0894f ("clk: socfpga: agilex: add clock driver for the Agilex platform") Cc: stable@vger.kernel.org Signed-off-by: Kris Chaplin Signed-off-by: Dinh Nguyen Link: https://lore.kernel.org/r/20210713144621.605140-2-dinguyen@kernel.org Signed-off-by: Stephen Boyd Signed-off-by: Greg Kroah-Hartman --- drivers/clk/socfpga/clk-agilex.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/drivers/clk/socfpga/clk-agilex.c +++ b/drivers/clk/socfpga/clk-agilex.c @@ -195,6 +195,13 @@ static const struct clk_parent_data sdmm .name = "boot_clk", }, }; +static const struct clk_parent_data s2f_user0_mux[] = { + { .fw_name = "s2f_user0_free_clk", + .name = "s2f_user0_free_clk", }, + { .fw_name = "boot_clk", + .name = "boot_clk", }, +}; + static const struct clk_parent_data s2f_user1_mux[] = { { .fw_name = "s2f_user1_free_clk", .name = "s2f_user1_free_clk", }, @@ -319,6 +326,8 @@ static const struct stratix10_gate_clock 4, 0x98, 0, 16, 0x88, 3, 0}, { AGILEX_SDMMC_CLK, "sdmmc_clk", NULL, sdmmc_mux, ARRAY_SIZE(sdmmc_mux), 0, 0x7C, 5, 0, 0, 0, 0x88, 4, 4}, + { AGILEX_S2F_USER0_CLK, "s2f_user0_clk", NULL, s2f_user0_mux, ARRAY_SIZE(s2f_user0_mux), 0, 0x24, + 6, 0, 0, 0, 0x30, 2, 0}, { AGILEX_S2F_USER1_CLK, "s2f_user1_clk", NULL, s2f_user1_mux, ARRAY_SIZE(s2f_user1_mux), 0, 0x7C, 6, 0, 0, 0, 0x88, 5, 0}, { AGILEX_PSI_REF_CLK, "psi_ref_clk", NULL, psi_mux, ARRAY_SIZE(psi_mux), 0, 0x7C,