@@ -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);
@@ -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>
@@ -6,6 +6,7 @@
* Copyright 2011 Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
*/
+#include <linux/clk/imx.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -4,6 +4,7 @@
* Copyright (C) 2002 Shane Nay (shane@minirl.com)
* 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>
@@ -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>
@@ -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>
@@ -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>
@@ -6,6 +6,7 @@
* Copyright (C) 2009 Daniel Mack <daniel@caiaq.de>
*/
+#include <linux/clk/imx.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/kernel.h>
@@ -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>
@@ -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>
@@ -4,6 +4,7 @@
* Copyright (C) 2009 Sascha Hauer (kernel@pengutronix.de)
*/
+#include <linux/clk/imx.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/i2c.h>
@@ -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>
@@ -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>
@@ -3,6 +3,7 @@
* Copyright (C) 2009 Ilya Yanok, Emcraft Systems Ltd, <yanok@emcraft.com>
*/
+#include <linux/clk/imx.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/kernel.h>
@@ -8,6 +8,7 @@
* Original author: Fabio Estevam <fabio.estevam@freescale.com>
*/
+#include <linux/clk/imx.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/platform_device.h>
Do not declare in mach-imx functions defined in clock drivers but include the respective header. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- 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(-)