From patchwork Fri Jan 24 09:29:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 232968 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B191AC32771 for ; Fri, 24 Jan 2020 11:20:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F319206D4 for ; Fri, 24 Jan 2020 11:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864852; bh=1xuk9SclsKPSSLHRSNWv9CKiEn1sSwg2WfxhtdB5fns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZVLARf2p5SEQFi8kfP/c6d11AxIcvULuLDrejhA5hexPig0L4de/4eYXOiAU59gCE Fr+lO4HPZICwuqpY3BwyH0+F6bKJJfwypFe58pXXVTeFIHyQtGtc3epqQNkFUZ7uZn n/AZtVkfd70nLFWGhnh02OXA8pLHMn6bYVgUOAHk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390746AbgAXLUo (ORCPT ); Fri, 24 Jan 2020 06:20:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:58546 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390751AbgAXLUn (ORCPT ); Fri, 24 Jan 2020 06:20:43 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B93A520704; Fri, 24 Jan 2020 11:20:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864843; bh=1xuk9SclsKPSSLHRSNWv9CKiEn1sSwg2WfxhtdB5fns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YW4FEXC7JGkkrlpX1p46NThLd16IAEazV9T0k6BwkcuyQxfPYC8JB8SZcQN5b2mdv p3yJsDYF4z0u0REZ8lRu73baUDd/aHTIdv7S6W+s3bswkHolGsdgQfFkWrIbmUcQBt 2SpJEoaj+E4Oy79kWJoLh18Iy8zlzHNMbuRU59vE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerome Brunet , Sasha Levin Subject: [PATCH 4.19 381/639] clk: meson: axg: spread spectrum is on mpll2 Date: Fri, 24 Jan 2020 10:29:11 +0100 Message-Id: <20200124093134.707110667@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jerome Brunet [ Upstream commit dc4e62d373f881cbf51513296a6db7806516a01a ] After testing, it appears that the SSEN bit controls the spread spectrum function on MPLL2, not MPLL0. Fixes: 78b4af312f91 ("clk: meson-axg: add clock controller drivers") Signed-off-by: Jerome Brunet Signed-off-by: Sasha Levin --- drivers/clk/meson/axg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index 02229d051d778..4e7dac24948b8 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -461,11 +461,6 @@ static struct clk_regmap axg_mpll0_div = { .shift = 16, .width = 9, }, - .ssen = { - .reg_off = HHI_MPLL_CNTL, - .shift = 25, - .width = 1, - }, .misc = { .reg_off = HHI_PLL_TOP_MISC, .shift = 0, @@ -560,6 +555,11 @@ static struct clk_regmap axg_mpll2_div = { .shift = 16, .width = 9, }, + .ssen = { + .reg_off = HHI_MPLL_CNTL, + .shift = 25, + .width = 1, + }, .misc = { .reg_off = HHI_PLL_TOP_MISC, .shift = 2,