Skip to contentSkip to conversation

clk: imx: Declare clock init functions in header acessible from mach

PATCH Applied Krzysztof Kozlowski 2 participants 5 messages Sep 2, 2020 – Sep 5, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 clk: imx: Declare clock init functions in header acessible from mach

Multiple files from arch/arm/mach-imx/ use clock init functions which are defined in the IMX clock drivers. Declare them in globally accessible header to fix GCC warnings:

drivers/clk/imx/clk-imx21.c:122:74: warning: no previous prototype for 'mx21_clocks_init' [-Wmissing-prototypes]

---
 drivers/clk/imx/clk-imx21.c |  1 +
 drivers/clk/imx/clk-imx27.c |  1 +
 drivers/clk/imx/clk-imx31.c |  1 +
 drivers/clk/imx/clk-imx35.c |  1 +
 include/linux/clk/imx.h     | 11 +++++++++++
 5 files changed, 15 insertions(+)
 create mode 100644 include/linux/clk/imx.h
drivers/clk/imx/clk-imx21.c +1 -0
index 077b4a7123ce..2105ef57b6bc 100644
@@ -7,6 +7,7 @@
 
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
+#include <linux/clk/imx.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
drivers/clk/imx/clk-imx27.c +1 -0
index a3753067fc12..c0d8bcdf0719 100644
@@ -2,6 +2,7 @@
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
+#include <linux/clk/imx.h>
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/of.h>
drivers/clk/imx/clk-imx31.c +1 -0
index 4bb05e440cdd..25be4c292e44 100644
@@ -6,6 +6,7 @@
 #include <linux/module.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
+#include <linux/clk/imx.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/of.h>
drivers/clk/imx/clk-imx35.c +1 -0
index e595f559907f..baf8d236d6ef 100644
@@ -5,6 +5,7 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
+#include <linux/clk/imx.h>
 #include <linux/io.h>
 #include <linux/clkdev.h>
 #include <linux/of.h>
include/linux/clk/imx.h new file +11 -0
new file mode 100644
index 000000000000..f6394d1b0a94
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef __LINUX_CLK_IMX_H
+#define __LINUX_CLK_IMX_H
+
+int mx21_clocks_init(unsigned long lref, unsigned long href);
+int mx27_clocks_init(unsigned long fref);
+int mx31_clocks_init(unsigned long fref);
+int mx35_clocks_init(void);
+
+#endif /* __LINUX_CLK_IMX_H */
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#1 lore raw

PATCH 2/3 ARM: imx: Include global clock header

Do not declare in mach-imx functions defined in clock drivers but include the respective header.

---
 arch/arm/mach-imx/common.h                  | 4 ----
 arch/arm/mach-imx/mach-armadillo5x0.c       | 1 +
 arch/arm/mach-imx/mach-bug.c                | 1 +
 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 +
 arch/arm/mach-imx/mach-kzm_arm11_01.c       | 1 +
 arch/arm/mach-imx/mach-mx21ads.c            | 1 +
 arch/arm/mach-imx/mach-mx27_3ds.c           | 1 +
 arch/arm/mach-imx/mach-mx27ads.c            | 1 +
 arch/arm/mach-imx/mach-mx31_3ds.c           | 1 +
 arch/arm/mach-imx/mach-mx31ads.c            | 1 +
 arch/arm/mach-imx/mach-mx31lilly.c          | 1 +
 arch/arm/mach-imx/mach-mx31lite.c           | 1 +
 arch/arm/mach-imx/mach-mx31moboard.c        | 1 +
 arch/arm/mach-imx/mach-mx35_3ds.c           | 1 +
 arch/arm/mach-imx/mach-pca100.c             | 1 +
 arch/arm/mach-imx/mach-pcm037.c             | 1 +
 arch/arm/mach-imx/mach-pcm043.c             | 1 +
 arch/arm/mach-imx/mach-qong.c               | 1 +
 arch/arm/mach-imx/mach-vpr200.c             | 1 +
 19 files changed, 18 insertions(+), 4 deletions(-)
arch/arm/mach-imx/common.h +0 -4
index 72c3fcc32910..fd80cdc9a479 100644
@@ -34,10 +34,6 @@ void imx21_soc_init(void);
 void imx27_soc_init(void);
 void imx31_soc_init(void);
 void imx35_soc_init(void);
-int mx21_clocks_init(unsigned long lref, unsigned long fref);
-int mx27_clocks_init(unsigned long fref);
-int mx31_clocks_init(unsigned long fref);
-int mx35_clocks_init(void);
 struct platform_device *mxc_register_gpio(char *name, int id,
 	resource_size_t iobase, resource_size_t iosize, int irq, int irq_high);
 void mxc_set_cpu_type(unsigned int type);
arch/arm/mach-imx/mach-armadillo5x0.c +1 -0
index 4d9a56fb6989..e01411d4c53e 100644
@@ -12,6 +12,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/clk.h>
+#include <linux/clk/imx.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/smsc911x.h>
arch/arm/mach-imx/mach-bug.c +1 -0
index 3929208600f2..acd333245c04 100644
@@ -6,6 +6,7 @@
  * Copyright 2011 Denis 'GNUtoo' Carikli <[email protected]>
  */
 
