From patchwork Mon Feb 3 16:19:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232266 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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 DF151C3524D for ; Mon, 3 Feb 2020 16:20:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B648C20838 for ; Mon, 3 Feb 2020 16:20:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580746858; bh=MFdQwpC8ocAw3gqlG2PhUf+SO3XPMQEGZg511YDWX24=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g7Dup8P0xzXIz7wiOvgwBwPKhrkQTfuIH959zFFCwnpRn3Vu0UiPV2mr3/8bLl+Xj 9ppPga6u3QRJ4HB+36O1pzYajl8dyag7vsR4GJCYMlqICPSQU1ABsnMFfeKwqiDGDv jbCDUPAcnEuqYOMJKYVAUNNza1nZ/tEN0Quy5jxQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729017AbgBCQU5 (ORCPT ); Mon, 3 Feb 2020 11:20:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:60932 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729016AbgBCQU5 (ORCPT ); Mon, 3 Feb 2020 11:20:57 -0500 Received: from localhost (unknown [104.132.45.99]) (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 70B192082E; Mon, 3 Feb 2020 16:20:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580746856; bh=MFdQwpC8ocAw3gqlG2PhUf+SO3XPMQEGZg511YDWX24=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WaB8gk1thL+CvRw+YH712TIZFLE8Mcc4CuEV3yfqZGcERKlZR/RAQO05WQzutJL83 T0CDzjTuFZt8n9iyfV+xUgvwTIcWI8H10cBuwarIMKZQwc2RrRJEw6pIR2c14Iq4HA 6g57hhlCwP34/A5KAtDEDKRcQsEf7cp5LFK6LALo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lubomir Rintel , Stephen Boyd , Olof Johansson , Sasha Levin Subject: [PATCH 4.4 34/53] clk: mmp2: Fix the order of timer mux parents Date: Mon, 3 Feb 2020 16:19:26 +0000 Message-Id: <20200203161909.159100760@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200203161902.714326084@linuxfoundation.org> References: <20200203161902.714326084@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: Lubomir Rintel [ Upstream commit 8bea5ac0fbc5b2103f8779ddff216122e3c2e1ad ] Determined empirically, no documentation is available. The OLPC XO-1.75 laptop used parent 1, that one being VCTCXO/4 (65MHz), but thought it's a VCTCXO/2 (130MHz). The mmp2 timer driver, not knowing what is going on, ended up just dividing the rate as of commit f36797ee4380 ("ARM: mmp/mmp2: dt: enable the clock")' Link: https://lore.kernel.org/r/20191218190454.420358-3-lkundrak@v3.sk Signed-off-by: Lubomir Rintel Acked-by: Stephen Boyd Signed-off-by: Olof Johansson Signed-off-by: Sasha Levin --- drivers/clk/mmp/clk-of-mmp2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/mmp/clk-of-mmp2.c b/drivers/clk/mmp/clk-of-mmp2.c index 8b45cb2caed1b..60db6531996eb 100644 --- a/drivers/clk/mmp/clk-of-mmp2.c +++ b/drivers/clk/mmp/clk-of-mmp2.c @@ -134,7 +134,7 @@ static DEFINE_SPINLOCK(ssp3_lock); static const char *ssp_parent_names[] = {"vctcxo_4", "vctcxo_2", "vctcxo", "pll1_16"}; static DEFINE_SPINLOCK(timer_lock); -static const char *timer_parent_names[] = {"clk32", "vctcxo_2", "vctcxo_4", "vctcxo"}; +static const char *timer_parent_names[] = {"clk32", "vctcxo_4", "vctcxo_2", "vctcxo"}; static DEFINE_SPINLOCK(reset_lock);