clk: imx: Declare clock init functions in header acessible from mach
Subsystems (5)
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
PATCH 3/3 clk: imx: Fix and update kerneldoc
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
@@ -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
@@ -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
@@ -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
PATCH 2/3 ARM: imx: Include global clock header
In reply to Krzysztof KozlowskiDo 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
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]Signed-off-by Krzysztof Kozlowski <[email protected]>
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.hdrivers/clk/imx/clk-imx21.c +1
-0@@ -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@@ -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@@ -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@@ -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@@ -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
Shawn Guo
AppliedRe: [PATCH 3/3] clk: imx: Fix and update kerneldoc
In reply to Krzysztof KozlowskiQuoted 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'Signed-off-by Krzysztof Kozlowski <[email protected]>
Applied, thanks.