From patchwork Mon Nov 27 18:14:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 170355 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3350455vqx; Mon, 27 Nov 2023 10:14:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IHqNLpT4gnVkifjwiS3G6AEQ4aPjKNVjd6j9hisGVjoVX6H0QOOCePKvlQOAOnlkSCEygWd X-Received: by 2002:a05:6a00:1813:b0:6be:43f8:4e0b with SMTP id y19-20020a056a00181300b006be43f84e0bmr12526965pfa.24.1701108899532; Mon, 27 Nov 2023 10:14:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701108899; cv=none; d=google.com; s=arc-20160816; b=ddWuYvwkI8e7RHzLDo8ZIW4nXEF2NAhOnMcyKW0vSkIEzR6ECbjK7rsTnVmuj+fibX C3K/RyU9ZZ1Uf31KNDXOzeurEA5AdBjY5CronjH6uRWBUPohS6iwIjtWhRNYnuDmvDV5 7CEX3+cI+0LmIs51PdNvOR/M3TevQ0zhFK0nCIxx3lwgvTefT402AUxAVqhU9p7E5AAB WH5tU5H2DJFQOwvw/lBSojeXQOp1K5HrGW5loKxizMskKjdlE0zeRc6ruYh/oSGLJN08 AR5m55UiaC/hrwdlbA+QLiEhW4f/pVic18S13mXNf/fY6fg5p4pTkxc9sgkZx3h36EM3 ZUZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tCB3azVd9wPLophpHh17n/6NPQGGZXQWFa2v4yG4E2Q=; fh=4xFgt7RA9LZlJHjZpzE2Yq/jadXJppuWcDbRgrl1Rno=; b=B3p94VWDY8iOEnYJIoLnyG8Z4OicpedxbVdhT/UX69Nqpo0fU7pGFhbVr0fDon/hoh Nx9pId1K6yruYStke/hC2jRENvI9g+dMowILmwHx+iseuhlJ4AZkIUcwUMCqQ3Uk9JIj ACgu1fE77o1r1PYljyp0fJv7oa4vWM5VwGH/YTA0Gmcgdv4mq5ivCZHABU6tUraAcZac qIQPhKhlhjpPFsfodbSkL2OLrFWUFKDIIgWdrzbfOE7RDb5h5bgl11s6vuLHJOlsF7Oc J5H/yqXwIsccKW7FMADNedOfpunawznW0CpRuVK1PkLUFBSyHmzYT4okY4jzjhRa+iOC hnvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VspH+Pf8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id a11-20020a056a000c8b00b006cb2db00287si10352675pfv.340.2023.11.27.10.14.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 10:14:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VspH+Pf8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id D8E80808BD02; Mon, 27 Nov 2023 10:14:56 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232571AbjK0SOq (ORCPT + 99 others); Mon, 27 Nov 2023 13:14:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232586AbjK0SOo (ORCPT ); Mon, 27 Nov 2023 13:14:44 -0500 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 095F81BE; Mon, 27 Nov 2023 10:14:50 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-a0b65cbf096so299244866b.1; Mon, 27 Nov 2023 10:14:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701108888; x=1701713688; darn=vger.kernel.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=tCB3azVd9wPLophpHh17n/6NPQGGZXQWFa2v4yG4E2Q=; b=VspH+Pf8grS6nQQbdYBV44lDwBq+/baNFsz6BKTlVGg3THZ0U4e56dMGWsSJGftER8 Z9EQ+Vgl+HAG7P+0njA/MXIvHSf1hvMNVUbmkF8xYY4JOoWKNB/UZd7wq3Qsg0HNiYdM U1VuYOIxeaxh99HoSwGtbjR90O5Iyi3AXJlmCAR+X7HsvjVIgEaPEzr4OZmg4cY4qGZW uRFhZIfKOqP740eN62mzlkbU0roFsqGCL95KupXNlpPbgc3ct7akTX7uVtV68oluwPlT jsL8DPML45TKQqvHZ2wbkd91ScOs8fKyAvRc5bItWB9l4Ww4OqngRzljUB9AT7Ahlsou S0/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701108888; x=1701713688; 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=tCB3azVd9wPLophpHh17n/6NPQGGZXQWFa2v4yG4E2Q=; b=eeJ0n72LxLPDCBnvvSfp8+9YeKPX7FlnK2jK1XnvHal9B2QrJqiPTEm14JLxUUet2C 0NBmD4bRZg86z05bR9kjHqxnMJpvdw3FTF/Hi/eCJKlZXjEHWyvHwCJXPuGh1bAzOtP+ rpTXtT6EaPUxRMaarWOGKhrxZl7510xmff5vtkNcCjFbtuNOn86zl/oIfX0ihOM3hpJv egwuis6D+5M5gY2GUd2dwPQ1G93Ku6YCYeOMNJ4+QoQrwRoJF44cKg4/en4g5xSmBnZr hLuzDUPJwSXmHXZonn18E/WKyfjCCtCR1fV2SnmTJDqlKEMM7KP95Kz3/EuoxyP2vW82 MNgg== X-Gm-Message-State: AOJu0Yxku1hBc8amW/TOjfzcOEUgAxRNqMv0j8rFX0llyUenjCuiutIS forCeyfILOwqFe36zvLRdQ== X-Received: by 2002:a17:906:5954:b0:a01:3df:ab1a with SMTP id g20-20020a170906595400b00a0103dfab1amr9747913ejr.75.1701108888378; Mon, 27 Nov 2023 10:14:48 -0800 (PST) Received: from U4.lan ([2a02:810b:f40:4300:370c:d8f:2dce:7367]) by smtp.gmail.com with ESMTPSA id dv19-20020a170906b81300b009a9fbeb15f2sm5952271ejb.62.2023.11.27.10.14.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 10:14:48 -0800 (PST) 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 v3 1/2] clk: rockchip: rk3128: Fix aclk_peri_src's parent Date: Mon, 27 Nov 2023 19:14:16 +0100 Message-ID: <20231127181415.11735-4-knaerzche@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231127181415.11735-2-knaerzche@gmail.com> References: <20231127181415.11735-2-knaerzche@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 27 Nov 2023 10:14:57 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783741965460738289 X-GMAIL-MSGID: 1783741965460738289 From: Finley Xiao According to the TRM there are no specific gpll_peri, cpll_peri, gpll_div2_peri or gpll_div3_peri gates, but a single clk_peri_src gate. Instead mux_clk_peri_src 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 peri aclks, pclks and hclks. 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 Mon Nov 27 18:14:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bee X-Patchwork-Id: 170356 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3350862vqx; Mon, 27 Nov 2023 10:15:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IEE+MFG38erp3zCUk/yWuCLEu4MwiV4WgZBUM8QC+bfDGv2fvIcBMqBbyfLEulQN12UlNiJ X-Received: by 2002:a05:6a20:3c91:b0:187:3643:ecce with SMTP id b17-20020a056a203c9100b001873643eccemr17331240pzj.56.1701108926431; Mon, 27 Nov 2023 10:15:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701108926; cv=none; d=google.com; s=arc-20160816; b=eOdMpKKN29qvWZFlrWQaw42ytDKL0cy8LxruDdiBfpEB6QaS/gf5V+9KVtmgm4tMqh uPH+/eudjW/9NCCXet2mP0Or54bTCtguvXNa8UV1ug8RimUwELeFB/FIeEJN4RDhs/IG NIYObICoc9sO2CE+axjigfhrFjaNz0Rcue+FkCKXD1HpbqJDuS1THDCyEmAnHaSKmTJE rTGvgoqwWprsXcf4oMbboi5REiTJkp5H9eQhvA6vmdukI9EVnchZ/sHFD9mOQPA5c0as ojyZnPUHyMkDiM2k86Phpbl38NU+hWQGotnq1q7OB+uKxWruqyseRwNSmaaY+XNBqxxo P3jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=x6EbGi5KYgfVG1CdJuzlcMAvljT6psfhah5arWG3Clc=; fh=MvfJuKp1Eh9Cic3Eghds46bmKL67YP/AyMW/+HAOMqc=; b=O5fWzcMWL6pX3gUqg7Om5+KJ4NQIMz4/e6hAEsAnSMe/cJmqivzkRCSwREnkKTnFGR qaoDK38ZJ89p6a5TJE6EtN2oFRXTm+gpbSaHKDey1eimUARSBnZ85i7N1zx6WxgW49Yp 1jPX511Lgr677W638MM+U1a34ZN1NBWcxaEvUP/5c5tGkScchA0Wj0sw0QLPEFP6wn8w I3g0zIaOC4b0avAlj45Xg3bQLfqCVj48qMo9gELgHasuQoZvFuoNYp7c6gX8Vk+IOlTU LNBu/yxp9bRRrjEUxLw3dKwKtS4Ef3Mv+FHJ9/NqPGnBjFTmgIJudzLhfLezFOJK/kML TOWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HxiD+wEm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id h22-20020a056a00219600b006cbb2cd545esi10405841pfi.5.2023.11.27.10.15.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 10:15:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HxiD+wEm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 070BF8131C13; Mon, 27 Nov 2023 10:15:15 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232571AbjK0SPF (ORCPT + 99 others); Mon, 27 Nov 2023 13:15:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230020AbjK0SPC (ORCPT ); Mon, 27 Nov 2023 13:15:02 -0500 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 752161BB; Mon, 27 Nov 2023 10:15:08 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-a00b01955acso654826466b.1; Mon, 27 Nov 2023 10:15:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701108907; x=1701713707; darn=vger.kernel.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=x6EbGi5KYgfVG1CdJuzlcMAvljT6psfhah5arWG3Clc=; b=HxiD+wEmUMJ3X8IEqrcg7JnnbnQ9GS17iOVFO2IGGHuF2qGjgzyGEULtyv7GGda6NC wAPYXnscFPt8I0fFjACIVeX+Fr0aGJ8LTz/Y+2NtFudqkAuhcDThangxygJa+rYpDGuJ TL+Yl1gDpbSrd+6ac5Md8GFADYrjjblPRo5rpzOw8o1uTKVb0I/J8+jvgm5sC8fdxgnl asT4M8dlfKprmygbD7L9eEq4kh9p0NSN2THXCIRMmjlf2J79F+EAFksyxGvhqPTFoa8Y TXPcq1P7bxk24qhjLcuVGR5w6RbtdTdYyiTRdVyvcMSQU8cAkcNXSNTjZ7LYjvbiJXkT levg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701108907; x=1701713707; 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=x6EbGi5KYgfVG1CdJuzlcMAvljT6psfhah5arWG3Clc=; b=fgv/XuGvFTWwPD4GotaKCYOn4LBSQB7nVjBc+l4PovzTYerB5y+SH5mpxtm1uS/KMS oQtFWuyJ9S22zUcMKRx3KAdw5XMylt9Ddltkwqa10UIr11gEEF8s4qbE3amu1AyglsDv MHlnbNabKYJsUISf8PVKguyUs2tsm7f6/m9p0fNuo8yqWH9dQ+2UThhcFLivDIZHkKbx W2imFyy6yTE2n3m76l9QPfwjbikWC80ZO0ytEagw/D+hv8+eUTjGxMjZ0A0vgaWB61fb FsQzV+UPMc3o6kUCGAUpCzkOXvRAMVrK1qacLUCdbq2n/L6gf5XO4RRO7rXcSaUhRVz6 oAtA== X-Gm-Message-State: AOJu0YxDpcHMaIV/MWj2zD/KrUoZeg480d395LB0gxUt1ejFeb4x2vPq VjcYsRyCihR0PjkCVFz/PQ== X-Received: by 2002:a17:906:d28e:b0:9e5:cef:6ff with SMTP id ay14-20020a170906d28e00b009e50cef06ffmr10355980ejb.33.1701108906794; Mon, 27 Nov 2023 10:15:06 -0800 (PST) Received: from U4.lan ([2a02:810b:f40:4300:370c:d8f:2dce:7367]) by smtp.gmail.com with ESMTPSA id dv19-20020a170906b81300b009a9fbeb15f2sm5952271ejb.62.2023.11.27.10.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 10:15:06 -0800 (PST) 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 v3 2/2] clk: rockchip: rk3128: Fix SCLK_SDMMC's clock name Date: Mon, 27 Nov 2023 19:14:18 +0100 Message-ID: <20231127181415.11735-6-knaerzche@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231127181415.11735-2-knaerzche@gmail.com> References: <20231127181415.11735-2-knaerzche@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 27 Nov 2023 10:15:16 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783741993645187667 X-GMAIL-MSGID: 1783741993645187667 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 fcacfe758829..22e752236030 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),