aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2013-11-27 07:51:17 -0500
committerMark Brown <broonie@linaro.org>2013-11-28 05:35:01 -0500
commit32a8fda90f52f547719b16dec07cce4abbd093e0 (patch)
tree76769a138a171d904b2b531554b9d3abba1fc039
parent0da2e5baf4233e2744a7fc691932638c39d9b245 (diff)
mfd: wm5110: Give new AIF2 registers defaults and mark as readable
The registers associated with the new channels on AIF2 were accidentally missing defaults and not marked as readable this patch fixes this. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/mfd/wm5110-tables.c64
1 files changed, 64 insertions, 0 deletions
diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
index d433e285f1f1..338cfbe6727b 100644
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@ -885,6 +885,38 @@ static const struct reg_default wm5110_reg_default[] = {
885 { 0x0000074D, 0x0080 }, /* R1869 - AIF2TX2MIX Input 3 Volume */ 885 { 0x0000074D, 0x0080 }, /* R1869 - AIF2TX2MIX Input 3 Volume */
886 { 0x0000074E, 0x0000 }, /* R1870 - AIF2TX2MIX Input 4 Source */ 886 { 0x0000074E, 0x0000 }, /* R1870 - AIF2TX2MIX Input 4 Source */
887 { 0x0000074F, 0x0080 }, /* R1871 - AIF2TX2MIX Input 4 Volume */ 887 { 0x0000074F, 0x0080 }, /* R1871 - AIF2TX2MIX Input 4 Volume */
888 { 0x00000750, 0x0000 }, /* R1872 - AIF2TX3MIX Input 1 Source */
889 { 0x00000751, 0x0080 }, /* R1873 - AIF2TX3MIX Input 1 Volume */
890 { 0x00000752, 0x0000 }, /* R1874 - AIF2TX3MIX Input 2 Source */
891 { 0x00000753, 0x0080 }, /* R1875 - AIF2TX3MIX Input 2 Volume */
892 { 0x00000754, 0x0000 }, /* R1876 - AIF2TX3MIX Input 3 Source */
893 { 0x00000755, 0x0080 }, /* R1877 - AIF2TX3MIX Input 3 Volume */
894 { 0x00000756, 0x0000 }, /* R1878 - AIF2TX3MIX Input 4 Source */
895 { 0x00000757, 0x0080 }, /* R1879 - AIF2TX3MIX Input 4 Volume */
896 { 0x00000758, 0x0000 }, /* R1880 - AIF2TX4MIX Input 1 Source */
897 { 0x00000759, 0x0080 }, /* R1881 - AIF2TX4MIX Input 1 Volume */
898 { 0x0000075A, 0x0000 }, /* R1882 - AIF2TX4MIX Input 2 Source */
899 { 0x0000075B, 0x0080 }, /* R1883 - AIF2TX4MIX Input 2 Volume */
900 { 0x0000075C, 0x0000 }, /* R1884 - AIF2TX4MIX Input 3 Source */
901 { 0x0000075D, 0x0080 }, /* R1885 - AIF2TX4MIX Input 3 Volume */
902 { 0x0000075E, 0x0000 }, /* R1886 - AIF2TX4MIX Input 4 Source */
903 { 0x0000075F, 0x0080 }, /* R1887 - AIF2TX4MIX Input 4 Volume */
904 { 0x00000760, 0x0000 }, /* R1888 - AIF2TX5MIX Input 1 Source */
905 { 0x00000761, 0x0080 }, /* R1889 - AIF2TX5MIX Input 1 Volume */
906 { 0x00000762, 0x0000 }, /* R1890 - AIF2TX5MIX Input 2 Source */
907 { 0x00000763, 0x0080 }, /* R1891 - AIF2TX5MIX Input 2 Volume */
908 { 0x00000764, 0x0000 }, /* R1892 - AIF2TX5MIX Input 3 Source */
909 { 0x00000765, 0x0080 }, /* R1893 - AIF2TX5MIX Input 3 Volume */
910 { 0x00000766, 0x0000 }, /* R1894 - AIF2TX5MIX Input 4 Source */
911 { 0x00000767, 0x0080 }, /* R1895 - AIF2TX5MIX Input 4 Volume */
912 { 0x00000768, 0x0000 }, /* R1896 - AIF2TX6MIX Input 1 Source */
913 { 0x00000769, 0x0080 }, /* R1897 - AIF2TX6MIX Input 1 Volume */
914 { 0x0000076A, 0x0000 }, /* R1898 - AIF2TX6MIX Input 2 Source */
915 { 0x0000076B, 0x0080 }, /* R1899 - AIF2TX6MIX Input 2 Volume */
916 { 0x0000076C, 0x0000 }, /* R1900 - AIF2TX6MIX Input 3 Source */
917 { 0x0000076D, 0x0080 }, /* R1901 - AIF2TX6MIX Input 3 Volume */
918 { 0x0000076E, 0x0000 }, /* R1902 - AIF2TX6MIX Input 4 Source */
919 { 0x0000076F, 0x0080 }, /* R1903 - AIF2TX6MIX Input 4 Volume */
888 { 0x00000780, 0x0000 }, /* R1920 - AIF3TX1MIX Input 1 Source */ 920 { 0x00000780, 0x0000 }, /* R1920 - AIF3TX1MIX Input 1 Source */
889 { 0x00000781, 0x0080 }, /* R1921 - AIF3TX1MIX Input 1 Volume */ 921 { 0x00000781, 0x0080 }, /* R1921 - AIF3TX1MIX Input 1 Volume */
890 { 0x00000782, 0x0000 }, /* R1922 - AIF3TX1MIX Input 2 Source */ 922 { 0x00000782, 0x0000 }, /* R1922 - AIF3TX1MIX Input 2 Source */
@@ -1883,6 +1915,38 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
1883 case ARIZONA_AIF2TX2MIX_INPUT_3_VOLUME: 1915 case ARIZONA_AIF2TX2MIX_INPUT_3_VOLUME:
1884 case ARIZONA_AIF2TX2MIX_INPUT_4_SOURCE: 1916 case ARIZONA_AIF2TX2MIX_INPUT_4_SOURCE:
1885 case ARIZONA_AIF2TX2MIX_INPUT_4_VOLUME: 1917 case ARIZONA_AIF2TX2MIX_INPUT_4_VOLUME:
1918 case ARIZONA_AIF2TX3MIX_INPUT_1_SOURCE:
1919 case ARIZONA_AIF2TX3MIX_INPUT_1_VOLUME:
1920 case ARIZONA_AIF2TX3MIX_INPUT_2_SOURCE:
1921 case ARIZONA_AIF2TX3MIX_INPUT_2_VOLUME:
1922 case ARIZONA_AIF2TX3MIX_INPUT_3_SOURCE:
1923 case ARIZONA_AIF2TX3MIX_INPUT_3_VOLUME:
1924 case ARIZONA_AIF2TX3MIX_INPUT_4_SOURCE:
1925 case ARIZONA_AIF2TX3MIX_INPUT_4_VOLUME:
1926 case ARIZONA_AIF2TX4MIX_INPUT_1_SOURCE:
1927 case ARIZONA_AIF2TX4MIX_INPUT_1_VOLUME:
1928 case ARIZONA_AIF2TX4MIX_INPUT_2_SOURCE:
1929 case ARIZONA_AIF2TX4MIX_INPUT_2_VOLUME:
1930 case ARIZONA_AIF2TX4MIX_INPUT_3_SOURCE:
1931 case ARIZONA_AIF2TX4MIX_INPUT_3_VOLUME:
1932 case ARIZONA_AIF2TX4MIX_INPUT_4_SOURCE:
1933 case ARIZONA_AIF2TX4MIX_INPUT_4_VOLUME:
1934 case ARIZONA_AIF2TX5MIX_INPUT_1_SOURCE:
1935 case ARIZONA_AIF2TX5MIX_INPUT_1_VOLUME:
1936 case ARIZONA_AIF2TX5MIX_INPUT_2_SOURCE:
1937 case ARIZONA_AIF2TX5MIX_INPUT_2_VOLUME:
1938 case ARIZONA_AIF2TX5MIX_INPUT_3_SOURCE:
1939 case ARIZONA_AIF2TX5MIX_INPUT_3_VOLUME:
1940 case ARIZONA_AIF2TX5MIX_INPUT_4_SOURCE:
1941 case ARIZONA_AIF2TX5MIX_INPUT_4_VOLUME:
1942 case ARIZONA_AIF2TX6MIX_INPUT_1_SOURCE:
1943 case ARIZONA_AIF2TX6MIX_INPUT_1_VOLUME:
1944 case ARIZONA_AIF2TX6MIX_INPUT_2_SOURCE:
1945 case ARIZONA_AIF2TX6MIX_INPUT_2_VOLUME:
1946 case ARIZONA_AIF2TX6MIX_INPUT_3_SOURCE:
1947 case ARIZONA_AIF2TX6MIX_INPUT_3_VOLUME:
1948 case ARIZONA_AIF2TX6MIX_INPUT_4_SOURCE:
1949 case ARIZONA_AIF2TX6MIX_INPUT_4_VOLUME:
1886 case ARIZONA_AIF3TX1MIX_INPUT_1_SOURCE: 1950 case ARIZONA_AIF3TX1MIX_INPUT_1_SOURCE:
1887 case ARIZONA_AIF3TX1MIX_INPUT_1_VOLUME: 1951 case ARIZONA_AIF3TX1MIX_INPUT_1_VOLUME:
1888 case ARIZONA_AIF3TX1MIX_INPUT_2_SOURCE: 1952 case ARIZONA_AIF3TX1MIX_INPUT_2_SOURCE: