Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / media / timb_video.h

diff --git a/drivers/spi/xilinx_spi.h b/include/media/timb_video.h
similarity index 61%
rename from drivers/spi/xilinx_spi.h
rename to include/media/timb_video.h
index d211accf68d2062cf98bef8aad9b5adba3372617..70ae43970a49f3362dc6404924204ee98ff5629a 100644 (file)
--- a/drivers/spi/xilinx_spi.h
+++ b/include/media/timb_video.h
@@ -1,7 +1,6 @@
 /*
- * Xilinx SPI device driver API and platform data header file
- *
- * Copyright (c) 2009 Intel Corporation
+ * timb_video.h Platform struct for the Timberdale video driver
+ * Copyright (c) 2009-2010 Intel Corporation
  *
  * 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
@@ -17,16 +16,18 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef _XILINX_SPI_H_
-#define _XILINX_SPI_H_
-
-#include <linux/spi/spi.h>
-#include <linux/spi/spi_bitbang.h>
+#ifndef _TIMB_VIDEO_
+#define _TIMB_VIDEO_ 1
 
-#define XILINX_SPI_NAME "xilinx_spi"
+#include <linux/i2c.h>
 
-struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem,
-       u32 irq, s16 bus_num);
+struct timb_video_platform_data {
+       int dma_channel;
+       int i2c_adapter; /* The I2C adapter where the encoder is attached */
+       struct {
+               const char *module_name;
+               struct i2c_board_info *info;
+       } encoder;
+};
 
-void xilinx_spi_deinit(struct spi_master *master);
 #endif