ASoC: rt1011: Read and apply r0 and temperature device property
Subsystems (3)
PATCH 1/1 ASoC: rt1011: Read and apply r0 and temperature device property
From: Shuming Fan <[email protected]>
Typically, the r0 (calibration data) and temperature were measured in the factory. This information is written into the non-volatile area
where keeps data whether factory reset or OS update.
In Chromium OS case, the coreboot will read the info from VPD and create the device property for each rt1011.
--- sound/soc/codecs/rt1011.c | 41 ++++++++++++++++++++++++++++++++++++++- sound/soc/codecs/rt1011.h | 1 + 2 files changed, 41 insertions(+), 1 deletion(-)
sound/soc/codecs/rt1011.c +40 -1
@@ -2328,8 +2328,12 @@ static void rt1011_calibration_work(struct work_struct *work)struct rt1011_priv *rt1011 = container_of(work, struct rt1011_priv, cali_work);struct snd_soc_component *component = rt1011->component; +unsigned int r0_integer, r0_factor, format; -rt1011_calibrate (rt1011,1 ); +if (rt1011->r0_calib) +rt1011_calibrate (rt1011,0 ); +else +rt1011_calibrate (rt1011,1 );/* * This flag should reset after booting.
@@ -2340,6 +2344,39 @@ static void rt1011_calibration_work(struct work_struct *work)/* initial */ rt1011_reg_init (component); + +/* Apply temperature and calibration data from device property */ +if (rt1011->temperature_calib) { +snd_soc_component_update_bits (component, +RT1011_STP_INITIAL_RESISTANCE_TEMP ,0x3ff , + (rt1011->temperature_calib <<2 )); + } + +if (rt1011->r0_calib) { + rt1011->r0_reg = rt1011->r0_calib; + + format =2147483648U ;/* 2^24 * 128 */ + r0_integer = format / rt1011->r0_reg /128 ; + r0_factor = ((format / rt1011->r0_reg *100 ) /128 ) + - (r0_integer *100 ); +dev_info (component->dev,"DP r0 resistance about %d.%02d ohm, reg=0x%X\n" , + r0_integer, r0_factor, rt1011->r0_reg); + +rt1011_r0_load (rt1011); + } +} + +static int rt1011_parse_dp (struct rt1011_priv *rt1011,struct device *dev) +{ +device_property_read_u32 (dev,"realtek,temperature_calib" , + &rt1011->temperature_calib); +device_property_read_u32 (dev,"realtek,r0_calib" , + &rt1011->r0_calib); + +dev_dbg (dev,"%s: r0_calib: 0x%x, temperture_calib: 0x%x" , + __func__, rt1011->r0_calib, rt1011->temperature_calib); + +return 0 ; } static int rt1011_i2c_probe(struct i2c_client *i2c,
@@ -2356,6 +2393,8 @@ static int rt1011_i2c_probe(struct i2c_client *i2c,i2c_set_clientdata (i2c, rt1011); +rt1011_parse_dp (rt1011, &i2c->dev); + rt1011->regmap =devm_regmap_init_i2c (i2c, &rt1011_regmap);if (IS_ERR (rt1011->regmap)) { ret =PTR_ERR (rt1011->regmap);
sound/soc/codecs/rt1011.h +1 -0
@@ -690,6 +690,7 @@ struct rt1011_priv {int bq_drc_set;unsigned int r0_reg, cali_done; +unsigned int r0_calib, temperature_calib;int recv_spk_mode; };
Signature · 6 lines
2.23.0 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 95 lines · On Wed, Oct 16, 2019 at 4:59 PM <[email protected]> wrote:
From: Shuming Fan <[email protected]>
Typically, the r0 (calibration data) and temperature were measured in the factory. This information is written into the non-volatile area
where keeps data whether factory reset or OS update.
In Chromium OS case, the coreboot will read the info from VPD and create the device property for each rt1011.Signed-off-by Shuming Fan <[email protected]>--- sound/soc/codecs/rt1011.c | 41 ++++++++++++++++++++++++++++++++++++++- sound/soc/codecs/rt1011.h | 1 + 2 files changed, 41 insertions(+), 1 deletion(-)sound/soc/codecs/rt1011.c +40
-1@@ -2328,8 +2328,12 @@ static void rt1011_calibration_work(struct work_struct *work)struct rt1011_priv *rt1011 = container_of(work, struct rt1011_priv, cali_work);struct snd_soc_component *component = rt1011->component; +unsigned int r0_integer, r0_factor, format; -rt1011_calibrate (rt1011,1 ); +if (rt1011->r0_calib) +rt1011_calibrate (rt1011,0 ); +else +rt1011_calibrate (rt1011,1 );/* * This flag should reset after booting. @@ -2340,6 +2344,39 @@ static void rt1011_calibration_work(struct work_struct *work)/* initial */ rt1011_reg_init (component); + +/* Apply temperature and calibration data from device property */ +if (rt1011->temperature_calib) { +snd_soc_component_update_bits (component, +RT1011_STP_INITIAL_RESISTANCE_TEMP ,0x3ff , + (rt1011->temperature_calib <<2 )); + } + +if (rt1011->r0_calib) { + rt1011->r0_reg = rt1011->r0_calib; + + format =2147483648U ;/* 2^24 * 128 */ + r0_integer = format / rt1011->r0_reg /128 ; + r0_factor = ((format / rt1011->r0_reg *100 ) /128 ) + - (r0_integer *100 ); +dev_info (component->dev,"DP r0 resistance about %d.%02d ohm, reg=0x%X\n" , + r0_integer, r0_factor, rt1011->r0_reg); + +rt1011_r0_load (rt1011); + } +} + +static int rt1011_parse_dp (struct rt1011_priv *rt1011,struct device *dev) +{ +device_property_read_u32 (dev,"realtek,temperature_calib" , + &rt1011->temperature_calib); +device_property_read_u32 (dev,"realtek,r0_calib" , + &rt1011->r0_calib); + +dev_dbg (dev,"%s: r0_calib: 0x%x, temperture_calib: 0x%x" , + __func__, rt1011->r0_calib, rt1011->temperature_calib); + +return 0 ; } static int rt1011_i2c_probe(struct i2c_client *i2c,@@ -2356,6 +2393,8 @@ static int rt1011_i2c_probe(struct i2c_client *i2c,i2c_set_clientdata (i2c, rt1011); +rt1011_parse_dp (rt1011, &i2c->dev); + rt1011->regmap =devm_regmap_init_i2c (i2c, &rt1011_regmap);if (IS_ERR (rt1011->regmap)) { ret =PTR_ERR (rt1011->regmap);sound/soc/codecs/rt1011.h +1
-1@@ -690,6 +690,7 @@ struct rt1011_priv {int bq_drc_set;unsigned int r0_reg, cali_done; +unsigned int r0_calib, temperature_calib;int recv_spk_mode; }; --
Quoted 2 lines
2.23.0
FYI, the relevant coreboot patch series is at
https://review.coreboot.org/c/coreboot/+/36031
I have tested it with coreboot changes.
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Mark Brown
maintainersound/soc/codecs/rt1011.c static void rt1011_calibration_work(struct work_struct *work) · line 2374
Quoted 6 lines · On Wed, Oct 16, 2019 at 04:58:45PM +0800, [email protected] wrote:
sound/soc/codecs/rt1011.c +6
-0+static int rt1011_parse_dp (struct rt1011_priv *rt1011,struct device *dev) +{ +device_property_read_u32 (dev,"realtek,temperature_calib" , + &rt1011->temperature_calib); +device_property_read_u32 (dev,"realtek,r0_calib" , + &rt1011->r0_calib);
These are new DT bindings and need to be added to the binding document.
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 12 lines · Shuming [范書銘]
Quoted 11 lines · On Wed, Oct 16, 2019 at 04:58:45PM +0800, [email protected] wrote:
sound/soc/codecs/rt1011.c static void rt1011_calibration_work(struct work_struct *work) · line 2374
Quoted 7 lines
sound/soc/codecs/rt1011.c +6
-0+static int rt1011_parse_dp (struct rt1011_priv *rt1011,struct device +*dev) { +device_property_read_u32 (dev,"realtek,temperature_calib" , + &rt1011->temperature_calib); +device_property_read_u32 (dev,"realtek,r0_calib" , + &rt1011->r0_calib);These are new DT bindings and need to be added to the binding document.
Quoted 3 lines
Sure, could I send another patch for it?
Quoted 1 line
------Please consider the environment before printing this e-mail.
Hi Shuming,
Yes, you will need a patch before this one to add the binding documentation. Thanks!
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Mark Brown
maintainerQuoted 3 lines · Shuming [范書銘]
Quoted 1 line
These are new DT bindings and need to be added to the binding document.
Sure, could I send another patch for it?
Yes, the DT bindings should go in a separate patch anyway.
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Mark Brown
maintainer[alsa-devel] Applied "ASoC: rt1011: Read and apply r0 and temperature device property" to the asoc tree
In reply to [email protected]The patch
ASoC: rt1011: Read and apply r0 and temperature device property
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
From 8de6e755069fbfaefae67d3abff2b2e3d83db986 Mon Sep 17 00:00:00 2001
From: Shuming Fan <[email protected]>
Date: Wed, 16 Oct 2019 16:58:45 +0800
Subject: [PATCH] ASoC: rt1011: Read and apply r0 and temperature device
property
Typically, the r0 (calibration data) and temperature were measured in the factory. This information is written into the non-volatile area
where keeps data whether factory reset or OS update.
In Chromium OS case, the coreboot will read the info from VPD and create the device property for each rt1011.
--- sound/soc/codecs/rt1011.c | 41 ++++++++++++++++++++++++++++++++++++++- sound/soc/codecs/rt1011.h | 1 + 2 files changed, 41 insertions(+), 1 deletion(-)
sound/soc/codecs/rt1011.c +40 -1
@@ -2328,8 +2328,12 @@ static void rt1011_calibration_work(struct work_struct *work)struct rt1011_priv *rt1011 = container_of(work, struct rt1011_priv, cali_work);struct snd_soc_component *component = rt1011->component; +unsigned int r0_integer, r0_factor, format; -rt1011_calibrate (rt1011,1 ); +if (rt1011->r0_calib) +rt1011_calibrate (rt1011,0 ); +else +rt1011_calibrate (rt1011,1 );/* * This flag should reset after booting.
@@ -2340,6 +2344,39 @@ static void rt1011_calibration_work(struct work_struct *work)/* initial */ rt1011_reg_init (component); + +/* Apply temperature and calibration data from device property */ +if (rt1011->temperature_calib) { +snd_soc_component_update_bits (component, +RT1011_STP_INITIAL_RESISTANCE_TEMP ,0x3ff , + (rt1011->temperature_calib <<2 )); + } + +if (rt1011->r0_calib) { + rt1011->r0_reg = rt1011->r0_calib; + + format =2147483648U ;/* 2^24 * 128 */ + r0_integer = format / rt1011->r0_reg /128 ; + r0_factor = ((format / rt1011->r0_reg *100 ) /128 ) + - (r0_integer *100 ); +dev_info (component->dev,"DP r0 resistance about %d.%02d ohm, reg=0x%X\n" , + r0_integer, r0_factor, rt1011->r0_reg); + +rt1011_r0_load (rt1011); + } +} + +static int rt1011_parse_dp (struct rt1011_priv *rt1011,struct device *dev) +{ +device_property_read_u32 (dev,"realtek,temperature_calib" , + &rt1011->temperature_calib); +device_property_read_u32 (dev,"realtek,r0_calib" , + &rt1011->r0_calib); + +dev_dbg (dev,"%s: r0_calib: 0x%x, temperture_calib: 0x%x" , + __func__, rt1011->r0_calib, rt1011->temperature_calib); + +return 0 ; } static int rt1011_i2c_probe(struct i2c_client *i2c,
@@ -2356,6 +2393,8 @@ static int rt1011_i2c_probe(struct i2c_client *i2c,i2c_set_clientdata (i2c, rt1011); +rt1011_parse_dp (rt1011, &i2c->dev); + rt1011->regmap =devm_regmap_init_i2c (i2c, &rt1011_regmap);if (IS_ERR (rt1011->regmap)) { ret =PTR_ERR (rt1011->regmap);
sound/soc/codecs/rt1011.h +1 -0
@@ -690,6 +690,7 @@ struct rt1011_priv {int bq_drc_set;unsigned int r0_reg, cali_done; +unsigned int r0_calib, temperature_calib;int recv_spk_mode; };
Signature · 6 lines
2.20.1 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel