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 smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 21A99C433EF for ; Mon, 30 May 2022 14:36:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id E07E6C3411C; Mon, 30 May 2022 14:36:30 +0000 (UTC) Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id 8F73EC3411A; Mon, 30 May 2022 14:36:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.kernel.org 8F73EC3411A Authentication-Results: smtp.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-30c2f288f13so37258517b3.7; Mon, 30 May 2022 07:36:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=dvrjYDA95UGzJEkqR4VWQMwdqXDFwSFdJ8W67vLKpl4=; b=LMsOZxYAf0FVawmL4l9HyVnwFTr5KxHbfd6atz7wufE52eRMwBsKAUo7modAdF3V/F a9NnsN6oodWL1Qqr8S8xbqC8WQGRreoiCK1fwX1HsK71yAEOeecBBq3BITC6+c/fdSgs k4c0Dx8uWsSAK/ZGPYkzj9Zeb/sg2fVzSUhtYRUEet7LRgMb10SH0hX9Q62d9Sh/Je70 fUSC2fln2PHSD+yT8SCDfxh+LBrWguHQAiD+COYQRw7pf5e8I21IIc52IUZeM/UTlMEF l1DYqZ2b8oqxlPWzwSuDAtoEr360jHpVFVPzC7t1vvh9Uvxi9vlyiBl67kJF5+gHMlVu Nvzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=dvrjYDA95UGzJEkqR4VWQMwdqXDFwSFdJ8W67vLKpl4=; b=ryMh8A/Mfa8v/iW5QR5k8tQFvFQSEuq2SFBhGuWfG/rBruaqNEviEtSvej6p0JKpGB L9rShYQdNbw5LKF+rL/8w/7H9/VehiiByLPIAB79ffadxPnu7ssruRs2Mt5z/bsTjlxJ +xdeX5UJ8a+enimllEhiWEUdoO9IPFp65HJaBK2vNLP5iss7wQOkldMNkVUORzm/rvVC wiJsNxYysldxr9LVP1l9kvs+MPjgWEy/y0RMwGBr5Jnm/6V8rLfP0KDaHjDVG/t2SUTm DUGxwlPxiTLqzMMNig52BRFYhKfRIosIqonpIutiv4VcSBUIMRP0wMK5pIgY3OSq5clx FYzw== X-Gm-Message-State: AOAM532oI5zr4XmPUl8XDptkywCdE31ikFV1cRsD3q0aCGyjncXp71by 7h8mgy2BcVOpHRU+kcjiHJpvpXHfE5CB5vpzXrRSaRwgeS4= X-Google-Smtp-Source: ABdhPJxOHvu9qZlCT/k8pTkE9biliB9SRM2xrmqUgiEPAUMRvPDWkoKRETzBXQNA5flFfXfubMvfu2eH/vYRwfFMKFM= X-Received: by 2002:a81:5543:0:b0:30c:1e9f:c027 with SMTP id j64-20020a815543000000b0030c1e9fc027mr11607389ywb.355.1653921387353; Mon, 30 May 2022 07:36:27 -0700 (PDT) MIME-Version: 1.0 References: <20220522155046.260146-1-tmaimon77@gmail.com> <20220522155046.260146-9-tmaimon77@gmail.com> <20220526193700.55285C385A9@smtp.kernel.org> In-Reply-To: <20220526193700.55285C385A9@smtp.kernel.org> From: Tomer Maimon Date: Mon, 30 May 2022 17:36:15 +0300 Message-ID: Subject: Re: [PATCH v1 08/19] clk: npcm8xx: add clock controller To: Stephen Boyd List-Id: Cc: Arnd Bergmann , Avi Fishman , Benjamin Fair , Biju Das , Bjorn Andersson , Catalin Marinas , Daniel Lezcano , Geert Uytterhoeven , Greg KH , =?UTF-8?Q?Jonathan_Neusch=C3=A4fer?= , Jiri Slaby , Joel Stanley , Krzysztof Kozlowski , Guenter Roeck , Lubomir Rintel , Marcel Ziswiler , Michael Turquette , Nobuhiro Iwamatsu , Olof Johansson , Philipp Zabel , Robert Hancock , Rob Herring , Shawn Guo , Tali Perry , Thomas Gleixner , Patrick Venture , Vinod Koul , Will Deacon , Wim Van Sebroeck , Nancy Yuen , SoC Team , devicetree , Linux Kernel Mailing List , linux-clk , "open list:SERIAL DRIVERS" , LINUXWATCHDOG , Linux ARM Content-Type: text/plain; charset="UTF-8" Hi Stephen, Thanks for your comments. The patch will modify according to your comments and will be sent in the next kernel revision 5.19.rc1 On Thu, 26 May 2022 at 22:37, Stephen Boyd wrote: > > Quoting Tomer Maimon (2022-05-22 08:50:35) > > diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig > > index 5d596e778ff4..b9f3202de872 100644 > > --- a/drivers/clk/Kconfig > > +++ b/drivers/clk/Kconfig > > @@ -414,6 +414,13 @@ config COMMON_CLK_K210 > > help > > Support for the Canaan Kendryte K210 RISC-V SoC clocks. > > > > +config COMMON_CLK_NPCM8XX > > + tristate "Clock driver for the NPCM8XX SoC Family" > > + depends on ARCH_NPCM || COMPILE_TEST > > + depends on OF > > What depends on OF? Presumably it builds even when OF is disabled. Will remove. > > > + help > > + This driver supports the clocks on the Nuvoton BMC NPCM8XX SoC Family. > > + > > source "drivers/clk/actions/Kconfig" > > source "drivers/clk/analogbits/Kconfig" > > source "drivers/clk/baikal-t1/Kconfig" > > diff --git a/drivers/clk/clk-npcm8xx.c b/drivers/clk/clk-npcm8xx.c > > new file mode 100644 > > index 000000000000..6d0ab7f97ae6 > > --- /dev/null > > +++ b/drivers/clk/clk-npcm8xx.c > > @@ -0,0 +1,767 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Nuvoton NPCM8xx Clock Generator > > + * All the clocks are initialized by the bootloader, so this driver allow only > > + * reading of current settings directly from the hardware. > > + * > > + * Copyright (C) 2020 Nuvoton Technologies tomer.maimon@nuvoton.com > > + */ > > + > > +#include > > What is this include for? will remove. > > > +#include > > It isn't a module though. Compiling the driver as a module will > (hopefully) fail. > > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > Please sort includes alphabetically. > > > + > > +#include > > This should stay at the end though. > > > + > > +struct npcm8xx_clk_pll { > > + struct clk_hw hw; > > + void __iomem *pllcon; > > + u8 flags; > > +}; > > + > > +#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_rate) > > +{ > > + struct npcm8xx_clk_pll *pll = to_npcm8xx_clk_pll(hw); > > + unsigned long fbdv, indv, otdv1, otdv2; > > + unsigned int val; > > + u64 ret; > > + > > + if (parent_rate == 0) { > > + pr_err("%s: parent rate is zero", __func__); > > This can happen because of registration logic, so downgrade to > pr_debug() or just remove entirely and return 0. > > > + return 0; > > + } > > + > > + val = readl_relaxed(pll->pllcon); > > + > > + indv = FIELD_GET(PLLCON_INDV, val); > > + fbdv = FIELD_GET(PLLCON_FBDV, val); > > + otdv1 = FIELD_GET(PLLCON_OTDV1, val); > > + otdv2 = FIELD_GET(PLLCON_OTDV2, val); > > + > > + ret = (u64)parent_rate * fbdv; > > + do_div(ret, indv * otdv1 * otdv2); > > Does that indv * otdv1 * otdv2 ever overflow 32-bits? No. > > > + > > + return ret; > > +} > > + > > +static const struct clk_ops npcm8xx_clk_pll_ops = { > > + .recalc_rate = npcm8xx_clk_pll_recalc_rate, > > +}; > > + > > +static struct clk_hw * > > +npcm8xx_clk_register_pll(void __iomem *pllcon, const char *name, > > + const char *parent_name, unsigned long flags) > > +{ > > + struct npcm8xx_clk_pll *pll; > > + struct clk_init_data init; > > + struct clk_hw *hw; > > + int ret; > > + > > + pll = kzalloc(sizeof(*pll), GFP_KERNEL); > > + if (!pll) > > + return ERR_PTR(-ENOMEM); > > + > > + pr_debug("%s reg, name=%s, p=%s\n", __func__, name, parent_name); > > + > > + init.name = name; > > + init.ops = &npcm8xx_clk_pll_ops; > > + init.parent_names = &parent_name; > > + init.num_parents = 1; > > + init.flags = flags; > > + > > + pll->pllcon = pllcon; > > + pll->hw.init = &init; > > + > > + hw = &pll->hw; > > + > > + ret = clk_hw_register(NULL, hw); > > + if (ret) { > > + kfree(pll); > > + hw = 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_gate_data { > > + u32 reg; > > + u8 bit_idx; > > + const char *name; > > + const char *parent_name; > > + 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_mux_data { > > + u8 shift; > > + u8 mask; > > + u32 *table; > > + const char *name; > > + const char * const *parent_names; > > + 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_fixed_data { > > + u8 mult; > > + u8 div; > > + const char *name; > > + const char *parent_name; > > + u8 clk_divider_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 char *parent_name; > > + 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; > > +}; > > + > > +struct npcm8xx_clk_pll_data { > > + u32 reg; > > + const char *name; > > + const char *parent_name; > > + 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 indexed 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_GFXBYPCK "gfxbypck" > > +#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_GPRFSEL_MUX "gprfsel_mux" > > +#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_UART2_MUX "uart2_mux" > > +#define NPCM8XX_CLK_S_TIM_MUX "timer_mux" > > +#define NPCM8XX_CLK_S_PRE_ADC_MUX "pre_adc_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_GFX_PIXEL "gfx_pixel" > > +#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_AMBA "amba" > > +#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" > > I suspect these defines will largely go away. Most of the definitions are used or will be used, I will keep only the used definitions > > > + > > +static u32 pll_mux_table[] = {0, 1, 2, 3}; > > +static const char * const pll_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_PLL0, > > + NPCM8XX_CLK_S_PLL1, > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_PLL2_DIV2, > > +}; > > + > > +static u32 cpuck_mux_table[] = {0, 1, 2, 3, 7}; > > +static const char * const cpuck_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_PLL0, > > + NPCM8XX_CLK_S_PLL1, > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_SYSBYPCK, > > + NPCM8XX_CLK_S_PLL2, > > +}; > > + > > +static u32 pixcksel_mux_table[] = {0, 2}; > > +static const char * const pixcksel_mux_parents[] __initconst = { > > Please use clk_parent_data instead of this. > > > + NPCM8XX_CLK_S_PLL_GFX, > > + NPCM8XX_CLK_S_REFCLK, > > +}; > > + > > +static u32 sucksel_mux_table[] = {2, 3}; > > +static const char * const sucksel_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_PLL2_DIV2, > > +}; > > + > > +static u32 mccksel_mux_table[] = {0, 2, 3}; > > +static const char * const mccksel_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_PLL1_DIV2, > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_MCBYPCK, > > +}; > > + > > +static u32 clkoutsel_mux_table[] = {0, 1, 2, 3, 4}; > > +static const char * const clkoutsel_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_PLL0, > > + NPCM8XX_CLK_S_PLL1, > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_PLL_GFX, // divided by 2 > > + NPCM8XX_CLK_S_PLL2_DIV2, > > +}; > > + > > +static u32 gfxmsel_mux_table[] = {2, 3}; > > +static const char * const gfxmsel_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_PLL2_DIV2, > > +}; > > + > > +static u32 dvcssel_mux_table[] = {2, 3}; > > Use checkpatch, add space around { and } for arrays. > > > +static const char * const dvcssel_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_PLL2, > > +}; > > + > > +static const struct npcm8xx_clk_pll_data npcm8xx_plls[] __initconst = { > > + {NPCM8XX_PLLCON0, NPCM8XX_CLK_S_PLL0, NPCM8XX_CLK_S_REFCLK, 0, -1}, > > + > > + {NPCM8XX_PLLCON1, NPCM8XX_CLK_S_PLL1, > > + NPCM8XX_CLK_S_REFCLK, 0, -1}, > > + > > + {NPCM8XX_PLLCON2, NPCM8XX_CLK_S_PLL2, > > + NPCM8XX_CLK_S_REFCLK, 0, -1}, > > + > > + {NPCM8XX_PLLCONG, NPCM8XX_CLK_S_PLL_GFX, > > + NPCM8XX_CLK_S_REFCLK, 0, -1}, > > +}; > > + > > +static const struct npcm8xx_clk_mux_data npcm8xx_muxes[] __initconst = { > > + {0, GENMASK(1, 0), cpuck_mux_table, NPCM8XX_CLK_S_CPU_MUX, > > + cpuck_mux_parents, ARRAY_SIZE(cpuck_mux_parents), CLK_IS_CRITICAL, > > + NPCM8XX_CLK_CPU}, > > + > > + {4, GENMASK(1, 0), pixcksel_mux_table, NPCM8XX_CLK_S_PIX_MUX, > > + pixcksel_mux_parents, ARRAY_SIZE(pixcksel_mux_parents), 0, > > + NPCM8XX_CLK_GFX_PIXEL}, > > + > > + {6, GENMASK(1, 0), pll_mux_table, NPCM8XX_CLK_S_SD_MUX, > > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1}, > > + > > + {8, GENMASK(1, 0), pll_mux_table, NPCM8XX_CLK_S_UART_MUX, > > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1}, > > + > > + {10, GENMASK(1, 0), sucksel_mux_table, NPCM8XX_CLK_S_SU_MUX, > > + sucksel_mux_parents, ARRAY_SIZE(sucksel_mux_parents), 0, -1}, > > + > > + {12, GENMASK(1, 0), mccksel_mux_table, NPCM8XX_CLK_S_MC_MUX, > > + mccksel_mux_parents, ARRAY_SIZE(mccksel_mux_parents), 0, -1}, > > + > > + {14, GENMASK(1, 0), pll_mux_table, NPCM8XX_CLK_S_ADC_MUX, > > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1}, > > + > > + {16, GENMASK(1, 0), pll_mux_table, NPCM8XX_CLK_S_GFX_MUX, > > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1}, > > + > > + {18, GENMASK(2, 0), clkoutsel_mux_table, NPCM8XX_CLK_S_CLKOUT_MUX, > > + clkoutsel_mux_parents, ARRAY_SIZE(clkoutsel_mux_parents), 0, -1}, > > + > > + {21, GENMASK(1, 0), gfxmsel_mux_table, NPCM8XX_CLK_S_GFXM_MUX, > > + gfxmsel_mux_parents, ARRAY_SIZE(gfxmsel_mux_parents), 0, -1}, > > + > > + {23, GENMASK(1, 0), dvcssel_mux_table, NPCM8XX_CLK_S_DVC_MUX, > > + dvcssel_mux_parents, ARRAY_SIZE(dvcssel_mux_parents), 0, -1}, > > + > > + {25, GENMASK(1, 0), pll_mux_table, NPCM8XX_CLK_S_RG_MUX, > > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1}, > > + > > + {27, GENMASK(1, 0), pll_mux_table, NPCM8XX_CLK_S_RCP_MUX, > > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1}, > > +}; > > + > > +/* fixed ratio dividers (no register): */ > > +static const struct npcm8xx_clk_div_fixed_data npcm8xx_divs_fx[] __initconst = { > > + { 1, 2, NPCM8XX_CLK_S_MC, NPCM8XX_CLK_S_MC_MUX, 0, NPCM8XX_CLK_MC}, > > + { 1, 2, NPCM8XX_CLK_S_AXI, NPCM8XX_CLK_S_TH, 0, NPCM8XX_CLK_AXI}, > > + { 1, 2, NPCM8XX_CLK_S_ATB, NPCM8XX_CLK_S_AXI, 0, NPCM8XX_CLK_ATB}, > > + { 1, 2, NPCM8XX_CLK_S_PRE_CLK, NPCM8XX_CLK_S_CPU_MUX, 0, -1}, > > + { 1, 2, NPCM8XX_CLK_S_PLL1_DIV2, NPCM8XX_CLK_S_PLL1, 0, -1}, > > + { 1, 2, NPCM8XX_CLK_S_PLL2_DIV2, NPCM8XX_CLK_S_PLL2, 0, -1}, > > +}; > > + > > +/* configurable dividers: */ > > +static const struct npcm8xx_clk_div_data npcm8xx_divs[] __initconst = { > > + {NPCM8XX_CLKDIV1, 28, 3, NPCM8XX_CLK_S_ADC, NPCM8XX_CLK_S_PRE_ADC, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > > + NPCM8XX_CLK_ADC}, > > + /*30-28 ADCCKDIV*/ > > What are the numbers for? Bits inside the register? yes, I will add bits > > > + {NPCM8XX_CLKDIV1, 26, 2, NPCM8XX_CLK_S_AHB, NPCM8XX_CLK_S_PRE_CLK, > > + CLK_DIVIDER_READ_ONLY, CLK_IS_CRITICAL, NPCM8XX_CLK_AHB}, > > + /*28-26 CLK4DIV*/ > > + {NPCM8XX_CLKDIV1, 21, 5, NPCM8XX_CLK_S_PRE_ADC, > > + NPCM8XX_CLK_S_ADC_MUX, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_PRE_ADC}, > > + /*25-21 PRE-ADCCKDIV*/ > > + {NPCM8XX_CLKDIV1, 16, 5, NPCM8XX_CLK_S_UART, > > + NPCM8XX_CLK_S_UART_MUX, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_UART}, > > + /*20-16 UARTDIV*/ > > + {NPCM8XX_CLKDIV1, 11, 5, NPCM8XX_CLK_S_MMC, > > + NPCM8XX_CLK_S_SD_MUX, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_MMC}, > > + /*15-11 MMCCKDIV*/ > > + {NPCM8XX_CLKDIV1, 6, 5, NPCM8XX_CLK_S_SPI3, > > + NPCM8XX_CLK_S_AHB, 0, 0, NPCM8XX_CLK_SPI3}, > > + /*10-6 AHB3CKDIV*/ > > + {NPCM8XX_CLKDIV1, 2, 4, NPCM8XX_CLK_S_PCI, > > + NPCM8XX_CLK_S_GFX_MUX, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_PCI}, > > + /*5-2 PCICKDIV*/ > > + > > + {NPCM8XX_CLKDIV2, 30, 2, NPCM8XX_CLK_S_APB4, NPCM8XX_CLK_S_AHB, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > > + NPCM8XX_CLK_APB4}, > > + /*31-30 APB4CKDIV*/ > > + {NPCM8XX_CLKDIV2, 28, 2, NPCM8XX_CLK_S_APB3, NPCM8XX_CLK_S_AHB, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > > + NPCM8XX_CLK_APB3}, > > + /*29-28 APB3CKDIV*/ > > + {NPCM8XX_CLKDIV2, 26, 2, NPCM8XX_CLK_S_APB2, NPCM8XX_CLK_S_AHB, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > > + NPCM8XX_CLK_APB2}, > > + /*28-26 APB2CKDIV*/ > > + {NPCM8XX_CLKDIV2, 24, 2, NPCM8XX_CLK_S_APB1, NPCM8XX_CLK_S_AHB, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > > + NPCM8XX_CLK_APB1}, > > + /*25-24 APB1CKDIV*/ > > + {NPCM8XX_CLKDIV2, 22, 2, NPCM8XX_CLK_S_APB5, NPCM8XX_CLK_S_AHB, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > > + NPCM8XX_CLK_APB5}, > > + /*23-22 APB5CKDIV*/ > > + {NPCM8XX_CLKDIV2, 16, 5, NPCM8XX_CLK_S_CLKOUT, NPCM8XX_CLK_S_CLKOUT_MUX, > > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_CLKOUT}, > > + /*20-16 CLKOUTDIV*/ > > + {NPCM8XX_CLKDIV2, 13, 3, NPCM8XX_CLK_S_GFX, NPCM8XX_CLK_S_GFX_MUX, > > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_GFX}, > > + /*15-13 GFXCKDIV*/ > > + {NPCM8XX_CLKDIV2, 8, 5, NPCM8XX_CLK_S_USB_BRIDGE, NPCM8XX_CLK_S_SU_MUX, > > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SU}, > > + /*12-8 SUCKDIV*/ > > + {NPCM8XX_CLKDIV2, 4, 4, NPCM8XX_CLK_S_USB_HOST, NPCM8XX_CLK_S_SU_MUX, > > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SU48}, > > + /*8-4 SU48CKDIV*/ > > + {NPCM8XX_CLKDIV2, 0, 4, NPCM8XX_CLK_S_SDHC, > > + NPCM8XX_CLK_S_SD_MUX, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SDHC} > > + ,/*3-0 SD1CKDIV*/ > > + > > + {NPCM8XX_CLKDIV3, 16, 8, NPCM8XX_CLK_S_SPI1, > > + NPCM8XX_CLK_S_AHB, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SPI1}, > > + /*23-16 SPI1CKDV*/ > > + {NPCM8XX_CLKDIV3, 11, 5, NPCM8XX_CLK_S_UART2, > > + NPCM8XX_CLK_S_UART_MUX, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_UART2}, > > + /*15-11 UARTDIV2*/ > > + {NPCM8XX_CLKDIV3, 6, 5, NPCM8XX_CLK_S_SPI0, > > + NPCM8XX_CLK_S_AHB, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SPI0}, > > + /*10-6 SPI0CKDV*/ > > + {NPCM8XX_CLKDIV3, 1, 5, NPCM8XX_CLK_S_SPIX, > > + NPCM8XX_CLK_S_AHB, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SPIX}, > > + > > + /*5-1 SPIXCKDV*/ > > + {NPCM8XX_CLKDIV4, 28, 4, NPCM8XX_CLK_S_RG, NPCM8XX_CLK_S_RG_MUX, > > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_RG}, > > + > > + /*31-28 RGREFDIV*/ > > + {NPCM8XX_CLKDIV4, 12, 4, NPCM8XX_CLK_S_RCP, NPCM8XX_CLK_S_RCP_MUX, > > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_RCP}, > > + > > + /*15-12 RCPREFDIV*/ > > + {NPCM8XX_THRTL_CNT, 0, 2, NPCM8XX_CLK_S_TH, NPCM8XX_CLK_S_CPU_MUX, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, NPCM8XX_CLK_TH}, > > + /*1-0 TH_DIV*/ > > +}; > > + > > +static const struct npcm8xx_clk_gate_data npcm8xx_gates[] __initconst = { > > + {NPCM8XX_CLKEN1, 31, "smb1-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 30, "smb0-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 29, "smb7-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 28, "smb6-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 27, "adc-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN1, 26, "wdt-gate", NPCM8XX_CLK_S_TIMER, 0}, > > + {NPCM8XX_CLKEN1, 25, "usbdev3-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 24, "usbdev6-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 23, "usbdev5-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 22, "usbdev4-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 21, "gmac4-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 20, "timer5_9-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN1, 19, "timer0_4-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN1, 18, "pwmm0-gate", NPCM8XX_CLK_S_APB3, 0}, > > + {NPCM8XX_CLKEN1, 17, "huart-gate", NPCM8XX_CLK_S_UART, 0}, > > + {NPCM8XX_CLKEN1, 16, "smb5-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 15, "smb4-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 14, "smb3-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 13, "smb2-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 12, "mc-gate", NPCM8XX_CLK_S_MC, 0}, > > + {NPCM8XX_CLKEN1, 11, "uart01-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN1, 10, "aes-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 9, "peci-gate", NPCM8XX_CLK_S_APB3, 0}, > > + {NPCM8XX_CLKEN1, 8, "usbdev2-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 7, "uart23-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN1, 6, "gmac3-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 5, "usbdev1-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 4, "shm-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 3, "gdma0-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 2, "kcs-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN1, 1, "spi3-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 0, "spi0-gate", NPCM8XX_CLK_S_AHB, 0}, > > + > > + {NPCM8XX_CLKEN2, 31, "cp-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 30, "tock-gate", NPCM8XX_CLK_S_TOCK, 0}, > > + /* bit 29 is reserved */ > > + {NPCM8XX_CLKEN2, 28, "gmac1-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 27, "usbif-gate", NPCM8XX_CLK_S_USBIF, 0}, > > + {NPCM8XX_CLKEN2, 26, "usbhost1-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 25, "gmac2-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 24, "spi1-gate", NPCM8XX_CLK_S_APB5, 0}, > > + {NPCM8XX_CLKEN2, 23, "pspi2-gate", NPCM8XX_CLK_S_APB5, 0}, > > + /* bit 22 is reserved */ > > + {NPCM8XX_CLKEN2, 21, "3des-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 20, "bt-gate", NPCM8XX_CLK_S_APB3, 0}, > > + {NPCM8XX_CLKEN2, 19, "siox2-gate", NPCM8XX_CLK_S_APB3, 0}, > > + {NPCM8XX_CLKEN2, 18, "siox1-gate", NPCM8XX_CLK_S_APB3, 0}, > > + {NPCM8XX_CLKEN2, 17, "viruart2-gate", NPCM8XX_CLK_S_APB5, 0}, > > + {NPCM8XX_CLKEN2, 16, "viruart1-gate", NPCM8XX_CLK_S_APB5, 0}, > > + /* bit 15 is reserved */ > > + {NPCM8XX_CLKEN2, 14, "vcd-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 13, "ece-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 12, "vdma-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 11, "ahbpcibrg-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 10, "gfxsys-gate", NPCM8XX_CLK_S_APB1, 0}, > > + //{NPCM8XX_CLKEN2, 9, "sdhc-gate", NPCM8XX_CLK_S_AHB, 0}, > > + /* bit 9 is reserved */ > > + {NPCM8XX_CLKEN2, 8, "mmc-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 7, "mft7-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 6, "mft6-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 5, "mft5-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 4, "mft4-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 3, "mft3-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 2, "mft2-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 1, "mft1-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 0, "mft0-gate", NPCM8XX_CLK_S_APB4, 0}, > > + > > + {NPCM8XX_CLKEN3, 31, "gpiom7-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 30, "gpiom6-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 29, "gpiom5-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 28, "gpiom4-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 27, "gpiom3-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 26, "gpiom2-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 25, "gpiom1-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 24, "gpiom0-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 23, "espi-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 22, "smb11-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 21, "smb10-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 20, "smb9-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 19, "smb8-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 18, "smb15-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 17, "rng-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 16, "timer10_14-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 15, "pcirc-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 14, "sececc-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 13, "sha-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 12, "smb14-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 11, "gdma2-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 10, "gdma1-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 9, "pcimbx-gate", NPCM8XX_CLK_S_AHB, 0}, > > + /* bit 8 is reserved */ > > + {NPCM8XX_CLKEN3, 7, "usbdev9-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 6, "usbdev8-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 5, "usbdev7-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 4, "usbdev0-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 3, "smb13-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 2, "spix-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 1, "smb12-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 0, "pwmm1-gate", NPCM8XX_CLK_S_APB3, 0}, > > + > > + {NPCM8XX_CLKEN4, 31, "usbhost2-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN4, 30, "jtm2-gate", NPCM8XX_CLK_S_APB5, 0}, > > + {NPCM8XX_CLKEN4, 29, "jtm1-gate", NPCM8XX_CLK_S_APB5, 0}, > > + {NPCM8XX_CLKEN4, 28, "pwmm2-gate", NPCM8XX_CLK_S_APB3, 0}, > > + /* bit 27 is reserved */ > > + /* bit 26 is reserved */ > > + /* bit 25 is reserved */ > > + {NPCM8XX_CLKEN4, 24, "smb26-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 23, "smb25-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 22, "smb24-gate", NPCM8XX_CLK_S_APB19, 0}, > > + /* bit 21 is reserved */ > > + /* bit 20 is reserved */ > > + {NPCM8XX_CLKEN4, 19, "pcimbx2-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN4, 18, "uart6-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN4, 17, "uart5-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN4, 16, "uart4-gate", NPCM8XX_CLK_S_APB1, 0}, > > + /* bit 15 is reserved */ > > + /* bit 14 is reserved */ > > + {NPCM8XX_CLKEN4, 13, "i3c5-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 12, "i3c4-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 11, "i3c3-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 10, "i3c2-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 9, "i3c1-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 8, "i3c0-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 7, "smb23-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 6, "smb22-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 5, "smb21-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 4, "smb20-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 3, "smb19-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 2, "smb18-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 1, "smb17-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 0, "smb16-gate", NPCM8XX_CLK_S_APB19, 0}, > > + > > +}; > > + > > +static DEFINE_SPINLOCK(npcm8xx_clk_lock); > > Preferably this lock isn't global. > > > + > > +static void __init npcm8xx_clk_init(struct device_node *clk_np) > > +{ > > + struct clk_hw_onecell_data *npcm8xx_clk_data; > > + void __iomem *clk_base; > > + struct resource res; > > + struct clk_hw *hw; > > + int ret; > > + int i; > > + > > + ret = of_address_to_resource(clk_np, 0, &res); > > + if (ret) { > > + pr_err("%pOFn: failed to get resource, ret %d\n", clk_np, ret); > > + return; > > + } > > + > > + clk_base = ioremap(res.start, resource_size(&res)); > > + if (!clk_base) > > + goto npcm8xx_init_error; > > + > > + npcm8xx_clk_data = kzalloc(struct_size(npcm8xx_clk_data, hws, > > + NPCM8XX_NUM_CLOCKS), GFP_KERNEL); > > + if (!npcm8xx_clk_data) > > + goto npcm8xx_init_np_err; > > + > > + npcm8xx_clk_data->num = NPCM8XX_NUM_CLOCKS; > > + > > + for (i = 0; i < NPCM8XX_NUM_CLOCKS; i++) > > + npcm8xx_clk_data->hws[i] = ERR_PTR(-EPROBE_DEFER); > > + > > + /* Register plls */ > > + for (i = 0; i < ARRAY_SIZE(npcm8xx_plls); i++) { > > + const struct npcm8xx_clk_pll_data *pll_data = &npcm8xx_plls[i]; > > + > > + hw = npcm8xx_clk_register_pll(clk_base + pll_data->reg, > > + pll_data->name, > > + pll_data->parent_name, > > + pll_data->flags); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register pll\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + if (pll_data->onecell_idx >= 0) > > + npcm8xx_clk_data->hws[pll_data->onecell_idx] = hw; > > + } > > + > > + /* Register fixed dividers */ > > + hw = clk_hw_register_fixed_factor(NULL, NPCM8XX_CLK_S_PLL1_DIV2, > > + NPCM8XX_CLK_S_PLL1, 0, 1, 2); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register fixed div\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + hw = clk_hw_register_fixed_factor(NULL, NPCM8XX_CLK_S_PLL2_DIV2, > > + NPCM8XX_CLK_S_PLL2, 0, 1, 2); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register pll div2\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + hw = clk_hw_register_fixed_factor(NULL, NPCM8XX_CLK_S_PRE_CLK, > > + NPCM8XX_CLK_S_CPU_MUX, 0, 1, 2); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register ckclk div2\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + hw = clk_hw_register_fixed_factor(NULL, NPCM8XX_CLK_S_AXI, > > + NPCM8XX_CLK_S_TH, 0, 1, 2); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register axi div2\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + hw = clk_hw_register_fixed_factor(NULL, NPCM8XX_CLK_S_ATB, > > + NPCM8XX_CLK_S_AXI, 0, 1, 2); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register atb div2\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + /* Register muxes */ > > + for (i = 0; i < ARRAY_SIZE(npcm8xx_muxes); i++) { > > + const struct npcm8xx_clk_mux_data *mux_data = &npcm8xx_muxes[i]; > > + > > + hw = clk_hw_register_mux_table(NULL, mux_data->name, > > + mux_data->parent_names, > > + 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)) { > > + pr_err("npcm8xx_clk: Can't register mux\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + if (mux_data->onecell_idx >= 0) > > + npcm8xx_clk_data->hws[mux_data->onecell_idx] = hw; > > + } > > + > > + /* Register clock dividers specified in npcm8xx_divs */ > > + for (i = 0; i < ARRAY_SIZE(npcm8xx_divs); i++) { > > + const struct npcm8xx_clk_div_data *div_data = &npcm8xx_divs[i]; > > + > > + hw = clk_hw_register_divider(NULL, div_data->name, > > + div_data->parent_name, > > + div_data->flags, > > + clk_base + div_data->reg, > > + div_data->shift, div_data->width, > > + div_data->clk_divider_flags, > > + &npcm8xx_clk_lock); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register div table\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + if (div_data->onecell_idx >= 0) > > + npcm8xx_clk_data->hws[div_data->onecell_idx] = hw; > > + } > > + > > + ret = of_clk_add_hw_provider(clk_np, of_clk_hw_onecell_get, > > + npcm8xx_clk_data); > > + if (ret) > > + pr_err("failed to add DT provider: %d\n", ret); > > + > > + of_node_put(clk_np); > > + > > + return; > > + > > +npcm8xx_init_fail: > > + kfree(npcm8xx_clk_data->hws); > > Why only hws and not the entire npcm8xx_clk_data? Also, this error path > fails to unregister clks on error. Probably devm usage will help make > all of this code go away. > > > +npcm8xx_init_np_err: > > + iounmap(clk_base); > > +npcm8xx_init_error: > > + of_node_put(clk_np); > > What is this of_node_put() associated with in this function? > > > +} > > + > > +CLK_OF_DECLARE(npcm8xx_clk_init, "nuvoton,npcm845-clk", npcm8xx_clk_init); > > This should be made into a platform device driver and platform device > APIs should be used throughout. Do you mean that I need to use builtin_platform_driver API and not CLK_OF_DECLARE declaration? Best regards, Tomer 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 C6CDAC433F5 for ; Mon, 30 May 2022 14:48:27 +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-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=unAezp2VnFjjxibQYuKkRHa1IRMpUXY4vy0zurmAawM=; b=sdfVVnz4RDNu5j PedzZB22Rl+PCShTaohPdsjHnvMKgRss01oF6WYXPkZAw1lxKH7kT8A62728Zm6AHzwfp6ipxoSlF hgunijCVPvBexnm2y4TqsUQqRSvBKHxg+MOW5eR30fp2Cxw75D9yS+5gta9ZIXAvz+r+Kt9NAojbP +S01ZwlVXk/V9xeY81ZPpB9Q0y7Hjace/o2yaEq0TeyX9feVxo3t6NBzMNU1ZEUzZ0fIlfHMGqqw5 8qvPuh9IZu1ZduYxAU/IBDCfVq6Oj0boHbP5AWyt1i447FKHrtwLeIHrujRWLOu1Bkv/9Z9GwbQOn 80J2vXimmGohXy9GuZlg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvgfK-007Lkg-N0; Mon, 30 May 2022 14:46:43 +0000 Received: from mail-yw1-x1135.google.com ([2607:f8b0:4864:20::1135]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvgVR-007Gxk-L3 for linux-arm-kernel@lists.infradead.org; Mon, 30 May 2022 14:36:33 +0000 Received: by mail-yw1-x1135.google.com with SMTP id 00721157ae682-3043b3f7d8fso101911057b3.8 for ; Mon, 30 May 2022 07:36:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=dvrjYDA95UGzJEkqR4VWQMwdqXDFwSFdJ8W67vLKpl4=; b=LMsOZxYAf0FVawmL4l9HyVnwFTr5KxHbfd6atz7wufE52eRMwBsKAUo7modAdF3V/F a9NnsN6oodWL1Qqr8S8xbqC8WQGRreoiCK1fwX1HsK71yAEOeecBBq3BITC6+c/fdSgs k4c0Dx8uWsSAK/ZGPYkzj9Zeb/sg2fVzSUhtYRUEet7LRgMb10SH0hX9Q62d9Sh/Je70 fUSC2fln2PHSD+yT8SCDfxh+LBrWguHQAiD+COYQRw7pf5e8I21IIc52IUZeM/UTlMEF l1DYqZ2b8oqxlPWzwSuDAtoEr360jHpVFVPzC7t1vvh9Uvxi9vlyiBl67kJF5+gHMlVu Nvzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=dvrjYDA95UGzJEkqR4VWQMwdqXDFwSFdJ8W67vLKpl4=; b=hJLE1nQmfkS3Tydhl/bBUq16T/R3DHI8rG/Cc5cNXJEORPZ83JA3hfjemM0zFBTWQS CS6cOWOTlmwaZiy3XZPT3DPM64w5N2UiKZYDCJZHA/2S7HUaIwAuEK/wGlnfPKQK/xMv K4VVPg8+Sy/Qr1ytcR2W9YV49qlQDfuMZJYljjR87b9DfHWDSubqwDBCfn9DuDZU8+33 UU1jS95bjTWzPZokqjUGrmzn4SoHcWpyzpAhCL8YEA8LbbS6g92Brvw2ljyDAJMw/BtS 0wnsKa+N7x6QcGkT0clvXugqA5lOWTHAMsR1KsypR0ArB0lQZsaA7QeoTSU6g64wVXch Rayw== X-Gm-Message-State: AOAM531MGoetDFi6H6E/6YgLbYT029GLYTH+5LgwzXjer6mUdR/OIDgU VuOk4W+fEYhsrb/KyHUElcuHi0esRCWYZk9Md64= X-Google-Smtp-Source: ABdhPJxOHvu9qZlCT/k8pTkE9biliB9SRM2xrmqUgiEPAUMRvPDWkoKRETzBXQNA5flFfXfubMvfu2eH/vYRwfFMKFM= X-Received: by 2002:a81:5543:0:b0:30c:1e9f:c027 with SMTP id j64-20020a815543000000b0030c1e9fc027mr11607389ywb.355.1653921387353; Mon, 30 May 2022 07:36:27 -0700 (PDT) MIME-Version: 1.0 References: <20220522155046.260146-1-tmaimon77@gmail.com> <20220522155046.260146-9-tmaimon77@gmail.com> <20220526193700.55285C385A9@smtp.kernel.org> In-Reply-To: <20220526193700.55285C385A9@smtp.kernel.org> From: Tomer Maimon Date: Mon, 30 May 2022 17:36:15 +0300 Message-ID: Subject: Re: [PATCH v1 08/19] clk: npcm8xx: add clock controller To: Stephen Boyd Cc: Arnd Bergmann , Avi Fishman , Benjamin Fair , Biju Das , Bjorn Andersson , Catalin Marinas , Daniel Lezcano , Geert Uytterhoeven , Greg KH , =?UTF-8?Q?Jonathan_Neusch=C3=A4fer?= , Jiri Slaby , Joel Stanley , Krzysztof Kozlowski , Guenter Roeck , Lubomir Rintel , Marcel Ziswiler , Michael Turquette , Nobuhiro Iwamatsu , Olof Johansson , Philipp Zabel , Robert Hancock , Rob Herring , Shawn Guo , Tali Perry , Thomas Gleixner , Patrick Venture , Vinod Koul , Will Deacon , Wim Van Sebroeck , Nancy Yuen , SoC Team , devicetree , Linux Kernel Mailing List , linux-clk , "open list:SERIAL DRIVERS" , LINUXWATCHDOG , Linux ARM X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220530_073629_808938_5D5F1A7D X-CRM114-Status: GOOD ( 36.70 ) 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Stephen, Thanks for your comments. The patch will modify according to your comments and will be sent in the next kernel revision 5.19.rc1 On Thu, 26 May 2022 at 22:37, Stephen Boyd wrote: > > Quoting Tomer Maimon (2022-05-22 08:50:35) > > diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig > > index 5d596e778ff4..b9f3202de872 100644 > > --- a/drivers/clk/Kconfig > > +++ b/drivers/clk/Kconfig > > @@ -414,6 +414,13 @@ config COMMON_CLK_K210 > > help > > Support for the Canaan Kendryte K210 RISC-V SoC clocks. > > > > +config COMMON_CLK_NPCM8XX > > + tristate "Clock driver for the NPCM8XX SoC Family" > > + depends on ARCH_NPCM || COMPILE_TEST > > + depends on OF > > What depends on OF? Presumably it builds even when OF is disabled. Will remove. > > > + help > > + This driver supports the clocks on the Nuvoton BMC NPCM8XX SoC Family. > > + > > source "drivers/clk/actions/Kconfig" > > source "drivers/clk/analogbits/Kconfig" > > source "drivers/clk/baikal-t1/Kconfig" > > diff --git a/drivers/clk/clk-npcm8xx.c b/drivers/clk/clk-npcm8xx.c > > new file mode 100644 > > index 000000000000..6d0ab7f97ae6 > > --- /dev/null > > +++ b/drivers/clk/clk-npcm8xx.c > > @@ -0,0 +1,767 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Nuvoton NPCM8xx Clock Generator > > + * All the clocks are initialized by the bootloader, so this driver allow only > > + * reading of current settings directly from the hardware. > > + * > > + * Copyright (C) 2020 Nuvoton Technologies tomer.maimon@nuvoton.com > > + */ > > + > > +#include > > What is this include for? will remove. > > > +#include > > It isn't a module though. Compiling the driver as a module will > (hopefully) fail. > > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > Please sort includes alphabetically. > > > + > > +#include > > This should stay at the end though. > > > + > > +struct npcm8xx_clk_pll { > > + struct clk_hw hw; > > + void __iomem *pllcon; > > + u8 flags; > > +}; > > + > > +#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_rate) > > +{ > > + struct npcm8xx_clk_pll *pll = to_npcm8xx_clk_pll(hw); > > + unsigned long fbdv, indv, otdv1, otdv2; > > + unsigned int val; > > + u64 ret; > > + > > + if (parent_rate == 0) { > > + pr_err("%s: parent rate is zero", __func__); > > This can happen because of registration logic, so downgrade to > pr_debug() or just remove entirely and return 0. > > > + return 0; > > + } > > + > > + val = readl_relaxed(pll->pllcon); > > + > > + indv = FIELD_GET(PLLCON_INDV, val); > > + fbdv = FIELD_GET(PLLCON_FBDV, val); > > + otdv1 = FIELD_GET(PLLCON_OTDV1, val); > > + otdv2 = FIELD_GET(PLLCON_OTDV2, val); > > + > > + ret = (u64)parent_rate * fbdv; > > + do_div(ret, indv * otdv1 * otdv2); > > Does that indv * otdv1 * otdv2 ever overflow 32-bits? No. > > > + > > + return ret; > > +} > > + > > +static const struct clk_ops npcm8xx_clk_pll_ops = { > > + .recalc_rate = npcm8xx_clk_pll_recalc_rate, > > +}; > > + > > +static struct clk_hw * > > +npcm8xx_clk_register_pll(void __iomem *pllcon, const char *name, > > + const char *parent_name, unsigned long flags) > > +{ > > + struct npcm8xx_clk_pll *pll; > > + struct clk_init_data init; > > + struct clk_hw *hw; > > + int ret; > > + > > + pll = kzalloc(sizeof(*pll), GFP_KERNEL); > > + if (!pll) > > + return ERR_PTR(-ENOMEM); > > + > > + pr_debug("%s reg, name=%s, p=%s\n", __func__, name, parent_name); > > + > > + init.name = name; > > + init.ops = &npcm8xx_clk_pll_ops; > > + init.parent_names = &parent_name; > > + init.num_parents = 1; > > + init.flags = flags; > > + > > + pll->pllcon = pllcon; > > + pll->hw.init = &init; > > + > > + hw = &pll->hw; > > + > > + ret = clk_hw_register(NULL, hw); > > + if (ret) { > > + kfree(pll); > > + hw = 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_gate_data { > > + u32 reg; > > + u8 bit_idx; > > + const char *name; > > + const char *parent_name; > > + 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_mux_data { > > + u8 shift; > > + u8 mask; > > + u32 *table; > > + const char *name; > > + const char * const *parent_names; > > + 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_fixed_data { > > + u8 mult; > > + u8 div; > > + const char *name; > > + const char *parent_name; > > + u8 clk_divider_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 char *parent_name; > > + 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; > > +}; > > + > > +struct npcm8xx_clk_pll_data { > > + u32 reg; > > + const char *name; > > + const char *parent_name; > > + 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 indexed 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_GFXBYPCK "gfxbypck" > > +#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_GPRFSEL_MUX "gprfsel_mux" > > +#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_UART2_MUX "uart2_mux" > > +#define NPCM8XX_CLK_S_TIM_MUX "timer_mux" > > +#define NPCM8XX_CLK_S_PRE_ADC_MUX "pre_adc_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_GFX_PIXEL "gfx_pixel" > > +#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_AMBA "amba" > > +#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" > > I suspect these defines will largely go away. Most of the definitions are used or will be used, I will keep only the used definitions > > > + > > +static u32 pll_mux_table[] = {0, 1, 2, 3}; > > +static const char * const pll_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_PLL0, > > + NPCM8XX_CLK_S_PLL1, > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_PLL2_DIV2, > > +}; > > + > > +static u32 cpuck_mux_table[] = {0, 1, 2, 3, 7}; > > +static const char * const cpuck_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_PLL0, > > + NPCM8XX_CLK_S_PLL1, > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_SYSBYPCK, > > + NPCM8XX_CLK_S_PLL2, > > +}; > > + > > +static u32 pixcksel_mux_table[] = {0, 2}; > > +static const char * const pixcksel_mux_parents[] __initconst = { > > Please use clk_parent_data instead of this. > > > + NPCM8XX_CLK_S_PLL_GFX, > > + NPCM8XX_CLK_S_REFCLK, > > +}; > > + > > +static u32 sucksel_mux_table[] = {2, 3}; > > +static const char * const sucksel_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_PLL2_DIV2, > > +}; > > + > > +static u32 mccksel_mux_table[] = {0, 2, 3}; > > +static const char * const mccksel_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_PLL1_DIV2, > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_MCBYPCK, > > +}; > > + > > +static u32 clkoutsel_mux_table[] = {0, 1, 2, 3, 4}; > > +static const char * const clkoutsel_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_PLL0, > > + NPCM8XX_CLK_S_PLL1, > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_PLL_GFX, // divided by 2 > > + NPCM8XX_CLK_S_PLL2_DIV2, > > +}; > > + > > +static u32 gfxmsel_mux_table[] = {2, 3}; > > +static const char * const gfxmsel_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_PLL2_DIV2, > > +}; > > + > > +static u32 dvcssel_mux_table[] = {2, 3}; > > Use checkpatch, add space around { and } for arrays. > > > +static const char * const dvcssel_mux_parents[] __initconst = { > > + NPCM8XX_CLK_S_REFCLK, > > + NPCM8XX_CLK_S_PLL2, > > +}; > > + > > +static const struct npcm8xx_clk_pll_data npcm8xx_plls[] __initconst = { > > + {NPCM8XX_PLLCON0, NPCM8XX_CLK_S_PLL0, NPCM8XX_CLK_S_REFCLK, 0, -1}, > > + > > + {NPCM8XX_PLLCON1, NPCM8XX_CLK_S_PLL1, > > + NPCM8XX_CLK_S_REFCLK, 0, -1}, > > + > > + {NPCM8XX_PLLCON2, NPCM8XX_CLK_S_PLL2, > > + NPCM8XX_CLK_S_REFCLK, 0, -1}, > > + > > + {NPCM8XX_PLLCONG, NPCM8XX_CLK_S_PLL_GFX, > > + NPCM8XX_CLK_S_REFCLK, 0, -1}, > > +}; > > + > > +static const struct npcm8xx_clk_mux_data npcm8xx_muxes[] __initconst = { > > + {0, GENMASK(1, 0), cpuck_mux_table, NPCM8XX_CLK_S_CPU_MUX, > > + cpuck_mux_parents, ARRAY_SIZE(cpuck_mux_parents), CLK_IS_CRITICAL, > > + NPCM8XX_CLK_CPU}, > > + > > + {4, GENMASK(1, 0), pixcksel_mux_table, NPCM8XX_CLK_S_PIX_MUX, > > + pixcksel_mux_parents, ARRAY_SIZE(pixcksel_mux_parents), 0, > > + NPCM8XX_CLK_GFX_PIXEL}, > > + > > + {6, GENMASK(1, 0), pll_mux_table, NPCM8XX_CLK_S_SD_MUX, > > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1}, > > + > > + {8, GENMASK(1, 0), pll_mux_table, NPCM8XX_CLK_S_UART_MUX, > > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1}, > > + > > + {10, GENMASK(1, 0), sucksel_mux_table, NPCM8XX_CLK_S_SU_MUX, > > + sucksel_mux_parents, ARRAY_SIZE(sucksel_mux_parents), 0, -1}, > > + > > + {12, GENMASK(1, 0), mccksel_mux_table, NPCM8XX_CLK_S_MC_MUX, > > + mccksel_mux_parents, ARRAY_SIZE(mccksel_mux_parents), 0, -1}, > > + > > + {14, GENMASK(1, 0), pll_mux_table, NPCM8XX_CLK_S_ADC_MUX, > > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1}, > > + > > + {16, GENMASK(1, 0), pll_mux_table, NPCM8XX_CLK_S_GFX_MUX, > > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1}, > > + > > + {18, GENMASK(2, 0), clkoutsel_mux_table, NPCM8XX_CLK_S_CLKOUT_MUX, > > + clkoutsel_mux_parents, ARRAY_SIZE(clkoutsel_mux_parents), 0, -1}, > > + > > + {21, GENMASK(1, 0), gfxmsel_mux_table, NPCM8XX_CLK_S_GFXM_MUX, > > + gfxmsel_mux_parents, ARRAY_SIZE(gfxmsel_mux_parents), 0, -1}, > > + > > + {23, GENMASK(1, 0), dvcssel_mux_table, NPCM8XX_CLK_S_DVC_MUX, > > + dvcssel_mux_parents, ARRAY_SIZE(dvcssel_mux_parents), 0, -1}, > > + > > + {25, GENMASK(1, 0), pll_mux_table, NPCM8XX_CLK_S_RG_MUX, > > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1}, > > + > > + {27, GENMASK(1, 0), pll_mux_table, NPCM8XX_CLK_S_RCP_MUX, > > + pll_mux_parents, ARRAY_SIZE(pll_mux_parents), 0, -1}, > > +}; > > + > > +/* fixed ratio dividers (no register): */ > > +static const struct npcm8xx_clk_div_fixed_data npcm8xx_divs_fx[] __initconst = { > > + { 1, 2, NPCM8XX_CLK_S_MC, NPCM8XX_CLK_S_MC_MUX, 0, NPCM8XX_CLK_MC}, > > + { 1, 2, NPCM8XX_CLK_S_AXI, NPCM8XX_CLK_S_TH, 0, NPCM8XX_CLK_AXI}, > > + { 1, 2, NPCM8XX_CLK_S_ATB, NPCM8XX_CLK_S_AXI, 0, NPCM8XX_CLK_ATB}, > > + { 1, 2, NPCM8XX_CLK_S_PRE_CLK, NPCM8XX_CLK_S_CPU_MUX, 0, -1}, > > + { 1, 2, NPCM8XX_CLK_S_PLL1_DIV2, NPCM8XX_CLK_S_PLL1, 0, -1}, > > + { 1, 2, NPCM8XX_CLK_S_PLL2_DIV2, NPCM8XX_CLK_S_PLL2, 0, -1}, > > +}; > > + > > +/* configurable dividers: */ > > +static const struct npcm8xx_clk_div_data npcm8xx_divs[] __initconst = { > > + {NPCM8XX_CLKDIV1, 28, 3, NPCM8XX_CLK_S_ADC, NPCM8XX_CLK_S_PRE_ADC, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > > + NPCM8XX_CLK_ADC}, > > + /*30-28 ADCCKDIV*/ > > What are the numbers for? Bits inside the register? yes, I will add bits > > > + {NPCM8XX_CLKDIV1, 26, 2, NPCM8XX_CLK_S_AHB, NPCM8XX_CLK_S_PRE_CLK, > > + CLK_DIVIDER_READ_ONLY, CLK_IS_CRITICAL, NPCM8XX_CLK_AHB}, > > + /*28-26 CLK4DIV*/ > > + {NPCM8XX_CLKDIV1, 21, 5, NPCM8XX_CLK_S_PRE_ADC, > > + NPCM8XX_CLK_S_ADC_MUX, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_PRE_ADC}, > > + /*25-21 PRE-ADCCKDIV*/ > > + {NPCM8XX_CLKDIV1, 16, 5, NPCM8XX_CLK_S_UART, > > + NPCM8XX_CLK_S_UART_MUX, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_UART}, > > + /*20-16 UARTDIV*/ > > + {NPCM8XX_CLKDIV1, 11, 5, NPCM8XX_CLK_S_MMC, > > + NPCM8XX_CLK_S_SD_MUX, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_MMC}, > > + /*15-11 MMCCKDIV*/ > > + {NPCM8XX_CLKDIV1, 6, 5, NPCM8XX_CLK_S_SPI3, > > + NPCM8XX_CLK_S_AHB, 0, 0, NPCM8XX_CLK_SPI3}, > > + /*10-6 AHB3CKDIV*/ > > + {NPCM8XX_CLKDIV1, 2, 4, NPCM8XX_CLK_S_PCI, > > + NPCM8XX_CLK_S_GFX_MUX, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_PCI}, > > + /*5-2 PCICKDIV*/ > > + > > + {NPCM8XX_CLKDIV2, 30, 2, NPCM8XX_CLK_S_APB4, NPCM8XX_CLK_S_AHB, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > > + NPCM8XX_CLK_APB4}, > > + /*31-30 APB4CKDIV*/ > > + {NPCM8XX_CLKDIV2, 28, 2, NPCM8XX_CLK_S_APB3, NPCM8XX_CLK_S_AHB, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > > + NPCM8XX_CLK_APB3}, > > + /*29-28 APB3CKDIV*/ > > + {NPCM8XX_CLKDIV2, 26, 2, NPCM8XX_CLK_S_APB2, NPCM8XX_CLK_S_AHB, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > > + NPCM8XX_CLK_APB2}, > > + /*28-26 APB2CKDIV*/ > > + {NPCM8XX_CLKDIV2, 24, 2, NPCM8XX_CLK_S_APB1, NPCM8XX_CLK_S_AHB, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > > + NPCM8XX_CLK_APB1}, > > + /*25-24 APB1CKDIV*/ > > + {NPCM8XX_CLKDIV2, 22, 2, NPCM8XX_CLK_S_APB5, NPCM8XX_CLK_S_AHB, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, > > + NPCM8XX_CLK_APB5}, > > + /*23-22 APB5CKDIV*/ > > + {NPCM8XX_CLKDIV2, 16, 5, NPCM8XX_CLK_S_CLKOUT, NPCM8XX_CLK_S_CLKOUT_MUX, > > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_CLKOUT}, > > + /*20-16 CLKOUTDIV*/ > > + {NPCM8XX_CLKDIV2, 13, 3, NPCM8XX_CLK_S_GFX, NPCM8XX_CLK_S_GFX_MUX, > > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_GFX}, > > + /*15-13 GFXCKDIV*/ > > + {NPCM8XX_CLKDIV2, 8, 5, NPCM8XX_CLK_S_USB_BRIDGE, NPCM8XX_CLK_S_SU_MUX, > > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SU}, > > + /*12-8 SUCKDIV*/ > > + {NPCM8XX_CLKDIV2, 4, 4, NPCM8XX_CLK_S_USB_HOST, NPCM8XX_CLK_S_SU_MUX, > > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SU48}, > > + /*8-4 SU48CKDIV*/ > > + {NPCM8XX_CLKDIV2, 0, 4, NPCM8XX_CLK_S_SDHC, > > + NPCM8XX_CLK_S_SD_MUX, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SDHC} > > + ,/*3-0 SD1CKDIV*/ > > + > > + {NPCM8XX_CLKDIV3, 16, 8, NPCM8XX_CLK_S_SPI1, > > + NPCM8XX_CLK_S_AHB, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SPI1}, > > + /*23-16 SPI1CKDV*/ > > + {NPCM8XX_CLKDIV3, 11, 5, NPCM8XX_CLK_S_UART2, > > + NPCM8XX_CLK_S_UART_MUX, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_UART2}, > > + /*15-11 UARTDIV2*/ > > + {NPCM8XX_CLKDIV3, 6, 5, NPCM8XX_CLK_S_SPI0, > > + NPCM8XX_CLK_S_AHB, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SPI0}, > > + /*10-6 SPI0CKDV*/ > > + {NPCM8XX_CLKDIV3, 1, 5, NPCM8XX_CLK_S_SPIX, > > + NPCM8XX_CLK_S_AHB, CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_SPIX}, > > + > > + /*5-1 SPIXCKDV*/ > > + {NPCM8XX_CLKDIV4, 28, 4, NPCM8XX_CLK_S_RG, NPCM8XX_CLK_S_RG_MUX, > > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_RG}, > > + > > + /*31-28 RGREFDIV*/ > > + {NPCM8XX_CLKDIV4, 12, 4, NPCM8XX_CLK_S_RCP, NPCM8XX_CLK_S_RCP_MUX, > > + CLK_DIVIDER_READ_ONLY, 0, NPCM8XX_CLK_RCP}, > > + > > + /*15-12 RCPREFDIV*/ > > + {NPCM8XX_THRTL_CNT, 0, 2, NPCM8XX_CLK_S_TH, NPCM8XX_CLK_S_CPU_MUX, > > + CLK_DIVIDER_READ_ONLY | CLK_DIVIDER_POWER_OF_TWO, 0, NPCM8XX_CLK_TH}, > > + /*1-0 TH_DIV*/ > > +}; > > + > > +static const struct npcm8xx_clk_gate_data npcm8xx_gates[] __initconst = { > > + {NPCM8XX_CLKEN1, 31, "smb1-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 30, "smb0-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 29, "smb7-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 28, "smb6-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 27, "adc-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN1, 26, "wdt-gate", NPCM8XX_CLK_S_TIMER, 0}, > > + {NPCM8XX_CLKEN1, 25, "usbdev3-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 24, "usbdev6-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 23, "usbdev5-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 22, "usbdev4-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 21, "gmac4-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 20, "timer5_9-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN1, 19, "timer0_4-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN1, 18, "pwmm0-gate", NPCM8XX_CLK_S_APB3, 0}, > > + {NPCM8XX_CLKEN1, 17, "huart-gate", NPCM8XX_CLK_S_UART, 0}, > > + {NPCM8XX_CLKEN1, 16, "smb5-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 15, "smb4-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 14, "smb3-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 13, "smb2-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN1, 12, "mc-gate", NPCM8XX_CLK_S_MC, 0}, > > + {NPCM8XX_CLKEN1, 11, "uart01-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN1, 10, "aes-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 9, "peci-gate", NPCM8XX_CLK_S_APB3, 0}, > > + {NPCM8XX_CLKEN1, 8, "usbdev2-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 7, "uart23-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN1, 6, "gmac3-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 5, "usbdev1-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 4, "shm-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 3, "gdma0-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 2, "kcs-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN1, 1, "spi3-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN1, 0, "spi0-gate", NPCM8XX_CLK_S_AHB, 0}, > > + > > + {NPCM8XX_CLKEN2, 31, "cp-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 30, "tock-gate", NPCM8XX_CLK_S_TOCK, 0}, > > + /* bit 29 is reserved */ > > + {NPCM8XX_CLKEN2, 28, "gmac1-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 27, "usbif-gate", NPCM8XX_CLK_S_USBIF, 0}, > > + {NPCM8XX_CLKEN2, 26, "usbhost1-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 25, "gmac2-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 24, "spi1-gate", NPCM8XX_CLK_S_APB5, 0}, > > + {NPCM8XX_CLKEN2, 23, "pspi2-gate", NPCM8XX_CLK_S_APB5, 0}, > > + /* bit 22 is reserved */ > > + {NPCM8XX_CLKEN2, 21, "3des-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 20, "bt-gate", NPCM8XX_CLK_S_APB3, 0}, > > + {NPCM8XX_CLKEN2, 19, "siox2-gate", NPCM8XX_CLK_S_APB3, 0}, > > + {NPCM8XX_CLKEN2, 18, "siox1-gate", NPCM8XX_CLK_S_APB3, 0}, > > + {NPCM8XX_CLKEN2, 17, "viruart2-gate", NPCM8XX_CLK_S_APB5, 0}, > > + {NPCM8XX_CLKEN2, 16, "viruart1-gate", NPCM8XX_CLK_S_APB5, 0}, > > + /* bit 15 is reserved */ > > + {NPCM8XX_CLKEN2, 14, "vcd-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 13, "ece-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 12, "vdma-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 11, "ahbpcibrg-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 10, "gfxsys-gate", NPCM8XX_CLK_S_APB1, 0}, > > + //{NPCM8XX_CLKEN2, 9, "sdhc-gate", NPCM8XX_CLK_S_AHB, 0}, > > + /* bit 9 is reserved */ > > + {NPCM8XX_CLKEN2, 8, "mmc-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN2, 7, "mft7-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 6, "mft6-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 5, "mft5-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 4, "mft4-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 3, "mft3-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 2, "mft2-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 1, "mft1-gate", NPCM8XX_CLK_S_APB4, 0}, > > + {NPCM8XX_CLKEN2, 0, "mft0-gate", NPCM8XX_CLK_S_APB4, 0}, > > + > > + {NPCM8XX_CLKEN3, 31, "gpiom7-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 30, "gpiom6-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 29, "gpiom5-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 28, "gpiom4-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 27, "gpiom3-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 26, "gpiom2-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 25, "gpiom1-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 24, "gpiom0-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 23, "espi-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 22, "smb11-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 21, "smb10-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 20, "smb9-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 19, "smb8-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 18, "smb15-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 17, "rng-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 16, "timer10_14-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN3, 15, "pcirc-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 14, "sececc-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 13, "sha-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 12, "smb14-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 11, "gdma2-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 10, "gdma1-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 9, "pcimbx-gate", NPCM8XX_CLK_S_AHB, 0}, > > + /* bit 8 is reserved */ > > + {NPCM8XX_CLKEN3, 7, "usbdev9-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 6, "usbdev8-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 5, "usbdev7-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 4, "usbdev0-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 3, "smb13-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 2, "spix-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN3, 1, "smb12-gate", NPCM8XX_CLK_S_APB2, 0}, > > + {NPCM8XX_CLKEN3, 0, "pwmm1-gate", NPCM8XX_CLK_S_APB3, 0}, > > + > > + {NPCM8XX_CLKEN4, 31, "usbhost2-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN4, 30, "jtm2-gate", NPCM8XX_CLK_S_APB5, 0}, > > + {NPCM8XX_CLKEN4, 29, "jtm1-gate", NPCM8XX_CLK_S_APB5, 0}, > > + {NPCM8XX_CLKEN4, 28, "pwmm2-gate", NPCM8XX_CLK_S_APB3, 0}, > > + /* bit 27 is reserved */ > > + /* bit 26 is reserved */ > > + /* bit 25 is reserved */ > > + {NPCM8XX_CLKEN4, 24, "smb26-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 23, "smb25-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 22, "smb24-gate", NPCM8XX_CLK_S_APB19, 0}, > > + /* bit 21 is reserved */ > > + /* bit 20 is reserved */ > > + {NPCM8XX_CLKEN4, 19, "pcimbx2-gate", NPCM8XX_CLK_S_AHB, 0}, > > + {NPCM8XX_CLKEN4, 18, "uart6-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN4, 17, "uart5-gate", NPCM8XX_CLK_S_APB1, 0}, > > + {NPCM8XX_CLKEN4, 16, "uart4-gate", NPCM8XX_CLK_S_APB1, 0}, > > + /* bit 15 is reserved */ > > + /* bit 14 is reserved */ > > + {NPCM8XX_CLKEN4, 13, "i3c5-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 12, "i3c4-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 11, "i3c3-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 10, "i3c2-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 9, "i3c1-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 8, "i3c0-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 7, "smb23-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 6, "smb22-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 5, "smb21-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 4, "smb20-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 3, "smb19-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 2, "smb18-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 1, "smb17-gate", NPCM8XX_CLK_S_APB19, 0}, > > + {NPCM8XX_CLKEN4, 0, "smb16-gate", NPCM8XX_CLK_S_APB19, 0}, > > + > > +}; > > + > > +static DEFINE_SPINLOCK(npcm8xx_clk_lock); > > Preferably this lock isn't global. > > > + > > +static void __init npcm8xx_clk_init(struct device_node *clk_np) > > +{ > > + struct clk_hw_onecell_data *npcm8xx_clk_data; > > + void __iomem *clk_base; > > + struct resource res; > > + struct clk_hw *hw; > > + int ret; > > + int i; > > + > > + ret = of_address_to_resource(clk_np, 0, &res); > > + if (ret) { > > + pr_err("%pOFn: failed to get resource, ret %d\n", clk_np, ret); > > + return; > > + } > > + > > + clk_base = ioremap(res.start, resource_size(&res)); > > + if (!clk_base) > > + goto npcm8xx_init_error; > > + > > + npcm8xx_clk_data = kzalloc(struct_size(npcm8xx_clk_data, hws, > > + NPCM8XX_NUM_CLOCKS), GFP_KERNEL); > > + if (!npcm8xx_clk_data) > > + goto npcm8xx_init_np_err; > > + > > + npcm8xx_clk_data->num = NPCM8XX_NUM_CLOCKS; > > + > > + for (i = 0; i < NPCM8XX_NUM_CLOCKS; i++) > > + npcm8xx_clk_data->hws[i] = ERR_PTR(-EPROBE_DEFER); > > + > > + /* Register plls */ > > + for (i = 0; i < ARRAY_SIZE(npcm8xx_plls); i++) { > > + const struct npcm8xx_clk_pll_data *pll_data = &npcm8xx_plls[i]; > > + > > + hw = npcm8xx_clk_register_pll(clk_base + pll_data->reg, > > + pll_data->name, > > + pll_data->parent_name, > > + pll_data->flags); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register pll\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + if (pll_data->onecell_idx >= 0) > > + npcm8xx_clk_data->hws[pll_data->onecell_idx] = hw; > > + } > > + > > + /* Register fixed dividers */ > > + hw = clk_hw_register_fixed_factor(NULL, NPCM8XX_CLK_S_PLL1_DIV2, > > + NPCM8XX_CLK_S_PLL1, 0, 1, 2); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register fixed div\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + hw = clk_hw_register_fixed_factor(NULL, NPCM8XX_CLK_S_PLL2_DIV2, > > + NPCM8XX_CLK_S_PLL2, 0, 1, 2); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register pll div2\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + hw = clk_hw_register_fixed_factor(NULL, NPCM8XX_CLK_S_PRE_CLK, > > + NPCM8XX_CLK_S_CPU_MUX, 0, 1, 2); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register ckclk div2\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + hw = clk_hw_register_fixed_factor(NULL, NPCM8XX_CLK_S_AXI, > > + NPCM8XX_CLK_S_TH, 0, 1, 2); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register axi div2\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + hw = clk_hw_register_fixed_factor(NULL, NPCM8XX_CLK_S_ATB, > > + NPCM8XX_CLK_S_AXI, 0, 1, 2); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register atb div2\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + /* Register muxes */ > > + for (i = 0; i < ARRAY_SIZE(npcm8xx_muxes); i++) { > > + const struct npcm8xx_clk_mux_data *mux_data = &npcm8xx_muxes[i]; > > + > > + hw = clk_hw_register_mux_table(NULL, mux_data->name, > > + mux_data->parent_names, > > + 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)) { > > + pr_err("npcm8xx_clk: Can't register mux\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + if (mux_data->onecell_idx >= 0) > > + npcm8xx_clk_data->hws[mux_data->onecell_idx] = hw; > > + } > > + > > + /* Register clock dividers specified in npcm8xx_divs */ > > + for (i = 0; i < ARRAY_SIZE(npcm8xx_divs); i++) { > > + const struct npcm8xx_clk_div_data *div_data = &npcm8xx_divs[i]; > > + > > + hw = clk_hw_register_divider(NULL, div_data->name, > > + div_data->parent_name, > > + div_data->flags, > > + clk_base + div_data->reg, > > + div_data->shift, div_data->width, > > + div_data->clk_divider_flags, > > + &npcm8xx_clk_lock); > > + if (IS_ERR(hw)) { > > + pr_err("npcm8xx_clk: Can't register div table\n"); > > + goto npcm8xx_init_fail; > > + } > > + > > + if (div_data->onecell_idx >= 0) > > + npcm8xx_clk_data->hws[div_data->onecell_idx] = hw; > > + } > > + > > + ret = of_clk_add_hw_provider(clk_np, of_clk_hw_onecell_get, > > + npcm8xx_clk_data); > > + if (ret) > > + pr_err("failed to add DT provider: %d\n", ret); > > + > > + of_node_put(clk_np); > > + > > + return; > > + > > +npcm8xx_init_fail: > > + kfree(npcm8xx_clk_data->hws); > > Why only hws and not the entire npcm8xx_clk_data? Also, this error path > fails to unregister clks on error. Probably devm usage will help make > all of this code go away. > > > +npcm8xx_init_np_err: > > + iounmap(clk_base); > > +npcm8xx_init_error: > > + of_node_put(clk_np); > > What is this of_node_put() associated with in this function? > > > +} > > + > > +CLK_OF_DECLARE(npcm8xx_clk_init, "nuvoton,npcm845-clk", npcm8xx_clk_init); > > This should be made into a platform device driver and platform device > APIs should be used throughout. Do you mean that I need to use builtin_platform_driver API and not CLK_OF_DECLARE declaration? Best regards, Tomer _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel