From patchwork Mon Jun 12 09:57:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 106502 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2507044vqr; Mon, 12 Jun 2023 04:13:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7wN62WnxTiI6CwQAYyCvOB4yI5b6b8b3QljxKmwRaXZlkZP0BPKGgyJ9QKeAEEXj+dy7Jb X-Received: by 2002:a05:6a00:10cd:b0:662:1126:90c2 with SMTP id d13-20020a056a0010cd00b00662112690c2mr9079147pfu.5.1686568433481; Mon, 12 Jun 2023 04:13:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686568433; cv=none; d=google.com; s=arc-20160816; b=GMw5zf5dauk9ZG6xc4BzUdmBJB5kOtV/TY+wfxj0g4u1cQ/8DNNRQ7BIovrgj5WO8a mein5nF30yQPdO9lyo8ZIPLv/AU8/UvZ4jMAZLwo8oHmFLStr/vdOdAgmMWdZc5FZHXF BBdOAabS6HY2jyPefrZUwrP5lFaKII47Z3WaPkpbKU+XnMt29gicSLp5c7ph8x+i28S1 HehaSQRR7kVqhbkZQS6bp8n86CR8NcpRBZtdI3cyQhAaLo8I5uvShHsGC1Fg25L6VLoZ FwqT9fpgc1vhpCR55TqFHcp9a0bna0ZSXFIJXatfMEVUzYCUqc2FJSwLC6wwa5/JsZuj 91jg== 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=4NrWkYN+T1PuofiMKnG6dXc8ZUYCBSKcJmUWA7/nNhc=; b=w/NBeEKUSPNztlhFU1OB/T3+VkYDRJC63oC14f853OkzQU67pNeIh5hF3txWZYDeXW kWq1LlF1UVvDQBERKJDhpQN94ir6H4Jh47loF4u5zBLuNItM8jGjsSuvhbH3XUTBavjs Lhc7HGTGKyOcAXnnKAAystZizyuudROg6+zekxynHvCOZ8H0ZNPNu4eTANGIDfikkGKX V1PJY3YWEr1KLg2hv0RUeiNdf4/CUr094fhpBhqEW7tPeUka262oQ9+MEMaT6UmQvrGy 2fd5wna6kO2P4a38EdQORJqE9IX0b3t1eOlLhG7vLyZzA4HtaZeYj2mHHmcxg2Garmom 5Bag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iGVxi7Wy; 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 h10-20020a63384a000000b00542d2508ac8si6521760pgn.89.2023.06.12.04.13.40; Mon, 12 Jun 2023 04:13:53 -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=iGVxi7Wy; 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 S234498AbjFLKat (ORCPT + 99 others); Mon, 12 Jun 2023 06:30:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233967AbjFLKaT (ORCPT ); Mon, 12 Jun 2023 06:30:19 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7712E42B9D for ; Mon, 12 Jun 2023 03:11:17 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-5147f7d045bso6174207a12.2 for ; Mon, 12 Jun 2023 03:11:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686564603; x=1689156603; 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=4NrWkYN+T1PuofiMKnG6dXc8ZUYCBSKcJmUWA7/nNhc=; b=iGVxi7WynRgu2Mvkpuu6WfSaTiMeQk78vcuT9skZSKAkjf/OQZZLKfRVGlyizob6dH easHar4p01pWftrl2U4/45zhILGm9sPTWJ1jNvO+BL38xc4BzSMBv1e3VdnCI17kmfmL KZY7QyrkyiTLmoEy3xRDyoEaHDJzinxoi9RjPQSJGDjIOwQ0Ayy9CMWAh+HpUNotvMnV 4NBKuSP0+fgRlrnE56wBkGkuZzWGoDxAJI36rTjyD/8Fy/o6l9/DgBebvHKxaGnpzVgg oxbiIaTlI6SIvWYX3OQ6wEsdmyQplFS7aNmyd9xxr+xgX8mLFcD1grUNQ7PuOKb4OaHs u6aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686564603; x=1689156603; 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=4NrWkYN+T1PuofiMKnG6dXc8ZUYCBSKcJmUWA7/nNhc=; b=NPiCPQq4vDoWSfxbtT0mLE2+agFzKalRG4yp5fb/RTrG2rLOJwLUXRRR1ZNjQ2maqY cn74xJ4ucT07ppWOv5DC5oL8n8KheSc6JQT+XBTQUXJgn4RErbqC4M1C3PkLdMKMAMNX 3Nvwl0y0PucHVBR1lM3MXHfZr673R1pTjLQDzxZR+fVk9V5KCEk/G16TVGopJRdLfV1A GNWagKBaqdw2CEiQSCKAYhAn/bWyAXAgacXwFKFO6P333d4cIXxNU98h5yBVac6bTYoN 1xC2k7RdOUlkOEtHYWpHUYezg5y5Nyi3oQkOYmj1rf+NMPiTIMGZt2BJvksk8TJVubW3 nFOQ== X-Gm-Message-State: AC+VfDyOxH5qoTpYqMuJ6JZVYA1po8RQ8819HKFqO+JNnxelLrxW0WfU 5EGSiEVfOaasMy8Bmsn4AWcnvsDcyqTmGxA3NXkhLg== X-Received: by 2002:a05:600c:3793:b0:3f7:8fd5:567 with SMTP id o19-20020a05600c379300b003f78fd50567mr7016692wmr.2.1686563864354; Mon, 12 Jun 2023 02:57:44 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 02:57:44 -0700 (PDT) From: Neil Armstrong Date: Mon, 12 Jun 2023 11:57:27 +0200 Subject: [PATCH v2 10/19] dt-bindings: clk: g12a-aoclkc: expose all clock ids MIME-Version: 1.0 Message-Id: <20230607-topic-amlogic-upstream-clkid-public-migration-v2-10-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 , Krzysztof Kozlowski X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2658; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=7gny86gEdGuVv1Xi4BFHu+2b+JlYB0+AahzkDT5GhB8=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBkhuwJUlUTItdC3kUPmDRVJZidNU1HOd9NfqDOUhnU bzLCyWiJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZIbsCQAKCRB33NvayMhJ0e6sD/ 9L2RHqJBZ/WvUasGVtJfG0CFUUkWOgmyPk/3wNkO1BBXEh3pG16D+iz8phOPtBXy4bZeoIy9yrECAg bFiUwZljtqSHiC2xuxI6NZZxhWtVL7a2O8REQF/c9l3Uvm6QK7QVKwAaHZ013tWz0vwXGEDwvB5vbg 39OL+HRj3gashe6POOxBPzkHvLRVPxYJbn5ki7VXalUGOlilNXSgt96xPL3Cb7UHQGKRd2N8bpqVe0 YFSsrd3LEVswisxTAIzkIdVYvQNtkPhH6pBRlbbI3RiaJ1N/iLU5UTF5Ryi7bd9sg5o4e4c5CGAjGI GnX8os6dWBlsfaZCgR9EMJr6szIRjyPlqvSN8iSeNpYdBhT7kfxhrTnRfiSIHzjVhe1Re94rzi+74H hOqm7JplhUOTBlT+0h5EUaUKPo9ywReTbZseoJbZbl/px/he34vURUqtFWHXi7yHVACZ+qk97hIp2n Z8+fa1H1gG3oAE5ebW2P19Tx0EbZDmTgT9HARMP2ryNONbEuEEq2WSSWNyZgloju8gzBB/+5TXJrf3 XWTSI3xP1UjIxWKeBIm41DJ0iiuZl+rHFp95rfv5lEOUkR6xl8f5WbBFR6NU7aJKptewbC5ZD0bndK /qbPrEkrVh9LJgadhJxLHK0Fugi2baKtbZXSOL89x7kLcHpcv8G7u22wbJGQ== 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?1768495181561316065?= X-GMAIL-MSGID: =?utf-8?q?1768495181561316065?= 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 g12a-aoclkc 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/ Acked-by: Krzysztof Kozlowski Signed-off-by: Neil Armstrong --- drivers/clk/meson/g12a-aoclk.h | 17 ----------------- include/dt-bindings/clock/g12a-aoclkc.h | 7 +++++++ 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/clk/meson/g12a-aoclk.h b/drivers/clk/meson/g12a-aoclk.h index 077bd25b94a1..9d6eeb24ae0c 100644 --- a/drivers/clk/meson/g12a-aoclk.h +++ b/drivers/clk/meson/g12a-aoclk.h @@ -7,23 +7,6 @@ #ifndef __G12A_AOCLKC_H #define __G12A_AOCLKC_H -/* - * CLKID index values - * - * 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/g12a-aoclkc.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_AO_SAR_ADC_DIV 17 -#define CLKID_AO_32K_PRE 20 -#define CLKID_AO_32K_DIV 21 -#define CLKID_AO_32K_SEL 22 -#define CLKID_AO_CEC_PRE 24 -#define CLKID_AO_CEC_DIV 25 -#define CLKID_AO_CEC_SEL 26 - #include #include diff --git a/include/dt-bindings/clock/g12a-aoclkc.h b/include/dt-bindings/clock/g12a-aoclkc.h index e916e49ff288..8fe7712fb12d 100644 --- a/include/dt-bindings/clock/g12a-aoclkc.h +++ b/include/dt-bindings/clock/g12a-aoclkc.h @@ -26,10 +26,17 @@ #define CLKID_AO_M4_FCLK 13 #define CLKID_AO_M4_HCLK 14 #define CLKID_AO_CLK81 15 +#define CLKID_AO_SAR_ADC_DIV 17 #define CLKID_AO_SAR_ADC_SEL 16 #define CLKID_AO_SAR_ADC_CLK 18 #define CLKID_AO_CTS_OSCIN 19 +#define CLKID_AO_32K_PRE 20 +#define CLKID_AO_32K_DIV 21 +#define CLKID_AO_32K_SEL 22 #define CLKID_AO_32K 23 +#define CLKID_AO_CEC_PRE 24 +#define CLKID_AO_CEC_DIV 25 +#define CLKID_AO_CEC_SEL 26 #define CLKID_AO_CEC 27 #define CLKID_AO_CTS_RTC_OSCIN 28