1 files changed, 56 insertions, 3 deletions

diff --git a/drivers/media/video/saa7164/saa7164-reg.h b/drivers/media/video/saa7164/saa7164-reg.h
index 06be4c13d5b1..2bbf81583d33 100644
--- a/drivers/media/video/saa7164/saa7164-reg.h
+++ b/drivers/media/video/saa7164/saa7164-reg.h
@@ -1,7 +1,7 @@
 /*
  *  Driver for the NXP SAA7164 PCIe bridge
  *
- *  Copyright (c) 2009 Steven Toth <stoth@kernellabs.com>
+ *  Copyright (c) 2010 Steven Toth <stoth@kernellabs.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -60,6 +60,7 @@
 #define GET_STRING_CONTROL              0x03
 #define GET_LANGUAGE_CONTROL            0x05
 #define SET_POWER_CONTROL               0x07
+#define GET_FW_STATUS_CONTROL           0x08
 #define GET_FW_VERSION_CONTROL          0x09
 #define SET_DEBUG_LEVEL_CONTROL         0x0B
 #define GET_DEBUG_DATA_CONTROL          0x0C
@@ -156,11 +157,63 @@
 #define EXU_INTERRUPT_CONTROL           0x03
 
 /* State Transition and args */
+#define SAA_PROBE_CONTROL       0x01
+#define SAA_COMMIT_CONTROL      0x02
 #define SAA_STATE_CONTROL       0x03
 #define SAA_DMASTATE_STOP       0x00
 #define SAA_DMASTATE_ACQUIRE    0x01
 #define SAA_DMASTATE_PAUSE      0x02
 #define SAA_DMASTATE_RUN        0x03
 
-/* Hardware registers */
-
+/* A/V Mux Input Selector */
+#define SU_INPUT_SELECT_CONTROL 0x01
+
+/* Encoder Profiles */
+#define EU_PROFILE_PS_DVD       0x06
+#define EU_PROFILE_TS_HQ        0x09
+#define EU_VIDEO_FORMAT_MPEG_2  0x02
+
+/* Tuner */
+#define TU_AUDIO_MODE_CONTROL  0x17
+
+/* Video Formats */
+#define TU_STANDARD_CONTROL             0x00
+#define TU_STANDARD_AUTO_CONTROL        0x01
+#define TU_STANDARD_NONE                0x00
+#define TU_STANDARD_NTSC_M              0x01
+#define TU_STANDARD_PAL_I               0x08
+#define TU_STANDARD_MANUAL              0x00
+#define TU_STANDARD_AUTO                0x01
+
+/* Video Controls */
+#define PU_BRIGHTNESS_CONTROL   0x02
+#define PU_CONTRAST_CONTROL     0x03
+#define PU_HUE_CONTROL          0x06
+#define PU_SATURATION_CONTROL   0x07
+#define PU_SHARPNESS_CONTROL    0x08
+
+/* Audio Controls */
+#define MUTE_CONTROL            0x01
+#define VOLUME_CONTROL          0x02
+#define AUDIO_DEFAULT_CONTROL   0x0D
+
+/* Default Volume Levels */
+#define TMHW_LEV_ADJ_DECLEV_DEFAULT     0x00
+#define TMHW_LEV_ADJ_MONOLEV_DEFAULT    0x00
+#define TMHW_LEV_ADJ_NICLEV_DEFAULT     0x00
+#define TMHW_LEV_ADJ_SAPLEV_DEFAULT     0x00
+#define TMHW_LEV_ADJ_ADCLEV_DEFAULT     0x00
+
+/* Encoder Related Commands */
+#define EU_PROFILE_CONTROL              0x00
+#define EU_VIDEO_FORMAT_CONTROL         0x01
+#define EU_VIDEO_BIT_RATE_CONTROL       0x02
+#define EU_VIDEO_RESOLUTION_CONTROL     0x03
+#define EU_VIDEO_GOP_STRUCTURE_CONTROL  0x04
+#define EU_VIDEO_INPUT_ASPECT_CONTROL   0x0A
+#define EU_AUDIO_FORMAT_CONTROL         0x0C
+#define EU_AUDIO_BIT_RATE_CONTROL       0x0D
+
+/* Firmware Debugging */
+#define SET_DEBUG_LEVEL_CONTROL 0x0B
+#define GET_DEBUG_DATA_CONTROL  0x0C