mfd: wm5110: Add missing registers for AIF2 channels 3-6

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

When the extra 4 channels were added to AIF2 the necessary frame control
registers were not given defaults and marked readable. This patch fixes
this.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>

authored by

Charles Keepax and committed by

Lee Jones 11 years ago 783f6fc4 90f2d0f7

+24

2 changed files

expand all

drivers

mfd

wm5110-tables.c

include

linux

mfd

arizona

registers.h

+16

drivers/mfd/wm5110-tables.c

··· 895 895 { 0x00000548, 0x1818 }, /* R1352 - AIF2 Frame Ctrl 2 */ 896 896 { 0x00000549, 0x0000 }, /* R1353 - AIF2 Frame Ctrl 3 */ 897 897 { 0x0000054A, 0x0001 }, /* R1354 - AIF2 Frame Ctrl 4 */ 898 + { 0x0000054B, 0x0002 }, /* R1355 - AIF2 Frame Ctrl 5 */ 899 + { 0x0000054C, 0x0003 }, /* R1356 - AIF2 Frame Ctrl 6 */ 900 + { 0x0000054D, 0x0004 }, /* R1357 - AIF2 Frame Ctrl 7 */ 901 + { 0x0000054E, 0x0005 }, /* R1358 - AIF2 Frame Ctrl 8 */ 898 902 { 0x00000551, 0x0000 }, /* R1361 - AIF2 Frame Ctrl 11 */ 899 903 { 0x00000552, 0x0001 }, /* R1362 - AIF2 Frame Ctrl 12 */ 904 + { 0x00000553, 0x0002 }, /* R1363 - AIF2 Frame Ctrl 13 */ 905 + { 0x00000554, 0x0003 }, /* R1364 - AIF2 Frame Ctrl 14 */ 906 + { 0x00000555, 0x0004 }, /* R1365 - AIF2 Frame Ctrl 15 */ 907 + { 0x00000556, 0x0005 }, /* R1366 - AIF2 Frame Ctrl 16 */ 900 908 { 0x00000559, 0x0000 }, /* R1369 - AIF2 Tx Enables */ 901 909 { 0x0000055A, 0x0000 }, /* R1370 - AIF2 Rx Enables */ 902 910 { 0x00000580, 0x000C }, /* R1408 - AIF3 BCLK Ctrl */ ··· 1944 1936 case ARIZONA_AIF2_FRAME_CTRL_2: 1945 1937 case ARIZONA_AIF2_FRAME_CTRL_3: 1946 1938 case ARIZONA_AIF2_FRAME_CTRL_4: 1939 + case ARIZONA_AIF2_FRAME_CTRL_5: 1940 + case ARIZONA_AIF2_FRAME_CTRL_6: 1941 + case ARIZONA_AIF2_FRAME_CTRL_7: 1942 + case ARIZONA_AIF2_FRAME_CTRL_8: 1947 1943 case ARIZONA_AIF2_FRAME_CTRL_11: 1948 1944 case ARIZONA_AIF2_FRAME_CTRL_12: 1945 + case ARIZONA_AIF2_FRAME_CTRL_13: 1946 + case ARIZONA_AIF2_FRAME_CTRL_14: 1947 + case ARIZONA_AIF2_FRAME_CTRL_15: 1948 + case ARIZONA_AIF2_FRAME_CTRL_16: 1949 1949 case ARIZONA_AIF2_TX_ENABLES: 1950 1950 case ARIZONA_AIF2_RX_ENABLES: 1951 1951 case ARIZONA_AIF3_BCLK_CTRL:

include/linux/mfd/arizona/registers.h

··· 281 281 #define ARIZONA_AIF2_FRAME_CTRL_2 0x548 282 282 #define ARIZONA_AIF2_FRAME_CTRL_3 0x549 283 283 #define ARIZONA_AIF2_FRAME_CTRL_4 0x54A 284 + #define ARIZONA_AIF2_FRAME_CTRL_5 0x54B 285 + #define ARIZONA_AIF2_FRAME_CTRL_6 0x54C 286 + #define ARIZONA_AIF2_FRAME_CTRL_7 0x54D 287 + #define ARIZONA_AIF2_FRAME_CTRL_8 0x54E 284 288 #define ARIZONA_AIF2_FRAME_CTRL_11 0x551 285 289 #define ARIZONA_AIF2_FRAME_CTRL_12 0x552 290 + #define ARIZONA_AIF2_FRAME_CTRL_13 0x553 291 + #define ARIZONA_AIF2_FRAME_CTRL_14 0x554 292 + #define ARIZONA_AIF2_FRAME_CTRL_15 0x555 293 + #define ARIZONA_AIF2_FRAME_CTRL_16 0x556 286 294 #define ARIZONA_AIF2_TX_ENABLES 0x559 287 295 #define ARIZONA_AIF2_RX_ENABLES 0x55A 288 296 #define ARIZONA_AIF2_FORCE_WRITE 0x55B