← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to sound/soc/codecs/wm5100-tables.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/soc/codecs/wm5100-tables.c
32
32
        case WM5100_MIC_DETECT_3:
33
33
                return 1;
34
34
        default:
35
 
                return 0;
 
35
                if ((reg >= WM5100_DSP1_PM_0 && reg <= WM5100_DSP1_PM_1535) ||
 
36
                    (reg >= WM5100_DSP1_ZM_0 && reg <= WM5100_DSP1_ZM_2047) ||
 
37
                    (reg >= WM5100_DSP1_DM_0 && reg <= WM5100_DSP1_DM_511) ||
 
38
                    (reg >= WM5100_DSP2_PM_0 && reg <= WM5100_DSP2_PM_1535) ||
 
39
                    (reg >= WM5100_DSP2_ZM_0 && reg <= WM5100_DSP2_ZM_2047) ||
 
40
                    (reg >= WM5100_DSP2_DM_0 && reg <= WM5100_DSP2_DM_511) ||
 
41
                    (reg >= WM5100_DSP3_PM_0 && reg <= WM5100_DSP3_PM_1535) ||
 
42
                    (reg >= WM5100_DSP3_ZM_0 && reg <= WM5100_DSP3_ZM_2047) ||
 
43
                    (reg >= WM5100_DSP3_DM_0 && reg <= WM5100_DSP3_DM_511))
 
44
                        return 1;
 
45
                else
 
46
                        return 0;
36
47
        }
37
48
}
38
49
 
697
708
        case WM5100_HPLPF3_2:
698
709
        case WM5100_HPLPF4_1:
699
710
        case WM5100_HPLPF4_2:
 
711
        case WM5100_DSP1_CONTROL_1:
 
712
        case WM5100_DSP1_CONTROL_2:
 
713
        case WM5100_DSP1_CONTROL_3:
 
714
        case WM5100_DSP1_CONTROL_4:
 
715
        case WM5100_DSP1_CONTROL_5:
 
716
        case WM5100_DSP1_CONTROL_6:
 
717
        case WM5100_DSP1_CONTROL_7:
 
718
        case WM5100_DSP1_CONTROL_8:
 
719
        case WM5100_DSP1_CONTROL_9:
 
720
        case WM5100_DSP1_CONTROL_10:
 
721
        case WM5100_DSP1_CONTROL_11:
 
722
        case WM5100_DSP1_CONTROL_12:
 
723
        case WM5100_DSP1_CONTROL_13:
 
724
        case WM5100_DSP1_CONTROL_14:
 
725
        case WM5100_DSP1_CONTROL_15:
 
726
        case WM5100_DSP1_CONTROL_16:
 
727
        case WM5100_DSP1_CONTROL_17:
 
728
        case WM5100_DSP1_CONTROL_18:
 
729
        case WM5100_DSP1_CONTROL_19:
 
730
        case WM5100_DSP1_CONTROL_20:
 
731
        case WM5100_DSP1_CONTROL_21:
 
732
        case WM5100_DSP1_CONTROL_22:
 
733
        case WM5100_DSP1_CONTROL_23:
 
734
        case WM5100_DSP1_CONTROL_24:
 
735
        case WM5100_DSP1_CONTROL_25:
 
736
        case WM5100_DSP1_CONTROL_26:
 
737
        case WM5100_DSP1_CONTROL_27:
 
738
        case WM5100_DSP1_CONTROL_28:
 
739
        case WM5100_DSP1_CONTROL_29:
 
740
        case WM5100_DSP1_CONTROL_30:
 
741
        case WM5100_DSP2_CONTROL_1:
 
742
        case WM5100_DSP2_CONTROL_2:
 
743
        case WM5100_DSP2_CONTROL_3:
 
744
        case WM5100_DSP2_CONTROL_4:
 
745
        case WM5100_DSP2_CONTROL_5:
 
746
        case WM5100_DSP2_CONTROL_6:
 
747
        case WM5100_DSP2_CONTROL_7:
 
748
        case WM5100_DSP2_CONTROL_8:
 
749
        case WM5100_DSP2_CONTROL_9:
 
750
        case WM5100_DSP2_CONTROL_10:
 
751
        case WM5100_DSP2_CONTROL_11:
 
752
        case WM5100_DSP2_CONTROL_12:
 
753
        case WM5100_DSP2_CONTROL_13:
 
754
        case WM5100_DSP2_CONTROL_14:
 
755
        case WM5100_DSP2_CONTROL_15:
 
756
        case WM5100_DSP2_CONTROL_16:
 
757
        case WM5100_DSP2_CONTROL_17:
 
758
        case WM5100_DSP2_CONTROL_18:
 
759
        case WM5100_DSP2_CONTROL_19:
 
760
        case WM5100_DSP2_CONTROL_20:
 
761
        case WM5100_DSP2_CONTROL_21:
 
762
        case WM5100_DSP2_CONTROL_22:
 
