From patchwork Wed Dec 18 19:04:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11301681 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A7DD814B7 for ; Wed, 18 Dec 2019 19:05:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5BF652082E for ; Wed, 18 Dec 2019 19:05:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kFvKy71R" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5BF652082E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=stFdjW0SVEkNkAm89ig9gGhknzl0kOxdD2lddndlZkg=; b=kFvKy71RcSnfxO Wzsz/3YX5tAmX1zl+do5xQKQTVRW+wDPg8KtlljyXWUIML9dzAhmFibOl2nj4fpxYo/3mvIjz/22e tI2QQGGoVn6tFbWA1+FH+BDfomNs4uB6otzfAaU0bzeApop0aDme2jeNbTupAyIW0rbFKEZyut36Z mQFYX8FIhaOIEVJVVcbxCUM7A+V9W9wKkhNnOfXzUSOrMrCyS6oZUaxEKCp/1rZUoBySvQ0xqCHtM GRRQuuaq6wC+VAoFz2AWA/NwYAgtdNQzsgSt5B2b1NEF5biCIloBvduQ1J7yLdcDTWOiHB8BdCpcR KLIpX6QV64lhGNeKCkBw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihedX-0006a1-Kr; Wed, 18 Dec 2019 19:05:31 +0000 Received: from [167.172.186.51] (helo=shell.v3.sk) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihed5-0004vK-RU for linux-arm-kernel@lists.infradead.org; Wed, 18 Dec 2019 19:05:06 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id A0285DD70C; Wed, 18 Dec 2019 19:05:02 +0000 (UTC) Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id qm_tt94XEMSD; Wed, 18 Dec 2019 19:05:01 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id B298CDFC5E; Wed, 18 Dec 2019 19:05:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at zimbra.v3.sk Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id tXSgnu7WdbjR; Wed, 18 Dec 2019 19:05:01 +0000 (UTC) Received: from furthur.lan (unknown [109.183.109.54]) by zimbra.v3.sk (Postfix) with ESMTPSA id 372B4DFB12; Wed, 18 Dec 2019 19:05:01 +0000 (UTC) From: Lubomir Rintel To: Olof Johansson Subject: [PATCH 1/2] ARM: mmp: do not divide the clock rate Date: Wed, 18 Dec 2019 20:04:53 +0100 Message-Id: <20191218190454.420358-2-lkundrak@v3.sk> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191218190454.420358-1-lkundrak@v3.sk> References: <20191218190454.420358-1-lkundrak@v3.sk> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191218_110504_031550_11C6F9C8 X-CRM114-Status: UNSURE ( 9.86 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Stephen Boyd , Michael Turquette , linux-kernel@vger.kernel.org, Lubomir Rintel , soc@kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This was done because the clock driver returned the wrong rate, which is fixed in "clk: mmp2: Fix the order of timer mux parents" patch. Signed-off-by: Lubomir Rintel --- arch/arm/mach-mmp/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c index 110dcb3314d13..c65cfc1ad99b4 100644 --- a/arch/arm/mach-mmp/time.c +++ b/arch/arm/mach-mmp/time.c @@ -207,7 +207,7 @@ static int __init mmp_dt_init_timer(struct device_node *np) ret = clk_prepare_enable(clk); if (ret) return ret; - rate = clk_get_rate(clk) / 2; + rate = clk_get_rate(clk); } else if (cpu_is_pj4()) { rate = 6500000; } else { From patchwork Wed Dec 18 19:04:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 11301679 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ABDFE109A for ; Wed, 18 Dec 2019 19:05:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 845192082E for ; Wed, 18 Dec 2019 19:05:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Wf8eLNrq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 845192082E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=683RGXPWlBlV0/7WsiRbaY+JpciYENu3ESaUzKHPsMg=; b=Wf8eLNrqVoj4Wb UtaTtIsPFvSJ/6W0IwtLCXUHUPmK3HwjPMFgs88DT8e+vmv76zMXJzRFc5ZqmFNnDoqWFaAavtsZt QVMvvQ7CXiDddrpPIJx+yEIZ9X/WMvMtfOj0uk1my96AvqWcxrUr/OTZN2Ri9ek/59uH2NZTOHe/i dR+jP9yJzSu9i1z8JdquPUNWaBMGDR6znowXjyBkv8lfNZkAtehpJXoojHU/sI4jrblsHGcKyTBHb vTWUTRhmsSrsUqrDAbZANSP6QHhDP06BV3cAcnGSfYCy0IyWIwxwU3CVvexYdi/SD8EVhNSYMs6DU 81giiH/T5xERcPTRXi0w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihedL-0006IP-Pk; Wed, 18 Dec 2019 19:05:19 +0000 Received: from [167.172.186.51] (helo=shell.v3.sk) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihed5-0004vL-Pm for linux-arm-kernel@lists.infradead.org; Wed, 18 Dec 2019 19:05:05 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id 0A0ABDFC5F; Wed, 18 Dec 2019 19:05:03 +0000 (UTC) Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id xGEUMlC3gG8f; Wed, 18 Dec 2019 19:05:02 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id 33510DFC76; Wed, 18 Dec 2019 19:05:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at zimbra.v3.sk Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id E00NoQuN8_jt; Wed, 18 Dec 2019 19:05:01 +0000 (UTC) Received: from furthur.lan (unknown [109.183.109.54]) by zimbra.v3.sk (Postfix) with ESMTPSA id 8FA12DD70C; Wed, 18 Dec 2019 19:05:01 +0000 (UTC) From: Lubomir Rintel To: Olof Johansson Subject: [PATCH 2/2] clk: mmp2: Fix the order of timer mux parents Date: Wed, 18 Dec 2019 20:04:54 +0100 Message-Id: <20191218190454.420358-3-lkundrak@v3.sk> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191218190454.420358-1-lkundrak@v3.sk> References: <20191218190454.420358-1-lkundrak@v3.sk> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191218_110503_989646_C4BF6A62 X-CRM114-Status: UNSURE ( 8.21 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , Stephen Boyd , Michael Turquette , linux-kernel@vger.kernel.org, Lubomir Rintel , soc@kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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")' Signed-off-by: Lubomir Rintel Acked-by: Stephen Boyd --- 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 e7e264f26a50d..24af9241bfa06 100644 --- a/drivers/clk/mmp/clk-of-mmp2.c +++ b/drivers/clk/mmp/clk-of-mmp2.c @@ -154,7 +154,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);