From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.7 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED 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 89535C43381 for ; Sun, 10 Mar 2019 16:46:36 +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 57C8D206DF for ; Sun, 10 Mar 2019 16:46:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="DwjweWdH"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AjKDaQVL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57C8D206DF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.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-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=5WZe+Kt110kdNlxi2PS+JsGw6DmygtGmJd1RHYk6B/M=; b=DwjweWdH4WqAHyBpm9GqzY0ff hTotJmyUz81i4YTw36LbzFg/EFDpf4t4HksWc8x6nVbCy+yGm44i4GjAKypEX8bciDhqlnNVbcAdx dHEC1BIYRLjbhlShyQU8qGnLnNqh7cjGFLvncaALymPxlupdlEqFHHcm2bKJWa75fuXLoM5lvXWpS dwmHIAwffAVd1Bo+LyBbjz+QjbmDM1h0E1Jr/kIByKxjrcrBiCnn1j4ihtY7YGBSfjdY9AH5wSst7 JTuJpWWoP5WxvPEzST5xGNz4LXwFXKnmKXDUC2u70tTdDB/lYhRl1XA0ws5gU0xxi/lddj58jmtXR v9+18XeaQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h31ai-0000fX-Nx; Sun, 10 Mar 2019 16:46:24 +0000 Received: from mail-qk1-x744.google.com ([2607:f8b0:4864:20::744]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h31af-0000f7-8t; Sun, 10 Mar 2019 16:46:23 +0000 Received: by mail-qk1-x744.google.com with SMTP id m9so1384539qkl.4; Sun, 10 Mar 2019 09:46:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=iuLVxnZ5LMgmdQCRDTIrsvvMMDtFinU+vzw34nR7vKQ=; b=AjKDaQVLKf60Hn9ZJuLN03ZkXyHTey9BudC1nuOXZfvAbJXQ521zCOu7rg4FItBEa7 iwOUBZE/8llFQIYvjt9yNXgs89NEgppkv9EHOyUmi9wI6xM/ZbLUfRp8TmeY4R1oHIb4 G4jT3CqfJYNJi3wxboHbCd0gR9Q3kyXQicO5/nJKX2ajdBpSngRD23rXk1QRFduCzh81 hDsLC8ErYwGr+XHkQK37WvJ/M71GfT/42Z6PEb4civZdccnMxg8Hq+iPz4uUEiO0LxcS JAB1/ma7zi9FmvlydDyX0pQudoj5CAG/6ymFzna63J4Jj8bs+bUXMCQubN0EtV39Cfl3 fpJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=iuLVxnZ5LMgmdQCRDTIrsvvMMDtFinU+vzw34nR7vKQ=; b=sCwqfQzk5gqbH2qawIQayHyEca2RI+0Uuyw/sOF8j7cDj96GuKO8WQVDPxLiszp7TR rRBdXxcvLIQpEoejXiCPu5MOBrmH4WbLOj9f4F1Il403fpflMNzigtJstUxHkVfaltgq HTRLMaETyvR5T+hhWl7CnYp9QpX8M3yORGPoCPlOGPSpBLFjx4TrkQO+UR4Y9dblvABI fuEBltHNuVg9Nf4tPUx/HTmavRxkSyIc/g6yivlhGln3MLu/oREb4zm3hSBWzoqSVrH8 3PHBqqigCEvIf90K2ef3xJYADLekpl6ZR8+GLssnsmIUBVxtu4yi8Uw57gkX8hkPAV9c lVbw== X-Gm-Message-State: APjAAAUydNZwfvDjZgW6WNg8IU1JM4101R+/rR05ZCA1SoeEgFhxJhFA pPL3zKjwAWCaHkBuxyi3iKI= X-Google-Smtp-Source: APXvYqyM4muD6up3eMkRBdK5r8lFeDYIAOUF/s9YbOTq4GO2s9AAeM/wuqqKyoziYPqWOANqJic7cQ== X-Received: by 2002:ae9:c30f:: with SMTP id n15mr21137507qkg.227.1552236378226; Sun, 10 Mar 2019 09:46:18 -0700 (PDT) Received: from ?IPv6:2601:153:900:ebb:e9a2:ce76:e8b3:e9e? ([2601:153:900:ebb:e9a2:ce76:e8b3:e9e]) by smtp.gmail.com with ESMTPSA id f189sm1959453qkb.79.2019.03.10.09.46.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Mar 2019 09:46:17 -0700 (PDT) Subject: Re: [PATCH] clk: rockchip: fix wrong clock definitions for rk3328 To: Jonas Karlman , "linux-clk@vger.kernel.org" , "linux-rockchip@lists.infradead.org" , "linux-arm-kernel@lists.infradead.org" References: From: Peter Geis Message-ID: <97e8505d-391c-9cc6-af3b-0eb1a7d895f5@gmail.com> Date: Sun, 10 Mar 2019 12:46:17 -0400 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.3 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190310_094621_339847_B1E3D86E X-CRM114-Status: GOOD ( 17.09 ) 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: Stephen Boyd , Michael Turquette , Heiko Stuebner , "linux-kernel@vger.kernel.org" Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 3/10/2019 8:00 AM, Jonas Karlman wrote: > This patch fixes definition of several clock gate and select register > that is wrong for rk3328 referring to the TRM and vendor kernel. > Also use correct number of softrst registers. > > Fix clock definition for: > - clk_crypto > - aclk_h265 > - pclk_h265 > - aclk_h264 > - hclk_h264 > - aclk_axisram > - aclk_gmac > - aclk_usb3otg > > Fixes: fe3511ad8a1c ("clk: rockchip: add clock controller for rk3328") > Signed-off-by: Jonas Karlman Tested on the rk3328-roc-cc. Tested-by: Peter Geis > --- > drivers/clk/rockchip/clk-rk3328.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/clk/rockchip/clk-rk3328.c b/drivers/clk/rockchip/clk-rk3328.c > index faa94adb2a37..5f6b6bcc2149 100644 > --- a/drivers/clk/rockchip/clk-rk3328.c > +++ b/drivers/clk/rockchip/clk-rk3328.c > @@ -458,7 +458,7 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { > RK3328_CLKSEL_CON(35), 15, 1, MFLAGS, 8, 7, DFLAGS, > RK3328_CLKGATE_CON(2), 12, GFLAGS), > COMPOSITE(SCLK_CRYPTO, "clk_crypto", mux_2plls_p, 0, > - RK3328_CLKSEL_CON(20), 7, 1, MFLAGS, 0, 7, DFLAGS, > + RK3328_CLKSEL_CON(20), 7, 1, MFLAGS, 0, 5, DFLAGS, > RK3328_CLKGATE_CON(2), 4, GFLAGS), > COMPOSITE_NOMUX(SCLK_TSADC, "clk_tsadc", "clk_24m", 0, > RK3328_CLKSEL_CON(22), 0, 10, DFLAGS, > @@ -550,15 +550,15 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { > GATE(0, "hclk_rkvenc_niu", "hclk_rkvenc", 0, > RK3328_CLKGATE_CON(25), 1, GFLAGS), > GATE(ACLK_H265, "aclk_h265", "aclk_rkvenc", 0, > - RK3328_CLKGATE_CON(25), 0, GFLAGS), > + RK3328_CLKGATE_CON(25), 2, GFLAGS), > GATE(PCLK_H265, "pclk_h265", "hclk_rkvenc", 0, > - RK3328_CLKGATE_CON(25), 1, GFLAGS), > + RK3328_CLKGATE_CON(25), 3, GFLAGS), > GATE(ACLK_H264, "aclk_h264", "aclk_rkvenc", 0, > - RK3328_CLKGATE_CON(25), 0, GFLAGS), > + RK3328_CLKGATE_CON(25), 4, GFLAGS), > GATE(HCLK_H264, "hclk_h264", "hclk_rkvenc", 0, > - RK3328_CLKGATE_CON(25), 1, GFLAGS), > + RK3328_CLKGATE_CON(25), 5, GFLAGS), > GATE(ACLK_AXISRAM, "aclk_axisram", "aclk_rkvenc", CLK_IGNORE_UNUSED, > - RK3328_CLKGATE_CON(25), 0, GFLAGS), > + RK3328_CLKGATE_CON(25), 6, GFLAGS), > > COMPOSITE(SCLK_VENC_CORE, "sclk_venc_core", mux_4plls_p, 0, > RK3328_CLKSEL_CON(51), 14, 2, MFLAGS, 8, 5, DFLAGS, > @@ -663,7 +663,7 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { > > /* PD_GMAC */ > COMPOSITE(ACLK_GMAC, "aclk_gmac", mux_2plls_hdmiphy_p, 0, > - RK3328_CLKSEL_CON(35), 6, 2, MFLAGS, 0, 5, DFLAGS, > + RK3328_CLKSEL_CON(25), 6, 2, MFLAGS, 0, 5, DFLAGS, > RK3328_CLKGATE_CON(3), 2, GFLAGS), > COMPOSITE_NOMUX(PCLK_GMAC, "pclk_gmac", "aclk_gmac", 0, > RK3328_CLKSEL_CON(25), 8, 3, DFLAGS, > @@ -733,7 +733,7 @@ static struct rockchip_clk_branch rk3328_clk_branches[] __initdata = { > > /* PD_PERI */ > GATE(0, "aclk_peri_noc", "aclk_peri", CLK_IGNORE_UNUSED, RK3328_CLKGATE_CON(19), 11, GFLAGS), > - GATE(ACLK_USB3OTG, "aclk_usb3otg", "aclk_peri", 0, RK3328_CLKGATE_CON(19), 4, GFLAGS), > + GATE(ACLK_USB3OTG, "aclk_usb3otg", "aclk_peri", 0, RK3328_CLKGATE_CON(19), 14, GFLAGS), > > GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 0, GFLAGS), > GATE(HCLK_SDIO, "hclk_sdio", "hclk_peri", 0, RK3328_CLKGATE_CON(19), 1, GFLAGS), > @@ -913,7 +913,7 @@ static void __init rk3328_clk_init(struct device_node *np) > &rk3328_cpuclk_data, rk3328_cpuclk_rates, > ARRAY_SIZE(rk3328_cpuclk_rates)); > > - rockchip_register_softrst(np, 11, reg_base + RK3328_SOFTRST_CON(0), > + rockchip_register_softrst(np, 12, reg_base + RK3328_SOFTRST_CON(0), > ROCKCHIP_SOFTRST_HIWORD_MASK); > > rockchip_register_restart_notifier(ctx, RK3328_GLB_SRST_FST, NULL); > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel