tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mfd: mc13xxx: add codec platform data

Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

authored by

Philippe Rétornaz and committed by
Mark Brown e3a0871c fe33d4c5

+13 -1
+2 -1
drivers/mfd/mc13xxx-core.c
··· 813 813 mc13xxx_add_subdevice(mc13xxx, "%s-adc"); 814 814 815 815 if (mc13xxx->flags & MC13XXX_USE_CODEC) 816 - mc13xxx_add_subdevice(mc13xxx, "%s-codec"); 816 + mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec", 817 + pdata->codec, sizeof(*pdata->codec)); 817 818 818 819 if (mc13xxx->flags & MC13XXX_USE_RTC) 819 820 mc13xxx_add_subdevice(mc13xxx, "%s-rtc");
+11
include/linux/mfd/mc13xxx.h
··· 170 170 bool atox; 171 171 }; 172 172 173 + enum mc13783_ssi_port { 174 + MC13783_SSI1_PORT, 175 + MC13783_SSI2_PORT, 176 + }; 177 + 178 + struct mc13xxx_codec_platform_data { 179 + enum mc13783_ssi_port adc_ssi_port; 180 + enum mc13783_ssi_port dac_ssi_port; 181 + }; 182 + 173 183 struct mc13xxx_platform_data { 174 184 #define MC13XXX_USE_TOUCHSCREEN (1 << 0) 175 185 #define MC13XXX_USE_CODEC (1 << 1) ··· 191 181 struct mc13xxx_leds_platform_data *leds; 192 182 struct mc13xxx_buttons_platform_data *buttons; 193 183 struct mc13xxx_ts_platform_data touch; 184 + struct mc13xxx_codec_platform_data *codec; 194 185 }; 195 186 196 187 #define MC13XXX_ADC_MODE_TS 1