From: Yusuf Caglar Akyuz <cag...@bilkon-kontrol.com.tr>
VPBE drivers heavly depend on davinci_read/write macros and these are
removed from latest kernels. This commit defines theses macros locally in
each file using them.
Signed-off-by: Yusuf Caglar Akyuz <cag...@bilkon-kontrol.com.tr>
---
drivers/media/video/davinci/davinci_osd.c | 8 ++++++++
drivers/media/video/davinci/davinci_platform.c | 8 ++++++++
drivers/media/video/davinci/vpbe_encoder.c | 8 ++++++++
3 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/drivers/media/video/davinci/davinci_osd.c
b/drivers/media/video/davinci/davinci_osd.c
index ac06f2e..5880c8c 100644
--- a/drivers/media/video/davinci/davinci_osd.c
+++ b/drivers/media/video/davinci/davinci_osd.c
@@ -19,6 +19,14 @@
#include <mach/io.h>
#include <mach/cputype.h>
+#define davinci_readb(a) __raw_readb(IO_ADDRESS(a))
+#define davinci_readw(a) __raw_readw(IO_ADDRESS(a))
+#define davinci_readl(a) __raw_readl(IO_ADDRESS(a))
+
+#define davinci_writeb(v, a) __raw_writeb(v, IO_ADDRESS(a))
+#define davinci_writew(v, a) __raw_writew(v, IO_ADDRESS(a))
+#define davinci_writel(v, a) __raw_writel(v, IO_ADDRESS(a))
+
/* parameters that apply on a per-window (OSD or video) basis */
struct davinci_window_state {
int is_allocated;
diff --git a/drivers/media/video/davinci/davinci_platform.c
b/drivers/media/video/davinci/davinci_platform.c
index 79fcc1f..1cf3a9d 100644
--- a/drivers/media/video/davinci/davinci_platform.c
+++ b/drivers/media/video/davinci/davinci_platform.c
@@ -36,6 +36,14 @@
#define DM644X_DDR2_CNTL_BASE (0x20000000)
//#define davinci_cfg_reg(x) davinci_mux_peripheral(x, 1)
+#define davinci_readb(a) __raw_readb(IO_ADDRESS(a))
+#define davinci_readw(a) __raw_readw(IO_ADDRESS(a))
+#define davinci_readl(a) __raw_readl(IO_ADDRESS(a))
+
+#define davinci_writeb(v, a) __raw_writeb(v, IO_ADDRESS(a))
+#define davinci_writew(v, a) __raw_writew(v, IO_ADDRESS(a))
+#define davinci_writel(v, a) __raw_writel(v, IO_ADDRESS(a))
+
extern struct vid_enc_device_mgr enc_dev[];
//#define USE_LCD_AS_DEFAULT
diff --git a/drivers/media/video/davinci/vpbe_encoder.c
b/drivers/media/video/davinci/vpbe_encoder.c
index 101068a..ecb4fb0 100644
--- a/drivers/media/video/davinci/vpbe_encoder.c
+++ b/drivers/media/video/davinci/vpbe_encoder.c
@@ -32,6 +32,14 @@
#include <mach/io.h>
#include <mach/cputype.h>
+#define davinci_readb(a) __raw_readb(IO_ADDRESS(a))
+#define davinci_readw(a) __raw_readw(IO_ADDRESS(a))
+#define davinci_readl(a) __raw_readl(IO_ADDRESS(a))
+
+#define davinci_writeb(v, a) __raw_writeb(v, IO_ADDRESS(a))
+#define davinci_writew(v, a) __raw_writew(v, IO_ADDRESS(a))
+#define davinci_writel(v, a) __raw_writel(v, IO_ADDRESS(a))
+
struct vpbe_encoder_params {
int outindex;
char *mode;
--
1.5.6
_______________________________________________
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
