Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 "This is the first part of the media patches for v3.6.

  This patch series contain:
   - new DVB frontend: rtl2832
   - new video drivers: adv7393
   - some unused files got removed
   - a selection API cleanup between V4L2 and V4L2 subdev API's
   - a major redesign at v4l-ioctl2, in order to clean it up
   - several driver fixes and improvements."

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (174 commits)
  v4l: Export v4l2-common.h in include/linux/Kbuild
  media: Revert "[media] Terratec Cinergy S2 USB HD Rev.2"
  [media] media: Use pr_info not homegrown pr_reg macro
  [media] Terratec Cinergy S2 USB HD Rev.2
  [media] v4l: Correct conflicting V4L2 subdev selection API documentation
  [media] Feature removal: V4L2 selections API target and flag definitions
  [media] v4l: Unify selection flags documentation
  [media] v4l: Unify selection flags
  [media] v4l: Common documentation for selection targets
  [media] v4l: Unify selection targets across V4L2 and V4L2 subdev interfaces
  [media] v4l: Remove "_ACTUAL" from subdev selection API target definition names
  [media] V4L: Remove "_ACTIVE" from the selection target name definitions
  [media] media: dvb-usb: print mac address via native %pM
  [media] s5p-tv: Use module_i2c_driver in sii9234_drv.c file
  [media] media: gpio-ir-recv: add allowed_protos for platform data
  [media] s5p-jpeg: Use module_platform_driver in jpeg-core.c file
  [media] saa7134: fix spelling of detach in label
  [media] cx88-blackbird: replace ioctl by unlocked_ioctl
  [media] cx88: don't use current_norm
  [media] cx88: fix a number of v4l2-compliance violations
  ...

1 files changed, 17 insertions, 16 deletions

diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 5717bdee8f1b..de2cb20ad2cc 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/vmalloc.h>
+#include <sound/ac97_codec.h>
 #include <media/v4l2-common.h>
 
 #include "em28xx.h"
@@ -326,13 +327,13 @@ struct em28xx_vol_itable {
 };
 
 static struct em28xx_vol_itable inputs[] = {
-        { EM28XX_AMUX_VIDEO,    AC97_VIDEO_VOL   },
-        { EM28XX_AMUX_LINE_IN,  AC97_LINEIN_VOL  },
-        { EM28XX_AMUX_PHONE,    AC97_PHONE_VOL   },
-        { EM28XX_AMUX_MIC,      AC97_MIC_VOL     },
-        { EM28XX_AMUX_CD,       AC97_CD_VOL      },
-        { EM28XX_AMUX_AUX,      AC97_AUX_VOL     },
-        { EM28XX_AMUX_PCM_OUT,  AC97_PCM_OUT_VOL },
+        { EM28XX_AMUX_VIDEO,    AC97_VIDEO      },
+        { EM28XX_AMUX_LINE_IN,  AC97_LINE       },
+        { EM28XX_AMUX_PHONE,    AC97_PHONE      },
+        { EM28XX_AMUX_MIC,      AC97_MIC        },
+        { EM28XX_AMUX_CD,       AC97_CD         },
+        { EM28XX_AMUX_AUX,      AC97_AUX        },
+        { EM28XX_AMUX_PCM_OUT,  AC97_PCM        },
 };
 
 static int set_ac97_input(struct em28xx *dev)
@@ -415,11 +416,11 @@ struct em28xx_vol_otable {
 };
 
 static const struct em28xx_vol_otable outputs[] = {
-        { EM28XX_AOUT_MASTER, AC97_MASTER_VOL      },
-        { EM28XX_AOUT_LINE,   AC97_LINE_LEVEL_VOL  },
-        { EM28XX_AOUT_MONO,   AC97_MASTER_MONO_VOL },
-        { EM28XX_AOUT_LFE,    AC97_LFE_MASTER_VOL  },
-        { EM28XX_AOUT_SURR,   AC97_SURR_MASTER_VOL },
+        { EM28XX_AOUT_MASTER, AC97_MASTER               },
+        { EM28XX_AOUT_LINE,   AC97_HEADPHONE            },
+        { EM28XX_AOUT_MONO,   AC97_MASTER_MONO          },
+        { EM28XX_AOUT_LFE,    AC97_CENTER_LFE_MASTER    },
+        { EM28XX_AOUT_SURR,   AC97_SURROUND_MASTER      },
 };
 
 int em28xx_audio_analog_set(struct em28xx *dev)
@@ -459,9 +460,9 @@ int em28xx_audio_analog_set(struct em28xx *dev)
         if (dev->audio_mode.ac97 != EM28XX_NO_AC97) {
                 int vol;
 
-                em28xx_write_ac97(dev, AC97_POWER_DOWN_CTRL, 0x4200);
-                em28xx_write_ac97(dev, AC97_EXT_AUD_CTRL, 0x0031);
-                em28xx_write_ac97(dev, AC97_PCM_IN_SRATE, 0xbb80);
+                em28xx_write_ac97(dev, AC97_POWERDOWN, 0x4200);
+                em28xx_write_ac97(dev, AC97_EXTENDED_STATUS, 0x0031);
+                em28xx_write_ac97(dev, AC97_PCM_LR_ADC_RATE, 0xbb80);
 
                 /* LSB: left channel - both channels with the same level */
                 vol = (0x1f - dev->volume) | ((0x1f - dev->volume) << 8);
@@ -487,7 +488,7 @@ int em28xx_audio_analog_set(struct em28xx *dev)
                            channels */
                         sel |= (sel << 8);
 
-                        em28xx_write_ac97(dev, AC97_RECORD_SELECT, sel);
+                        em28xx_write_ac97(dev, AC97_REC_SEL, sel);
                 }
         }