From patchwork Mon Oct 24 11:31:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9090 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp445966wru; Mon, 24 Oct 2022 06:13:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7C6wH5vjC5vq2hy1cSCe+DFa7appOrJzmHLLhj9A5xRXYRerDzhEW4gzXYJbE5yafSES7c X-Received: by 2002:a17:90a:e592:b0:20d:3b10:3817 with SMTP id g18-20020a17090ae59200b0020d3b103817mr23613217pjz.43.1666617207970; Mon, 24 Oct 2022 06:13:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666617207; cv=none; d=google.com; s=arc-20160816; b=unRCuZzyAw6LOVFgFE8fURzQdiRye9LjNQtbzO/NQdymrK1eTUsKN5thHJgAM/Nfl6 SRfRDN7jL9EMFsAhTVzZLsTmPbTUzCosB9rE09Mj+3+46kKDrsOvP/3gYr9XOC1YtAEQ Ss7OEMMGu9hkMNVAufgYGWCKTeo3GBItZPvpDvg5RWYIA/+FjjgZpGULO3eypphQ8MyC mSytXbmeotThAvxnt1IiTIf/ydzWyANa5BsVe7RPbtk4ic7prtVRnTkrzua+eEhQpahG XyQE5F4j4kj+JhqDHZd8UOm3ybIWrtLDmJCbHWCQnW84ptgk3Z7MLQzk3f/T4rFDIS+M BYSQ== 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=IxX/IiHrCyuc8PH3RAtoB0xqiOVh+QI6bQ/415RmINs=; b=fRrZzcL+rwCbl/0H+VkbvtTcs6YaDeSPMHZm4LiJqCxu92MNfE8FoGFESut6CguS/N 0CMm6dnbV7AYA1DBwr7H+Oeu113Mn6XkxsgRMqhvfUzk8UXKVxB4xwk7wG5VfRPcbc4a +cerhU0bMYFmpPUPHXDqHcRmI3QJdnJW5uFv4vx0A9xS/S2v6gW2s/waLsdTwiZAyR7y AWZGLRTWubCJPn6VFwQEgGSxESpk+BL+gC2ecI8Bw4+W0P7/5Ynm9zw9aTvEnmH+dwmp H0sDMYyHpC7BNBzSXm6/nTTnq3xwsQjRKolpxYFfshKB3/HhdOZL1I7Ii8CREceANt/L KxKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2iYhcub7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c20-20020a170902f31400b00186989097d3si5410085ple.385.2022.10.24.06.13.13; Mon, 24 Oct 2022 06:13:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2iYhcub7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S235766AbiJXNMv (ORCPT + 99 others); Mon, 24 Oct 2022 09:12:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235990AbiJXNKV (ORCPT ); Mon, 24 Oct 2022 09:10:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 665602717A; Mon, 24 Oct 2022 05:24:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 35545612E9; Mon, 24 Oct 2022 12:11:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43826C433C1; Mon, 24 Oct 2022 12:11:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613518; bh=+qZs5s2FdzLZ3zTM9H0xVRLIwdP/OwjXS0V/QMyZzRk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2iYhcub7UsPho6WrSBiobpc7tRWwV79Dh0BNH33SFmHG4Xy79QRQsGnp6Le6EJ2lc ImzZmnAGCE1Kj+Hjt9xPT+bZOAL233E7EcZHtk2UyGemOou3BhgFzJ53vuSSeRaKAJ ckzKLcYr2JGUqfAwV/ahJnyfEfz8toewS9NJnJvo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joel Stanley , Stephen Boyd , Sasha Levin Subject: [PATCH 5.4 168/255] clk: ast2600: BCLK comes from EPLL Date: Mon, 24 Oct 2022 13:31:18 +0200 Message-Id: <20221024113008.334497123@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747574805554656985?= X-GMAIL-MSGID: =?utf-8?q?1747574805554656985?= From: Joel Stanley [ Upstream commit b8c1dc9c00b252b3be853720a71b05ed451ddd9f ] This correction was made in the u-boot SDK recently. There are no in-tree users of this clock so the impact is minimal. Fixes: d3d04f6c330a ("clk: Add support for AST2600 SoC") Link: https://github.com/AspeedTech-BMC/u-boot/commit/8ad54a5ae15f27fea5e894cc2539a20d90019717 Signed-off-by: Joel Stanley Link: https://lore.kernel.org/r/20220421040426.171256-1-joel@jms.id.au Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/clk-ast2600.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/clk-ast2600.c b/drivers/clk/clk-ast2600.c index 48122f574cb6..8a6c6b9c9a6a 100644 --- a/drivers/clk/clk-ast2600.c +++ b/drivers/clk/clk-ast2600.c @@ -579,7 +579,7 @@ static int aspeed_g6_clk_probe(struct platform_device *pdev) regmap_write(map, 0x308, 0x12000); /* 3x3 = 9 */ /* P-Bus (BCLK) clock divider */ - hw = clk_hw_register_divider_table(dev, "bclk", "hpll", 0, + hw = clk_hw_register_divider_table(dev, "bclk", "epll", 0, scu_g6_base + ASPEED_G6_CLK_SELECTION1, 20, 3, 0, ast2600_div_table, &aspeed_g6_clk_lock);