projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
media
/
platform
/
vsp1
/
vsp1.h
diff --git
a/drivers/media/platform/vsp1/vsp1.h
b/drivers/media/platform/vsp1/vsp1.h
index
94d1b02
..
1246719
100644
(file)
--- a/
drivers/media/platform/vsp1/vsp1.h
+++ b/
drivers/media/platform/vsp1/vsp1.h
@@
-1,7
+1,7
@@
/*
* vsp1.h -- R-Car VSP1 Driver
*
/*
* vsp1.h -- R-Car VSP1 Driver
*
- * Copyright (C) 2013
Renesa
s Corporation
+ * Copyright (C) 2013
-2014 Renesas Electronic
s Corporation
*
* Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
*
*
* Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
*
@@
-28,6
+28,7
@@
struct clk;
struct device;
struct vsp1_platform_data;
struct device;
struct vsp1_platform_data;
+struct vsp1_bru;
struct vsp1_hsit;
struct vsp1_lif;
struct vsp1_lut;
struct vsp1_hsit;
struct vsp1_lif;
struct vsp1_lut;
@@
-35,9
+36,9
@@
struct vsp1_rwpf;
struct vsp1_sru;
struct vsp1_uds;
struct vsp1_sru;
struct vsp1_uds;
-#define V
PS
1_MAX_RPF 5
-#define V
PS
1_MAX_UDS 3
-#define V
PS
1_MAX_WPF 4
+#define V
SP
1_MAX_RPF 5
+#define V
SP
1_MAX_UDS 3
+#define V
SP
1_MAX_WPF 4
struct vsp1_device {
struct device *dev;
struct vsp1_device {
struct device *dev;
@@
-45,19
+46,19
@@
struct vsp1_device {
void __iomem *mmio;
struct clk *clock;
void __iomem *mmio;
struct clk *clock;
- struct clk *rt_clock;
struct mutex lock;
int ref_count;
struct mutex lock;
int ref_count;
+ struct vsp1_bru *bru;
struct vsp1_hsit *hsi;
struct vsp1_hsit *hst;
struct vsp1_lif *lif;
struct vsp1_lut *lut;
struct vsp1_hsit *hsi;
struct vsp1_hsit *hst;
struct vsp1_lif *lif;
struct vsp1_lut *lut;
- struct vsp1_rwpf *rpf[V
PS
1_MAX_RPF];
+ struct vsp1_rwpf *rpf[V
SP
1_MAX_RPF];
struct vsp1_sru *sru;
struct vsp1_sru *sru;
- struct vsp1_uds *uds[V
PS
1_MAX_UDS];
- struct vsp1_rwpf *wpf[V
PS
1_MAX_WPF];
+ struct vsp1_uds *uds[V
SP
1_MAX_UDS];
+ struct vsp1_rwpf *wpf[V
SP
1_MAX_WPF];
struct list_head entities;
struct list_head entities;
@@
-65,7
+66,7
@@
struct vsp1_device {
struct media_device media_dev;
};
struct media_device media_dev;
};
-
struct vsp1_device *
vsp1_device_get(struct vsp1_device *vsp1);
+
int
vsp1_device_get(struct vsp1_device *vsp1);
void vsp1_device_put(struct vsp1_device *vsp1);
static inline u32 vsp1_read(struct vsp1_device *vsp1, u32 reg)
void vsp1_device_put(struct vsp1_device *vsp1);
static inline u32 vsp1_read(struct vsp1_device *vsp1, u32 reg)