763
        case WM5100_DSP2_CONTROL_23:
 
764
        case WM5100_DSP2_CONTROL_24:
 
765
        case WM5100_DSP2_CONTROL_25:
 
766
        case WM5100_DSP2_CONTROL_26:
 
767
        case WM5100_DSP2_CONTROL_27:
 
768
        case WM5100_DSP2_CONTROL_28:
 
769
        case WM5100_DSP2_CONTROL_29:
 
770
        case WM5100_DSP2_CONTROL_30:
 
771
        case WM5100_DSP3_CONTROL_1:
 
772
        case WM5100_DSP3_CONTROL_2:
 
773
        case WM5100_DSP3_CONTROL_3:
 
774
        case WM5100_DSP3_CONTROL_4:
 
775
        case WM5100_DSP3_CONTROL_5:
 
776
        case WM5100_DSP3_CONTROL_6:
 
777
        case WM5100_DSP3_CONTROL_7:
 
778
        case WM5100_DSP3_CONTROL_8:
 
779
        case WM5100_DSP3_CONTROL_9:
 
780
        case WM5100_DSP3_CONTROL_10:
 
781
        case WM5100_DSP3_CONTROL_11:
 
782
        case WM5100_DSP3_CONTROL_12:
 
783
        case WM5100_DSP3_CONTROL_13:
 
784
        case WM5100_DSP3_CONTROL_14:
 
785
        case WM5100_DSP3_CONTROL_15:
 
786
        case WM5100_DSP3_CONTROL_16:
 
787
        case WM5100_DSP3_CONTROL_17:
 
788
        case WM5100_DSP3_CONTROL_18:
 
789
        case WM5100_DSP3_CONTROL_19:
 
790
        case WM5100_DSP3_CONTROL_20:
 
791
        case WM5100_DSP3_CONTROL_21:
 
792
        case WM5100_DSP3_CONTROL_22:
 
793
        case WM5100_DSP3_CONTROL_23:
 
794
        case WM5100_DSP3_CONTROL_24:
 
795
        case WM5100_DSP3_CONTROL_25:
 
796
        case WM5100_DSP3_CONTROL_26:
 
797
        case WM5100_DSP3_CONTROL_27:
 
798
        case WM5100_DSP3_CONTROL_28:
 
799
        case WM5100_DSP3_CONTROL_29:
 
800
        case WM5100_DSP3_CONTROL_30:
700
801
                return 1;
701
802
        default:
702
 
                return 0;
 
803
                if ((reg >= WM5100_DSP1_PM_0 && reg <= WM5100_DSP1_PM_1535) ||
 
804
                    (reg >= WM5100_DSP1_ZM_0 && reg <= WM5100_DSP1_ZM_2047) ||
 
805
                    (reg >= WM5100_DSP1_DM_0 && reg <= WM5100_DSP1_DM_511) ||
 
806
                    (reg >= WM5100_DSP2_PM_0 && reg <= WM5100_DSP2_PM_1535) ||
 
807
                    (reg >= WM5100_DSP2_ZM_0 && reg <= WM5100_DSP2_ZM_2047) ||
 
808
                    (reg >= WM5100_DSP2_DM_0 && reg <= WM5100_DSP2_DM_511) ||
 
809
                    (reg >= WM5100_DSP3_PM_0 && reg <= WM5100_DSP3_PM_1535) ||
 
810
                    (reg >= WM5100_DSP3_ZM_0 && reg <= WM5100_DSP3_ZM_2047) ||
 
811
                    (reg >= WM5100_DSP3_DM_0 && reg <= WM5100_DSP3_DM_511))
 
812
                        return 1;
 
813
                else
 
814
                        return 0;
703
815
        }
704
816
}
705
817
 
1361
1473
        { 0x0EC9, 0x0000 },  /* R3785  - HPLPF3_2 */
1362
1474
        { 0x0ECC, 0x0000 },  /* R3788  - HPLPF4_1 */
1363
1475
        { 0x0ECD, 0x0000 },  /* R3789  - HPLPF4_2 */
 
1476
        { 0x0F02, 0x0000 },  /* R3842  - DSP1 Control 2 */
 
1477
        { 0x0F03, 0x0000 },  /* R3843  - DSP1 Control 3 */
 
1478
        { 0x0F04, 0x0000 },  /* R3844  - DSP1 Control 4 */
 
1479
        { 0x1002, 0x0000 },  /* R4098  - DSP2 Control 2 */
 
1480
        { 0x1003, 0x0000 },  /* R4099  - DSP2 Control 3 */
 
1481
        { 0x1004, 0x0000 },  /* R4100  - DSP2 Control 4 */
 
1482
        { 0x1102, 0x0000 },  /* R4354  - DSP3 Control 2 */
 
1483
        { 0x1103, 0x0000 },  /* R4355  - DSP3 Control 3 */
 
1484
        { 0x1104, 0x0000 },  /* R4356  - DSP3 Control 4 */
1364
1485
};