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 X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3368C433DB for ; Thu, 7 Jan 2021 03:01:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D39F23100 for ; Thu, 7 Jan 2021 03:01:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726343AbhAGDBZ (ORCPT ); Wed, 6 Jan 2021 22:01:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726293AbhAGDBY (ORCPT ); Wed, 6 Jan 2021 22:01:24 -0500 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1A6AC0612F1 for ; Wed, 6 Jan 2021 19:00:44 -0800 (PST) Received: by mail-pg1-x535.google.com with SMTP id 30so3819999pgr.6 for ; Wed, 06 Jan 2021 19:00:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=BRLNPuGfj3ivO2euUNkJ0P2eXIJZBKP4UpcEqnbsjb0=; b=nsQXvntr/Be1QwCn3rjuU1BaOepIKvGnGbEQIh9SeSgggzyGKOrNfuMv2lXfCE9Sfj 1vBUuJFoYVD47AMsJHSjCt12FkTfEe+yVcYtY9rBnAb214XfC5F/SP9XOGhRQu3fZCph rQzBcKwgGFfsGTT3Cdl2x+49ENuaAVb4cs3NQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=BRLNPuGfj3ivO2euUNkJ0P2eXIJZBKP4UpcEqnbsjb0=; b=ujhQIuDphh0iOSfggWJNUUplhwfwSxXeEt9i8WUerFfr1zPcmwx4f0tHz+1iLkQ8Uv jvNNbSPOFHTOeb87l4yjLX/xX8ymK1x9zmVzFEk95F5MIynZuHbiUtMJRq/i5FXW2atc /5aGto1gcEeFZCiYYSqYtpmqdpNJCT7yZTREdCqqtzFBkff2QXVjMnE72EtAMv9YXIpq CWNbFRe6Oec0hP5m4gioC3zRoOJRCOATPZ8JxMAfHEADHtwZLQMW2jfsQGbmkuoK9+Ap oqWM8BC2R+L4nahdKBobter4EY5/9mwIM5hLHKlsV65026lnwfEGn9kpHmGvyQ39kzuG Hikw== X-Gm-Message-State: AOAM531TgnMr4iaVHXczez0Gkqj9efLNyCTT8oTzXppY42s7JQR32JTa gkr6ny8CiLMl7e8T/u6A3khV2hKJk4wiQdMJy+NrS3HHqyXYMVl0 X-Google-Smtp-Source: ABdhPJygrAgFZ2XgLIlhW5wQPGzTk6X7MBKbFeUG69GLIJhGNsa0p96qlju/S7+tGj+7yG58V+PkWBmJ9aWjsw6VpC8= X-Received: by 2002:a63:5f93:: with SMTP id t141mr7558126pgb.299.1609988444001; Wed, 06 Jan 2021 19:00:44 -0800 (PST) MIME-Version: 1.0 References: <1608642587-15634-1-git-send-email-weiyi.lu@mediatek.com> <1608642587-15634-11-git-send-email-weiyi.lu@mediatek.com> <1609929721.7491.3.camel@mtksdaap41> <1609931196.30620.3.camel@mtksdaap41> In-Reply-To: <1609931196.30620.3.camel@mtksdaap41> From: Ikjoon Jang Date: Thu, 7 Jan 2021 11:00:32 +0800 Message-ID: Subject: Re: [PATCH v6 10/22] clk: mediatek: Add MT8192 basic clocks support To: Weiyi Lu Cc: Rob Herring , Nicolas Boichat , srv_heupstream , Stephen Boyd , open list , Project_Global_Chrome_Upstream_Group@mediatek.com, "moderated list:ARM/Mediatek SoC support" , Matthias Brugger , linux-clk@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org On Wed, Jan 6, 2021 at 7:06 PM Weiyi Lu wrote: > > On Wed, 2021-01-06 at 18:52 +0800, Ikjoon Jang wrote: > > On Wed, Jan 6, 2021 at 6:42 PM Weiyi Lu wrote: > > > > > > On Wed, 2021-01-06 at 18:25 +0800, Ikjoon Jang wrote: > > > > On Tue, Dec 22, 2020 at 9:14 PM Weiyi Lu wrote: > > > > > > > > > > Add MT8192 basic clock providers, include topckgen, apmixedsys, > > > > > infracfg and pericfg. > > > > > > > > > > Signed-off-by: Weiyi Lu > > > > > --- > > > > > drivers/clk/mediatek/Kconfig | 8 + > > > > > drivers/clk/mediatek/Makefile | 1 + > > > > > drivers/clk/mediatek/clk-mt8192.c | 1326 +++++++++++++++++++++++++++++++++++++ > > > > > drivers/clk/mediatek/clk-mux.h | 15 + > > > > > 4 files changed, 1350 insertions(+) > > > > > create mode 100644 drivers/clk/mediatek/clk-mt8192.c > > > > > > > > > > > > > > > > > > > > > > diff --git a/drivers/clk/mediatek/clk-mux.h b/drivers/clk/mediatek/clk-mux.h > > > > > index f5625f4..afbc7df 100644 > > > > > --- a/drivers/clk/mediatek/clk-mux.h > > > > > +++ b/drivers/clk/mediatek/clk-mux.h > > > > > @@ -77,6 +77,21 @@ struct mtk_mux { > > > > > _width, _gate, _upd_ofs, _upd, \ > > > > > CLK_SET_RATE_PARENT) > > > > > > > > > > +#define MUX_CLR_SET_UPD_FLAGS(_id, _name, _parents, _mux_ofs, \ > > > > > + _mux_set_ofs, _mux_clr_ofs, _shift, _width, \ > > > > > + _upd_ofs, _upd, _flags) \ > > > > > + GATE_CLR_SET_UPD_FLAGS(_id, _name, _parents, _mux_ofs, \ > > > > > + _mux_set_ofs, _mux_clr_ofs, _shift, _width, \ > > > > > + 0, _upd_ofs, _upd, _flags, \ > > > > > + mtk_mux_clr_set_upd_ops) > > > > > + > > > > > +#define MUX_CLR_SET_UPD(_id, _name, _parents, _mux_ofs, \ > > > > > + _mux_set_ofs, _mux_clr_ofs, _shift, _width, \ > > > > > + _upd_ofs, _upd) \ > > > > > + MUX_CLR_SET_UPD_FLAGS(_id, _name, _parents, \ > > > > > + _mux_ofs, _mux_set_ofs, _mux_clr_ofs, _shift, \ > > > > > + _width, _upd_ofs, _upd, CLK_SET_RATE_PARENT) > > > > > + > > > > > > > > conflicts, these macros are already existed in upstream. > > > > > > really? These two macros don't show up in 5.11-rc1 yet. > > > > yep, maybe this one: a3ae549917f1 "clk: mediatek: Add new clkmux register API" > > > > The new macros in this patch are for the clock MUX without gate control. > It's a little different from those mux macros with gate control in > a3ae549917f1 "clk: mediatek: Add new clkmux register API" > sorry, my bad. it's just a simple context conflict from > > > > > > > > struct clk *mtk_clk_register_mux(const struct mtk_mux *mux, > > > > > struct regmap *regmap, > > > > > spinlock_t *lock); > > > > > -- your another patch, 2aeff9d8c8e "clk: mediatek: Make mtk_clk_register_mux() a static function" was applied before this series. > > > > > 1.8.1.1.dirty > > > > > _______________________________________________ > > > > > Linux-mediatek mailing list > > > > > Linux-mediatek@lists.infradead.org > > > > > http://lists.infradead.org/mailman/listinfo/linux-mediatek > > > > > > _______________________________________________ > > > Linux-mediatek mailing list > > > Linux-mediatek@lists.infradead.org > > > http://lists.infradead.org/mailman/listinfo/linux-mediatek >