summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPer Persson <per.xb.persson@stericsson.com>2011-06-07 12:52:15 +0200
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-17 13:42:15 +0200
commit631ad6fc447811627ef35073383d338f3641e21b (patch)
treed923ffbe54f4de67a07cde2a86611b84dfe2289d /include
parentc8521b3ceae30f8edd33ff3427a464c025101c7e (diff)
video: hdmi: Correct hdcp acc to documentation
The hdcp management data sent to av8100 is synchronised with the av8100 documentation. ST-Ericsson ID: 344063 ST-Ericsson Linux next: Not tested, ER 282779 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I00f54abe266178be0141ee1c4a46cc9bd2de91d5 Signed-off-by: Per Persson <per.xb.persson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24522 Reviewed-by: QATOOLS Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com> Reviewed-by: QATEST Reviewed-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com>
Diffstat (limited to 'include')
-rw-r--r--include/video/av8100.h6
-rw-r--r--include/video/hdmi.h5
2 files changed, 2 insertions, 9 deletions
diff --git a/include/video/av8100.h b/include/video/av8100.h
index 6f59cee5b70..b0dc7b7f1cb 100644
--- a/include/video/av8100.h
+++ b/include/video/av8100.h
@@ -321,11 +321,6 @@ enum av8100_hdcp_auth_req_type {
AV8100_HDCP_AUTH_CONT = 3,
};
-enum av8100_hdcp_encr_req_type {
- AV8100_HDCP_ENCR_REQ_OFF = 0,
- AV8100_HDCP_ENCR_REQ_ON = 1,
-};
-
enum av8100_hdcp_encr_use {
AV8100_HDCP_ENCR_USE_OESS = 0,
AV8100_HDCP_ENCR_USE_EESS = 1,
@@ -333,7 +328,6 @@ enum av8100_hdcp_encr_use {
struct av8100_hdcp_management_format_cmd {
unsigned char req_type;
- unsigned char req_encr;
unsigned char encr_use;
};
diff --git a/include/video/hdmi.h b/include/video/hdmi.h
index 0a4dd723486..d2ef87f910a 100644
--- a/include/video/hdmi.h
+++ b/include/video/hdmi.h
@@ -113,9 +113,8 @@ enum hdmi_hdcp_auth_type {
};
enum hdmi_hdcp_encr_type {
- HDMI_HDCP_ENCR_OFF = 0,
- HDMI_HDCP_ENCR_OESS = 1,
- HDMI_HDCP_ENCR_EESS = 2,
+ HDMI_HDCP_ENCR_OESS = 0,
+ HDMI_HDCP_ENCR_EESS = 1,
};
struct plug_detect {