Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp3313235rwb; Fri, 9 Dec 2022 12:47:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf49y6MIrzizrK938KZ/Gaba6TIuA0OqAGF1gPeK78NSPibY9mo6d95YHhM3BackqCb5yB4n X-Received: by 2002:a17:903:2345:b0:189:ba1f:b178 with SMTP id c5-20020a170903234500b00189ba1fb178mr9937394plh.9.1670618832265; Fri, 09 Dec 2022 12:47:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670618832; cv=none; d=google.com; s=arc-20160816; b=GRSe8127axM9xQn2gGAN8FSKn8dT23QyySTkCGwvuLU2oDd/1LTUYQFCtW6PUYB9T3 XQNiP+jbV12rEOZtIX6K5uaqPKQrFTqmQlXbm0lstrp7H9mkSLlOe4IEdKjn/nS1yWld gIPb4TG5NWtwTQ36AkJfB2CsnaAF1TwuNzlj/lWyOM0gwraxAOc1bbqXV1pC1e8UykwU rJ3gHM+BryOLqn55WudcX39iY/mGcvBHa1kLIoaO7m6XKBfTF/3sOFL9SZbhaACJFexw R446tREjW78u8SrUePPvq44W2JxnYZgmIlesHnnptcKMEgWMPQW3E68Jp94+OOrVvadh u3hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:user-agent:date:to:cc:from:subject :references:in-reply-to:content-transfer-encoding:mime-version :dkim-signature; bh=jnzSK87EX41EHytJEhmEtRwiGBu70EL/O2DWBEHdLjY=; b=K0RkQ4QffEGiRb/O8m/ly4K946dq2IfEOHqhrDTCP6GDBB6XGuWiYaQLkpRSrXpXJ2 DMx3U31O0HNB3MNbPbxilXHtOGZObGJFrRlLkN/lf9UYIgjb2ctoUHdag/+LwVo0PYG/ /odDO0Gqr4RBn3hQna2tuor/7oK0EFjqOJe9Wv0CWXMuHHiJS/+lZk/j6HKdGYyFY3Z5 Uj7uemdzvWAMs1frul9J2xpfmi0uILn4IV2rjwuFaaVTRYsYJVSSXiDLQxpxqXcpOdg8 ncoW781S3aZOJylEwNkmKezyNA4Ff5NX5Ki1b9cKDh5Yiz/btryz/ZI+XeoIA/IPiddh jecg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=r8dc+nK0; 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=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j3-20020a170903028300b001899e936c2csi2596388plr.531.2022.12.09.12.47.02; Fri, 09 Dec 2022 12:47:12 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=r8dc+nK0; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229807AbiLIUeP (ORCPT + 75 others); Fri, 9 Dec 2022 15:34:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229517AbiLIUeN (ORCPT ); Fri, 9 Dec 2022 15:34:13 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16565A0F86; Fri, 9 Dec 2022 12:34:11 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7C84AB828ED; Fri, 9 Dec 2022 20:34:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2064DC433D2; Fri, 9 Dec 2022 20:34:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670618048; bh=aB9+HSxKQijfUSrpwlG3JSUYPh2EeUbxMw7Zup+hZtI=; h=In-Reply-To:References:Subject:From:Cc:To:Date:From; b=r8dc+nK0PwYXyx27lpoCwN0LVxolW1ZTAZnW0voADwpBclCzz5DpwHDHpy8xmXQo9 7F6IabDlkQ9UlVcm9LjLj69RrrsjZVJOKp4B5otZTp0dd54JyAWcYZivP4NItDiQnO FzVJ2g3lTHmzrKWfowEh+BJmlFy8/kdlfuwmTnO8hWAmeBLQDHqE6LSxivg+YPnk21 LzdFjrK0hMfwlt1qUb1Pb+xcqd1YKZLJMCEjYpg+coAyjB7J+lJPW4yHbqmOQyFOOB nNHR0BER9HSWDosliPyCDp41J6t14fuT9tB46t+JxULPdTae5W4Mf4pC+w5fQz0Wl4 +PrpMLP7AU+bw== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable In-Reply-To: <20221117155944.32380-2-tmaimon77@gmail.com> References: <20221117155944.32380-1-tmaimon77@gmail.com> <20221117155944.32380-2-tmaimon77@gmail.com> Subject: Re: [PATCH v13 1/1] clk: npcm8xx: add clock controller From: Stephen Boyd Cc: openbmc@lists.ozlabs.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Tomer Maimon To: Tomer Maimon , avifishman70@gmail.com, benjaminfair@google.com, joel@jms.id.au, mturquette@baylibre.com, tali.perry1@gmail.com, venture@google.com, yuenn@google.com Date: Fri, 09 Dec 2022 12:34:05 -0800 User-Agent: alot/0.10 Message-Id: <20221209203408.2064DC433D2@smtp.kernel.org> X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 Quoting Tomer Maimon (2022-11-17 07:59:44) > Nuvoton Arbel BMC NPCM8XX contains an integrated clock controller which > generates and supplies clocks to all modules within the BMC. >=20 > Signed-off-by: Tomer Maimon Sorry for the delayed response. > diff --git a/drivers/clk/clk-npcm8xx.c b/drivers/clk/clk-npcm8xx.c > new file mode 100644 > index 000000000000..ff54cf65e8f7 > --- /dev/null > +++ b/drivers/clk/clk-npcm8xx.c > @@ -0,0 +1,640 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Nuvoton NPCM8xx Clock Generator > + * All the clocks are initialized by the bootloader, so this driver allo= w only > + * reading of current settings directly from the hardware. > + * > + * Copyright (C) 2020 Nuvoton Technologies > + * Author: Tomer Maimon > + */ > + > +#include > +#include > +#include > +#include > +#include Include module.h please. > +#include > +#include These of includes are not used, please remove. > +#include > +#include > + > +#include > + > +#define NPCM8XX_REF_CLK 25000000 > + > +struct npcm8xx_clk_pll_data { > + unsigned int id; > + const char *name; > + u32 reg; > + unsigned long flags; > +}; > + > +struct npcm8xx_clk_pll { > + struct clk_hw hw; > + void __iomem *pllcon; > + struct npcm8xx_clk_pll_data pll; > + struct clk_init_data init; > +}; > + > +#define to_npcm8xx_clk_pll(_hw) container_of(_hw, struct npcm8xx_clk_pll= , hw) > + > +#define PLLCON_LOKI BIT(31) > +#define PLLCON_LOKS BIT(30) > +#define PLLCON_FBDV GENMASK(27, 16) > +#define PLLCON_OTDV2 GENMASK(15, 13) > +#define PLLCON_PWDEN BIT(12) > +#define PLLCON_OTDV1 GENMASK(10, 8) > +#define PLLCON_INDV GENMASK(5, 0) > + > +static unsigned long npcm8xx_clk_pll_recalc_rate(struct clk_hw *hw, > + unsigned long parent_rat= e) > +{ > + struct npcm8xx_clk_pll *pll =3D to_npcm8xx_clk_pll(hw); > + unsigned long fbdv, indv, otdv1, otdv2; > + unsigned int val; > + u64 ret; > + > + if (parent_rate =3D=3D 0) { > + pr_debug("%s: parent rate is zero\n", __func__); > + return 0; > + } > + > + val =3D readl_relaxed(pll->pllcon + pll->pll.reg); > + > + indv =3D FIELD_GET(PLLCON_INDV, val); > + fbdv =3D FIELD_GET(PLLCON_FBDV, val); > + otdv1 =3D FIELD_GET(PLLCON_OTDV1, val); > + otdv2 =3D FIELD_GET(PLLCON_OTDV2, val); > + > + ret =3D (u64)parent_rate * fbdv; > + do_div(ret, indv * otdv1 * otdv2); > + > + return ret; > +} > + > +static const struct clk_ops npcm8xx_clk_pll_ops =3D { > + .recalc_rate =3D npcm8xx_clk_pll_recalc_rate, > +}; > + > +static struct clk_hw * > +npcm8xx_clk_register_pll(struct device *dev, struct npcm8xx_clk_pll *pll, > + void __iomem *sys_base) > +{ > + struct clk_hw *hw; > + int ret; > + > + pll->pllcon =3D sys_base; > + hw =3D &pll->hw; > + > + ret =3D devm_clk_hw_register(dev, hw); > + if (ret) > + return ERR_PTR(ret); > + > + return hw; > +} > + > +#define NPCM8XX_CLKEN1 (0x00) > +#define NPCM8XX_CLKEN2 (0x28) > +#define NPCM8XX_CLKEN3 (0x30) > +#define NPCM8XX_CLKEN4 (0x70) > +#define NPCM8XX_CLKSEL (0x04) > +#define NPCM8XX_CLKDIV1 (0x08) > +#define NPCM8XX_CLKDIV2 (0x2C) > +#define NPCM8XX_CLKDIV3 (0x58) > +#define NPCM8XX_CLKDIV4 (0x7C) > +#define NPCM8XX_PLLCON0 (0x0C) > +#define NPCM8XX_PLLCON1 (0x10) > +#define NPCM8XX_PLLCON2 (0x54) > +#define NPCM8XX_SWRSTR (0x14) > +#define NPCM8XX_IRQWAKECON (0x18) > +#define NPCM8XX_IRQWAKEFLAG (0x1C) > +#define NPCM8XX_IPSRST1 (0x20) > +#define NPCM8XX_IPSRST2 (0x24) > +#define NPCM8XX_IPSRST3 (0x34) > +#define NPCM8XX_WD0RCR (0x38) > +#define NPCM8XX_WD1RCR (0x3C) > +#define NPCM8XX_WD2RCR (0x40) > +#define NPCM8XX_SWRSTC1 (0x44) > +#define NPCM8XX_SWRSTC2 (0x48) > +#define NPCM8XX_SWRSTC3 (0x4C) > +#define NPCM8XX_SWRSTC4 (0x50) > +#define NPCM8XX_CORSTC (0x5C) > +#define NPCM8XX_PLLCONG (0x60) > +#define NPCM8XX_AHBCKFI (0x64) > +#define NPCM8XX_SECCNT (0x68) > +#define NPCM8XX_CNTR25M (0x6C) > +#define NPCM8XX_THRTL_CNT (0xC0) > + > +struct npcm8xx_clk_mux_data { > + u8 shift; > + u32 mask; > + const u32 *table; > + const char *name; > + const struct clk_parent_data *parent_data; > + u8 num_parents; > + unsigned long flags; > + /* > + * If this clock is exported via DT, set onecell_idx to constant > + * defined in include/dt-bindings/clock/nuvoton, NPCM8XX-clock.h = for > + * this specific clock. Otherwise, set to -1. > + */ > + int onecell_idx; > +}; > + > +struct npcm8xx_clk_div_data { > + u32 reg; > + u8 shift; > + u8 width; > + const char *name; > + const struct clk_parent_data *parent_data; > + u8 clk_divider_flags; > + unsigned long flags; > + /* > + * If this clock is exported via DT, set onecell_idx to constant > + * defined in include/dt-bindings/clock/nuvoton, NPCM8XX-clock.h = for > + * this specific clock. Otherwise, set to -1. > + */ > + int onecell_idx; > +}; > + > +/* > + * Single copy of strings used to refer to clocks within this driver ind= exed by > + * above enum. > + */ > +#define NPCM8XX_CLK_S_REFCLK "refclk" > +#define NPCM8XX_CLK_S_SYSBYPCK "sysbypck" > +#define NPCM8XX_CLK_S_MCBYPCK "mcbypck" > +#define NPCM8XX_CLK_S_PLL0 "pll0" > +#define NPCM8XX_CLK_S_PLL1 "pll1" > +#define NPCM8XX_CLK_S_PLL1_DIV2 "pll1_div2" > +#define NPCM8XX_CLK_S_PLL2 "pll2" > +#define NPCM8XX_CLK_S_PLL_GFX "pll_gfx" > +#define NPCM8XX_CLK_S_PLL2_DIV2 "pll2_div2" > +#define NPCM8XX_CLK_S_PIX_MUX "gfx_pixel" > +#define NPCM8XX_CLK_S_MC_MUX "mc_phy" > +#define NPCM8XX_CLK_S_CPU_MUX "cpu" /* AKA system clock */ > +#define NPCM8XX_CLK_S_MC "mc" > +#define NPCM8XX_CLK_S_AXI "axi" /* AKA CLK2 */ > +#define NPCM8XX_CLK_S_AHB "ahb" /* AKA CLK4 */ > +#define NPCM8XX_CLK_S_CLKOUT_MUX "clkout_mux" > +#define NPCM8XX_CLK_S_UART_MUX "uart_mux" > +#define NPCM8XX_CLK_S_SD_MUX "sd_mux" > +#define NPCM8XX_CLK_S_GFXM_MUX "gfxm_mux" > +#define NPCM8XX_CLK_S_SU_MUX "serial_usb_mux" > +#define NPCM8XX_CLK_S_DVC_MUX "dvc_mux" > +#define NPCM8XX_CLK_S_GFX_MUX "gfx_mux" > +#define NPCM8XX_CLK_S_ADC_MUX "adc_mux" > +#define NPCM8XX_CLK_S_SPI0 "spi0" > +#define NPCM8XX_CLK_S_SPI1 "spi1" > +#define NPCM8XX_CLK_S_SPI3 "spi3" > +#define NPCM8XX_CLK_S_SPIX "spix" > +#define NPCM8XX_CLK_S_APB1 "apb1" > +#define NPCM8XX_CLK_S_APB2 "apb2" > +#define NPCM8XX_CLK_S_APB3 "apb3" > +#define NPCM8XX_CLK_S_APB4 "apb4" > +#define NPCM8XX_CLK_S_APB5 "apb5" > +#define NPCM8XX_CLK_S_APB19 "apb19" > +#define NPCM8XX_CLK_S_TOCK "tock" > +#define NPCM8XX_CLK_S_CLKOUT "clkout" > +#define NPCM8XX_CLK_S_PRE_ADC "pre adc" > +#define NPCM8XX_CLK_S_UART "uart" > +#define NPCM8XX_CLK_S_UART2 "uart2" > +#define NPCM8XX_CLK_S_TIMER "timer" > +#define NPCM8XX_CLK_S_MMC "mmc" > +#define NPCM8XX_CLK_S_SDHC "sdhc" > +#define NPCM8XX_CLK_S_ADC "adc" > +#define NPCM8XX_CLK_S_GFX "gfx0_gfx1_mem" > +#define NPCM8XX_CLK_S_USBIF "serial_usbif" > +#define NPCM8XX_CLK_S_USB_HOST "usb_host" > +#define NPCM8XX_CLK_S_USB_BRIDGE "usb_bridge" > +#define NPCM8XX_CLK_S_PCI "pci" > +#define NPCM8XX_CLK_S_TH "th" > +#define NPCM8XX_CLK_S_ATB "atb" > +#define NPCM8XX_CLK_S_PRE_CLK "pre_clk" > + > +#define NPCM8XX_CLK_S_RG_MUX "rg_mux" > +#define NPCM8XX_CLK_S_RCP_MUX "rcp_mux" > +#define NPCM8XX_CLK_S_RG "rg" > +#define NPCM8XX_CLK_S_RCP "rcp" > + > +static const u32 pll_mux_table[] =3D { 0, 1, 2, 3 }; > +static const struct clk_parent_data pll_mux_parents[] =3D { > + { .name =3D NPCM8XX_CLK_S_PLL0 }, Please don't use .name in clk_parent_data alone. Instead, use direct clk_hw pointers or .fw_name field to get clks from the DT node's 'clocks' property.=20 > + { .name =3D NPCM8XX_CLK_S_PLL1 }, > + { .name =3D NPCM8XX_CLK_S_REFCLK }, > + { .name =3D NPCM8XX_CLK_S_PLL2_DIV2 } > +}; > + > +static const u32 cpuck_mux_table[] =3D { 0, 1, 2, 3, 7 }; > +static const struct clk_parent_data cpuck_mux_parents[] =3D { > + { .name =3D NPCM8XX_CLK_S_PLL0 }, > + { .name =3D NPCM8XX_CLK_S_PLL1 }, > + { .name =3D NPCM8XX_CLK_S_REFCLK }, > + { .name =3D NPCM8XX_CLK_S_SYSBYPCK }, > + { .name =3D NPCM8XX_CLK_S_PLL2 } > +}; > + > +static const u32 pixcksel_mux_table[] =3D { 0, 2 }; > +static const struct clk_parent_data pixcksel_mux_parents[] =3D { > + { .name =3D NPCM8XX_CLK_S_PLL_GFX }, > + { .name =3D NPCM8XX_CLK_S_REFCLK } > +}; > + > +static const u32 sucksel_mux_table[] =3D { 2, 3 }; > +static const struct clk_parent_data sucksel_mux_parents[] =3D { > + { .name =3D NPCM8XX_CLK_S_REFCLK }, > + { .name =3D NPCM8XX_CLK_S_PLL2_DIV2 } > +}; > + > +static const u32 mccksel_mux_table[] =3D { 0, 2, 3 }; > +static const struct clk_parent_data mccksel_mux_parents[] =3D { > + { .name =3D NPCM8XX_CLK_S_PLL1_DIV2 }, > + { .name =3D NPCM8XX_CLK_S_REFCLK }, > + { .name =3D NPCM8XX_CLK_S_MCBYPCK } > +}; > + > +static const u32 clkoutsel_mux_table[] =3D { 0, 1, 2, 3, 4 }; > +static const struct clk_parent_data clkoutsel_mux_parents[] =3D { > + { .name =3D NPCM8XX_CLK_S_PLL0 }, > + { .name =3D NPCM8XX_CLK_S_PLL1 }, > + { .name =3D NPCM8XX_CLK_S_REFCLK }, > + { .name =3D NPCM8XX_CLK_S_PLL_GFX }, > + { .name =3D NPCM8XX_CLK_S_PLL2_DIV2 } > +}; > + > +static const u32 gfxmsel_mux_table[] =3D { 2, 3 }; > +static const struct clk_parent_data gfxmsel_mux_parents[] =3D { > + { .name =3D NPCM8XX_CLK_S_REFCLK }, > + { .name =3D NPCM8XX_CLK_S_PLL2_DIV2 } > +}; > + > +static const u32 dvcssel_mux_table[] =3D { 2, 3 }; > +static const struct clk_parent_data dvcssel_mux_parents[] =3D { > + { .name =3D NPCM8XX_CLK_S_REFCLK }, > + { .name =3D NPCM8XX_CLK_S_PLL2 } > +}; > + > +static struct clk_parent_data pre_adc_div_parent[] =3D { These can be const? > + { .name =3D NPCM8XX_CLK_S_PRE_ADC } > +}; > + > +static struct clk_parent_data pre_clk_div_parent[] =3D { > + { .name =3D NPCM8XX_CLK_S_PRE_CLK } > +}; > + > +static struct clk_parent_data mux_adc_div_parent[] =3D { > + { .name =3D NPCM8XX_CLK_S_ADC_MUX } > +}; > + > +static struct clk_parent_data mux_uart_div_parent[] =3D { > + { .name =3D NPCM8XX_CLK_S_UART_MUX } > +}; > + > +static struct clk_parent_data mux_sd_div_parent[] =3D { > + { .name =3D NPCM8XX_CLK_S_SD_MUX } > +}; > + > +static struct clk_parent_data ahb_div_parent[] =3D { > + { .name =3D NPCM8XX_CLK_S_AHB } > +}; > + > +static struct clk_parent_data mux_gfx_div_parent[] =3D { > + { .name =3D NPCM8XX_CLK_S_GFX_MUX } > +}; > + > +static struct clk_parent_data mux_clkout_div_parent[] =3D { > + { .name =3D NPCM8XX_CLK_S_CLKOUT_MUX } > +}; > + > +static struct clk_parent_data mux_su_div_parent[] =3D { > + { .name =3D NPCM8XX_CLK_S_SU_MUX } > +}; > + > +static struct clk_parent_data mux_rg_div_parent[] =3D { > + { .name =3D NPCM8XX_CLK_S_RG_MUX } > +}; > + > +static struct clk_parent_data mux_rcp_div_parent[] =3D { > + { .name =3D NPCM8XX_CLK_S_RCP_MUX } > +}; > + > +static struct clk_parent_data mux_cpu_div_parent[] =3D { > + { .name =3D NPCM8XX_CLK_S_CPU_MUX } > +}; > + > +#define CLK_PLL(_reg, _name, _parent, _flags, _id) { \ > + .pll.id =3D _id, = \ > + .pll.name =3D _name, = \ > + .pll.reg =3D _reg, = \ > + .hw.init =3D CLK_HW_INIT_PARENTS_DATA(_name, _parent, = \ > + &npcm8xx_clk_pll_ops,= \ > + _flags), \ > + } > + > +static struct clk_parent_data npcm8xx_pll_parent[] =3D { > + { .name =3D NPCM8XX_CLK_S_REFCLK }, > +}; > + > +static struct npcm8xx_clk_pll npcm8xx_pll_clks[] =3D { > + CLK_PLL(NPCM8XX_PLLCON0, NPCM8XX_CLK_S_PLL0, npcm8xx_pll_parent, = 0, -1), > + CLK_PLL(NPCM8XX_PLLCON1, NPCM8XX_CLK_S_PLL1, npcm8xx_pll_parent, = 0, -1), > + CLK_PLL(NPCM8XX_PLLCON2, NPCM8XX_CLK_S_PLL2, npcm8xx_pll_parent, = 0, -1), > + CLK_PLL(NPCM8XX_PLLCONG, NPCM8XX_CLK_S_PLL_GFX, npcm8xx_pll_paren= t, 0, -1), > +}; > + > +static const struct npcm8xx_clk_mux_data npcm8xx_muxes[] =3D { > + { 0, 3, cpuck_mux_table, NPCM8XX_CLK_S_CPU_MUX, > + cpuck_mux_parents, ARRAY_SIZE(cpuck_mux_parents), CLK_IS_CRITICAL, > + NPCM8XX_CLK_CPU }, > + > + { 4, 2, pixcksel_mux_table, NPCM8XX_CLK_S_PIX_MUX, > + pixcksel_mux_parents, ARRAY_SIZE(pixcksel_mux_parents), 0, > + NPCM8XX_CLK_GFX_PIXEL }, > + > + { 6, 2, pll_mux_table, NPCM8XX_CLK_S_SD_MUX, > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1 }, > + > + { 8, 2, pll_mux_table, NPCM8XX_CLK_S_UART_MUX, > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1 }, > + > + { 10, 2, sucksel_mux_table, NPCM8XX_CLK_S_SU_MUX, > + sucksel_mux_parents, ARRAY_SIZE(sucksel_mux_parents), 0, -1 }, > + > + { 12, 2, mccksel_mux_table, NPCM8XX_CLK_S_MC_MUX, > + mccksel_mux_parents, ARRAY_SIZE(mccksel_mux_parents), 0, -1 }, > + > + { 14, 2, pll_mux_table, NPCM8XX_CLK_S_ADC_MUX, > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1 }, > + > + { 16, 2, pll_mux_table, NPCM8XX_CLK_S_GFX_MUX, > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1 }, > + > + { 18, 3, clkoutsel_mux_table, NPCM8XX_CLK_S_CLKOUT_MUX, > + clkoutsel_mux_parents, ARRAY_SIZE(clkoutsel_mux_parents), 0, -1 }, > + > + { 21, 2, gfxmsel_mux_table, NPCM8XX_CLK_S_GFXM_MUX, > + gfxmsel_mux_parents, ARRAY_SIZE(gfxmsel_mux_parents), 0, -1 }, > + > + { 23, 2, dvcssel_mux_table, NPCM8XX_CLK_S_DVC_MUX, > + dvcssel_mux_parents, ARRAY_SIZE(dvcssel_mux_parents), 0, -1 }, > + > + { 25, 2, pll_mux_table, NPCM8XX_CLK_S_RG_MUX, > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1 }, > + > + { 27, 2, pll_mux_table, NPCM8XX_CLK_S_RCP_MUX, > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1 }, > +}; > + > +/* configurable dividers: */ > +static const struct npcm8xx_clk_div_data npcm8xx_divs[] =3D { > + { NPCM8XX_CLKDIV1, 28, 3, NPCM8XX_CLK_S_ADC, pre_adc_div_parent, > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > + NPCM8XX_CLK_ADC }, > + /* bit 30-28 ADCCKDIV*/ > + { NPCM8XX_CLKDIV1, 26, 2, NPCM8XX_CLK_S_AHB, pre_clk_div_parent, > + CLK_DIVIDER_READ_ONLY, CLK_IS_CRITICAL, NPCM8XX_CLK_AHB }, > + /* bit 28-26 CLK4DIV*/ > + { NPCM8XX_CLKDIV1, 21, 5, NPCM8XX_CLK_S_PRE_ADC, > + mux_adc_div_parent, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_PRE_ADC= }, > + /* bit 25-21 PRE-ADCCKDIV*/ > + { NPCM8XX_CLKDIV1, 16, 5, NPCM8XX_CLK_S_UART, > + mux_uart_div_parent, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_UART }, > + /* bit 20-16 UARTDIV*/ > + { NPCM8XX_CLKDIV1, 11, 5, NPCM8XX_CLK_S_MMC, > + mux_sd_div_parent, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_MMC }, > + /* bit 15-11 MMCCKDIV*/ > + { NPCM8XX_CLKDIV1, 6, 5, NPCM8XX_CLK_S_SPI3, > + ahb_div_parent, 0, 0, NPCM8XX_CLK_SPI3 }, > + /* bit 10-6 AHB3CKDIV*/ > + { NPCM8XX_CLKDIV1, 2, 4, NPCM8XX_CLK_S_PCI, > + mux_gfx_div_parent, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_PCI }, > + /* bit 5-2 PCICKDIV*/ > + > + { NPCM8XX_CLKDIV2, 30, 2, NPCM8XX_CLK_S_APB4, ahb_div_parent, > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > + NPCM8XX_CLK_APB4 }, > + /* bit 31-30 APB4CKDIV*/ > + { NPCM8XX_CLKDIV2, 28, 2, NPCM8XX_CLK_S_APB3, ahb_div_parent, > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > + NPCM8XX_CLK_APB3 }, > + /* bit 29-28 APB3CKDIV*/ > + { NPCM8XX_CLKDIV2, 26, 2, NPCM8XX_CLK_S_APB2, ahb_div_parent, > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > + NPCM8XX_CLK_APB2 }, > + /* bit 28-26 APB2CKDIV*/ > + { NPCM8XX_CLKDIV2, 24, 2, NPCM8XX_CLK_S_APB1, ahb_div_parent, > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > + NPCM8XX_CLK_APB1 }, > + /* bit 25-24 APB1CKDIV*/ > + { NPCM8XX_CLKDIV2, 22, 2, NPCM8XX_CLK_S_APB5, ahb_div_parent, > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > + NPCM8XX_CLK_APB5 }, > + /* bit 23-22 APB5CKDIV*/ > + { NPCM8XX_CLKDIV2, 16, 5, NPCM8XX_CLK_S_CLKOUT, mux_clkout_div_pa= rent, > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_CLKOUT }, > + /* bit 20-16 CLKOUTDIV*/ > + { NPCM8XX_CLKDIV2, 13, 3, NPCM8XX_CLK_S_GFX, mux_gfx_div_parent, > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_GFX }, > + /* bit 15-13 GFXCKDIV*/ > + { NPCM8XX_CLKDIV2, 8, 5, NPCM8XX_CLK_S_USB_BRIDGE, mux_su_div_par= ent, > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SU }, > + /* bit 12-8 SUCKDIV*/ > + { NPCM8XX_CLKDIV2, 4, 4, NPCM8XX_CLK_S_USB_HOST, mux_su_div_paren= t, > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SU48 }, > + /* bit 8-4 SU48CKDIV*/ > + { NPCM8XX_CLKDIV2, 0, 4, NPCM8XX_CLK_S_SDHC, > + mux_sd_div_parent, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SDHC } > + ,/* bit 3-0 SD1CKDIV*/ > + > + { NPCM8XX_CLKDIV3, 16, 8, NPCM8XX_CLK_S_SPI1, > + ahb_div_parent, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SPI1 }, > + /* bit 23-16 SPI1CKDV*/ > + { NPCM8XX_CLKDIV3, 11, 5, NPCM8XX_CLK_S_UART2, > + mux_uart_div_parent, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_UART2 = }, > + /* bit 15-11 UARTDIV2*/ > + { NPCM8XX_CLKDIV3, 6, 5, NPCM8XX_CLK_S_SPI0, > + ahb_div_parent, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SPI0 }, > + /* bit 10-6 SPI0CKDV*/ > + { NPCM8XX_CLKDIV3, 1, 5, NPCM8XX_CLK_S_SPIX, > + ahb_div_parent, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SPIX }, > + /* bit 5-1 SPIXCKDV*/ > + > + { NPCM8XX_CLKDIV4, 28, 4, NPCM8XX_CLK_S_RG, mux_rg_div_parent, > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_RG }, > + /* bit 31-28 RGREFDIV*/ > + { NPCM8XX_CLKDIV4, 12, 4, NPCM8XX_CLK_S_RCP, mux_rcp_div_parent, > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_RCP }, > + /* bit 15-12 RCPREFDIV*/ > + { NPCM8XX_THRTL_CNT, 0, 2, NPCM8XX_CLK_S_TH, mux_cpu_div_parent, > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, NPCM8XX_CLK_= TH }, > + /* bit 1-0 TH_DIV*/ > +}; > + > +static DEFINE_SPINLOCK(npcm8xx_clk_lock); > + > +static int npcm8xx_clk_probe(struct platform_device *pdev) > +{ > + struct clk_hw_onecell_data *npcm8xx_clk_data; > + struct device *dev =3D &pdev->dev; > + void __iomem *clk_base; > + struct resource *res; > + struct clk_hw *hw; > + unsigned int i; > + int err; > + > + npcm8xx_clk_data =3D devm_kzalloc(dev, struct_size(npcm8xx_clk_da= ta, hws, > + NPCM8XX_NUM_CLOC= KS), > + GFP_KERNEL); > + if (!npcm8xx_clk_data) > + return -ENOMEM; > + > + res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); > + clk_base =3D devm_ioremap(dev, res->start, resource_size(res)); Use devm_platform_ioremap_resource()? > + if (!clk_base) { > + dev_err(&pdev->dev, "Failed to remap I/O memory\n"); > + return -ENOMEM; > + } > + > + npcm8xx_clk_data->num =3D NPCM8XX_NUM_CLOCKS; > + > + for (i =3D 0; i < NPCM8XX_NUM_CLOCKS; i++) > + npcm8xx_clk_data->hws[i] =3D ERR_PTR(-EPROBE_DEFER); > + > + /* Reference 25MHz clock */ > + hw =3D devm_clk_hw_register_fixed_rate(dev, "refclk", NULL, 0, > + NPCM8XX_REF_CLK); > + if (IS_ERR(hw)) > + return PTR_ERR(hw); > + npcm8xx_clk_data->hws[NPCM8XX_CLK_REFCLK] =3D hw; > + > + /* Register plls */ > + for (i =3D 0; i < ARRAY_SIZE(npcm8xx_pll_clks); i++) { > + struct npcm8xx_clk_pll *pll_clk =3D &npcm8xx_pll_clks[i]; > + > + hw =3D npcm8xx_clk_register_pll(dev, pll_clk, clk_base); > + if (IS_ERR(hw)) { > + dev_err(dev, "npcm8xx_clk: Can't register pll\n"); > + goto unregister_refclk; > + } > + } > + > + /* Register fixed dividers */ > + hw =3D devm_clk_hw_register_fixed_factor(dev, NPCM8XX_CLK_S_PLL1_= DIV2, > + NPCM8XX_CLK_S_PLL1, 0, 1, = 2); > + if (IS_ERR(hw)) { > + dev_err(dev, "npcm8xx_clk: Can't register fixed div\n"); > + goto unregister_refclk; > + } > + > + hw =3D devm_clk_hw_register_fixed_factor(dev, NPCM8XX_CLK_S_PLL2_= DIV2, > + NPCM8XX_CLK_S_PLL2, 0, 1, = 2); > + if (IS_ERR(hw)) { > + dev_err(dev, "npcm8xx_clk: Can't register pll div2\n"); > + goto unregister_refclk; > + } > + > + hw =3D devm_clk_hw_register_fixed_factor(dev, NPCM8XX_CLK_S_PRE_C= LK, > + NPCM8XX_CLK_S_CPU_MUX, 0, = 1, 2); > + if (IS_ERR(hw)) { > + dev_err(dev, "npcm8xx_clk: Can't register ckclk div2\n"); > + goto unregister_refclk; > + } > + > + hw =3D devm_clk_hw_register_fixed_factor(dev, NPCM8XX_CLK_S_AXI, > + NPCM8XX_CLK_S_TH, 0, 1, 2); > + if (IS_ERR(hw)) { > + dev_err(dev, "npcm8xx_clk: Can't register axi div2\n"); > + goto unregister_refclk; > + } > + > + hw =3D devm_clk_hw_register_fixed_factor(dev, NPCM8XX_CLK_S_ATB, > + NPCM8XX_CLK_S_AXI, 0, 1, 2= ); > + if (IS_ERR(hw)) { > + dev_err(dev, "npcm8xx_clk: Can't register atb div2\n"); > + goto unregister_refclk; > + } > + > + /* Register muxes */ > + for (i =3D 0; i < ARRAY_SIZE(npcm8xx_muxes); i++) { > + const struct npcm8xx_clk_mux_data *mux_data =3D &npcm8xx_= muxes[i]; > + > + hw =3D devm_clk_hw_register_mux_parent_data_table(dev, > + mux_data-= >name, > + mux_data-= >parent_data, > + mux_data-= >num_parents, > + mux_data-= >flags, > + clk_base = + NPCM8XX_CLKSEL, > + mux_data-= >shift, > + mux_data-= >mask, > + 0, > + mux_data-= >table, > + &npcm8xx_= clk_lock); > + if (IS_ERR(hw)) { > + dev_err(dev, "npcm8xx_clk: Can't register mux\n"); > + goto err_mux_clk; > + } > + > + if (mux_data->onecell_idx >=3D 0) > + npcm8xx_clk_data->hws[mux_data->onecell_idx] =3D = hw; > + } > + > + /* Register clock dividers specified in npcm8xx_divs */ > + for (i =3D 0; i < ARRAY_SIZE(npcm8xx_divs); i++) { > + const struct npcm8xx_clk_div_data *div_data =3D &npcm8xx_= divs[i]; > + > + hw =3D clk_hw_register_divider_parent_data(dev, div_data-= >name, > + div_data->parent= _data, > + div_data->flags, > + clk_base + div_d= ata->reg, > + div_data->shift, > + div_data->width, > + div_data->clk_di= vider_flags, > + &npcm8xx_clk_loc= k); > + if (IS_ERR(hw)) { > + dev_err(dev, "npcm8xx_clk: Can't register div tab= le\n"); > + goto unregister_refclk; > + } > + > + if (div_data->onecell_idx >=3D 0) > + npcm8xx_clk_data->hws[div_data->onecell_idx] =3D = hw; > + } > + > + err =3D devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, > + npcm8xx_clk_data); > + if (err) { > + dev_err(dev, "unable to add clk provider\n"); > + hw =3D ERR_PTR(err); > + goto err_mux_clk; > + } > + > + return err; > + > +err_mux_clk: > + while (i--) { > + if (npcm8xx_muxes[i].onecell_idx >=3D 0) > + clk_hw_unregister_mux(npcm8xx_clk_data->hws[npcm8= xx_muxes[i].onecell_idx]); > + } > +unregister_refclk: > + clk_hw_unregister(npcm8xx_clk_data->hws[NPCM8XX_CLK_REFCLK]); > + return PTR_ERR(hw); > +} > + > +static const struct of_device_id npcm8xx_clk_dt_ids[] =3D { > + { .compatible =3D "nuvoton,npcm845-clk", }, > + { } > +}; Add a MODULE_DEVICE_TABLE() please. > + > +static struct platform_driver npcm8xx_clk_driver =3D { > + .probe =3D npcm8xx_clk_probe, > + .driver =3D { > + .name =3D "npcm8xx_clk", > + .of_match_table =3D npcm8xx_clk_dt_ids, > + }, > +}; > + > +static int __init npcm8xx_clk_driver_init(void) > +{ > + return platform_driver_register(&npcm8xx_clk_driver); > +} > +arch_initcall(npcm8xx_clk_driver_init); > + This needs a module exit and a MODULE_DESCRIPTION() and MODULE_LICENSE(). Here's a patch to get started, but I gave up once I had to look at the clk_parent_data tables. ---8<--- diff --git a/drivers/clk/clk-npcm8xx.c b/drivers/clk/clk-npcm8xx.c index ff54cf65e8f7..953da60eed60 100644 --- a/drivers/clk/clk-npcm8xx.c +++ b/drivers/clk/clk-npcm8xx.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include =20 @@ -274,51 +273,51 @@ static const struct clk_parent_data dvcssel_mux_paren= ts[] =3D { { .name =3D NPCM8XX_CLK_S_PLL2 } }; =20 -static struct clk_parent_data pre_adc_div_parent[] =3D { +static const struct clk_parent_data pre_adc_div_parent[] =3D { { .name =3D NPCM8XX_CLK_S_PRE_ADC } }; =20 -static struct clk_parent_data pre_clk_div_parent[] =3D { +static const struct clk_parent_data pre_clk_div_parent[] =3D { { .name =3D NPCM8XX_CLK_S_PRE_CLK } }; =20 -static struct clk_parent_data mux_adc_div_parent[] =3D { +static const struct clk_parent_data mux_adc_div_parent[] =3D { { .name =3D NPCM8XX_CLK_S_ADC_MUX } }; =20 -static struct clk_parent_data mux_uart_div_parent[] =3D { +static const struct clk_parent_data mux_uart_div_parent[] =3D { { .name =3D NPCM8XX_CLK_S_UART_MUX } }; =20 -static struct clk_parent_data mux_sd_div_parent[] =3D { +static const struct clk_parent_data mux_sd_div_parent[] =3D { { .name =3D NPCM8XX_CLK_S_SD_MUX } }; =20 -static struct clk_parent_data ahb_div_parent[] =3D { +static const struct clk_parent_data ahb_div_parent[] =3D { { .name =3D NPCM8XX_CLK_S_AHB } }; =20 -static struct clk_parent_data mux_gfx_div_parent[] =3D { +static const struct clk_parent_data mux_gfx_div_parent[] =3D { { .name =3D NPCM8XX_CLK_S_GFX_MUX } }; =20 -static struct clk_parent_data mux_clkout_div_parent[] =3D { +static const struct clk_parent_data mux_clkout_div_parent[] =3D { { .name =3D NPCM8XX_CLK_S_CLKOUT_MUX } }; =20 -static struct clk_parent_data mux_su_div_parent[] =3D { +static const struct clk_parent_data mux_su_div_parent[] =3D { { .name =3D NPCM8XX_CLK_S_SU_MUX } }; =20 -static struct clk_parent_data mux_rg_div_parent[] =3D { +static const struct clk_parent_data mux_rg_div_parent[] =3D { { .name =3D NPCM8XX_CLK_S_RG_MUX } }; =20 -static struct clk_parent_data mux_rcp_div_parent[] =3D { +static const struct clk_parent_data mux_rcp_div_parent[] =3D { { .name =3D NPCM8XX_CLK_S_RCP_MUX } }; =20 -static struct clk_parent_data mux_cpu_div_parent[] =3D { +static const struct clk_parent_data mux_cpu_div_parent[] =3D { { .name =3D NPCM8XX_CLK_S_CPU_MUX } }; =20 @@ -623,6 +622,7 @@ static const struct of_device_id npcm8xx_clk_dt_ids[] = =3D { { .compatible =3D "nuvoton,npcm845-clk", }, { } }; +MODULE_DEVICE_TABLE(of, npcm8xx_clk_dt_ids); =20 static struct platform_driver npcm8xx_clk_driver =3D { .probe =3D npcm8xx_clk_probe, @@ -638,3 +638,11 @@ static int __init npcm8xx_clk_driver_init(void) } arch_initcall(npcm8xx_clk_driver_init); =20 +static void __exit npcm8xx_clk_driver_exit(void) +{ + return platform_driver_unregister(&npcm8xx_clk_driver); +} +module_exit(npcm8xx_clk_driver_init); + +MODULE_DESCRIPTION("npcm8xx clk driver"); +MODULE_LICENSE("GPL v2");