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 9B4BFC77B6C for ; Thu, 13 Apr 2023 09:24:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: In-Reply-To:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date: Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=GE8PCagvCupc8woXOVUN77R87CDEnq+NbzgeiK/lvzs=; b=s+Xq7FJN5TqN5xHGwBZWGpofUY IvVcqR9LDs+r8sfRiEvTRXxJBgcWsulpGfYC84xJmzkBMmNfNuDO2r+XDpEAP0vfGspdxhaZkfB8Q 6CmnG80uOAv/NyE3fuUQq5glEsd2f9lWQOljWDwmSsVDutychiflFS4t/PjwetozvSGArV28JdUMV Lpzj5fIrIhhgoGvZFLFHSA+tWt/IwaA1gcxYNqUgB3/y8FycYMUAdiMIUpGW5bQ+x5SxZBdlMTVhN 50bOz1Sm59I73HqTA8vQ+SKEHu847KeGiEQX3J15ru/q9/xLnG3FUugsCnOQwRdxa0o6KJGw391d/ yYgq7XRA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pmtAm-005bCL-1r; Thu, 13 Apr 2023 09:23:20 +0000 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pmtAi-005bAJ-2N; Thu, 13 Apr 2023 09:23:18 +0000 Received: by mail-ej1-x631.google.com with SMTP id ud9so35574579ejc.7; Thu, 13 Apr 2023 02:23:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681377792; x=1683969792; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=nzTTbhfFcZTGMDra4ZzytX8FtG7O0yt+/KOC/gcA42g=; b=MS5UrRavGhMkko2goaKDguazFwRR3eHaZscHm70DVgnFWrOb8bfdgVf0MIds2d/dZE qyUxWMIqH9YyS22gzZzAgkUi2x+PJGE0yCgItRVu8RcNNK1mJFI3X9pHS2TeifrzdNVZ TQ31qi7Y/bvfeIuEJs9YfFIrp1dYcROE879fnXc0E4gIF0FZy0PTnHAIc43+g4x3mFn3 Kr9RLYpCS0B/JtOb142LmmkhsJtqFJYODtKHzSfd29GrjFjNuwFZISNp1GqhWIsdalub q9h9YYWo/20k4jFN58lJDyOO7kD2a15MqagzCEkzdtGjWaySjyfud3HcQVKWCdd7dDph fhNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681377792; x=1683969792; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nzTTbhfFcZTGMDra4ZzytX8FtG7O0yt+/KOC/gcA42g=; b=QwiwaZ1Ta622FjTrsqZREWsvCv18HzF+N44e+YV4PA3Qomlu3/F9rK42R49+uNr3LX A+CFX2BJIzTeP/UKV2u7K2KV1TnEsNvQwKj0G5SBPcSMoGZpQhQBVHCsMWw5VgamO2+A xvwJz4iFUI/2N1G3JUTj/LzH5KuLV1lRsce0UfFU1sJGCLQFFoMP/KfiSPKkIKe/CwNR kID0x6AEuSm0pSuars8/qGuJQJ/TxXHIK9WocaiWcysW8Bz3cQ01Ndv0VsGByLqILMoz hxys9n4LnfXhT/dhRbLsmeqNUsANg0T6hiBaUxTkNaf7bV5/ZNl3Ej8c8NaWZTqXjNvN h+1w== X-Gm-Message-State: AAQBX9dW1/IR8Lv1+9tyQ5engdgiXdtdYFvnr5aZAFn+4p09fQADDaJB n7Bk8bn4LsmsV1nIoXarPNs= X-Google-Smtp-Source: AKy350b+0wfw7dVL91U9xvbCROvtI06Ebusi+QNQCVM6y3b7U26QgoeOhAtqd/T8n8CMpiwbMTy4DA== X-Received: by 2002:a17:906:a841:b0:94a:4499:ec30 with SMTP id dx1-20020a170906a84100b0094a4499ec30mr1944498ejb.15.1681377792565; Thu, 13 Apr 2023 02:23:12 -0700 (PDT) Received: from orome (p200300e41f1c0800f22f74fffe1f3a53.dip0.t-ipconnect.de. [2003:e4:1f1c:800:f22f:74ff:fe1f:3a53]) by smtp.gmail.com with ESMTPSA id b11-20020a17090636cb00b00930aa50372csm703184ejc.43.2023.04.13.02.23.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 02:23:12 -0700 (PDT) Date: Thu, 13 Apr 2023 11:23:10 +0200 From: Thierry Reding To: Heiner Kallweit Cc: Jerome Brunet , Martin Blumenstingl , Neil Armstrong , Kevin Hilman , Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= , "linux-arm-kernel@lists.infradead.org" , "open list:ARM/Amlogic Meson..." , linux-pwm@vger.kernel.org, Jian Hu Subject: Re: [PATCH v2] pwm: meson: fix axg ao mux parents Message-ID: References: MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/2.2.10 (2023-03-25) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230413_022316_772967_7ABE8376 X-CRM114-Status: GOOD ( 22.41 ) 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: , Content-Type: multipart/mixed; boundary="===============3695292950565135778==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============3695292950565135778== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="JY0L2Q8GjmC/YsxM" Content-Disposition: inline --JY0L2Q8GjmC/YsxM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Apr 09, 2023 at 05:15:52PM +0200, Heiner Kallweit wrote: > This fix is basically the same as 9bce02ef0dfa ("pwm: meson: Fix the > G12A AO clock parents order"). Vendor driver referenced there has > xtal as first parent also for axg ao. In addition fix the name > of the aoclk81 clock. Apparently name aoclk81 as used by the vendor > driver was changed when mainlining the axg clock driver. >=20 > Fixes: bccaa3f917c9 ("pwm: meson: Add clock source configuration for Meso= n-AXG") > Cc: stable@vger.kernel.org >=20 > Signed-off-by: Heiner Kallweit > --- > drivers/pwm/pwm-meson.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) This looks like it supersedes this one: https://patchwork.ozlabs.org/project/linux-pwm/patch/e7a95baf-5f9d-be56-93= dc-82ca83b69c7a@gmail.com/ I don't see any discussion on on that one, nor does v2 here have a changelog and the commit subject is slightly changed, so you're making it more difficult than necessary to correlate the two. Anyway, since both patches conflict, I've picked up v2. Let me know if that's not what you intended. Thierry >=20 > diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c > index b5c746fab..0fe0400c2 100644 > --- a/drivers/pwm/pwm-meson.c > +++ b/drivers/pwm/pwm-meson.c > @@ -381,7 +381,7 @@ static const struct meson_pwm_data pwm_axg_ee_data = =3D { > }; > =20 > static const char * const pwm_axg_ao_parent_names[] =3D { > - "aoclk81", "xtal", "fclk_div4", "fclk_div5" > + "xtal", "axg_ao_clk81", "fclk_div4", "fclk_div5" > }; > =20 > static const struct meson_pwm_data pwm_axg_ao_data =3D { > --=20 > 2.40.0 >=20 --JY0L2Q8GjmC/YsxM Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmQ3yf4ACgkQ3SOs138+ s6HqNw//YI7ly5943Ef3PUyEnJsR3phdH4mHTCJ/u908QspsLWp9d3rwJR6bln95 PA5S8hbymwO2EbLEW9C4XtX3SelSQqy1+DOJeDN5YuRpFRRdrlErbch1lPSNIMTm SK99Saho5jZe4VYZhNtMUD7vvGhcLGtgn54cBoU45dTTWJuVqLPZOPLIfvUo/jm7 cU9fR49DhmlOSTTJrrmapKKD5Fz8ciYkHq734fQYL6KtPJjKk8fMjvDMPDDVx69F BOBqczdoIvKoh2u26kg6X0l9/yjrQdscaNsn5nJg4C0bydgmpuE9hideGDyIbmkS 7/2l8gEWxznWC2hAasfVz0mCd1prH/7yJ75cbtJLjmEIQI1McUq5tu1MWg7bjink 9PZBaOCw1nZTBCYLtDVxJN4ANQGOO+fDEW3c95vYFrIwuC+ER4EhafyOt0Mr0FX1 jkNbIyPhvCxtq+J1RFA7ScES+HhVYyE6OHhlfCdHNSL34YGJigIEuJSbtRI4S7X6 +UrtTK3VAPkWZIjU/l1oEt7KFwzerg8S4Q6Bae80RxWpVHaP1G+2JSbnh11GXZjY qFHzvOan+374UyQ4xJIfZOuKivtb1v2SqQ3mRVrhkLzZkbf7oktVsUUdP3BW9vip zN/g2SaY8PWGWFWGzYmp/8lp8/SD2b4xeZLm1sGLzifAbr7z5sY= =I0Iv -----END PGP SIGNATURE----- --JY0L2Q8GjmC/YsxM-- --===============3695292950565135778== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============3695292950565135778==--