+#include <linux/clk/imx.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
arch/arm/mach-imx/mach-imx27_visstrim_m10.c +1 -0
index 3da4c0920198..a334d2908b17 100644
@@ -9,6 +9,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/clk/imx.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
 #include <linux/i2c.h>
arch/arm/mach-imx/mach-kzm_arm11_01.c +1 -0
index 63f7f78a77af..1835f6edd9b4 100644
@@ -9,6 +9,7 @@
  *  Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
+#include <linux/clk/imx.h>
 #include <linux/gpio.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
arch/arm/mach-imx/mach-mx21ads.c +1 -0
index ec011e89eb9e..f77efe2b1de7 100644
@@ -5,6 +5,7 @@
  *  Copyright 2006-2007 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
+#include <linux/clk/imx.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/physmap.h>
arch/arm/mach-imx/mach-mx27_3ds.c +1 -0
index 2db4475b7f85..c64c4dddbdce 100644
@@ -11,6 +11,7 @@
  *  - i.MX27 Platform Development Kit (i.MX27 PDK)
  */
 
+#include <linux/clk/imx.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/gpio/machine.h>
arch/arm/mach-imx/mach-mx27ads.c +1 -0
index ba202f95bcdf..8a1fc8c23c48 100644
@@ -4,6 +4,7 @@
  *  Copyright (C) 2002 Shane Nay ([email protected])
  *  Copyright 2006-2007 Freescale Semiconductor, Inc. All Rights Reserved.
  */
+#include <linux/clk/imx.h>
 #include <linux/gpio/driver.h>
 /* Needed for gpio_to_irq() */
 #include <linux/gpio.h>
arch/arm/mach-imx/mach-mx31_3ds.c +1 -0
index 23e63d3b4c6a..13739a474e5e 100644
@@ -3,6 +3,7 @@
  *  Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
+#include <linux/clk/imx.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/types.h>
arch/arm/mach-imx/mach-mx31ads.c +1 -0
index 49783385bccf..5b1cde2b25e1 100644
@@ -8,6 +8,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/clk.h>
+#include <linux/clk/imx.h>
 #include <linux/serial_8250.h>
 #include <linux/gpio.h>
 #include <linux/i2c.h>
arch/arm/mach-imx/mach-mx31lilly.c +1 -0
index 4b955ccc92cd..211564e332fb 100644
@@ -14,6 +14,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/clk.h>
+#include <linux/clk/imx.h>
 #include <linux/gpio.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
arch/arm/mach-imx/mach-mx31lite.c +1 -0
index aaccf52f7ac1..fa58eff1dbff 100644
@@ -6,6 +6,7 @@
  *  Copyright (C) 2009 Daniel Mack <[email protected]>
  */
 
+#include <linux/clk/imx.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
arch/arm/mach-imx/mach-mx31moboard.c +1 -0
index 96845a4eaf57..f32173bb15ee 100644
@@ -3,6 +3,7 @@
  *  Copyright (C) 2008 Valentin Longchamp, EPFL Mobots group
  */
 
+#include <linux/clk/imx.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/gfp.h>
arch/arm/mach-imx/mach-mx35_3ds.c +1 -0
index 802e0abe4568..2d369e1b5123 100644
@@ -17,6 +17,7 @@
  *  - i.MX35 Platform Development Kit (i.MX35 PDK)
  */
 
+#include <linux/clk/imx.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
arch/arm/mach-imx/mach-pca100.c +1 -0
index 27a3678e0658..5c90b11fe554 100644
@@ -4,6 +4,7 @@
  * Copyright (C) 2009 Sascha Hauer ([email protected])
  */
 
+#include <linux/clk/imx.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/i2c.h>
arch/arm/mach-imx/mach-pcm037.c +1 -0
index c7d23e9d4f8b..924052e52fc7 100644
@@ -3,6 +3,7 @@
  *  Copyright (C) 2008 Sascha Hauer, Pengutronix
  */
 
+#include <linux/clk/imx.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
arch/arm/mach-imx/mach-pcm043.c +1 -0
index 017a50113005..6bff62566ed6 100644
@@ -6,6 +6,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 
+#include <linux/clk/imx.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/plat-ram.h>
arch/arm/mach-imx/mach-qong.c +1 -0
index 5b362da2dc09..d2a607ced1ce 100644
@@ -3,6 +3,7 @@
  *  Copyright (C) 2009 Ilya Yanok, Emcraft Systems Ltd, <[email protected]>
  */
 
+#include <linux/clk/imx.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
arch/arm/mach-imx/mach-vpr200.c +1 -0
index fae5a41b5f6c..2218d66b947e 100644
@@ -8,6 +8,7 @@
  * Original author: Fabio Estevam <[email protected]>
  */
 
+#include <linux/clk/imx.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#2 lore raw

PATCH 3/3 clk: imx: Fix and update kerneldoc

In reply to Krzysztof Kozlowski

Fix and add missing kerneldoc to fix compile warnings like:

