From patchwork Tue Aug 29 07:58:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 9926833 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6B3A860380 for ; Tue, 29 Aug 2017 07:59:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CA08284C4 for ; Tue, 29 Aug 2017 07:59:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51854287D7; Tue, 29 Aug 2017 07:59:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D4372284C4 for ; Tue, 29 Aug 2017 07:59:30 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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:In-Reply-To: References:List-Owner; bh=eSq+UuuQ1GP+piIGHvzXFmHMuFcB6EKIQIi+9fRYSMw=; b=PXJ 0VpdQm8tUMM7R04A/TIsX1Nk4/hhFu5rRSO15WvEyIAcJXmGUfu5EIb2/3/RvwTaBYA/UiVw/sL3N M7hT9zS2sAtSAwd25YELBK9/xH2dcvHLYVE48mzMrsDmi6fhvuHbkBKdr/mb1Q1+yy76Xj/CqLpOJ y06VkBplT0XWShfPvj5Sl2Al+Ow4Vn9ELDAJTcsCGSYA9hRF1BNyarx4AhzZ5RegZscAX+j8GlyVs HpyLyDmF/Uwl04iVb3/0z+g2AZwSKCWnrxBPoFel7ZBJo6YZ3Q6QXyS3f16bcpEsuRSx+tmT/v8a7 TiLMlJRJeApbsZURlpE2RC2W7cvwUNg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dmbQi-0002Ut-53; Tue, 29 Aug 2017 07:59:24 +0000 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dmbQd-0002QL-QR for linux-arm-kernel@lists.infradead.org; Tue, 29 Aug 2017 07:59:22 +0000 Received: by mail-wm0-x22c.google.com with SMTP id b82so15578995wmd.1 for ; Tue, 29 Aug 2017 00:58:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=1QTAkAouuld/wM+dc9gS4N+DO6HtlObajL2OqRTxkq8=; b=bJTZNtv6nd511Vi4PEmZ8aEC0ilhQnBUZdFBZRkpXK4T09jbuV3LAG2ClIjSuiIwow hwMjuxg18xerAQ/t/+vnRXxbAkika/ByQefdmDloKgGT02t58p5n6YcHYZQX/MV8dWxR IspLr+o2t5gwHguX43HrYnO59/DMzO7+M3IDo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=1QTAkAouuld/wM+dc9gS4N+DO6HtlObajL2OqRTxkq8=; b=K/xbNwFo/9VPD+6p16x8JssEfMIvs2Eq/7BnKpyuWjia7qkTT6ZCGKqtHVCmyN2lAn O8kZAtxShLg91HuX5qtlqZE/0AG69zPIBybxXjSaLj3+rh3NqPTdLHCJ11criXGXMnBr +wC8o/+kxlWrH+lTKi0sQdy7NlNWO6KEEYdEqrVwQX4AXr5Kco+B1LtxZiGJlwHiNtT9 6vOc/+KE3eMLbocVXB7lxH8N9G3M9OYaPADZ6HxTPmRnD6icSNoAlVDyjRYl1D6cJGSU 4f4W6/VMIKRCCItQi2zA8MYFD1q7bqwXYxCzXcPoGxtVlO3o1x6Q8smnzStZAePraIU1 pVrg== X-Gm-Message-State: AHYfb5jDHD8glFwstFKdcK2cXCpCErKIgi+XEYkWhu7Labf66NE1cQwP +Hlm4aLdbAEF/XGr X-Received: by 10.80.134.138 with SMTP id r10mr2703412eda.123.1503993537260; Tue, 29 Aug 2017 00:58:57 -0700 (PDT) Received: from localhost.localdomain (li524-22.members.linode.com. [176.58.122.22]) by smtp.gmail.com with ESMTPSA id a30sm965360ede.13.2017.08.29.00.58.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Aug 2017 00:58:55 -0700 (PDT) From: Leo Yan To: Wei Xu , Rob Herring , Mark Rutland , Michael Turquette , Stephen Boyd , Zhangfei Gao , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Dmitry Shmidt , Guodong Xu , Haojian Zhuang Subject: [PATCH 1/2] clk: hi6220: change watchdog clock source Date: Tue, 29 Aug 2017 15:58:37 +0800 Message-Id: <1503993518-24428-1-git-send-email-leo.yan@linaro.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170829_005920_087550_4C9495B5 X-CRM114-Status: GOOD ( 11.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Yan MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The old code uses tcxo (19.2MHz) as watchdog clock but actually the watchdog uses 32K clock, as result the watchdog timeout cannot be set correctly and delay long time to reset SoC. So this patch is to use 'ref32k' as clock source for watchdog. Fixes: 72ea48610d43 ("clk: hi6220: Clock driver support for Hisilicon hi6220 SoC") Signed-off-by: Leo Yan --- drivers/clk/hisilicon/clk-hi6220.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clk/hisilicon/clk-hi6220.c b/drivers/clk/hisilicon/clk-hi6220.c index 4181b68..e786d71 100644 --- a/drivers/clk/hisilicon/clk-hi6220.c +++ b/drivers/clk/hisilicon/clk-hi6220.c @@ -55,9 +55,9 @@ static struct hisi_fixed_factor_clock hi6220_fixed_factor_clks[] __initdata = { }; static struct hisi_gate_clock hi6220_separated_gate_clks_ao[] __initdata = { - { HI6220_WDT0_PCLK, "wdt0_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 12, 0, }, - { HI6220_WDT1_PCLK, "wdt1_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 13, 0, }, - { HI6220_WDT2_PCLK, "wdt2_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 14, 0, }, + { HI6220_WDT0_PCLK, "wdt0_pclk", "ref32k", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 12, 0, }, + { HI6220_WDT1_PCLK, "wdt1_pclk", "ref32k", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 13, 0, }, + { HI6220_WDT2_PCLK, "wdt2_pclk", "ref32k", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 14, 0, }, { HI6220_TIMER0_PCLK, "timer0_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 15, 0, }, { HI6220_TIMER1_PCLK, "timer1_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 16, 0, }, { HI6220_TIMER2_PCLK, "timer2_pclk", "clk_tcxo", CLK_SET_RATE_PARENT|CLK_IGNORE_UNUSED, 0x630, 17, 0, },