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
  ...

2 files changed, 76 insertions, 0 deletions

diff --git a/include/linux/clk.h b/include/linux/clk.h
index 778777316ea4..1db9bbf444a3 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -125,4 +125,21 @@ int clk_set_parent(struct clk *clk, struct clk *parent);
  */
 struct clk *clk_get_parent(struct clk *clk);
 
+/**
+ * clk_get_sys - get a clock based upon the device name
+ * @dev_id: device name
+ * @con_id: connection ID
+ *
+ * Returns a struct clk corresponding to the clock producer, or
+ * valid IS_ERR() condition containing errno.  The implementation
+ * uses @dev_id and @con_id to determine the clock consumer, and
+ * thereby the clock producer. In contrast to clk_get() this function
+ * takes the device name instead of the device itself for identification.
+ *
+ * Drivers must assume that the clock source is not enabled.
+ *
+ * clk_get_sys should not be called from within interrupt context.
+ */
+struct clk *clk_get_sys(const char *dev_id, const char *con_id);
+
 #endif
diff --git a/include/video/broadsheetfb.h b/include/video/broadsheetfb.h
new file mode 100644
index 000000000000..a758534c0272
--- /dev/null
+++ b/include/video/broadsheetfb.h
@@ -0,0 +1,59 @@
+/*
+ * broadsheetfb.h - definitions for the broadsheet framebuffer driver
+ *
+ * Copyright (C) 2008 by Jaya Kumar
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
+ * more details.
+ *
+ */
+
+#ifndef _LINUX_BROADSHEETFB_H_
+#define _LINUX_BROADSHEETFB_H_
+
+/* Broadsheet command defines */
+#define BS_CMD_INIT_SYS_RUN     0x06
+#define BS_CMD_INIT_DSPE_CFG    0x09
+#define BS_CMD_INIT_DSPE_TMG    0x0A
+#define BS_CMD_INIT_ROTMODE     0x0B
+#define BS_CMD_RD_REG           0x10
+#define BS_CMD_WR_REG           0x11
+#define BS_CMD_LD_IMG           0x20
+#define BS_CMD_LD_IMG_AREA      0x22
+#define BS_CMD_LD_IMG_END       0x23
+#define BS_CMD_WAIT_DSPE_TRG    0x28
+#define BS_CMD_WAIT_DSPE_FREND  0x29
+#define BS_CMD_RD_WFM_INFO      0x30
+#define BS_CMD_UPD_INIT         0x32
+#define BS_CMD_UPD_FULL         0x33
+#define BS_CMD_UPD_GDRV_CLR     0x37
+
+/* Broadsheet pin interface specific defines */
+#define BS_CS   0x01
+#define BS_DC   0x02
+#define BS_WR   0x03
+
+/* struct used by broadsheet. board specific stuff comes from *board */
+struct broadsheetfb_par {
+        struct fb_info *info;
+        struct broadsheet_board *board;
+        void (*write_reg)(struct broadsheetfb_par *, u16 reg, u16 val);
+        u16 (*read_reg)(struct broadsheetfb_par *, u16 reg);
+        wait_queue_head_t waitq;
+};
+
+/* board specific routines */
+struct broadsheet_board {
+        struct module *owner;
+        int (*init)(struct broadsheetfb_par *);
+        int (*wait_for_rdy)(struct broadsheetfb_par *);
+        void (*set_ctl)(struct broadsheetfb_par *, unsigned char, u8);
+        void (*set_hdb)(struct broadsheetfb_par *, u16);
+        u16 (*get_hdb)(struct broadsheetfb_par *);
+        void (*cleanup)(struct broadsheetfb_par *);
+        int (*get_panel_type)(void);
+        int (*setup_irq)(struct fb_info *);
+};
+
+#endif