diff options
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/common.h | 20 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/mach-mxs.c | 2 | ||||
| -rw-r--r-- | include/linux/clk/mxs.h | 16 |
3 files changed, 17 insertions, 21 deletions
diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h deleted file mode 100644 index aca982c6d43f..000000000000 --- a/arch/arm/mach-mxs/include/mach/common.h +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. | ||
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __MACH_MXS_COMMON_H__ | ||
| 12 | #define __MACH_MXS_COMMON_H__ | ||
| 13 | |||
| 14 | extern int mxs_saif_clkmux_select(unsigned int clkmux); | ||
| 15 | |||
| 16 | extern int mx23_clocks_init(void); | ||
| 17 | |||
| 18 | extern int mx28_clocks_init(void); | ||
| 19 | |||
| 20 | #endif /* __MACH_MXS_COMMON_H__ */ | ||
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index f346c432cda2..fc762579d30f 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/clk.h> | 13 | #include <linux/clk.h> |
| 14 | #include <linux/clk/mxs.h> | ||
| 14 | #include <linux/clkdev.h> | 15 | #include <linux/clkdev.h> |
| 15 | #include <linux/clocksource.h> | 16 | #include <linux/clocksource.h> |
| 16 | #include <linux/can/platform/flexcan.h> | 17 | #include <linux/can/platform/flexcan.h> |
| @@ -30,7 +31,6 @@ | |||
| 30 | #include <asm/mach/map.h> | 31 | #include <asm/mach/map.h> |
| 31 | #include <asm/mach/time.h> | 32 | #include <asm/mach/time.h> |
| 32 | #include <asm/system_misc.h> | 33 | #include <asm/system_misc.h> |
| 33 | #include <mach/common.h> | ||
| 34 | #include <mach/digctl.h> | 34 | #include <mach/digctl.h> |
| 35 | #include <mach/mxs.h> | 35 | #include <mach/mxs.h> |
| 36 | 36 | ||
diff --git a/include/linux/clk/mxs.h b/include/linux/clk/mxs.h new file mode 100644 index 000000000000..90c30dc3efc7 --- /dev/null +++ b/include/linux/clk/mxs.h | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2013 Freescale Semiconductor, Inc. | ||
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License version 2 as | ||
| 6 | * published by the Free Software Foundation. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #ifndef __LINUX_CLK_MXS_H | ||
| 10 | #define __LINUX_CLK_MXS_H | ||
| 11 | |||
| 12 | int mx23_clocks_init(void); | ||
| 13 | int mx28_clocks_init(void); | ||
| 14 | int mxs_saif_clkmux_select(unsigned int clkmux); | ||
| 15 | |||
| 16 | #endif | ||
