CLK: microchip: Add clkcfg driver for Microchip PolarFire SoC
Subsystems (3)
[email protected]
reviewerv5 cover CLK: microchip: Add clkcfg driver for Microchip PolarFire SoC
From: Daire McNamara <[email protected]>
Not too sure what happened here. Just resending to get things moving again.
This patchset adds support for the Microchip PolarFire clkcfg hardware block.
Major changes since v4:
* Adjusted license for microchip,mpfs-clock.h to match microchip,mpfs.yaml
* Corrected the number of clocks to 33 from 32
Major changes since v3:
* Patch reformatted so microchip,mpfs-clock.h is part of device-tree patch
Major changes since v2:
* In mpfs_cfg_clk_set_rate, return immediately if divider_get_val returns <0
* rebased to v5.12-rc1
Major changes since v1:
* Dependency on SOC_MICROCHIP_POLARFIRE
* All references to PFSOC/pfsoc changed to MPFS/mpfs
* Cleaned error handling in _probe
* Re-ordered code to place structs et al at top
Daire McNamara (2):
dt-bindings: clk: microchip: Add Microchip PolarFire host binding
clk: microchip: Add driver for Microchip PolarFire SoC
.../bindings/clock/microchip,mpfs.yaml | 67 +++ drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 2 +- drivers/clk/microchip/Kconfig | 7 + drivers/clk/microchip/Makefile | 6 +- drivers/clk/microchip/clk-mpfs.c | 444 ++++++++++++++++++ .../dt-bindings/clock/microchip,mpfs-clock.h | 45 ++ 7 files changed, 569 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/microchip,mpfs.yaml create mode 100644 drivers/clk/microchip/Kconfig create mode 100644 drivers/clk/microchip/clk-mpfs.c create mode 100644 include/dt-bindings/clock/microchip,mpfs-clock.h
base-commit: 9f4ad9e425a1d3b6a34617b8ea226d56a119a717
prerequisite-patch-id: 6f7f70120adfa8e938b97517f0c664e43e8745a0
prerequisite-patch-id: 4ea37008d23838aa2e0658811fe15462f6cdbd87
Signature · 1 line
2.25.1
[email protected]
reviewerPATCH RESEND v5 1/2 dt-bindings: clk: microchip: Add Microchip PolarFire host binding
From: Daire McNamara <[email protected]>
Add device tree bindings for the Microchip PolarFire system clock controller
--- .../bindings/clock/microchip,mpfs.yaml | 67 +++++++++++++++++++ .../dt-bindings/clock/microchip,mpfs-clock.h | 45 +++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/microchip,mpfs.yaml create mode 100644 include/dt-bindings/clock/microchip,mpfs-clock.h
Documentation/devicetree/bindings/clock/microchip,mpfs.yaml new file +67 -0
@@ -0,0 +1,67 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/microchip,mpfs.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Microchip PolarFire Clock Control Module Binding + +maintainers: + - Daire McNamara <[email protected]> + +description: | + Microchip PolarFire clock control (CLKCFG) is an integrated clock controller, + which gates and enables all peripheral clocks. + + This device tree binding describes 33 gate clocks. Clocks are referenced by + user nodes by the CLKCFG node phandle and the clock index in the group, from + 0 to 32. + +properties: + compatible: + const: microchip,mpfs-clkcfg + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + '#clock-cells': + const: 1 + description: | + The clock consumer should specify the desired clock by having the clock + ID in its "clocks" phandle cell. See include/dt-bindings/clock/microchip,mpfs-clock.h + for the full list of PolarFire clock IDs. + + clock-output-names: + maxItems: 33 + +required: + - compatible + - reg + - clocks + - '#clock-cells' + - clock-output-names + +additionalProperties: false + +examples: + # Clock Config node: + - | + #include <dt-bindings/clock/microchip,mpfs-clock.h> + soc { + #address-cells = <2>; + #size-cells = <2>; + clkcfg: clock-controller@20002000 { + compatible = "microchip,mpfs-clkcfg"; + reg = <0x0 0x20002000 0x0 0x1000>; + clocks = <&ref>; + #clock-cells = <1>; + clock-output-names = "cpu", "axi", "ahb", "envm", "mac0", "mac1", "mmc", "timer", + "mmuart0", "mmuart1", "mmuart2", "mmuart3", "mmuart4", + "spi0", "spi1", "i2c0", "i2c1", "can0", "can1", "usb", "rsvd", + "rtc", "qspi", "gpio0", "gpio1", "gpio2", "ddrc", + "fic0", "fic1", "fic2", "fic3", "athena", "cfm"; + }; + };
include/dt-bindings/clock/microchip,mpfs-clock.h new file +45 -0
45 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v5 1/2 resend] dt-bindings: clk: microchip: Add Microchip PolarFire host binding
Quoted 5 lines · On Wed, 18 Aug 2021 15:11:01 +0100, [email protected] wrote:
From: Daire McNamara <[email protected]>
Add device tree bindings for the Microchip PolarFire system clock controller
Quoted 8 lines
Signed-off-by Daire McNamara <[email protected]>--- .../bindings/clock/microchip,mpfs.yaml | 67 +++++++++++++++++++ .../dt-bindings/clock/microchip,mpfs-clock.h | 45 +++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/microchip,mpfs.yaml create mode 100644 include/dt-bindings/clock/microchip,mpfs-clock.h
Stephen Boyd
maintainerRe: [PATCH v5 1/2 resend] dt-bindings: clk: microchip: Add Microchip PolarFire host binding
In reply to [email protected]Quoting [email protected] (2021-08-18 07:11:01)
Quoted 47 lines
From: Daire McNamara <[email protected]>
Add device tree bindings for the Microchip PolarFire system clock controller
Signed-off-by Daire McNamara <[email protected]>--- .../bindings/clock/microchip,mpfs.yaml | 67 +++++++++++++++++++ .../dt-bindings/clock/microchip,mpfs-clock.h | 45 +++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/microchip,mpfs.yaml create mode 100644 include/dt-bindings/clock/microchip,mpfs-clock.hDocumentation/devicetree/bindings/clock/microchip,mpfs.yaml new file +28
-0@@ -0,0 +1,67 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/microchip,mpfs.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Microchip PolarFire Clock Control Module Binding + +maintainers: + - Daire McNamara <[email protected]> + +description: | + Microchip PolarFire clock control (CLKCFG) is an integrated clock controller, + which gates and enables all peripheral clocks. + + This device tree binding describes 33 gate clocks. Clocks are referenced by + user nodes by the CLKCFG node phandle and the clock index in the group, from + 0 to 32. + +properties: + compatible: + const: microchip,mpfs-clkcfg + + reg: + maxItems: 1 + + clocks: + maxItems: 1
Documentation/devicetree/bindings/clock/microchip,mpfs.yaml line 38
Quoted 10 lines
Documentation/devicetree/bindings/clock/microchip,mpfs.yaml new file +10
-0+ + '#clock-cells': + const: 1 + description: | + The clock consumer should specify the desired clock by having the clock + ID in its "clocks" phandle cell. See include/dt-bindings/clock/microchip,mpfs-clock.h + for the full list of PolarFire clock IDs. + + clock-output-names: + maxItems: 33
Do you need clock-output-names? I'd prefer to see less of this property used, not more.
Quoted 9 lines
Documentation/devicetree/bindings/clock/microchip,mpfs.yaml new file +9
-0+ +required: + - compatible + - reg + - clocks + - '#clock-cells' + - clock-output-names + +additionalProperties: false
[email protected]
reviewerPATCH RESEND v5 2/2 clk: microchip: Add driver for Microchip PolarFire SoC
In reply to [email protected]From: Daire McNamara <[email protected]>
Add support for clock configuration on Microchip PolarFire SoC
--- drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 2 +- drivers/clk/microchip/Kconfig | 7 + drivers/clk/microchip/Makefile | 6 +- drivers/clk/microchip/clk-mpfs.c | 444 +++++++++++++++++++++++++++++++ 5 files changed, 457 insertions(+), 3 deletions(-) create mode 100644 drivers/clk/microchip/Kconfig create mode 100644 drivers/clk/microchip/clk-mpfs.c
drivers/clk/Kconfig +1 -0
@@ -388,6 +388,7 @@ source "drivers/clk/keystone/Kconfig" source "drivers/clk/mediatek/Kconfig" source "drivers/clk/meson/Kconfig" source "drivers/clk/mstar/Kconfig" +source "drivers/clk/microchip/Kconfig" source "drivers/clk/mvebu/Kconfig" source "drivers/clk/qcom/Kconfig" source "drivers/clk/renesas/Kconfig"
drivers/clk/Makefile +1 -1
@@ -89,7 +89,7 @@ obj-$(CONFIG_ARCH_KEYSTONE) += keystone/ obj-$(CONFIG_MACH_LOONGSON32) += loongson1/ obj-y += mediatek/ obj-$(CONFIG_ARCH_MESON) += meson/ -obj-$(CONFIG_MACH_PIC32) += microchip/ +obj-y += microchip/ ifeq ($(CONFIG_COMMON_CLK), y) obj-$(CONFIG_ARCH_MMP) += mmp/ endif
drivers/clk/microchip/Kconfig new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +config MCHP_CLK_MPFS + bool "Clk driver for PolarFire SoC" + depends on (RISCV && SOC_MICROCHIP_POLARFIRE) || COMPILE_TEST + help + Supports Clock Configuration for PolarFire SoC
drivers/clk/microchip/Makefile +4 -2
@@ -1,3 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_COMMON_CLK_PIC32) += clk-core.o -obj-$(CONFIG_PIC32MZDA) += clk-pic32mzda.o + +obj-$(CONFIG_COMMON_CLK_PIC32) += clk-core.o +obj-$(CONFIG_PIC32MZDA) += clk-pic32mzda.o +obj-$(CONFIG_MCHP_CLK_MPFS) += clk-mpfs.o
drivers/clk/microchip/clk-mpfs.c new file +444 -0
444 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v5 2/2 resend] clk: microchip: Add driver for Microchip PolarFire SoC
Quoted 46 lines · On Wed, 18 Aug 2021 07:11:02 PDT (-0700), [email protected] wrote:
From: Daire McNamara <[email protected]>
Add support for clock configuration on Microchip PolarFire SoC
Signed-off-by Daire McNamara <[email protected]>--- drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 2 +- drivers/clk/microchip/Kconfig | 7 + drivers/clk/microchip/Makefile | 6 +- drivers/clk/microchip/clk-mpfs.c | 444 +++++++++++++++++++++++++++++++ 5 files changed, 457 insertions(+), 3 deletions(-) create mode 100644 drivers/clk/microchip/Kconfig create mode 100644 drivers/clk/microchip/clk-mpfs.cdrivers/clk/Kconfig +1
-0@@ -388,6 +388,7 @@ source "drivers/clk/keystone/Kconfig" source "drivers/clk/mediatek/Kconfig" source "drivers/clk/meson/Kconfig" source "drivers/clk/mstar/Kconfig" +source "drivers/clk/microchip/Kconfig" source "drivers/clk/mvebu/Kconfig" source "drivers/clk/qcom/Kconfig" source "drivers/clk/renesas/Kconfig"drivers/clk/Makefile +1
-1@@ -89,7 +89,7 @@ obj-$(CONFIG_ARCH_KEYSTONE) += keystone/ obj-$(CONFIG_MACH_LOONGSON32) += loongson1/ obj-y += mediatek/ obj-$(CONFIG_ARCH_MESON) += meson/ -obj-$(CONFIG_MACH_PIC32) += microchip/ +obj-y += microchip/ ifeq ($(CONFIG_COMMON_CLK), y) obj-$(CONFIG_ARCH_MMP) += mmp/ endifdrivers/clk/microchip/Kconfig new file +0
-0
drivers/clk/microchip/Kconfig line 5
Quoted 5 lines
drivers/clk/microchip/Kconfig new file +5
-0@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +config MCHP_CLK_MPFS + bool "Clk driver for PolarFire SoC" + depends on (RISCV && SOC_MICROCHIP_POLARFIRE) || COMPILE_TEST
This shouldn't depend on the SOC config. Those were meant to just enable a set of drivers, not restrict what can be enabled. Also, they're broken so we should get rid of them.
Quoted 454 lines
drivers/clk/microchip/Kconfig new file +2
-0+ help + Supports Clock Configuration for PolarFire SoCdrivers/clk/microchip/Makefile +4
-2@@ -1,3 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_COMMON_CLK_PIC32) += clk-core.o -obj-$(CONFIG_PIC32MZDA) += clk-pic32mzda.o + +obj-$(CONFIG_COMMON_CLK_PIC32) += clk-core.o +obj-$(CONFIG_PIC32MZDA) += clk-pic32mzda.o +obj-$(CONFIG_MCHP_CLK_MPFS) += clk-mpfs.odrivers/clk/microchip/clk-mpfs.c new file +434
-0@@ -0,0 +1,444 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Daire McNamara,<[email protected]> +* Copyright (C) 2020 Microchip Technology Inc. All rights reserved. +*/ +#include <linux/clk-provider.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <dt-bindings/clock/microchip,mpfs-clock.h> + +/* address offset of control registers */ +#define REG_CLOCK_CONFIG_CR 0x08u +#define REG_SUBBLK_CLOCK_CR 0x84u +#define REG_SUBBLK_RESET_CR 0x88u + +struct mpfs_clock_data { +void __iomem *base; +struct clk_hw_onecell_data hw_data; +}; + +struct mpfs_cfg_clock { +unsigned int id; +const char *name; +u8 shift; +u8 width; +const struct clk_div_table *table; +unsigned long flags; +}; + +struct mpfs_cfg_hw_clock { +struct mpfs_cfg_clock cfg; +void __iomem *sys_base; +/* lock is used to prevent multiple writes */ +spinlock_t *lock; +struct clk_hw hw; +struct clk_init_data init; +}; + +#define to_mpfs_cfg_clk (_hw) container_of(_hw, struct mpfs_cfg_hw_clock, hw) + +struct mpfs_periph_clock { +unsigned int id; +const char *name; +u8 shift; +unsigned long flags; +}; + +struct mpfs_periph_hw_clock { +struct mpfs_periph_clock periph; +void __iomem *sys_base; +/* lock is used to prevent multiple writes */ +spinlock_t *lock; +struct clk_hw hw; +}; + +#define to_mpfs_periph_clk (_hw) container_of(_hw, struct mpfs_periph_hw_clock, hw) + +/* +* mpfs_clk_lock prevents anything else from writing to the +* mpfs clk block while a software locked register is being written. +*/ +static DEFINE_SPINLOCK (mpfs_clk_lock); + +static struct clk_parent_data mpfs_cfg_parent[] = { + { .fw_name ="msspllclk" , .name ="msspllclk" }, +}; + +static const struct clk_div_table mpfs_div_cpu_axi_table[] = { + {0 ,1 }, {1 ,2 }, {2 ,4 }, {3 ,8 }, + {0 ,0 } +}; + +static const struct clk_div_table mpfs_div_ahb_table[] = { + {1 ,2 }, {2 ,4 }, {3 ,8 }, + {0 ,0 } +}; + +static unsigned long mpfs_cfg_clk_recalc_rate (struct clk_hw *hw,unsigned long prate) +{ +struct mpfs_cfg_hw_clock *cfg_hw =to_mpfs_cfg_clk (hw); +struct mpfs_cfg_clock *cfg = &cfg_hw->cfg; +void __iomem *base_addr = cfg_hw->sys_base; +unsigned long rate; +u32 val; + + val =readl_relaxed (base_addr +REG_CLOCK_CONFIG_CR ) >> cfg->shift; + val &=clk_div_mask (cfg->width); + rate = prate / (1u << val); + +return rate; +} + +static long mpfs_cfg_clk_round_rate (struct clk_hw *hw,unsigned long rate,unsigned long *prate) +{ +struct mpfs_cfg_hw_clock *cfg_hw =to_mpfs_cfg_clk (hw); +struct mpfs_cfg_clock *cfg = &cfg_hw->cfg; + +return divider_round_rate (hw, rate, prate, cfg->table, cfg->width, cfg->flags); +} + +static int mpfs_cfg_clk_set_rate (struct clk_hw *hw,unsigned long rate,unsigned long prate) +{ +struct mpfs_cfg_hw_clock *cfg_hw =to_mpfs_cfg_clk (hw); +struct mpfs_cfg_clock *cfg = &cfg_hw->cfg; +void __iomem *base_addr = cfg_hw->sys_base; +unsigned long flags =0 ; +u32 val; +int divider_setting; + + divider_setting =divider_get_val (rate, prate, cfg->table, cfg->width, cfg_hw->cfg.flags); + +if (divider_setting <0 ) +return divider_setting; + +if (cfg_hw->lock) +spin_lock_irqsave (cfg_hw->lock, flags); +else +__acquire (cfg_hw->lock); + + val =readl_relaxed (base_addr +REG_CLOCK_CONFIG_CR ); + val &= ~(clk_div_mask (cfg->width) << cfg_hw->cfg.shift); + val |= divider_setting << cfg->shift; +writel_relaxed (val, base_addr +REG_CLOCK_CONFIG_CR ); + +if (cfg_hw->lock) +spin_unlock_irqrestore (cfg_hw->lock, flags); +else +__release (cfg_hw->lock); + +return 0 ; +} + +static const struct clk_ops mpfs_clk_cfg_ops = { + .recalc_rate = mpfs_cfg_clk_recalc_rate, + .round_rate = mpfs_cfg_clk_round_rate, + .set_rate = mpfs_cfg_clk_set_rate, +}; + +#define CLK_CFG (_id, _name, _parent, _shift, _width, _table, _flags) { \ + .cfg.id = _id, \ + .cfg.name = _name, \ + .cfg.shift = _shift, \ + .cfg.width = _width, \ + .cfg.table = _table, \ + .hw.init = CLK_HW_INIT_PARENTS_DATA(_name, _parent, &mpfs_clk_cfg_ops, \ + _flags), \ + } + +static struct mpfs_cfg_hw_clock mpfs_cfg_clks[] = { +CLK_CFG (CLK_CPU ,"clk_cpu" , mpfs_cfg_parent,0 ,2 , mpfs_div_cpu_axi_table,0 ), +CLK_CFG (CLK_AXI ,"clk_axi" , mpfs_cfg_parent,2 ,2 , mpfs_div_cpu_axi_table,0 ), +CLK_CFG (CLK_AHB ,"clk_ahb" , mpfs_cfg_parent,4 ,2 , mpfs_div_ahb_table,0 ), +}; + +static void mpfs_clk_unregister_cfg (struct device *dev,struct clk_hw *hw) +{ +struct mpfs_cfg_hw_clock *cfg_hw =to_mpfs_cfg_clk (hw); + +devm_clk_hw_unregister (dev, hw); +kfree (cfg_hw); +} + +static struct clk_hw *mpfs_clk_register_cfg (struct device *dev, +struct mpfs_cfg_hw_clock *cfg_hw, +void __iomem *sys_base) +{ +struct clk_hw *hw; +int err; + + cfg_hw->sys_base = sys_base; + cfg_hw->lock = &mpfs_clk_lock; + + hw = &cfg_hw->hw; + err =devm_clk_hw_register (dev, hw); +if (err) +return ERR_PTR (err); + +return hw; +} + +static int mpfs_clk_register_cfgs (struct device *dev,struct mpfs_cfg_hw_clock *cfg_hws, +int num_clks,struct mpfs_clock_data *data) +{ +struct clk_hw *hw; +void __iomem *sys_base = data->base; +unsigned int i, id; + +for (i =0 ; i < num_clks; i++) { +struct mpfs_cfg_hw_clock *cfg_hw = &cfg_hws[i]; + + hw =mpfs_clk_register_cfg (dev, cfg_hw, sys_base); +if (IS_ERR (hw)) { +dev_err (dev,"%s: failed to register clock %s\n" , __func__, + cfg_hw->cfg.name); + goto err_clk; + } + + id = cfg_hws[i].cfg.id; + data->hw_data.hws[id] = hw; + } + +return 0 ; + +err_clk: +while (i--) +mpfs_clk_unregister_cfg (dev, data->hw_data.hws[cfg_hws[i].cfg.id]); + +return PTR_ERR (hw); +} + +static int mpfs_periph_clk_enable (struct clk_hw *hw) +{ +struct mpfs_periph_hw_clock *periph_hw =to_mpfs_periph_clk (hw); +struct mpfs_periph_clock *periph = &periph_hw->periph; +void __iomem *base_addr = periph_hw->sys_base; +u32 reg, val; + + reg =readl_relaxed (base_addr +REG_SUBBLK_RESET_CR ); + val = reg & ~(1u << periph->shift); +writel_relaxed (val, base_addr +REG_SUBBLK_RESET_CR ); + + reg =readl_relaxed (base_addr +REG_SUBBLK_CLOCK_CR ); + val = reg | (1u << periph->shift); +writel_relaxed (val, base_addr +REG_SUBBLK_CLOCK_CR ); + +return 0 ; +} + +static void mpfs_periph_clk_disable (struct clk_hw *hw) +{ +struct mpfs_periph_hw_clock *periph_hw =to_mpfs_periph_clk (hw); +struct mpfs_periph_clock *periph = &periph_hw->periph; +void __iomem *base_addr = periph_hw->sys_base; +u32 reg, val; + + reg =readl_relaxed (base_addr +REG_SUBBLK_RESET_CR ); + val = reg | (1u << periph->shift); +writel_relaxed (val, base_addr +REG_SUBBLK_RESET_CR ); + + reg =readl_relaxed (base_addr +REG_SUBBLK_CLOCK_CR ); + val = reg & ~(1u << periph->shift); +writel_relaxed (val, base_addr +REG_SUBBLK_CLOCK_CR ); +} + +static int mpfs_periph_clk_is_enabled (struct clk_hw *hw) +{ +struct mpfs_periph_hw_clock *periph_hw =to_mpfs_periph_clk (hw); +struct mpfs_periph_clock *periph = &periph_hw->periph; +void __iomem *base_addr = periph_hw->sys_base; +u32 reg; + + reg =readl_relaxed (base_addr +REG_SUBBLK_RESET_CR ); +if ((reg & (1u << periph->shift)) ==0u ) { + reg =readl_relaxed (base_addr +REG_SUBBLK_CLOCK_CR ); +if (reg & (1u << periph->shift)) +return 1 ; + } + +return 0 ; +} + +static unsigned long mpfs_periph_clk_recalc_rate (struct clk_hw *hw,unsigned long prate) +{ +return prate; +} + +static const struct clk_ops mpfs_periph_clk_ops = { + .enable = mpfs_periph_clk_enable, + .disable = mpfs_periph_clk_disable, + .is_enabled = mpfs_periph_clk_is_enabled, + .recalc_rate = mpfs_periph_clk_recalc_rate, +}; + +#define CLK_PERIPH (_id, _name, _parent, _shift, _flags) { \ + .periph.id = _id, \ + .periph.name = _name, \ + .periph.shift = _shift, \ + .hw.init = CLK_HW_INIT_HW(_name, _parent, &mpfs_periph_clk_ops, \ + _flags), \ + } + +#define PARENT_CLK (PARENT ) (&mpfs_cfg_clks[CLK_##PARENT].hw) + +static struct mpfs_periph_hw_clock mpfs_periph_clks[] = { +CLK_PERIPH (CLK_ENVM ,"clk_periph_envm" ,PARENT_CLK (AHB ),0 ,CLK_IS_CRITICAL ), +CLK_PERIPH (CLK_MAC0 ,"clk_periph_mac0" ,PARENT_CLK (AHB ),1 ,0 ), +CLK_PERIPH (CLK_MAC1 ,"clk_periph_mac1" ,PARENT_CLK (AHB ),2 ,0 ), +CLK_PERIPH (CLK_MMC ,"clk_periph_mmc" ,PARENT_CLK (AHB ),3 ,0 ), +CLK_PERIPH (CLK_TIMER ,"clk_periph_timer" ,PARENT_CLK (AHB ),4 ,0 ), +CLK_PERIPH (CLK_MMUART0 ,"clk_periph_mmuart0" ,PARENT_CLK (AHB ),5 ,CLK_IS_CRITICAL ), +CLK_PERIPH (CLK_MMUART1 ,"clk_periph_mmuart1" ,PARENT_CLK (AHB ),6 ,0 ), +CLK_PERIPH (CLK_MMUART2 ,"clk_periph_mmuart2" ,PARENT_CLK (AHB ),7 ,0 ), +CLK_PERIPH (CLK_MMUART3 ,"clk_periph_mmuart3" ,PARENT_CLK (AHB ),8 ,0 ), +CLK_PERIPH (CLK_MMUART4 ,"clk_periph_mmuart4" ,PARENT_CLK (AHB ),9 ,0 ), +CLK_PERIPH (CLK_SPI0 ,"clk_periph_spi0" ,PARENT_CLK (AHB ),10 ,0 ), +CLK_PERIPH (CLK_SPI1 ,"clk_periph_spi1" ,PARENT_CLK (AHB ),11 ,0 ), +CLK_PERIPH (CLK_I2C0 ,"clk_periph_i2c0" ,PARENT_CLK (AHB ),12 ,0 ), +CLK_PERIPH (CLK_I2C1 ,"clk_periph_i2c1" ,PARENT_CLK (AHB ),13 ,0 ), +CLK_PERIPH (CLK_CAN0 ,"clk_periph_can0" ,PARENT_CLK (AHB ),14 ,0 ), +CLK_PERIPH (CLK_CAN1 ,"clk_periph_can1" ,PARENT_CLK (AHB ),15 ,0 ), +CLK_PERIPH (CLK_USB ,"clk_periph_usb" ,PARENT_CLK (AHB ),16 ,0 ), +CLK_PERIPH (CLK_RTC ,"clk_periph_rtc" ,PARENT_CLK (AHB ),18 ,0 ), +CLK_PERIPH (CLK_QSPI ,"clk_periph_qspi" ,PARENT_CLK (AHB ),19 ,0 ), +CLK_PERIPH (CLK_GPIO0 ,"clk_periph_gpio0" ,PARENT_CLK (AHB ),20 ,0 ), +CLK_PERIPH (CLK_GPIO1 ,"clk_periph_gpio1" ,PARENT_CLK (AHB ),21 ,0 ), +CLK_PERIPH (CLK_GPIO2 ,"clk_periph_gpio2" ,PARENT_CLK (AHB ),22 ,0 ), +CLK_PERIPH (CLK_DDRC ,"clk_periph_ddrc" ,PARENT_CLK (AHB ),23 ,CLK_IS_CRITICAL ), +CLK_PERIPH (CLK_FIC0 ,"clk_periph_fic0" ,PARENT_CLK (AHB ),24 ,0 ), +CLK_PERIPH (CLK_FIC1 ,"clk_periph_fic1" ,PARENT_CLK (AHB ),25 ,0 ), +CLK_PERIPH (CLK_FIC2 ,"clk_periph_fic2" ,PARENT_CLK (AHB ),26 ,0 ), +CLK_PERIPH (CLK_FIC3 ,"clk_periph_fic3" ,PARENT_CLK (AHB ),27 ,0 ), +CLK_PERIPH (CLK_ATHENA ,"clk_periph_athena" ,PARENT_CLK (AHB ),28 ,0 ), +CLK_PERIPH (CLK_CFM ,"clk_periph_cfm" ,PARENT_CLK (AHB ),29 ,0 ), +}; + +static void mpfs_clk_unregister_periph (struct device *dev,struct clk_hw *hw) +{ +struct mpfs_periph_hw_clock *periph_hw =to_mpfs_periph_clk (hw); + +devm_clk_hw_unregister (dev, hw); +kfree (periph_hw); +} + +static struct clk_hw *mpfs_clk_register_periph (struct device *dev, +struct mpfs_periph_hw_clock *periph_hw, +void __iomem *sys_base) +{ +struct clk_hw *hw; +int err; + + periph_hw->sys_base = sys_base; + periph_hw->lock = &mpfs_clk_lock; + + hw = &periph_hw->hw; + err =devm_clk_hw_register (dev, hw); +if (err) +return ERR_PTR (err); + +return hw; +} + +static int mpfs_clk_register_periphs (struct device *dev,struct mpfs_periph_hw_clock *periph_hws, +int num_clks,struct mpfs_clock_data *data) +{ +struct clk_hw *hw; +void __iomem *sys_base = data->base; +unsigned int i, id; + +for (i =0 ; i < num_clks; i++) { +struct mpfs_periph_hw_clock *periph_hw = &periph_hws[i]; + + hw =mpfs_clk_register_periph (dev, periph_hw, sys_base); +if (IS_ERR (hw)) { +dev_err (dev,"%s: failed to register clock %s\n" , __func__, + periph_hw->periph.name); + goto err_clk; + } + + id = periph_hws[i].periph.id; + data->hw_data.hws[id] = hw; + } + +return 0 ; + +err_clk: +while (i--) +mpfs_clk_unregister_periph (dev, data->hw_data.hws[periph_hws[i].periph.id]); + +return PTR_ERR (hw); +} + +static int mpfs_clk_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct mpfs_clock_data *clk_data; +struct resource *res; +int num_clks; +int ret; + + num_clks =ARRAY_SIZE (mpfs_cfg_clks) +ARRAY_SIZE (mpfs_periph_clks); + + clk_data =devm_kzalloc (dev,struct_size (clk_data, hw_data.hws, num_clks),GFP_KERNEL ); +if (!clk_data) +return -ENOMEM ; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + clk_data->base =devm_ioremap_resource (dev, res); +if (IS_ERR (clk_data->base)) +return PTR_ERR (clk_data->base); + + clk_data->hw_data.num = num_clks; + + ret =mpfs_clk_register_cfgs (dev, mpfs_cfg_clks,ARRAY_SIZE (mpfs_cfg_clks), clk_data); +if (ret) + goto err_clk; + + ret =mpfs_clk_register_periphs (dev, mpfs_periph_clks,ARRAY_SIZE (mpfs_periph_clks), + clk_data); +if (ret) + goto err_clk; + + ret =devm_of_clk_add_hw_provider (dev, of_clk_hw_onecell_get, &clk_data->hw_data); +if (ret) + goto err_clk; + +dev_info (dev,"registered MPFS core clocks\n" ); +return ret; + +err_clk: +dev_err (dev,"failed to register MPFS core clocks\n" ); +return ret; +} + +static const struct of_device_id mpfs_clk_of_match_table[] = { + { .compatible ="microchip,mpfs-clkcfg" , }, + {} +}; +MODULE_DEVICE_TABLE (of, mpfs_clk_match_table); + +static struct platform_driver mpfs_clk_driver = { + .probe = mpfs_clk_probe, + .driver = { + .name ="microchip-mpfs-clkcfg" , + .of_match_table = mpfs_clk_of_match_table, + }, +}; + +static int __init clk_mpfs_init (void ) +{ +return platform_driver_register (&mpfs_clk_driver); +} +core_initcall (clk_mpfs_init);
drivers/clk/microchip/clk-mpfs.c line 444
Quoted 10 lines
drivers/clk/microchip/clk-mpfs.c new file +10
-0+ +static void __exit clk_mpfs_exit(void) +{ +platform_driver_unregister (&mpfs_clk_driver); +} +module_exit (clk_mpfs_exit); + +MODULE_DESCRIPTION ("Microchip PolarFire SoC Clock Driver" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("platform:clk-mpfs" );
Aside from those small issues, this generally looks OK. I'd much prefer at least a review from a clock maintainer, though.
Thanks!
Re: [PATCH v5 2/2 resend] clk: microchip: Add driver for Microchip PolarFire SoC
Quoted 47 lines · Palmer Dabbelt
Quoted 46 lines · On Wed, 18 Aug 2021 07:11:02 PDT (-0700), [email protected] wrote:
From: Daire McNamara <[email protected]>
Add support for clock configuration on Microchip PolarFire SoC
Signed-off-by Daire McNamara <[email protected]>--- drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 2 +- drivers/clk/microchip/Kconfig | 7 + drivers/clk/microchip/Makefile | 6 +- drivers/clk/microchip/clk-mpfs.c | 444 +++++++++++++++++++++++++++++++ 5 files changed, 457 insertions(+), 3 deletions(-) create mode 100644 drivers/clk/microchip/Kconfig create mode 100644 drivers/clk/microchip/clk-mpfs.cdrivers/clk/Kconfig +1
-0@@ -388,6 +388,7 @@ source "drivers/clk/keystone/Kconfig" source "drivers/clk/mediatek/Kconfig" source "drivers/clk/meson/Kconfig" source "drivers/clk/mstar/Kconfig" +source "drivers/clk/microchip/Kconfig" source "drivers/clk/mvebu/Kconfig" source "drivers/clk/qcom/Kconfig" source "drivers/clk/renesas/Kconfig"drivers/clk/Makefile +1
-1@@ -89,7 +89,7 @@ obj-$(CONFIG_ARCH_KEYSTONE) += keystone/ obj-$(CONFIG_MACH_LOONGSON32) += loongson1/ obj-y += mediatek/ obj-$(CONFIG_ARCH_MESON) += meson/ -obj-$(CONFIG_MACH_PIC32) += microchip/ +obj-y += microchip/ ifeq ($(CONFIG_COMMON_CLK), y) obj-$(CONFIG_ARCH_MMP) += mmp/ endifdrivers/clk/microchip/Kconfig new file +0
-0@@ -0,0 +1,7 @@
Quoted 8 lines
drivers/clk/microchip/Kconfig line 5
Quoted 5 lines
drivers/clk/microchip/Kconfig new file +5
-0+# SPDX-License-Identifier: GPL-2.0 + +config MCHP_CLK_MPFS + bool "Clk driver for PolarFire SoC" + depends on (RISCV && SOC_MICROCHIP_POLARFIRE) || COMPILE_TESTThis shouldn't depend on the SOC config. Those were meant to just enable a set of drivers, not restrict what can be enabled.
The kernel config is overwhelmed with amount of choices of drivers, so it is quite common to restrict the choices of subarch-specific drivers to these sub-architectures. That's how many, if not most, of ARM v7 and ARMv8 drivers are restricted. Some other RISC-V drivers follow this concept (git grep SOC_CANAAN, git grep SOC_SIFIVE) because it is friendly for people configuring kernels. Why making configuration choice more difficult and show the SoC-specific clock driver to every other platform (when this SoC is not used)?
Best regards,
Krzysztof
Re: [PATCH v5 2/2 resend] clk: microchip: Add driver for Microchip PolarFire SoC
Quoted 14 lines · Krzysztof Kozlowski
Quoted 12 lines · Palmer Dabbelt
drivers/clk/microchip/Kconfig line 5
Quoted 8 lines · On Wed, 18 Aug 2021 07:11:02 PDT (-0700), [email protected] wrote:
drivers/clk/microchip/Kconfig new file +5
-0@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +config MCHP_CLK_MPFS + bool "Clk driver for PolarFire SoC" + depends on (RISCV && SOC_MICROCHIP_POLARFIRE) || COMPILE_TESTThis shouldn't depend on the SOC config. Those were meant to just enable a set of drivers, not restrict what can be enabled.
Quoted 8 lines
The kernel config is overwhelmed with amount of choices of drivers, so it is quite common to restrict the choices of subarch-specific drivers to these sub-architectures. That's how many, if not most, of ARM v7 and ARMv8 drivers are restricted. Some other RISC-V drivers follow this concept (git grep
SOC_CANAAN, git grepSOC_SIFIVE) because it is friendly for people configuring kernels. Why making configuration choice more difficult and show the SoC-specific clock driver to every other platform (when this SoC is not used)?
+1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds