Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
  [ARM] 5435/1: fix compile warning in sanity_check_meminfo()
  [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
  [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
  [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
  imxfb: Fix TFT mode
  i.MX21/27: remove ifdef CONFIG_FB_IMX
  imxfb: add clock support
  mxc: add arch_reset() function
  clkdev: add possibility to get a clock based on the device name
  i.MX1: remove fb support from mach-imx
  [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
  Gemini: Add support for Teltonika RUT100
  Gemini: gpiolib based GPIO support v2
  MAINTAINERS: add myself as Gemini architecture maintainer
  ARM: Add Gemini architecture v3
  [ARM] OMAP: Fix compile for omap2_init_common_hw()
  MAINTAINERS: Add myself as Faraday ARM core variant maintainer
  ARM: Add support for FA526 v2
  [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
  [ARM] collie: fix two minor formatting nits
  ...

1 files changed, 71 insertions, 0 deletions

diff --git a/arch/arm/mach-mmp/clock.h b/arch/arm/mach-mmp/clock.h
new file mode 100644
index 000000000000..ed967e78e6a8
--- /dev/null
+++ b/arch/arm/mach-mmp/clock.h
@@ -0,0 +1,71 @@
+/*
+ *  linux/arch/arm/mach-mmp/clock.h
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#include <asm/clkdev.h>
+
+struct clkops {
+        void                    (*enable)(struct clk *);
+        void                    (*disable)(struct clk *);
+        unsigned long           (*getrate)(struct clk *);
+};
+
+struct clk {
+        const struct clkops     *ops;
+
+        void __iomem    *clk_rst;       /* clock reset control register */
+        int             fnclksel;       /* functional clock select (APBC) */
+        uint32_t        enable_val;     /* value for clock enable (APMU) */
+        unsigned long   rate;
+        int             enabled;
+};
+
+extern struct clkops apbc_clk_ops;
+
+#define APBC_CLK(_name, _reg, _fnclksel, _rate)                 \
+struct clk clk_##_name = {                                      \
+                .clk_rst        = (void __iomem *)APBC_##_reg,  \
+                .fnclksel       = _fnclksel,                    \
+                .rate           = _rate,                        \
+                .ops            = &apbc_clk_ops,                \
+}
+
+#define APBC_CLK_OPS(_name, _reg, _fnclksel, _rate, _ops)       \
+struct clk clk_##_name = {                                      \
+                .clk_rst        = (void __iomem *)APBC_##_reg,  \
+                .fnclksel       = _fnclksel,                    \
+                .rate           = _rate,                        \
+                .ops            = _ops,                         \
+}
+
+#define APMU_CLK(_name, _reg, _eval, _rate)                     \
+struct clk clk_##_name = {                                      \
+                .clk_rst        = (void __iomem *)APMU_##_reg,  \
+                .enable_val     = _eval,                        \
+                .rate           = _rate,                        \
+                .ops            = &apmu_clk_ops,                \
+}
+
+#define APMU_CLK_OPS(_name, _reg, _eval, _rate, _ops)           \
+struct clk clk_##_name = {                                      \
+                .clk_rst        = (void __iomem *)APMU_##_reg,  \
+                .enable_val     = _eval,                        \
+                .rate           = _rate,                        \
+                .ops            = _ops,                         \
+}
+
+#define INIT_CLKREG(_clk, _devname, _conname)                   \
+        {                                                       \
+                .clk            = _clk,                         \
+                .dev_id         = _devname,                     \
+                .con_id         = _conname,                     \
+        }
+
+extern struct clk clk_pxa168_gpio;
+extern struct clk clk_pxa168_timers;
+
+extern void clks_register(struct clk_lookup *, size_t);