Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c583eac3 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/ux500' into asoc-linus

parents 0335cd6c 2371e9cf
Loading
Loading
Loading
Loading
+18 −18
Original line number Diff line number Diff line
@@ -348,25 +348,25 @@

/* AB8500_ADSLOTSELX */
#define AB8500_ADSLOTSELX_AD_OUT1_TO_SLOT_ODD	0x00
#define AB8500_ADSLOTSELX_AD_OUT2_TO_SLOT_ODD	0x01
#define AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_ODD	0x02
#define AB8500_ADSLOTSELX_AD_OUT4_TO_SLOT_ODD	0x03
#define AB8500_ADSLOTSELX_AD_OUT5_TO_SLOT_ODD	0x04
#define AB8500_ADSLOTSELX_AD_OUT6_TO_SLOT_ODD	0x05
#define AB8500_ADSLOTSELX_AD_OUT7_TO_SLOT_ODD	0x06
#define AB8500_ADSLOTSELX_AD_OUT8_TO_SLOT_ODD	0x07
#define AB8500_ADSLOTSELX_ZEROES_TO_SLOT_ODD	0x08
#define AB8500_ADSLOTSELX_TRISTATE_TO_SLOT_ODD	0x0F
#define AB8500_ADSLOTSELX_AD_OUT2_TO_SLOT_ODD	0x10
#define AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_ODD	0x20
#define AB8500_ADSLOTSELX_AD_OUT4_TO_SLOT_ODD	0x30
#define AB8500_ADSLOTSELX_AD_OUT5_TO_SLOT_ODD	0x40
#define AB8500_ADSLOTSELX_AD_OUT6_TO_SLOT_ODD	0x50
#define AB8500_ADSLOTSELX_AD_OUT7_TO_SLOT_ODD	0x60
#define AB8500_ADSLOTSELX_AD_OUT8_TO_SLOT_ODD	0x70
#define AB8500_ADSLOTSELX_ZEROES_TO_SLOT_ODD	0x80
#define AB8500_ADSLOTSELX_TRISTATE_TO_SLOT_ODD	0xF0
#define AB8500_ADSLOTSELX_AD_OUT1_TO_SLOT_EVEN	0x00
#define AB8500_ADSLOTSELX_AD_OUT2_TO_SLOT_EVEN	0x10
#define AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_EVEN	0x20
#define AB8500_ADSLOTSELX_AD_OUT4_TO_SLOT_EVEN	0x30
#define AB8500_ADSLOTSELX_AD_OUT5_TO_SLOT_EVEN	0x40
#define AB8500_ADSLOTSELX_AD_OUT6_TO_SLOT_EVEN	0x50
#define AB8500_ADSLOTSELX_AD_OUT7_TO_SLOT_EVEN	0x60
#define AB8500_ADSLOTSELX_AD_OUT8_TO_SLOT_EVEN	0x70
#define AB8500_ADSLOTSELX_ZEROES_TO_SLOT_EVEN	0x80
#define AB8500_ADSLOTSELX_TRISTATE_TO_SLOT_EVEN	0xF0
#define AB8500_ADSLOTSELX_AD_OUT2_TO_SLOT_EVEN	0x01
#define AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_EVEN	0x02
#define AB8500_ADSLOTSELX_AD_OUT4_TO_SLOT_EVEN	0x03
#define AB8500_ADSLOTSELX_AD_OUT5_TO_SLOT_EVEN	0x04
#define AB8500_ADSLOTSELX_AD_OUT6_TO_SLOT_EVEN	0x05
#define AB8500_ADSLOTSELX_AD_OUT7_TO_SLOT_EVEN	0x06
#define AB8500_ADSLOTSELX_AD_OUT8_TO_SLOT_EVEN	0x07
#define AB8500_ADSLOTSELX_ZEROES_TO_SLOT_EVEN	0x08
#define AB8500_ADSLOTSELX_TRISTATE_TO_SLOT_EVEN	0x0F
#define AB8500_ADSLOTSELX_EVEN_SHIFT		0
#define AB8500_ADSLOTSELX_ODD_SHIFT		4