From patchwork Tue Aug 29 19:29:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 13369517 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 767A2C71153 for ; Tue, 29 Aug 2023 19:31:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sFFfduw8P88Dj2pLsiZ7qCDvNt1+8kttSsHsXjAhzrw=; b=mldB7DAfUGhDSl IVj/IzNgnnROPaFPEYIadx721X2q85KfyKfOfkCbYSRJ1lHwS5vqbfFPGf91WWrTcqimo85XJmKnE 54bYw1IydvXT3ZS5DmHR6bNH6UNSSnuLfF/OOazMftro/ua+ePwCetMdL3j4MOZ5HA5KjDsf8S7Hb 5Kmxxw9sZvX0U4XSEAbBPeF97FnCBVnaMvk8q6Fig1W4xVNJAzjbhJjqbDlzZB6/hNwMLLi7OjF4P TyHcsH8vUXHc8AEdJTaRNAY7Edi+UcCyLhdaZ+/9aPVQPC7UGW6jc1nDRUwAPoXE/f9eW9NErq7er oOTIDkiXhN81RfpGitIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qb4QJ-00C8jo-2B; Tue, 29 Aug 2023 19:30:47 +0000 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qb4Q4-00C8hw-1D; Tue, 29 Aug 2023 19:30:39 +0000 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-500b0f06136so5380563e87.0; Tue, 29 Aug 2023 12:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693337430; x=1693942230; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eglkfRZu56bK3qZVs6wBq4nX9Ykg+M4S/tca+p9SQ30=; b=jruP9OV0Cp6ujyJehHhmSgckXYPv5kzIE/ofTujIZnvpA34/6dBmoxH1rbYtdMXFih kFpwPpfSFd9lXwbYzZTREjUW8uUS17xTiLWsgtlAiEIV2fj8UJ1ftWYc22ucfable8R/ +fs39uyDtpOB0s9Gy9uLrL3MD+NfcnHcPKqB32H0L4Ax2/JpGmwznU96hZMth0CEDdDv 4/csJoQbC+Vtt6evliCCQILLJAFConRiGU8t6N+uAM4yU2qQIj9DAnRP51VuMaAH/FmP OWq59Lar9SXHwEuebsNn4XBl4srthjzzheotqT6dLAcvLWt0e1RmkFBSuAF1a2f178HN htQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693337430; x=1693942230; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eglkfRZu56bK3qZVs6wBq4nX9Ykg+M4S/tca+p9SQ30=; b=bqK0KLNx9jkkUb9FSqt81QmWyfgIPOdfELC1TBsGycL/+TDEVuTqsUn20XEjunx+zw YyTadMQ5n7Ql/8tjjTCRjw14R5DjV6YMyWvdDo8VHEDXSH/MY+D3EhTujCnibLBB73Kk dBviJ+Zilo9kkWfvLHeOURuO/T0i4WbzZq47T8pSRQPGE/63RyGlLc6CTUEELYNl8WZB zyk86KVST7PA4REZTc8YIgou8ht9os976zsDS5YpB+JfTyEze3yW9nkhQ8smWYHxgx1X 0dD27Nt1JwilV9/izmoo/GDAVi5OFvxrT5K6eCKt9kff55S7QNLRzNdXI5Fh2p+RC++9 Bu3w== X-Gm-Message-State: AOJu0YwIXmrkSKq9cxbKNuT6YzQNs6xMFp+QuwkqoHMXICMLuq0y1fXl VCIDCjrOzF5RsGAK3ApjCA== X-Google-Smtp-Source: AGHT+IGKu0J2D48F+mooqlGIw6OnQ/YOnu4pF/VvL1n566pIMWV+tJNpWaqbTUwmm6Fet/DMD5rnUA== X-Received: by 2002:a05:6512:ea4:b0:4ff:7602:5879 with SMTP id bi36-20020a0565120ea400b004ff76025879mr26903079lfb.55.1693337429715; Tue, 29 Aug 2023 12:30:29 -0700 (PDT) Received: from U4.lan ([2001:9e8:b958:3410:8e0c:ed68:cd6c:7cb8]) by smtp.gmail.com with ESMTPSA id o8-20020aa7d3c8000000b0052544bca116sm5940902edr.13.2023.08.29.12.30.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 12:30:29 -0700 (PDT) From: Alex Bee To: Heiko Stuebner , Stephen Boyd , Michael Turquette Cc: Elaine Zhang , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Finley Xiao , Alex Bee Subject: [PATCH v2 1/3] clk: rockchip: rk3128: Fix aclk_peri_src parent Date: Tue, 29 Aug 2023 21:29:56 +0200 Message-ID: <20230829192958.250248-2-knaerzche@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230829192958.250248-1-knaerzche@gmail.com> References: <20230829192958.250248-1-knaerzche@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230829_123036_815314_E78E40B5 X-CRM114-Status: GOOD ( 12.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Finley Xiao gpll_div3_peri gates, but a single clk_peri_src gate. The peri mux directly connects to the plls respectively the pll divider clocks. Fix this by creating a single gated composite. Also rename all occurrences of aclk_peri_src to clk_peri_src, since it is the parent for both peri aclks and hclks and that name also matches the one used in the TRM. Fixes: f6022e88faca ("clk: rockchip: add clock controller for rk3128") Signed-off-by: Finley Xiao [renamed aclk_peri_src -> clk_peri_src and added commit message] Signed-off-by: Alex Bee --- drivers/clk/rockchip/clk-rk3128.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3128.c b/drivers/clk/rockchip/clk-rk3128.c index aa53797dbfc1..fcacfe758829 100644 --- a/drivers/clk/rockchip/clk-rk3128.c +++ b/drivers/clk/rockchip/clk-rk3128.c @@ -138,7 +138,7 @@ PNAME(mux_pll_src_5plls_p) = { "cpll", "gpll", "gpll_div2", "gpll_div3", "usb480 PNAME(mux_pll_src_4plls_p) = { "cpll", "gpll", "gpll_div2", "usb480m" }; PNAME(mux_pll_src_3plls_p) = { "cpll", "gpll", "gpll_div2" }; -PNAME(mux_aclk_peri_src_p) = { "gpll_peri", "cpll_peri", "gpll_div2_peri", "gpll_div3_peri" }; +PNAME(mux_clk_peri_src_p) = { "gpll", "cpll", "gpll_div2", "gpll_div3" }; PNAME(mux_mmc_src_p) = { "cpll", "gpll", "gpll_div2", "xin24m" }; PNAME(mux_clk_cif_out_src_p) = { "clk_cif_src", "xin24m" }; PNAME(mux_sclk_vop_src_p) = { "cpll", "gpll", "gpll_div2", "gpll_div3" }; @@ -275,23 +275,17 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { RK2928_CLKGATE_CON(0), 11, GFLAGS), /* PD_PERI */ - GATE(0, "gpll_peri", "gpll", CLK_IGNORE_UNUSED, + COMPOSITE(0, "clk_peri_src", mux_clk_peri_src_p, 0, + RK2928_CLKSEL_CON(10), 14, 2, MFLAGS, 0, 5, DFLAGS, RK2928_CLKGATE_CON(2), 0, GFLAGS), - GATE(0, "cpll_peri", "cpll", CLK_IGNORE_UNUSED, - RK2928_CLKGATE_CON(2), 0, GFLAGS), - GATE(0, "gpll_div2_peri", "gpll_div2", CLK_IGNORE_UNUSED, - RK2928_CLKGATE_CON(2), 0, GFLAGS), - GATE(0, "gpll_div3_peri", "gpll_div3", CLK_IGNORE_UNUSED, - RK2928_CLKGATE_CON(2), 0, GFLAGS), - COMPOSITE_NOGATE(0, "aclk_peri_src", mux_aclk_peri_src_p, 0, - RK2928_CLKSEL_CON(10), 14, 2, MFLAGS, 0, 5, DFLAGS), - COMPOSITE_NOMUX(PCLK_PERI, "pclk_peri", "aclk_peri_src", 0, + + COMPOSITE_NOMUX(PCLK_PERI, "pclk_peri", "clk_peri_src", 0, RK2928_CLKSEL_CON(10), 12, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO, RK2928_CLKGATE_CON(2), 3, GFLAGS), - COMPOSITE_NOMUX(HCLK_PERI, "hclk_peri", "aclk_peri_src", 0, + COMPOSITE_NOMUX(HCLK_PERI, "hclk_peri", "clk_peri_src", 0, RK2928_CLKSEL_CON(10), 8, 2, DFLAGS | CLK_DIVIDER_POWER_OF_TWO, RK2928_CLKGATE_CON(2), 2, GFLAGS), - GATE(ACLK_PERI, "aclk_peri", "aclk_peri_src", 0, + GATE(ACLK_PERI, "aclk_peri", "clk_peri_src", 0, RK2928_CLKGATE_CON(2), 1, GFLAGS), GATE(SCLK_TIMER0, "sclk_timer0", "xin24m", 0, From patchwork Tue Aug 29 19:29:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 13369518 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id BC9EDC83F12 for ; Tue, 29 Aug 2023 19:31:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rEzFeExHrGNaPQalSQ4sYpJbS6TJvbcYmLl2r99OJOo=; b=Nyjln4Ni/xgx+1 R9YOKylW7uiJtp8lpGWKl0y8E02oi6hQi+U5hOwrj5jwrJ97W75kV3PJpXy2W8kkGFTPkYPYgM8n3 htBCOk1JOjPWyu26pv9UGA1I0gK9QuAvKid8UZKzkVIYUBdnv0ZiOf2K8xbOqZgabk4k1gpYgq3JJ 64IJvZlHDas4ZyYUNxTtzZInk/Mc3s3wkpn6lSWcocabgkPns4kDb/H8C5wyrRXcps2QHn7FzpdMG /JK+3g98xyWBiDlXuyC0poizmJhBWlg4jnQcCmsze22xG2GJgFcHaqecOWHy+qRRh2oOpst9/2AWe NMm6TRcP11NEAm0lMzUQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qb4QI-00C8jc-2N; Tue, 29 Aug 2023 19:30:46 +0000 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qb4Q4-00C8hx-1R; Tue, 29 Aug 2023 19:30:38 +0000 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-9a2a4a5472dso25966066b.1; Tue, 29 Aug 2023 12:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693337430; x=1693942230; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bfzC+/2ZWaml8G5FoMVqEV7cfUPth65LiMOYJOwJeN0=; b=JkJN3G3JOjhW/ON0sxFI1b3sJN3P+c076L7+NyQHqqiY99dz14iMjajuWgfyFDMYjq yHQOvaa0p8JUa9LzlhSSxmQArk7tgnaW1MJaRMW7c2c4BhrvCKG+4eShIZjhGeCP26jq hO2XimlS+gOTrBBbiVDwz5CATppqnE0qFJgPobpLBnCWSSjsK4thAZhQtf+U5S33c1gE YtyUoro5UQBRtrJBLaEw9TXiuNfQvbeO4UApcP0O0j7AXLpZ8XN96HmCGiro7czF6B+W hcRCZr4DHJLnVRGvaErQ4rcFYvglLiIOR0yF1UeAXuC7XnkbI8fjv+K8akbQZJQeocVi xUHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693337430; x=1693942230; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bfzC+/2ZWaml8G5FoMVqEV7cfUPth65LiMOYJOwJeN0=; b=fS68NhL8QLbIIPFDp9ptDQZ90ZC6s/4HnwFDCUF87uWwHJ3yjwGKbGJXTY5VAo7Rw3 jmlj+z/7p0NNkJKDC42ggBTmqwjAF8J81ANIfGiLF2YEhMJ+FCAt0dS9SAtVR20/m2xm s38iyQFa4o8Hhoqgxl6E/8yZ2hndRCFfki9ru0DIjz4mKG5cNQtxnQEGWoz1WcTsJuQF IHW3gv6ZTrEf1xZlIPJvm9c+vNO7w+OgreVO9Be4sO9/pdlKtjYwRe6HDdNMQ3UaJGYs OoB1xF/fX1Xi+VnKLbVaFMHLL08ABFXl7wVuWT3jDOHXEHonkLeAxBthgetlUTyUgNER /dHg== X-Gm-Message-State: AOJu0Yxnhn7UbXmWd0dzo4h1f6mFwbf/7RjHTl39LGNASSbOvysguTiO YngBtJCP+TIyTaYXd+cVyVfqhvIDwA== X-Google-Smtp-Source: AGHT+IGNh4/VCGDQCZHTWgx0EhZ1PtJBqs8JN8DF92lQhMLKLCha86n99pCn/Xj5QM+kGftFnuVypw== X-Received: by 2002:a17:907:60cf:b0:9a5:aa43:1c7c with SMTP id hv15-20020a17090760cf00b009a5aa431c7cmr5036312ejc.26.1693337430408; Tue, 29 Aug 2023 12:30:30 -0700 (PDT) Received: from U4.lan ([2001:9e8:b958:3410:8e0c:ed68:cd6c:7cb8]) by smtp.gmail.com with ESMTPSA id o8-20020aa7d3c8000000b0052544bca116sm5940902edr.13.2023.08.29.12.30.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 12:30:30 -0700 (PDT) From: Alex Bee To: Heiko Stuebner , Stephen Boyd , Michael Turquette Cc: Elaine Zhang , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Finley Xiao , Alex Bee Subject: [PATCH v2 2/3] clk: rockchip: rk3128: Fix hclk_otg gate Date: Tue, 29 Aug 2023 21:29:57 +0200 Message-ID: <20230829192958.250248-3-knaerzche@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230829192958.250248-1-knaerzche@gmail.com> References: <20230829192958.250248-1-knaerzche@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230829_123036_812996_2881C7CE X-CRM114-Status: GOOD ( 12.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Finley Xiao HCLK_OTG gate is located in CRU_CLKGATE5_CON, not in CRU_CLKGATE3_CON. CRU_CLKGATE3_CON bit 13 is already (correctly) defined for ACLK_GPU. Fixes: f6022e88faca ("clk: rockchip: add clock controller for rk3128") Signed-off-by: Finley Xiao [added commit message] Signed-off-by: Alex Bee --- drivers/clk/rockchip/clk-rk3128.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/rockchip/clk-rk3128.c b/drivers/clk/rockchip/clk-rk3128.c index fcacfe758829..17bacf6dd6e7 100644 --- a/drivers/clk/rockchip/clk-rk3128.c +++ b/drivers/clk/rockchip/clk-rk3128.c @@ -484,7 +484,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { GATE(HCLK_I2S_2CH, "hclk_i2s_2ch", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 2, GFLAGS), GATE(0, "hclk_usb_peri", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(9), 13, GFLAGS), GATE(HCLK_HOST2, "hclk_host2", "hclk_peri", 0, RK2928_CLKGATE_CON(7), 3, GFLAGS), - GATE(HCLK_OTG, "hclk_otg", "hclk_peri", 0, RK2928_CLKGATE_CON(3), 13, GFLAGS), + GATE(HCLK_OTG, "hclk_otg", "hclk_peri", 0, RK2928_CLKGATE_CON(5), 13, GFLAGS), GATE(0, "hclk_peri_ahb", "hclk_peri", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(9), 14, GFLAGS), GATE(HCLK_SPDIF, "hclk_spdif", "hclk_peri", 0, RK2928_CLKGATE_CON(10), 9, GFLAGS), GATE(HCLK_TSP, "hclk_tsp", "hclk_peri", 0, RK2928_CLKGATE_CON(10), 12, GFLAGS), From patchwork Tue Aug 29 19:29:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 13369520 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 0C8B4C83F12 for ; Tue, 29 Aug 2023 19:31:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8zvWpp+yzXmyJUSRE0oWI36pHeVRZ66CWrWnzeTvD90=; b=NSkhjMeD8njsAe lo6rHI7Ycr6oSeZBIsVnIqArnxInQSCxVRG3LFW2IetEjCQbykI0PFbaySVbmhRJZ724xQDuEe4ti zjWNrXf3rhALPLWfzAiN/sDi3UqFAKzHGEIai4HpvRpzHJZH4q0kmtYhCYYe/u2EFWtcwOssST4Mk wQBMGYO2MnHtAvNVvTD08GMPsCe6YAPtjXH6Z1RpWBrk0de+6n2c6b3QUePd6dUX8/c98iWwHmKEi I8LHDLStLND2AlnjpS1CVZ3tyvxYQ+neDAq26rc9vqm+Q9Wc0JpKIWP8OW8ZinO6h/tdb/eb9PUee 2LMr6PpA2/iK+ubOXq3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qb4QK-00C8jw-0X; Tue, 29 Aug 2023 19:30:48 +0000 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qb4Q5-00C8hz-0k; Tue, 29 Aug 2023 19:30:39 +0000 Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-52a40cf952dso6332216a12.2; Tue, 29 Aug 2023 12:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693337431; x=1693942231; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qFpS6puAfr1Vvk5xVzMQk3TJscyGtiLTY36CCDlYgn4=; b=hDBDy9UrRUeaus4NKzec7qHKCjmZbbN/8iy4HOjQ1Rmd0EnRlpfvJkGSt5SVZztoiG MXDKPuo/ELRUPSBgUbnoZPiUjzbqa8b89kQcas21o3z8porHsxIuRTmexR4EIDz/Q4g3 EnWBwdJKXrvm7qTGF6Kz+Xl5GlYGIYZz4W9I45ZIhyHlcbWXnOMssvq0h/y3MGve+d8d VbMmoIBLYmEO13+4SLU5Lt8bJ+FVzEAJyyiYZIgjkXMjDa8OaTZqXljUWclkZ9YIgsCo USCxNC53WcQl0X1aUxvu/2OG+PV0jB6lBynoVKP+fOXCKp16MgHiF+iWd4mLyDA4WJDM ktdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693337431; x=1693942231; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qFpS6puAfr1Vvk5xVzMQk3TJscyGtiLTY36CCDlYgn4=; b=RdDJcwfBW/GPTq7qTGRy2tCibrM8nKF5iJbJcDm4cLGxST9Fa6iCHamBjyEfTa021c 7s1kzlXQkSbM17LORi7MaPd+GKjTDfHmX/e3RdviFuaOIIHcxvbKK8s4jeaRLqmzyZzt BIhu6U5K03hBhCYg8BA3zXqT/ih4fhw/m1a0WTI+1PC/zmuoySFi1d/eUQMVRlM0p10b isx8Y7Fd0QMGeOE6uRlItdspyKEP+OhwI/HaT94rwsruBmmnCduCzvqFjKUfIWX3KWUO Kg5bnv59UdaCNaqu2e8TTw95Xal9qY6CsMdI/0dH3tvdyWXazlhCR3AsglMiP5AcXcq6 RVCA== X-Gm-Message-State: AOJu0YztasTR8PiqWD88XbPnYTRcXHbq0z8ETz8WI7ii/++4FZBb/n2b 9VvR+/VTudGuYfPCKePbDA== X-Google-Smtp-Source: AGHT+IF3soeV+vQd0OW4HUmy2zdE2aptWsopC7QBNqpTZOjsWegWne49TwOnE9EMxuKhbIvdZqAXyA== X-Received: by 2002:aa7:d699:0:b0:52a:1c3c:2ecc with SMTP id d25-20020aa7d699000000b0052a1c3c2eccmr177588edr.25.1693337431101; Tue, 29 Aug 2023 12:30:31 -0700 (PDT) Received: from U4.lan ([2001:9e8:b958:3410:8e0c:ed68:cd6c:7cb8]) by smtp.gmail.com with ESMTPSA id o8-20020aa7d3c8000000b0052544bca116sm5940902edr.13.2023.08.29.12.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Aug 2023 12:30:30 -0700 (PDT) From: Alex Bee To: Heiko Stuebner , Stephen Boyd , Michael Turquette Cc: Elaine Zhang , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Alex Bee Subject: [PATCH v2 3/3] clk: rockchip: rk3128: Fix SCLK_SDMMC's clock name Date: Tue, 29 Aug 2023 21:29:58 +0200 Message-ID: <20230829192958.250248-4-knaerzche@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230829192958.250248-1-knaerzche@gmail.com> References: <20230829192958.250248-1-knaerzche@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230829_123036_816653_39C49EA8 X-CRM114-Status: GOOD ( 15.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org SCLK_SDMMC is the parent for SCLK_SDMMC_DRV and SCLK_SDMMC_SAMPLE, but used with the (more) correct name sclk_sdmmc. SD card tuning does currently fail as the parent can't be found under that name There is no need to suffix the name with '0' since RK312x SoCs do have a single sdmmc controller - so rename it to the name which is already used by it's children. Fixes: f6022e88faca ("clk: rockchip: add clock controller for rk3128") Signed-off-by: Alex Bee --- drivers/clk/rockchip/clk-rk3128.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/rockchip/clk-rk3128.c b/drivers/clk/rockchip/clk-rk3128.c index 17bacf6dd6e7..75071e0cd321 100644 --- a/drivers/clk/rockchip/clk-rk3128.c +++ b/drivers/clk/rockchip/clk-rk3128.c @@ -310,7 +310,7 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { GATE(SCLK_MIPI_24M, "clk_mipi_24m", "xin24m", CLK_IGNORE_UNUSED, RK2928_CLKGATE_CON(2), 15, GFLAGS), - COMPOSITE(SCLK_SDMMC, "sclk_sdmmc0", mux_mmc_src_p, 0, + COMPOSITE(SCLK_SDMMC, "sclk_sdmmc", mux_mmc_src_p, 0, RK2928_CLKSEL_CON(11), 6, 2, MFLAGS, 0, 6, DFLAGS, RK2928_CLKGATE_CON(2), 11, GFLAGS),