diff options
-rw-r--r-- | drivers/mfd/mc13xxx-core.c | 3 | ||||
-rw-r--r-- | include/linux/mfd/mc13xxx.h | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c index 9fd4f63c45cc..738722cdecaa 100644 --- a/drivers/mfd/mc13xxx-core.c +++ b/drivers/mfd/mc13xxx-core.c | |||
@@ -813,7 +813,8 @@ err_revision: | |||
813 | mc13xxx_add_subdevice(mc13xxx, "%s-adc"); | 813 | mc13xxx_add_subdevice(mc13xxx, "%s-adc"); |
814 | 814 | ||
815 | if (mc13xxx->flags & MC13XXX_USE_CODEC) | 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 | if (mc13xxx->flags & MC13XXX_USE_RTC) | 819 | if (mc13xxx->flags & MC13XXX_USE_RTC) |
819 | mc13xxx_add_subdevice(mc13xxx, "%s-rtc"); | 820 | mc13xxx_add_subdevice(mc13xxx, "%s-rtc"); |
diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h index 10e038bac8dd..bf070755982e 100644 --- a/include/linux/mfd/mc13xxx.h +++ b/include/linux/mfd/mc13xxx.h | |||
@@ -170,6 +170,16 @@ struct mc13xxx_ts_platform_data { | |||
170 | bool atox; | 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 | struct mc13xxx_platform_data { | 183 | struct mc13xxx_platform_data { |
174 | #define MC13XXX_USE_TOUCHSCREEN (1 << 0) | 184 | #define MC13XXX_USE_TOUCHSCREEN (1 << 0) |
175 | #define MC13XXX_USE_CODEC (1 << 1) | 185 | #define MC13XXX_USE_CODEC (1 << 1) |
@@ -181,6 +191,7 @@ struct mc13xxx_platform_data { | |||
181 | struct mc13xxx_leds_platform_data *leds; | 191 | struct mc13xxx_leds_platform_data *leds; |
182 | struct mc13xxx_buttons_platform_data *buttons; | 192 | struct mc13xxx_buttons_platform_data *buttons; |
183 | struct mc13xxx_ts_platform_data touch; | 193 | struct mc13xxx_ts_platform_data touch; |
194 | struct mc13xxx_codec_platform_data *codec; | ||
184 | }; | 195 | }; |
185 | 196 | ||
186 | #define MC13XXX_ADC_MODE_TS 1 | 197 | #define MC13XXX_ADC_MODE_TS 1 |