← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to sound/soc/codecs/wm8955.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/soc/codecs/wm8955.c
176
176
        return 0;
177
177
}
178
178
 
179
 
/* Lookup table specifiying SRATE (table 25 in datasheet); some of the
 
179
/* Lookup table specifying SRATE (table 25 in datasheet); some of the
180
180
 * output frequencies have been rounded to the standard frequencies
181
181
 * they are intended to match where the error is slight. */
182
182
static struct {
934
934
        }
935
935
 
936
936
        /* Change some default settings - latch VU and enable ZC */
937
 
        reg_cache[WM8955_LEFT_DAC_VOLUME] |= WM8955_LDVU;
938
 
        reg_cache[WM8955_RIGHT_DAC_VOLUME] |= WM8955_RDVU;
939
 
        reg_cache[WM8955_LOUT1_VOLUME] |= WM8955_LO1VU | WM8955_LO1ZC;
940
 
        reg_cache[WM8955_ROUT1_VOLUME] |= WM8955_RO1VU | WM8955_RO1ZC;
941
 
        reg_cache[WM8955_LOUT2_VOLUME] |= WM8955_LO2VU | WM8955_LO2ZC;
942
 
        reg_cache[WM8955_ROUT2_VOLUME] |= WM8955_RO2VU | WM8955_RO2ZC;
943
 
        reg_cache[WM8955_MONOOUT_VOLUME] |= WM8955_MOZC;
 
937
        snd_soc_update_bits(codec, WM8955_LEFT_DAC_VOLUME,
 
938
                            WM8955_LDVU, WM8955_LDVU);
 
939
        snd_soc_update_bits(codec, WM8955_RIGHT_DAC_VOLUME,
 
940
                            WM8955_RDVU, WM8955_RDVU);
 
941
        snd_soc_update_bits(codec, WM8955_LOUT1_VOLUME,
 
942
                            WM8955_LO1VU | WM8955_LO1ZC,
 
943
                            WM8955_LO1VU | WM8955_LO1ZC);
 
944
        snd_soc_update_bits(codec, WM8955_ROUT1_VOLUME,
 
945
                            WM8955_RO1VU | WM8955_RO1ZC,
 
946
                            WM8955_RO1VU | WM8955_RO1ZC);
 
947
        snd_soc_update_bits(codec, WM8955_LOUT2_VOLUME,
 
948
                            WM8955_LO2VU | WM8955_LO2ZC,
 
949
                            WM8955_LO2VU | WM8955_LO2ZC);
 
950
        snd_soc_update_bits(codec, WM8955_ROUT2_VOLUME,
 
951
                            WM8955_RO2VU | WM8955_RO2ZC,
 
952
                            WM8955_RO2VU | WM8955_RO2ZC);
 
953
        snd_soc_update_bits(codec, WM8955_MONOOUT_VOLUME,
 
954
                            WM8955_MOZC, WM8955_MOZC);
944
955
 
945
956
        /* Also enable adaptive bass boost by default */
946
 
        reg_cache[WM8955_BASS_CONTROL] |= WM8955_BB;
 
957
        snd_soc_update_bits(codec, WM8955_BASS_CONTROL, WM8955_BB, WM8955_BB);
947
958
 
948
959
        /* Set platform data values */
949
960
        if (pdata) {