From: Mark Brown Date: Sun, 13 Mar 2016 08:17:35 +0000 (+0700) Subject: Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/rockchip', 'asoc/topic... X-Git-Tag: v4.6-rc1~101^2~9^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4bfd5ba31fa989ed2b9fe5c22d4265dc1f9b9a68;p=karo-tx-linux.git Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/rockchip', 'asoc/topic/rt298', 'asoc/topic/rt5514' and 'asoc/topic/rt5616' into asoc-next --- 4bfd5ba31fa989ed2b9fe5c22d4265dc1f9b9a68 diff --cc drivers/base/regmap/regmap.c index e2f68807d970,c7d4a636778d,ee54e841de4a,ee54e841de4a,ee54e841de4a,ee54e841de4a..4b89c95a5dec --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@@@@@@ -1722,48 -1710,16 -1720,48 -1720,48 -1720,48 -1720,48 +1712,16 @@@@@@@ int regmap_field_update_bits_base(struc { mask = (mask << field->shift) & field->mask; - ---- return regmap_update_bits(field->regmap, field->reg, - ---- mask, val << field->shift); ----} ----EXPORT_SYMBOL_GPL(regmap_field_update_bits); ---- ----/** ---- * regmap_fields_write(): Write a value to a single register field with port ID ---- * ---- * @field: Register field to write to ---- * @id: port ID ---- * @val: Value to be written ---- * ---- * A value of zero will be returned on success, a negative errno will ---- * be returned in error cases. ---- */ ----int regmap_fields_write(struct regmap_field *field, unsigned int id, ---- unsigned int val) ----{ ---- if (id >= field->id_size) ---- return -EINVAL; ---- ---- return regmap_update_bits(field->regmap, ---- field->reg + (field->id_offset * id), ---- field->mask, val << field->shift); ----} ----EXPORT_SYMBOL_GPL(regmap_fields_write); ---- ----int regmap_fields_force_write(struct regmap_field *field, unsigned int id, ---- unsigned int val) ----{ ---- if (id >= field->id_size) ---- return -EINVAL; ---- ---- return regmap_write_bits(field->regmap, ---- field->reg + (field->id_offset * id), ---- field->mask, val << field->shift); + ++++ return regmap_update_bits_base(field->regmap, field->reg, + ++++ mask, val << field->shift, + ++++ change, async, force); } - EXPORT_SYMBOL_GPL(regmap_field_update_bits); ----EXPORT_SYMBOL_GPL(regmap_fields_force_write); + ++++EXPORT_SYMBOL_GPL(regmap_field_update_bits_base); /** - * regmap_fields_write(): Write a value to a single register field with port ID - * - * @field: Register field to write to - * @id: port ID - * @val: Value to be written - * - * A value of zero will be returned on success, a negative errno will - * be returned in error cases. - */ - int regmap_fields_write(struct regmap_field *field, unsigned int id, - unsigned int val) - { - if (id >= field->id_size) - return -EINVAL; - - return regmap_update_bits(field->regmap, - field->reg + (field->id_offset * id), - field->mask, val << field->shift); - } - EXPORT_SYMBOL_GPL(regmap_fields_write); - - int regmap_fields_force_write(struct regmap_field *field, unsigned int id, - unsigned int val) - { - if (id >= field->id_size) - return -EINVAL; - - return regmap_write_bits(field->regmap, - field->reg + (field->id_offset * id), - field->mask, val << field->shift); - } - EXPORT_SYMBOL_GPL(regmap_fields_force_write); - - /** - ---- * regmap_fields_update_bits(): Perform a read/modify/write cycle - ---- * on the register field + ++++ * regmap_fields_update_bits_base(): + ++++ * Perform a read/modify/write cycle on the register field + ++++ * with change, async, force option * * @field: Register field to write to * @id: port ID @@@@@@@ -2730,37 -2648,10 -2725,37 -2725,37 -2725,37 -2725,37 +2653,10 @@@@@@@ int regmap_update_bits_base(struct regm return ret; } - ----EXPORT_SYMBOL_GPL(regmap_update_bits_async); - - /** - * regmap_update_bits_check: Perform a read/modify/write cycle on the - * register map and report if updated - * - * @map: Register map to update - * @reg: Register to update - * @mask: Bitmask to change - * @val: New value for bitmask - * @change: Boolean indicating if a write was done - * - * Returns zero for success, a negative number on error. - */ - int regmap_update_bits_check(struct regmap *map, unsigned int reg, - unsigned int mask, unsigned int val, - bool *change) - { - int ret; - - map->lock(map->lock_arg); - ret = _regmap_update_bits(map, reg, mask, val, change, false); - map->unlock(map->lock_arg); - return ret; - } - EXPORT_SYMBOL_GPL(regmap_update_bits_check); + ++++EXPORT_SYMBOL_GPL(regmap_update_bits_base); /** ---- * regmap_update_bits_check: Perform a read/modify/write cycle on the ---- * register map and report if updated ---- * ---- * @map: Register map to update ---- * @reg: Register to update ---- * @mask: Bitmask to change ---- * @val: New value for bitmask ---- * @change: Boolean indicating if a write was done ---- * ---- * Returns zero for success, a negative number on error. ---- */ ----int regmap_update_bits_check(struct regmap *map, unsigned int reg, ---- unsigned int mask, unsigned int val, ---- bool *change) ----{ ---- int ret; ---- ---- map->lock(map->lock_arg); ---- ret = _regmap_update_bits(map, reg, mask, val, change, false); ---- map->unlock(map->lock_arg); ---- return ret; ----} ----EXPORT_SYMBOL_GPL(regmap_update_bits_check); ---- ----/** - ---- * regmap_update_bits_check_async: Perform a read/modify/write cycle on the - ---- * register map asynchronously and report if - ---- * updated + ++++ * regmap_write_bits: Perform a read/modify/write cycle on the register map * * @map: Register map to update * @reg: Register to update diff --cc sound/soc/codecs/Kconfig index b414a92b677a,50693c867e71,1f7eaa919088,50693c867e71,dabd479bf1f0,1de259860bc9..649e92a252ae --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@@@@@@ -620,9 -595,9 -596,9 -595,9 -598,12 -595,9 +624,12 @@@@@@@ config SND_SOC_RT29 tristate depends on I2C ---- config SND_SOC_RT5616 ++++ +config SND_SOC_RT5514 + tristate + ++++ config SND_SOC_RT5616 - tristate +++++ tristate "Realtek RT5616 CODEC" ++++ config SND_SOC_RT5631 tristate "Realtek ALC5631/RT5631 CODEC" depends on I2C