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 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 5C5D0C3DA5D for ; Mon, 22 Jul 2024 15:19:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JZZm/jVzx2sVLbDqnECY3sLep0fCK/QHWyg5ThLslhk=; b=KX1bnm5XsIu9bhwUv/RTrDnFy0 K9/wwKPcupqDa4EOOCtezdXK9krBWilPGX4PEi3PPtUEd+9I5ThO7rVfCp+GXnJYDJ6Xu/Bi1BcnJ 3UU1nHBXrQkGdvr1vvcH6W93snpJuVvTGg2SpPJXvib9LIagIKbptKMg7ik4H5ODtlpRRZxK1/hhq VFdyp0cVtfyzv5n1jsgkvj+KAX32pto0Q+ylHzjOQgaHqJ6+5J8jEHxv2WZyvh1N6Ai4H/79Ng1+h axxVfPScevQ1mO4c7csZlzfyXJ7qXmC/O8jMcmf2oDVYC/V6Jq8SzZ284A1dh8qcMR3Z+5PjPORmP /Zd5uWVA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sVuoM-00000009v2m-1k0B; Mon, 22 Jul 2024 15:18:50 +0000 Received: from madrid.collaboradmins.com ([46.235.227.194]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sVuny-00000009uxq-2Eea for linux-arm-kernel@lists.infradead.org; Mon, 22 Jul 2024 15:18:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1721661505; bh=zm5u8wZXEjdYWsoOLkmz2zH7ehYsVAsv9EcqDcypJq4=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=Q0l6Lj6pVf5jYns2yr30sMv0IbtiubDDUm/fpJ3kDqghCxhPLeKV9r3hiupwV0J/d Fabc1z9YNf5djiyFPa4Wf5iWhtO1ODjbOswHlNtLJ87aVh9XCh/EH2Gu8HWJHUqrzP cs3dX0251qNrXDPbJ6a1kdascz4vY1melpM34ysOoZNPcxgqina+2s/cSjm8ImfZSV P8UrzWHuEdtp3Zc7//nNk7yBYKUxnrAA+tgEzuwbtmEH4VkQbQPJMWvFolpn7f9d8H l78Z7BZpuiBiUm15vSfbeNnFsewWxArx84+bt5b0vSTvox6XIfQ2rcc+AUuTbeNcSC vbFY8JSclqnSQ== Received: from [100.113.186.2] (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 749AE37800DE; Mon, 22 Jul 2024 15:18:24 +0000 (UTC) Message-ID: <26151f58-9dd3-4e14-afaf-c62f539f8e26@collabora.com> Date: Mon, 22 Jul 2024 17:18:23 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/2] clk: en7523: fix scuclk io region for upcoming pinctrl To: Lorenzo Bianconi , linux-clk@vger.kernel.org Cc: mturquette@baylibre.com, sboyd@kernel.org, p.zabel@pengutronix.de, lorenzo.bianconi83@gmail.com, linux-arm-kernel@lists.infradead.org, nbd@nbd.name, john@phrozen.org, upstream@airoha.com References: From: AngeloGioacchino Del Regno Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240722_081826_736263_C7B51503 X-CRM114-Status: GOOD ( 16.89 ) 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 Il 09/07/24 09:48, Lorenzo Bianconi ha scritto: > EN7581 clock driver shares the IO region with the upcoming pinctrl > driver for Airoha EN7581 SoC. Fix it by reducing the clk mapped > region to only used registers in order to not overlap with pinctrl > one. This change is not introducing any backward compatibility issue > since the EN7581 dts is not upstream yet. > > Signed-off-by: Lorenzo Bianconi > --- > drivers/clk/clk-en7523.c | 23 +++++++++++++++-------- > 1 file changed, 15 insertions(+), 8 deletions(-) > > diff --git a/drivers/clk/clk-en7523.c b/drivers/clk/clk-en7523.c > index b20e56337a6b..d9ecbb6bf55a 100644 > --- a/drivers/clk/clk-en7523.c > +++ b/drivers/clk/clk-en7523.c > @@ -31,7 +31,14 @@ > #define REG_RESET_CONTROL_PCIE1 BIT(27) > #define REG_RESET_CONTROL_PCIE2 BIT(26) > /* EN7581 */ > -#define REG_CRYPTO_CLKSRC2 0x20c > +#define REG_GSW_CLK_DIV_SEL2 0x00 > +#define REG_EMI_CLK_DIV_SEL2 0x04 > +#define REG_BUS_CLK_DIV_SEL2 0x08 > +#define REG_SPI_CLK_DIV_SEL2 0x10 > +#define REG_SPI_CLK_FREQ_SEL2 0x14 > +#define REG_NPU_CLK_DIV_SEL2 0x48 > +#define REG_CRYPTO_CLKSRC2 0x58 > + > #define REG_PCIE0_MEM 0x00 > #define REG_PCIE0_MEM_MASK 0x04 > #define REG_PCIE1_MEM 0x08 > @@ -203,7 +210,7 @@ static const struct en_clk_desc en7581_base_clks[] = { > .id = EN7523_CLK_GSW, > .name = "gsw", > > - .base_reg = REG_GSW_CLK_DIV_SEL, > + .base_reg = REG_GSW_CLK_DIV_SEL2, This is practically just commit noise :-) You are adding the en7581_base_clks[] in patch [1/2] with the wrong base register, then fixing it here ... and that's wrong. Please squash the two patches. Cheers, Angelo > .base_bits = 1, > .base_shift = 8, > .base_values = gsw_base, > @@ -217,7 +224,7 @@ static const struct en_clk_desc en7581_base_clks[] = { > .id = EN7523_CLK_EMI, > .name = "emi", > > - .base_reg = REG_EMI_CLK_DIV_SEL, > + .base_reg = REG_EMI_CLK_DIV_SEL2, > .base_bits = 2, > .base_shift = 8, > .base_values = emi7581_base, > @@ -231,7 +238,7 @@ static const struct en_clk_desc en7581_base_clks[] = { > .id = EN7523_CLK_BUS, > .name = "bus", > > - .base_reg = REG_BUS_CLK_DIV_SEL, > + .base_reg = REG_BUS_CLK_DIV_SEL2, > .base_bits = 1, > .base_shift = 8, > .base_values = bus_base, > @@ -245,13 +252,13 @@ static const struct en_clk_desc en7581_base_clks[] = { > .id = EN7523_CLK_SLIC, > .name = "slic", > > - .base_reg = REG_SPI_CLK_FREQ_SEL, > + .base_reg = REG_SPI_CLK_FREQ_SEL2, > .base_bits = 1, > .base_shift = 0, > .base_values = slic_base, > .n_base_values = ARRAY_SIZE(slic_base), > > - .div_reg = REG_SPI_CLK_DIV_SEL, > + .div_reg = REG_SPI_CLK_DIV_SEL2, > .div_bits = 5, > .div_shift = 24, > .div_val0 = 20, > @@ -260,7 +267,7 @@ static const struct en_clk_desc en7581_base_clks[] = { > .id = EN7523_CLK_SPI, > .name = "spi", > > - .base_reg = REG_SPI_CLK_DIV_SEL, > + .base_reg = REG_SPI_CLK_DIV_SEL2, > > .base_value = 400000000, > > @@ -272,7 +279,7 @@ static const struct en_clk_desc en7581_base_clks[] = { > .id = EN7523_CLK_NPU, > .name = "npu", > > - .base_reg = REG_NPU_CLK_DIV_SEL, > + .base_reg = REG_NPU_CLK_DIV_SEL2, > .base_bits = 2, > .base_shift = 8, > .base_values = npu7581_base,