summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-02 14:46:47 +0000
committerArnd Bergmann <arnd@arndb.de>2012-03-02 14:46:47 +0000
commitfcd2a8e945949868eaf6705db318c31524102286 (patch)
tree6adb92e38143c112770ec67ebd59eac0c704efe7 /arch/arm/plat-mxc
parent48b3b08e00012382cb52099e509b529305ae0a00 (diff)
parent6ad109fa3f46713a5cd28f41d872c9a4fc2bcedc (diff)
downloadblackbird-op-linux-fcd2a8e945949868eaf6705db318c31524102286.tar.gz
blackbird-op-linux-fcd2a8e945949868eaf6705db318c31524102286.zip
Merge branch 'features/imx27-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
* 'features/imx27-dt' of git://git.pengutronix.de/git/imx/linux-2.6: devicetree-bindings: Add documentation for i.MX generic boards ARM i.MX: Add phytec phycore-i.MX27 (aka pcm038) devicetree support ARM i.MX27: Add devicetree support
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r--arch/arm/plat-mxc/include/mach/common.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h
index 1bf0df81bdc6..16d10a807a63 100644
--- a/arch/arm/plat-mxc/include/mach/common.h
+++ b/arch/arm/plat-mxc/include/mach/common.h
@@ -65,6 +65,7 @@ extern int mx51_clocks_init(unsigned long ckil, unsigned long osc,
unsigned long ckih1, unsigned long ckih2);
extern int mx53_clocks_init(unsigned long ckil, unsigned long osc,
unsigned long ckih1, unsigned long ckih2);
+extern int mx27_clocks_init_dt(void);
extern int mx51_clocks_init_dt(void);
extern int mx53_clocks_init_dt(void);
extern int mx6q_clocks_init(void);
OpenPOWER on IntegriCloud