Skip to content

Commit c0856b7

Browse files
committed
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd: "A collection of clk driver fixes, and a couple OF clk patches to fix regressions seen in the last few weeks. The fwnode patch broke the build for one driver that isn't always compiled, so I waited over the weekend to be certain no more build issues came up. - Mark the firmware node (fwnode) that matches the compatible in CLK_OF_DECLARE() as initialized to fix a regression on u8500 SoCs after fw_devlink stopped checking parent nodes in of_link_to_phandle() - Remove a couple MODULE_LICENSE macros in non-modules - Update the maintainers file for Microchip clk drivers - Use 'select' instead of 'depend on' for the REGMAP config to fix Kconfig issues - Use div_u64() for portable 64-bit division in K210 clk driver" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: Avoid invalid function names in CLK_OF_DECLARE() clk: k210: remove an implicit 64-bit division MAINTAINERS: add missing clock driver coverage for Microchip FPGAs clk: HI655X: select REGMAP instead of depending on it kbuild, clk: remove MODULE_LICENSE in non-modules kbuild, clk: bcm2835: remove MODULE_LICENSE in non-modules clk: Mark a fwnode as initialized when using CLK_OF_DECLARE() macro
2 parents 4979bf8 + 5cf9d01 commit c0856b7

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17990,7 +17990,7 @@ F: Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml
1799017990
F: Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml
1799117991
F: arch/riscv/boot/dts/microchip/
1799217992
F: drivers/char/hw_random/mpfs-rng.c
17993-
F: drivers/clk/microchip/clk-mpfs.c
17993+
F: drivers/clk/microchip/clk-mpfs*.c
1799417994
F: drivers/i2c/busses/i2c-microchip-corei2c.c
1799517995
F: drivers/mailbox/mailbox-mpfs.c
1799617996
F: drivers/pci/controller/pcie-microchip-host.c

drivers/clk/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ config COMMON_CLK_RK808
9191
config COMMON_CLK_HI655X
9292
tristate "Clock driver for Hi655x" if EXPERT
9393
depends on (MFD_HI655X_PMIC || COMPILE_TEST)
94-
depends on REGMAP
94+
select REGMAP
9595
default MFD_HI655X_PMIC
9696
help
9797
This driver supports the hi655x PMIC clock. This

drivers/clk/bcm/clk-bcm2835-aux.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,3 @@ builtin_platform_driver(bcm2835_aux_clk_driver);
6969

7070
MODULE_AUTHOR("Eric Anholt <[email protected]>");
7171
MODULE_DESCRIPTION("BCM2835 auxiliary peripheral clock driver");
72-
MODULE_LICENSE("GPL");

drivers/clk/bcm/clk-bcm2835.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2350,4 +2350,3 @@ builtin_platform_driver(bcm2835_clk_driver);
23502350

23512351
MODULE_AUTHOR("Eric Anholt <[email protected]>");
23522352
MODULE_DESCRIPTION("BCM2835 clock driver");
2353-
MODULE_LICENSE("GPL");

drivers/clk/clk-fixed-mmio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,3 @@ module_platform_driver(of_fixed_mmio_clk_driver);
9999

100100
MODULE_AUTHOR("Jan Kotas <[email protected]>");
101101
MODULE_DESCRIPTION("Memory Mapped IO Fixed clock driver");
102-
MODULE_LICENSE("GPL v2");

drivers/clk/clk-fsl-sai.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,4 @@ module_platform_driver(fsl_sai_clk_driver);
8888

8989
MODULE_DESCRIPTION("Freescale SAI bitclock-as-a-clock driver");
9090
MODULE_AUTHOR("Michael Walle <[email protected]>");
91-
MODULE_LICENSE("GPL");
9291
MODULE_ALIAS("platform:fsl-sai-clk");

drivers/clk/clk-k210.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ static unsigned long k210_pll_get_rate(struct clk_hw *hw,
495495
f = FIELD_GET(K210_PLL_CLKF, reg) + 1;
496496
od = FIELD_GET(K210_PLL_CLKOD, reg) + 1;
497497

498-
return (u64)parent_rate * f / (r * od);
498+
return div_u64((u64)parent_rate * f, r * od);
499499
}
500500

501501
static const struct clk_ops k210_pll_ops = {

drivers/clk/hisilicon/clk-hi3559a.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -841,5 +841,4 @@ static void __exit hi3559av100_crg_exit(void)
841841
module_exit(hi3559av100_crg_exit);
842842

843843

844-
MODULE_LICENSE("GPL v2");
845844
MODULE_DESCRIPTION("HiSilicon Hi3559AV100 CRG Driver");

drivers/clk/microchip/clk-mpfs-ccc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,4 +291,3 @@ module_exit(clk_ccc_exit);
291291

292292
MODULE_DESCRIPTION("Microchip PolarFire SoC Clock Conditioning Circuitry Driver");
293293
MODULE_AUTHOR("Conor Dooley <[email protected]>");
294-
MODULE_LICENSE("GPL");

include/linux/clk-provider.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1363,7 +1363,13 @@ struct clk_hw_onecell_data {
13631363
struct clk_hw *hws[];
13641364
};
13651365

1366-
#define CLK_OF_DECLARE(name, compat, fn) OF_DECLARE_1(clk, name, compat, fn)
1366+
#define CLK_OF_DECLARE(name, compat, fn) \
1367+
static void __init __##name##_of_clk_init_declare(struct device_node *np) \
1368+
{ \
1369+
fn(np); \
1370+
fwnode_dev_initialized(of_fwnode_handle(np), true); \
1371+
} \
1372+
OF_DECLARE_1(clk, name, compat, __##name##_of_clk_init_declare)
13671373

13681374
/*
13691375
* Use this macro when you have a driver that requires two initialization

0 commit comments

Comments
 (0)