[v2,08/11] clk: mediatek: mt8xxx: Replace 'struct clk' with 'struct clk_hw'

As part of the effort to improve the MediaTek clk drivers, the next step
is to switch from the old 'struct clk' clk prodivder APIs to the new
'struct clk_hw' ones.

Instead of adding new APIs to the MediaTek clk driver library mirroring
the existing ones, moving all drivers to the new APIs, and then removing
the old ones, just migrate everything at the same time. This involves
replacing 'struct clk' with 'struct clk_hw', and 'struct clk_onecell_data'
with 'struct clk_hw_onecell_data', and fixing up all usages.

This is done with the following coccinelle script.

To avoid a really large patch, the changes have been split into multiple
ones. This patch covers MT8xxx.

    // Replace type
    @@
    @@
    - struct clk_onecell_data
    + struct clk_hw_onecell_data

    // Replace of_clk_add_provider() & of_clk_src_simple_get()
    @@
    expression NP, DATA;
    symbol of_clk_src_onecell_get;
    @@
    - of_clk_add_provider(
    + of_clk_add_hw_provider(
	    NP,
    -	of_clk_src_onecell_get,
    +	of_clk_hw_onecell_get,
	    DATA
      )

    // Fix register/unregister
    @@
    identifier CD;
    expression E;
    identifier fn =~ "unregister";
    @@
      fn(...,
    -    CD->clks[E]
    +    CD->hws[E]->clk
	 ,...
	);

    // Fix calls to clk_prepare_enable()
    @@
    identifier CD;
    expression E;
    @@
      clk_prepare_enable(
    - 		     CD->clks[E]
    + 		     CD->hws[E]->clk
      );

    // Fix pointer assignment
    @@
    identifier CD;
    identifier CLK;
    expression E;
    @@
    - CD->clks[E]
    + CD->hws[E]
      =
    (
    - CLK
    + __clk_get_hw(CLK)
    |
      ERR_PTR(...)
    )
      ;

    // Fix pointer usage
    @@
    identifier CD;
    expression E;
    @@
    - CD->clks[E]
    + CD->hws[E]

    // Fix mtk_clk_pll_get_base()
    @@
    symbol clk, hw, data;
    @@
      mtk_clk_pll_get_base(
    - 		       struct clk *clk,
    + 		       struct clk_hw *hw,
			   const struct mtk_pll_data *data
      ) {
    - struct clk_hw *hw = __clk_get_hw(clk);
      ...
      }

    // Fix mtk_clk_pll_get_base() usage
    @@
    identifier CD;
    expression E;
    @@
      mtk_clk_pll_get_base(
    -    CD->clks[E]
    +    CD->hws[E]->clk
	 ,...
      );

Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
---
 drivers/clk/mediatek/clk-mt8135.c            | 18 +++----
 drivers/clk/mediatek/clk-mt8167-aud.c        |  4 +-
 drivers/clk/mediatek/clk-mt8167-img.c        |  4 +-
 drivers/clk/mediatek/clk-mt8167-mfgcfg.c     |  4 +-
 drivers/clk/mediatek/clk-mt8167-mm.c         |  4 +-
 drivers/clk/mediatek/clk-mt8167-vdec.c       |  4 +-
 drivers/clk/mediatek/clk-mt8167.c            | 12 ++---
 drivers/clk/mediatek/clk-mt8173-mm.c         |  4 +-
 drivers/clk/mediatek/clk-mt8173.c            | 52 ++++++++++----------
 drivers/clk/mediatek/clk-mt8183-audio.c      |  4 +-
 drivers/clk/mediatek/clk-mt8183-cam.c        |  4 +-
 drivers/clk/mediatek/clk-mt8183-img.c        |  4 +-
 drivers/clk/mediatek/clk-mt8183-ipu0.c       |  4 +-
 drivers/clk/mediatek/clk-mt8183-ipu1.c       |  4 +-
 drivers/clk/mediatek/clk-mt8183-ipu_adl.c    |  4 +-
 drivers/clk/mediatek/clk-mt8183-ipu_conn.c   |  4 +-
 drivers/clk/mediatek/clk-mt8183-mfgcfg.c     |  4 +-
 drivers/clk/mediatek/clk-mt8183-mm.c         |  4 +-
 drivers/clk/mediatek/clk-mt8183-vdec.c       |  4 +-
 drivers/clk/mediatek/clk-mt8183-venc.c       |  4 +-
 drivers/clk/mediatek/clk-mt8183.c            | 25 +++++-----
 drivers/clk/mediatek/clk-mt8186-apmixedsys.c |  6 +--
 drivers/clk/mediatek/clk-mt8186-mcu.c        |  6 +--
 drivers/clk/mediatek/clk-mt8186-mm.c         |  6 +--
 drivers/clk/mediatek/clk-mt8186-topckgen.c   |  6 +--
 drivers/clk/mediatek/clk-mt8192-aud.c        |  4 +-
 drivers/clk/mediatek/clk-mt8192-mm.c         |  4 +-
 drivers/clk/mediatek/clk-mt8192.c            | 21 ++++----
 drivers/clk/mediatek/clk-mt8195-apmixedsys.c |  6 +--
 drivers/clk/mediatek/clk-mt8195-apusys_pll.c |  6 +--
 drivers/clk/mediatek/clk-mt8195-topckgen.c   |  6 +--
 drivers/clk/mediatek/clk-mt8195-vdo0.c       |  6 +--
 drivers/clk/mediatek/clk-mt8195-vdo1.c       |  6 +--
 drivers/clk/mediatek/clk-mt8516-aud.c        |  4 +-
 drivers/clk/mediatek/clk-mt8516.c            | 12 ++---
 35 files changed, 138 insertions(+), 136 deletions(-)

Message ID	20220510104804.544597-9-wenst@chromium.org (mailing list archive)
State	Superseded, archived
Headers	show Return-Path: <linux-clk-owner@kernel.org> From: Chen-Yu Tsai <wenst@chromium.org> To: Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Chun-Jie Chen <chun-jie.chen@mediatek.com>, Miles Chen <miles.chen@mediatek.com>, Rex-BC Chen <rex-bc.chen@mediatek.com> Cc: Chen-Yu Tsai <wenst@chromium.org>, Matthias Brugger <matthias.bgg@gmail.com>, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>, linux-clk@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 08/11] clk: mediatek: mt8xxx: Replace 'struct clk' with 'struct clk_hw' Date: Tue, 10 May 2022 18:48:01 +0800 Message-Id: <20220510104804.544597-9-wenst@chromium.org> In-Reply-To: <20220510104804.544597-1-wenst@chromium.org> References: <20220510104804.544597-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	clk: mediatek: Move to struct clk_hw provider APIs \| expand [v2,00/11] clk: mediatek: Move to struct clk_hw provider APIs [v2,01/11] clk: mediatek: Make mtk_clk_register_composite() static [v2,02/11] clk: mediatek: apmixed: Drop error message from clk_register() failure [v2,03/11] clk: mediatek: Convert mtk_{alloc,free}_clk_data to struct clk_hw [v2,04/11] clk: mediatek: Replace 'struct clk' with 'struct clk_hw' [v2,05/11] clk: mediatek: mt27xx: Replace 'struct clk' with 'struct clk_hw' [v2,06/11] clk: mediatek: mt67xx: Replace 'struct clk' with 'struct clk_hw' [v2,07/11] clk: mediatek: mt7xxx: Replace 'struct clk' with 'struct clk_hw' [v2,08/11] clk: mediatek: mt8xxx: Replace 'struct clk' with 'struct clk_hw' [v2,09/11] clk: mediatek: Switch to clk_hw provider APIs [v2,10/11] clk: mediatek: mt8173: Fix usage of mtk_clk_register_ref2usb_tx() [v2,11/11] clk: mediatek: mt8173: Switch to clk_hw provider APIs

[v2,08/11] clk: mediatek: mt8xxx: Replace 'struct clk' with 'struct clk_hw'

Commit Message

Comments

Patch