From patchwork Mon Jun 12 09:57:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 106481 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2486415vqr; Mon, 12 Jun 2023 03:31:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7pTjJuULAfh1QPbWj9MgJhNN4V+6hvCLtDJswA1DXxuqvz5sS1USnjS4+gTHqRyMRpEi5A X-Received: by 2002:a05:6a20:6a22:b0:105:c456:ab99 with SMTP id p34-20020a056a206a2200b00105c456ab99mr10695367pzk.9.1686565874377; Mon, 12 Jun 2023 03:31:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686565874; cv=none; d=google.com; s=arc-20160816; b=Yqe4wszFiAR9IxF/bNQALgtslZw8TYcIJlO1bDJ0Uhm4ZOF/vXHcL8ZxzncMt1C8CT 4gUidC7Y3L0blLiPZpFQNYQEqgkhQ9qluRMCSQbQkySKJ5YzXb4Z3+dlKK/h7QJIOq3c ycPFPb8yrwIEuyPSGOAB2GSX0awSF7vLwKBsY9QitqMHbkKvyBYrIEPVJQoUPSCjy0vQ BAIsot7uYeaNQVMWET+7dAqWjob/YAOxE8xa76BR5uQrIEnDMFuW9gWfEfDbmoL/rudS kx77IBt/n+5JqqYCYS9P07HxSq8OtLxfgaerD0FwQntV0GiFJcOavgmFx94ebodHecLx cuuw== 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=ZL7F676qnGuDggNTxNbDvWwuuEoE9PWaV3K3eMeu4cY=; b=0v8WMibopRF7+5FnMkaTl72m+ghnG9ZGoG6gIwh6o/zgVlWbvVfsjNvvobMdbtZhDL mqn3oOgXjaJj8YS9De+pgfS9TBTqbiw6/sMrk3XqX0StkZn1VSVMKYBEI65mcMvp2zJ9 I+rAYpfQYjmTtXZ21bzKm5ny8PvPHl479Kp5II1JYmFMKnyXyfTEmke07tP1kjFnGpD9 c8EemJGit9mM/fAH7avgSpWFYMO1vhiZx5DydTIqyQviRkH7SAhimX3MvZgCjZ73ZkMi 5yiE+O3SN7QlLc/eW8v5isQlj24fh3gnyKBEyjtVAMnHJkqMLPckRhQ2sQZmLb2mRQcD Fu1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZJhQLvTl; 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 y21-20020a634b15000000b005486a1e9440si6179672pga.780.2023.06.12.03.31.02; Mon, 12 Jun 2023 03:31:14 -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=ZJhQLvTl; 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 S231652AbjFLKTd (ORCPT + 99 others); Mon, 12 Jun 2023 06:19:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230121AbjFLKSa (ORCPT ); Mon, 12 Jun 2023 06:18:30 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3102326B0 for ; Mon, 12 Jun 2023 02:59:15 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f732d37d7cso41649285e9.2 for ; Mon, 12 Jun 2023 02:59:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686563873; x=1689155873; 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=ZL7F676qnGuDggNTxNbDvWwuuEoE9PWaV3K3eMeu4cY=; b=ZJhQLvTlBIAKPJI07OjUieRfKmCPgu3j55886ScyUilRznd0SKbmB9apDzwj3Tqj5x T2mNQh5iowlGKVkiZ46Gd/gpv2Wy6NLFSgVR5fHOR2OuGf+FGpOSwjaTeQA6cqOkxqxi 3V5qKAnPRZbMKSHHM+vb8Kxx8AtKnoqyKmQXRg0feNx3KfiMPFFMNV+0SfCdOT8jkNRZ hxzcfi2tjr8eNPpACRfFNfA+kkK8JCUMn/qdcbcCga6vs6ozs+iUw/6GOLo9cezpdzZH ou4dcgqHkqSRY4t3WmZm2auawHu6R8i0b6yoUAHQ3P66jX6iLlBbnzngM/sO0aDlCDwx s0DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686563873; x=1689155873; 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=ZL7F676qnGuDggNTxNbDvWwuuEoE9PWaV3K3eMeu4cY=; b=e34Vav4Bg0J44+JkzUX2912MA85x5LYfr+7CxESVoUPy5nFdgWX7oAxEhDR0wv/tif 4mgZLHh+kyWgZN8lDE9IkM3foeUhsO1BEndm2OYA8bkJiQYhbH0sjDHJAdm5XnA9BbUI 09snQciVI7xtlIEUxirXmR303hrZMPVDsRB8fSl03Ou3tGB5fd32VoisfNwjRwAei2Cr QOgaZJgUJUcS41e2itvutzR4+Vn32029DPbJ+HM7ToulEXwrGu0RBxGfF54KqI1uybbq OJhRSLObliJuIKY0Xr2kG9AdT5kaUt97gwmrWB/rSzOB/tJEdcNKdK+B08RnEvvEf8XW H1dw== X-Gm-Message-State: AC+VfDztMCf00Py1cTgik173EDKHJSdSSHi1t2D6Wq+0wR1va6nhCiYK qOBk7EIM7bBMqEKeQc5TAukXGQ== X-Received: by 2002:a05:600c:2310:b0:3f7:4961:52aa with SMTP id 16-20020a05600c231000b003f7496152aamr6850138wmo.15.1686563873362; Mon, 12 Jun 2023 02:57:53 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 02:57:52 -0700 (PDT) From: Neil Armstrong Date: Mon, 12 Jun 2023 11:57:36 +0200 Subject: [PATCH v2 19/19] clk: meson: axg-audio: move bindings include to main driver MIME-Version: 1.0 Message-Id: <20230607-topic-amlogic-upstream-clkid-public-migration-v2-19-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 X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1218; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=tdQh/9l9bbOO/xduw4X55YNw4CGdSuUcP4MCwJ672SM=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBkhuwMajJn0JjAA6/q5/GCSSK8FW4zQ5lCG+SLMeYI Y9WBiP+JAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZIbsDAAKCRB33NvayMhJ0W5aD/ kB1Y6fa+guMuUVS04lb4q/w0zkGu6tny+ys/DakB1hd8KJvHhB9usTDp1i/zA0MFmddC8Ob0H+pazF NrBuq9fvnuctYR3Fbx7dq0ou+i1TUGxkq9/OZz9GSawxSWipZ2gnc0Ld2EZN/FByH8xgRqodTtqaXf Xxls79k/mr3sixj+ETzANRfhTOCb+42jJ6yFvhh8FQ4e4/aM1TZILftVB5B9XfwTFDFTxM/Mg84gO1 OAC7DsrVGUzXd5OHjlAqm2xjeE0/IPMeRDbEe7TYd5rgUgDF+LJeKLPsssWjkNjFYG94A5UFz9enGq 988wLDobKgDxDnom/raCWlFACKPYZfmttUKqgTv9u93ZF1ZJ3IYUxy4VNINPiC5DoCbVRgHSogG2JU Qq2V7yadzzrscVwIbY/pa6HEWmIFqN7aIYYn9Aab58jRx8a5g0pg36RALx81l6tHizpY1LE3rFIF4Y UElNq1G9Ywd9vh5GW04HOUI70sNCViR45IvrqNa4Cmk/v1U9dBqdNxsNsr6qVL9//MtD4bK6g0P0bZ yxqmHK1awPTy51C99Ft8VDS5WXPDHKM1v4dCmppgUo2tfDDHCjhfoFSKp2NNtYl5AAmeLeegYeLwAs Q0skahEYpqSvPYcn7QDPs/QN6teL0TcS/qIQ4B+pFLs60SMFt9idTFCoOiBQ== 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?1768492498182991137?= X-GMAIL-MSGID: =?utf-8?q?1768492498182991137?= Now the clock ids are no more defined in private headers, cleanup and include the dt-bindings headers from the main driver file. Signed-off-by: Neil Armstrong --- drivers/clk/meson/axg-audio.c | 2 ++ drivers/clk/meson/axg-audio.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/clk/meson/axg-audio.c b/drivers/clk/meson/axg-audio.c index 6917e35232b6..6aca231b1d81 100644 --- a/drivers/clk/meson/axg-audio.c +++ b/drivers/clk/meson/axg-audio.c @@ -21,6 +21,8 @@ #include "clk-phase.h" #include "sclk-div.h" +#include + #define AUD_GATE(_name, _reg, _bit, _pname, _iflags) { \ .data = &(struct clk_regmap_gate_data){ \ .offset = (_reg), \ diff --git a/drivers/clk/meson/axg-audio.h b/drivers/clk/meson/axg-audio.h index faf08748b205..01a3da19933e 100644 --- a/drivers/clk/meson/axg-audio.h +++ b/drivers/clk/meson/axg-audio.h @@ -65,7 +65,4 @@ #define AUDIO_CLK81_CTRL 0x030 #define AUDIO_CLK81_EN 0x034 -/* include the CLKIDs which are part of the DT bindings */ -#include - #endif /*__AXG_AUDIO_CLKC_H */