From patchwork Mon Jun 12 09:57:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 106508 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2518761vqr; Mon, 12 Jun 2023 04:35:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7DSe5/2ypB6vgrczNdB0XHDXHvnAD/FVfPZW9BOB0wXwt1bIXbGdTtaXWAy6S4wlKKD9lI X-Received: by 2002:a05:6402:88e:b0:514:964c:4c42 with SMTP id e14-20020a056402088e00b00514964c4c42mr5093392edy.8.1686569701563; Mon, 12 Jun 2023 04:35:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686569701; cv=none; d=google.com; s=arc-20160816; b=NC+OaQ/iH0hIJw4Pf/Dn3wORNENCwehR4KU530h0ddNoZLeNSlS3C9cI5yIUs5ud1q 6R8BjR7kPfPoXdaNuGtTlMwM46TC4Omx1WkWExUhWaA2wQ4b3CRq0DoNxdYcHZI/ytUm gDEVHTYBcexK500ZIqT5QjDVVeCGCiiclpWs8jtAWsqN18Cvcdj0qzbtz63s7i0F5iTz EWXsJ6+OMDSSkrDExmE7tonnUmhmoXM7Zp5tTJdgfiQ93/lB3EbRZfeVDdmosGOAkscf RuUte1omx2d69OTBbN6qjF9XpxZAnSnai/o8xk12izSebXBfQhdHluFSBmy+OzpMoBoW T1ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=rHrltOhPwHWK2bpR0DxoLOvFiRn2yagBk1jYIwgsaRc=; b=zxkHmLUqtDi0MQ9mbqFdLptyYS5RcG21kQZedvTySrE+fxnZVN+e27Zh2Xah1psZZZ dWEfdtJt4ApYJO2GfNfpBU6SWyDrfVW0a2pev6bpEcg9ySvFYl9/QEAR93G1PVM/eWcs etQCnUqxsy7ryKcm7uo9wcfv/KHa3uvbewMJ9WZEq8lMZOt8lxfRWdEMt53u4DLUe41t J62poxiYLaEZUIW73kGpEHRDNCTl56h4KHde4e4l4CmAKI2ZTjRtrgewOcjcBiPDORgt mk34iwCOpsgwkNdlcUALKPn/luSSZgUw2+8adVRu3HGBx2nz2pOcfhwZoFR1nA3+zIaM gkig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="bKJ/Msh0"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a4-20020aa7cf04000000b00514b9801aa5si2067763edy.271.2023.06.12.04.34.37; Mon, 12 Jun 2023 04:35:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="bKJ/Msh0"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231201AbjFLKd2 (ORCPT + 99 others); Mon, 12 Jun 2023 06:33:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234784AbjFLKdN (ORCPT ); Mon, 12 Jun 2023 06:33:13 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1990B5BBF for ; Mon, 12 Jun 2023 03:14:39 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-51868eb05ecso35071a12.2 for ; Mon, 12 Jun 2023 03:14:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686564808; x=1689156808; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=rHrltOhPwHWK2bpR0DxoLOvFiRn2yagBk1jYIwgsaRc=; b=bKJ/Msh0EZtYMnrKrxkXuLzwkFxp1ZnK+ISIe24zz88y9239zZQD1mmaJm4zuhvZ1r Haa6Mk0TYYGMtBMDpV04X+VipD3ZzXN1dhA36iEMgiaOUsYAVpsdvpNtHANYpHwbYluG xWOjkR/bFXWWIzCEqZwwEkmLNV3DdK6jiM3gAuUA6eLPaUf4s/bljciva1fMeSbeTkzl 3uG0fLeeukwU63oAUz5pdXwF5TJvY/xr6eZuDV6OA7JHxDQTIdL0gXyGP6FjT389DHB9 k1yKNJUUDPPzfIoJISr2zjZ4SzUThwMKNjWwb1SZB4nq3AfiyKDFTZGux0APGErbXYex Wrfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686564808; x=1689156808; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rHrltOhPwHWK2bpR0DxoLOvFiRn2yagBk1jYIwgsaRc=; b=MeGrzW1RrAUPFiQtjGC3iPH8YQ0D0ktVFUwJpKIy5BqFoVknG4nNI+KdYbR2jkL34Z LMW5LvDaW6gwoMbBfM8gvubRyYMKPkbkqzPWIMGkR+WBvVmNKp12DbW7e83lOU20rxZG l1MTaW22cqUBsnJp28zbLqQFly8bHhqdtf0V20OIcoKGwTgTuVAXWaesvaPZl9ly0ia3 8wbmpqfv3bTiHIUOMHyW+6KEuJKQvlGNXCnnu7UmrRT/DVVEqkJ+peILc/NXhmjnWZHV Z4TvTwyG82bFEFypddj0eDtR39As/TJOdIB/zRUK1Lgvbl8YEEMAM1NAjdje0ouKyU9B GEzA== X-Gm-Message-State: AC+VfDzjDUMhgUIvQbvzXiBhlh6o5tsL40NURQd/BIIM9OCFO5R2dfE/ ome0TyrDxOfuDloHjTe8COPSy0Fe2buNDrC2cof23w== X-Received: by 2002:a7b:c419:0:b0:3f8:575:4a9b with SMTP id k25-20020a7bc419000000b003f805754a9bmr7056547wmi.30.1686563867322; Mon, 12 Jun 2023 02:57:47 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id f25-20020a7bcd19000000b003f7ff520a14sm10829525wmj.22.2023.06.12.02.57.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 02:57:46 -0700 (PDT) From: Neil Armstrong Date: Mon, 12 Jun 2023 11:57:30 +0200 Subject: [PATCH v2 13/19] dt-bindings: clk: amlogic,a1-pll-clkc: expose all clock ids MIME-Version: 1.0 Message-Id: <20230607-topic-amlogic-upstream-clkid-public-migration-v2-13-38172d17c27a@linaro.org> References: <20230607-topic-amlogic-upstream-clkid-public-migration-v2-0-38172d17c27a@linaro.org> In-Reply-To: <20230607-topic-amlogic-upstream-clkid-public-migration-v2-0-38172d17c27a@linaro.org> To: Jerome Brunet , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Neil Armstrong , Dmitry Rokosov , Krzysztof Kozlowski X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2543; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=8+Beuenscy4bmR1N+SURUZHfM2VbWNc/8zWOD3YMkRw=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBkhuwKhsxp88Je1fPTOzxc52XMDugQD6BBUFlf3GRj zj1XbDyJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZIbsCgAKCRB33NvayMhJ0eFRD/ 96dVXxJaJYuPFrGVAz/js6Gu2juJbYY8htUTF0i5rAk3s6qxIdxGYTUq0z5vOVjvXp6PzlVHW9gLKX uhf2B9uJb7iu+yErma8dEKfNHj+7IEkgUDG8my1nVuUOXJVJIpkw8+1d1zuwIItOla169hQ5Z1UCVS f4zMfs7KwXy12JJgU4N6SkxkJ9N8CB4tGDIyCH7XfUQVWfviwGddrvGfT28fu0dO7PTmn7uwlAYtbG lA3Jlx/U//ACyf0yfgrX8N0DoPT/7jMTz5XIVT/zbLP+tQSxSxd3M2NzfjVokD0q2JsijJwxEy3tfm TZnlNkV/8stkPlZNmzqHvJYnLS/Qwm5mUYOcZEXCuRgPScNDTxmYzCXzJ9FazMvCgxIS36jaAzADPI tH1pr2s632awKXSGSvQqlMpd6YJdkToVsHDkFl03zv5oS4R40hZ8cDVAssXWQldEqw0JGmh79Ubh9Z PFk61Fc6PKLGRxGBmQCW7MRepaaH/DK5dsx/akMMmDpcZd33RP9VIXEMbsit1NZQVjjEnsrJOU4Vp0 UGYteO5ooeWV0v3LGn7t6m7qw5YNcfCK9XjNNhWcsuA87psfg5mTZkp4wxgck79fpkWfc6aSSRsDRV fr0N4hu084xbPckK6+P3CoS0Dn7AZMUrgssLxKYpb5MJf7z+y1oWstkbgEQQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, 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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768496511567095754?= X-GMAIL-MSGID: =?utf-8?q?1768496511567095754?= Due to a policy change in clock ID bindings handling, expose all the "private" clock IDs to the public clock dt-bindings to move out of the previous maintenance scheme. This refers to a discussion at [1] & [2] with Krzysztof about the issue with the current maintenance. It was decided to move every A1 pll ID to the public clock dt-bindings headers to be merged in a single tree so we can safely add new clocks without having merge issues. [1] https://lore.kernel.org/all/c088e01c-0714-82be-8347-6140daf56640@linaro.org/ [2] https://lore.kernel.org/all/2fabe721-7434-43e7-bae5-088a42ba128d@app.fastmail.com/ Reviewed-by: Dmitry Rokosov Acked-by: Krzysztof Kozlowski Signed-off-by: Neil Armstrong --- drivers/clk/meson/a1-pll.h | 15 --------------- include/dt-bindings/clock/amlogic,a1-pll-clkc.h | 5 +++++ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/clk/meson/a1-pll.h b/drivers/clk/meson/a1-pll.h index 82570759e6a2..0add1c7ea9f5 100644 --- a/drivers/clk/meson/a1-pll.h +++ b/drivers/clk/meson/a1-pll.h @@ -28,19 +28,4 @@ /* include the CLKIDs that have been made part of the DT binding */ #include -/* - * CLKID index values for internal clocks - * - * These indices are entirely contrived and do not map onto the hardware. - * It has now been decided to expose everything by default in the DT header: - * include/dt-bindings/clock/a1-pll-clkc.h. Only the clocks ids we don't want - * to expose, such as the internal muxes and dividers of composite clocks, - * will remain defined here. - */ -#define CLKID_FIXED_PLL_DCO 0 -#define CLKID_FCLK_DIV2_DIV 2 -#define CLKID_FCLK_DIV3_DIV 3 -#define CLKID_FCLK_DIV5_DIV 4 -#define CLKID_FCLK_DIV7_DIV 5 - #endif /* __A1_PLL_H */ diff --git a/include/dt-bindings/clock/amlogic,a1-pll-clkc.h b/include/dt-bindings/clock/amlogic,a1-pll-clkc.h index 01fb8164ac29..2b660c0f2c9f 100644 --- a/include/dt-bindings/clock/amlogic,a1-pll-clkc.h +++ b/include/dt-bindings/clock/amlogic,a1-pll-clkc.h @@ -10,7 +10,12 @@ #ifndef __A1_PLL_CLKC_H #define __A1_PLL_CLKC_H +#define CLKID_FIXED_PLL_DCO 0 #define CLKID_FIXED_PLL 1 +#define CLKID_FCLK_DIV2_DIV 2 +#define CLKID_FCLK_DIV3_DIV 3 +#define CLKID_FCLK_DIV5_DIV 4 +#define CLKID_FCLK_DIV7_DIV 5 #define CLKID_FCLK_DIV2 6 #define CLKID_FCLK_DIV3 7 #define CLKID_FCLK_DIV5 8