drivers/clk/imx/clk-pfd.c:27: warning: Function parameter or member 'hw' not described in 'clk_pfd' drivers/clk/imx/clk-pllv3.c:53: warning: Function parameter or member 'ref_clock' not described in 'clk_pllv3'

---
 drivers/clk/imx/clk-pfd.c   | 2 +-
 drivers/clk/imx/clk-pfdv2.c | 2 +-
 drivers/clk/imx/clk-pllv3.c | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)
drivers/clk/imx/clk-pfd.c +1 -1
index 50b7c30296f7..5d2a9a3be95e 100644
@@ -12,7 +12,7 @@
 
 /**
  * struct clk_pfd - IMX PFD clock
- * @clk_hw:	clock source
+ * @hw:		clock source
  * @reg:	PFD register address
  * @idx:	the index of PFD encoded in the register
  *
drivers/clk/imx/clk-pfdv2.c +1 -1
index 78e1f7641aaa..6b744c84278e 100644
@@ -17,7 +17,7 @@
 
 /**
  * struct clk_pfdv2 - IMX PFD clock
- * @clk_hw:	clock source
+ * @hw:		clock source
  * @reg:	PFD register address
  * @gate_bit:	Gate bit offset
  * @vld_bit:	Valid bit offset
drivers/clk/imx/clk-pllv3.c +4 -1
index b20cdea3e9cc..20ee9611ba6e 100644
@@ -30,12 +30,15 @@
 
 /**
  * struct clk_pllv3 - IMX PLL clock version 3
- * @clk_hw:	 clock source
+ * @hw:		clock source
  * @base:	 base address of PLL registers
  * @power_bit:	 pll power bit mask
  * @powerup_set: set power_bit to power up the PLL
  * @div_mask:	 mask of divider bits
  * @div_shift:	 shift of divider bits
+ * @ref_clock:	reference clock rate
+ * @num_offset:	num register offset
+ * @denom_offset: denom register offset
  *
  * IMX PLL clock version 3, found on i.MX6 series.  Divider for pllv3
  * is actually a multiplier, and always sits at bit 0.
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Applied
#3 lore raw

Re: [PATCH 3/3] clk: imx: Fix and update kerneldoc

Quoted 6 lines · Krzysztof Kozlowski

Fix and add missing kerneldoc to fix compile warnings like:

drivers/clk/imx/clk-pfd.c:27: warning: Function parameter or member 'hw' not described in 'clk_pfd' drivers/clk/imx/clk-pllv3.c:53: warning: Function parameter or member 'ref_clock' not described in 'clk_pllv3'

Applied, thanks.

#4 lore raw
In reply to Krzysztof Kozlowski
Quoted 7 lines · Krzysztof Kozlowski

Multiple files from arch/arm/mach-imx/ use clock init functions which are defined in the IMX clock drivers. Declare them in globally accessible header to fix GCC warnings:

drivers/clk/imx/clk-imx21.c:122:74: warning: no previous prototype for 'mx21_clocks_init' [-Wmissing-prototypes]

Fabio is working on converting these platforms to DT only, so we will be able to use CLK_OF_DECLARE() for calling these clock init functions soon.

Shawn

Quoted 77 lines
---
 drivers/clk/imx/clk-imx21.c |  1 +
 drivers/clk/imx/clk-imx27.c |  1 +
 drivers/clk/imx/clk-imx31.c |  1 +
 drivers/clk/imx/clk-imx35.c |  1 +
 include/linux/clk/imx.h     | 11 +++++++++++
 5 files changed, 15 insertions(+)
 create mode 100644 include/linux/clk/imx.h
drivers/clk/imx/clk-imx21.c +1 -0
index 077b4a7123ce..2105ef57b6bc 100644
@@ -7,6 +7,7 @@
 
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
+#include <linux/clk/imx.h>
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
drivers/clk/imx/clk-imx27.c +1 -0
index a3753067fc12..c0d8bcdf0719 100644
@@ -2,6 +2,7 @@
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
+#include <linux/clk/imx.h>
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/of.h>
drivers/clk/imx/clk-imx31.c +1 -0
index 4bb05e440cdd..25be4c292e44 100644
@@ -6,6 +6,7 @@
 #include <linux/module.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
+#include <linux/clk/imx.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/of.h>
drivers/clk/imx/clk-imx35.c +1 -0
index e595f559907f..baf8d236d6ef 100644
@@ -5,6 +5,7 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
+#include <linux/clk/imx.h>
 #include <linux/io.h>
 #include <linux/clkdev.h>
 #include <linux/of.h>
include/linux/clk/imx.h new file +11 -0
new file mode 100644
index 000000000000..f6394d1b0a94
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef __LINUX_CLK_IMX_H
+#define __LINUX_CLK_IMX_H
+
+int mx21_clocks_init(unsigned long lref, unsigned long href);
+int mx27_clocks_init(unsigned long fref);
+int mx31_clocks_init(unsigned long fref);
+int mx35_clocks_init(void);
+
+#endif /* __LINUX_CLK_IMX_H */
Signature · 1 line
2.17.1