patch "iio: adc: meson-saradc: Meson8 and Meson8b do not have REG11 and" added to staging-linus
Subsystems (3)
This is a note to let you know that I've just added the patch titled
iio: adc: meson-saradc: Meson8 and Meson8b do not have REG11 and
to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
96748823c483c6eed8321f78bd128dd33f09c55cMon Sep 17 00:00:00 2001
From: Martin Blumenstingl <[email protected]>
Date: Tue, 31 Oct 2017 21:01:45 +0100
Subject: iio: adc: meson-saradc: Meson8 and Meson8b do not have REG11 and
REG13
The Meson GXBB and newer SoCs have a few more registers than the older Meson8 and Meson8b SoCs.
Use a separate regmap config to limit the older SoCs to the DELTA_10 register.
--- drivers/iio/adc/meson_saradc.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/iio/adc/meson_saradc.c +15 -2
@@ -224,6 +224,7 @@ struct meson_sar_adc_data {u32 bandgap_reg;unsigned int resolution;const char *name; +const struct regmap_config *regmap_config; };struct meson_sar_adc_priv {
@@ -243,13 +244,20 @@ struct meson_sar_adc_priv {int calibscale; }; -static const struct regmap_config meson_sar_adc_regmap_config = { +static const struct regmap_config meson_sar_adc_regmap_config_gxbb = { .reg_bits =8 , .val_bits =32 , .reg_stride =4 , .max_register =MESON_SAR_ADC_REG13 , }; +static const struct regmap_config meson_sar_adc_regmap_config_meson8 = { + .reg_bits =8 , + .val_bits =32 , + .reg_stride =4 , + .max_register =MESON_SAR_ADC_DELTA_10 , +}; +static unsigned int meson_sar_adc_get_fifo_count (struct iio_dev *indio_dev) {struct meson_sar_adc_priv *priv =iio_priv (indio_dev);
@@ -859,6 +867,7 @@ static const struct iio_info meson_sar_adc_iio_info = {static const struct meson_sar_adc_data meson_sar_adc_meson8_data = { .has_bl30_integration = false, .bandgap_reg =MESON_SAR_ADC_DELTA_10 , + .regmap_config = &meson_sar_adc_regmap_config_meson8, .resolution =10 , .name ="meson-meson8-saradc" , };
@@ -866,6 +875,7 @@ static const struct meson_sar_adc_data meson_sar_adc_meson8_data = {static const struct meson_sar_adc_data meson_sar_adc_meson8b_data = { .has_bl30_integration = false, .bandgap_reg =MESON_SAR_ADC_DELTA_10 , + .regmap_config = &meson_sar_adc_regmap_config_meson8, .resolution =10 , .name ="meson-meson8b-saradc" , };
@@ -873,6 +883,7 @@ static const struct meson_sar_adc_data meson_sar_adc_meson8b_data = {static const struct meson_sar_adc_data meson_sar_adc_gxbb_data = { .has_bl30_integration = true, .bandgap_reg =MESON_SAR_ADC_REG11 , + .regmap_config = &meson_sar_adc_regmap_config_gxbb, .resolution =10 , .name ="meson-gxbb-saradc" , };
@@ -880,6 +891,7 @@ static const struct meson_sar_adc_data meson_sar_adc_gxbb_data = {static const struct meson_sar_adc_data meson_sar_adc_gxl_data = { .has_bl30_integration = true, .bandgap_reg =MESON_SAR_ADC_REG11 , + .regmap_config = &meson_sar_adc_regmap_config_gxbb, .resolution =12 , .name ="meson-gxl-saradc" , };
@@ -887,6 +899,7 @@ static const struct meson_sar_adc_data meson_sar_adc_gxl_data = {static const struct meson_sar_adc_data meson_sar_adc_gxm_data = { .has_bl30_integration = true, .bandgap_reg =MESON_SAR_ADC_REG11 , + .regmap_config = &meson_sar_adc_regmap_config_gxbb, .resolution =12 , .name ="meson-gxm-saradc" , };
@@ -964,7 +977,7 @@ static int meson_sar_adc_probe(struct platform_device *pdev)return ret; priv->regmap =devm_regmap_init_mmio (&pdev->dev, base, - &meson_sar_adc_regmap_config); + priv->data->regmap_config);if (IS_ERR (priv->regmap))return PTR_ERR (priv->regmap);
Signature · 1 line
2.15.1