Ignore:
Timestamp:
Apr 3, 2017, 4:51:56 PM (8 years ago)
Author:
David Azarewicz
Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:
GPL/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • GPL/trunk

  • GPL/trunk/alsa-kernel/include/sound/ak4114.h

    r399 r598  
    9696/* AK4114_REG_IO0 */
    9797#define AK4114_TX1E             (1<<7)  /* TX1 Output Enable (1 = enable) */
    98 #define AK4114_OPS12            (1<<2)  /* Output Though Data Selector for TX1 pin */
    99 #define AK4114_OPS11            (1<<1)  /* Output Though Data Selector for TX1 pin */
    100 #define AK4114_OPS10            (1<<0)  /* Output Though Data Selector for TX1 pin */
     98#define AK4114_OPS12            (1<<6)  /* Output Data Selector for TX1 pin */
     99#define AK4114_OPS11            (1<<5)  /* Output Data Selector for TX1 pin */
     100#define AK4114_OPS10            (1<<4)  /* Output Data Selector for TX1 pin */
    101101#define AK4114_TX0E             (1<<3)  /* TX0 Output Enable (1 = enable) */
    102 #define AK4114_OPS02            (1<<2)  /* Output Though Data Selector for TX0 pin */
    103 #define AK4114_OPS01            (1<<1)  /* Output Though Data Selector for TX0 pin */
    104 #define AK4114_OPS00            (1<<0)  /* Output Though Data Selector for TX0 pin */
     102#define AK4114_OPS02            (1<<2)  /* Output Data Selector for TX0 pin */
     103#define AK4114_OPS01            (1<<1)  /* Output Data Selector for TX0 pin */
     104#define AK4114_OPS00            (1<<0)  /* Output Data Selector for TX0 pin */
    105105
    106106/* AK4114_REG_IO1 */
Note: See TracChangeset for help on using the changeset viewer.