From: Jonathan Cameron <jic23@kernel.org> To: Billy Tsai <billy_tsai@aspeedtech.com> Cc: <lars@metafoo.de>, <pmeerw@pmeerw.net>, <robh+dt@kernel.org>, <joel@jms.id.au>, <andrew@aj.id.au>, <p.zabel@pengutronix.de>, <lgirdwood@gmail.com>, <broonie@kernel.org>, <linux-iio@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-aspeed@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>, <BMC-SW@aspeedtech.com> Subject: Re: [RESEND v4 02/15] iio: adc: aspeed: completes the bitfield declare. Date: Sun, 29 Aug 2021 16:07:08 +0100 [thread overview] Message-ID: <20210829160708.2b1a26c0@jic23-huawei> (raw) In-Reply-To: <20210824091243.9393-3-billy_tsai@aspeedtech.com> On Tue, 24 Aug 2021 17:12:30 +0800 Billy Tsai <billy_tsai@aspeedtech.com> wrote: > This patch completes the declare of adc register bitfields and uses the > same prefix ASPEED_ADC_* for these bitfields. > > Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com> > --- > drivers/iio/adc/aspeed_adc.c | 56 +++++++++++++++++++++++++----------- > 1 file changed, 39 insertions(+), 17 deletions(-) > > diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c > index 19efaa41bc34..7010d56ac3b9 100644 > --- a/drivers/iio/adc/aspeed_adc.c > +++ b/drivers/iio/adc/aspeed_adc.c > @@ -3,6 +3,7 @@ > * Aspeed AST2400/2500 ADC > * > * Copyright (C) 2017 Google, Inc. > + * Copyright (C) 2021 Aspeed Technology Inc. > */ > > #include <linux/clk.h> > @@ -16,6 +17,7 @@ > #include <linux/reset.h> > #include <linux/spinlock.h> > #include <linux/types.h> > +#include <linux/bitfield.h> > > #include <linux/iio/iio.h> > #include <linux/iio/driver.h> > @@ -28,15 +30,31 @@ > #define ASPEED_REG_INTERRUPT_CONTROL 0x04 > #define ASPEED_REG_VGA_DETECT_CONTROL 0x08 > #define ASPEED_REG_CLOCK_CONTROL 0x0C > -#define ASPEED_REG_MAX 0xC0 > - > -#define ASPEED_OPERATION_MODE_POWER_DOWN (0x0 << 1) > -#define ASPEED_OPERATION_MODE_STANDBY (0x1 << 1) > -#define ASPEED_OPERATION_MODE_NORMAL (0x7 << 1) > - > -#define ASPEED_ENGINE_ENABLE BIT(0) > - > -#define ASPEED_ADC_CTRL_INIT_RDY BIT(8) > +#define ASPEED_REG_COMPENSATION_TRIM 0xC4 > +#define ASPEED_REG_MAX 0xCC This REG_MAX value is used as a sanity check for debugfs based access. As this raises the limit for all devices supported by the driver, not just the new ast2600, are we fine to read these non existent registers on the other parts? If so, perhaps a comment to say that here somewhere? > + > +#define ASPEED_ADC_ENGINE_ENABLE BIT(0) Are all the following in the same register? Bit usual to have overlapping fields, so if they are, perhaps a few comments to explain what is going on would be good. > +#define ASPEED_ADC_OP_MODE GENMASK(3, 1) > +#define ASPEED_ADC_OP_MODE_PWR_DOWN 0 > +#define ASPEED_ADC_OP_MODE_STANDBY 1 > +#define ASPEED_ADC_OP_MODE_NORMAL 7 > +#define ASPEED_ADC_CTRL_COMPENSATION BIT(4) > +#define ASPEED_ADC_AUTO_COMPENSATION BIT(5) > +#define ASPEED_ADC_REF_VOLTAGE GENMASK(7, 6) > +#define ASPEED_ADC_REF_VOLTAGE_2500mV 0 > +#define ASPEED_ADC_REF_VOLTAGE_1200mV 1 > +#define ASPEED_ADC_REF_VOLTAGE_EXT_HIGH 2 > +#define ASPEED_ADC_REF_VOLTAGE_EXT_LOW 3 > +#define ASPEED_ADC_BAT_SENSING_DIV BIT(6) > +#define ASPEED_ADC_BAT_SENSING_DIV_2_3 0 > +#define ASPEED_ADC_BAT_SENSING_DIV_1_3 1 > +#define ASPEED_ADC_CTRL_INIT_RDY BIT(8) > +#define ASPEED_ADC_CH7_MODE BIT(12) > +#define ASPEED_ADC_CH7_NORMAL 0 > +#define ASPEED_ADC_CH7_BAT 1 > +#define ASPEED_ADC_BAT_SENSING_ENABLE BIT(13) > +#define ASPEED_ADC_CTRL_CHANNEL GENMASK(31, 16) > +#define ASPEED_ADC_CTRL_CHANNEL_ENABLE(ch) FIELD_PREP(ASPEED_ADC_CTRL_CHANNEL, BIT(ch)) > > #define ASPEED_ADC_INIT_POLLING_TIME 500 > #define ASPEED_ADC_INIT_TIMEOUT 500000 > @@ -226,7 +244,9 @@ static int aspeed_adc_probe(struct platform_device *pdev) > > if (model_data->wait_init_sequence) { > /* Enable engine in normal mode. */ > - writel(ASPEED_OPERATION_MODE_NORMAL | ASPEED_ENGINE_ENABLE, > + writel(FIELD_PREP(ASPEED_ADC_OP_MODE, > + ASPEED_ADC_OP_MODE_NORMAL) | > + ASPEED_ADC_ENGINE_ENABLE, > data->base + ASPEED_REG_ENGINE_CONTROL); > > /* Wait for initial sequence complete. */ > @@ -245,10 +265,12 @@ static int aspeed_adc_probe(struct platform_device *pdev) > if (ret) > goto clk_enable_error; > > - adc_engine_control_reg_val = GENMASK(31, 16) | > - ASPEED_OPERATION_MODE_NORMAL | ASPEED_ENGINE_ENABLE; > + adc_engine_control_reg_val = > + ASPEED_ADC_CTRL_CHANNEL | > + FIELD_PREP(ASPEED_ADC_OP_MODE, ASPEED_ADC_OP_MODE_NORMAL) | > + ASPEED_ADC_ENGINE_ENABLE; > writel(adc_engine_control_reg_val, > - data->base + ASPEED_REG_ENGINE_CONTROL); > + data->base + ASPEED_REG_ENGINE_CONTROL); > > model_data = of_device_get_match_data(&pdev->dev); > indio_dev->name = model_data->model_name; > @@ -264,8 +286,8 @@ static int aspeed_adc_probe(struct platform_device *pdev) > return 0; > > iio_register_error: > - writel(ASPEED_OPERATION_MODE_POWER_DOWN, > - data->base + ASPEED_REG_ENGINE_CONTROL); > + writel(FIELD_PREP(ASPEED_ADC_OP_MODE, ASPEED_ADC_OP_MODE_PWR_DOWN), > + data->base + ASPEED_REG_ENGINE_CONTROL); > clk_disable_unprepare(data->clk_scaler->clk); > clk_enable_error: > poll_timeout_error: > @@ -283,8 +305,8 @@ static int aspeed_adc_remove(struct platform_device *pdev) > struct aspeed_adc_data *data = iio_priv(indio_dev); > > iio_device_unregister(indio_dev); > - writel(ASPEED_OPERATION_MODE_POWER_DOWN, > - data->base + ASPEED_REG_ENGINE_CONTROL); > + writel(FIELD_PREP(ASPEED_ADC_OP_MODE, ASPEED_ADC_OP_MODE_PWR_DOWN), > + data->base + ASPEED_REG_ENGINE_CONTROL); Ideally these white space changes would be in a precursor patch. At the very least mention them in the patch description. They are good thing to tidy up, but they do add noise to this patch. > clk_disable_unprepare(data->clk_scaler->clk); > reset_control_assert(data->rst); > clk_hw_unregister_divider(data->clk_scaler);
WARNING: multiple messages have this Message-ID (diff)
From: Jonathan Cameron <jic23@kernel.org> To: Billy Tsai <billy_tsai@aspeedtech.com> Cc: <lars@metafoo.de>, <pmeerw@pmeerw.net>, <robh+dt@kernel.org>, <joel@jms.id.au>, <andrew@aj.id.au>, <p.zabel@pengutronix.de>, <lgirdwood@gmail.com>, <broonie@kernel.org>, <linux-iio@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-aspeed@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>, <BMC-SW@aspeedtech.com> Subject: Re: [RESEND v4 02/15] iio: adc: aspeed: completes the bitfield declare. Date: Sun, 29 Aug 2021 16:07:08 +0100 [thread overview] Message-ID: <20210829160708.2b1a26c0@jic23-huawei> (raw) In-Reply-To: <20210824091243.9393-3-billy_tsai@aspeedtech.com> On Tue, 24 Aug 2021 17:12:30 +0800 Billy Tsai <billy_tsai@aspeedtech.com> wrote: > This patch completes the declare of adc register bitfields and uses the > same prefix ASPEED_ADC_* for these bitfields. > > Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com> > --- > drivers/iio/adc/aspeed_adc.c | 56 +++++++++++++++++++++++++----------- > 1 file changed, 39 insertions(+), 17 deletions(-) > > diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c > index 19efaa41bc34..7010d56ac3b9 100644 > --- a/drivers/iio/adc/aspeed_adc.c > +++ b/drivers/iio/adc/aspeed_adc.c > @@ -3,6 +3,7 @@ > * Aspeed AST2400/2500 ADC > * > * Copyright (C) 2017 Google, Inc. > + * Copyright (C) 2021 Aspeed Technology Inc. > */ > > #include <linux/clk.h> > @@ -16,6 +17,7 @@ > #include <linux/reset.h> > #include <linux/spinlock.h> > #include <linux/types.h> > +#include <linux/bitfield.h> > > #include <linux/iio/iio.h> > #include <linux/iio/driver.h> > @@ -28,15 +30,31 @@ > #define ASPEED_REG_INTERRUPT_CONTROL 0x04 > #define ASPEED_REG_VGA_DETECT_CONTROL 0x08 > #define ASPEED_REG_CLOCK_CONTROL 0x0C > -#define ASPEED_REG_MAX 0xC0 > - > -#define ASPEED_OPERATION_MODE_POWER_DOWN (0x0 << 1) > -#define ASPEED_OPERATION_MODE_STANDBY (0x1 << 1) > -#define ASPEED_OPERATION_MODE_NORMAL (0x7 << 1) > - > -#define ASPEED_ENGINE_ENABLE BIT(0) > - > -#define ASPEED_ADC_CTRL_INIT_RDY BIT(8) > +#define ASPEED_REG_COMPENSATION_TRIM 0xC4 > +#define ASPEED_REG_MAX 0xCC This REG_MAX value is used as a sanity check for debugfs based access. As this raises the limit for all devices supported by the driver, not just the new ast2600, are we fine to read these non existent registers on the other parts? If so, perhaps a comment to say that here somewhere? > + > +#define ASPEED_ADC_ENGINE_ENABLE BIT(0) Are all the following in the same register? Bit usual to have overlapping fields, so if they are, perhaps a few comments to explain what is going on would be good. > +#define ASPEED_ADC_OP_MODE GENMASK(3, 1) > +#define ASPEED_ADC_OP_MODE_PWR_DOWN 0 > +#define ASPEED_ADC_OP_MODE_STANDBY 1 > +#define ASPEED_ADC_OP_MODE_NORMAL 7 > +#define ASPEED_ADC_CTRL_COMPENSATION BIT(4) > +#define ASPEED_ADC_AUTO_COMPENSATION BIT(5) > +#define ASPEED_ADC_REF_VOLTAGE GENMASK(7, 6) > +#define ASPEED_ADC_REF_VOLTAGE_2500mV 0 > +#define ASPEED_ADC_REF_VOLTAGE_1200mV 1 > +#define ASPEED_ADC_REF_VOLTAGE_EXT_HIGH 2 > +#define ASPEED_ADC_REF_VOLTAGE_EXT_LOW 3 > +#define ASPEED_ADC_BAT_SENSING_DIV BIT(6) > +#define ASPEED_ADC_BAT_SENSING_DIV_2_3 0 > +#define ASPEED_ADC_BAT_SENSING_DIV_1_3 1 > +#define ASPEED_ADC_CTRL_INIT_RDY BIT(8) > +#define ASPEED_ADC_CH7_MODE BIT(12) > +#define ASPEED_ADC_CH7_NORMAL 0 > +#define ASPEED_ADC_CH7_BAT 1 > +#define ASPEED_ADC_BAT_SENSING_ENABLE BIT(13) > +#define ASPEED_ADC_CTRL_CHANNEL GENMASK(31, 16) > +#define ASPEED_ADC_CTRL_CHANNEL_ENABLE(ch) FIELD_PREP(ASPEED_ADC_CTRL_CHANNEL, BIT(ch)) > > #define ASPEED_ADC_INIT_POLLING_TIME 500 > #define ASPEED_ADC_INIT_TIMEOUT 500000 > @@ -226,7 +244,9 @@ static int aspeed_adc_probe(struct platform_device *pdev) > > if (model_data->wait_init_sequence) { > /* Enable engine in normal mode. */ > - writel(ASPEED_OPERATION_MODE_NORMAL | ASPEED_ENGINE_ENABLE, > + writel(FIELD_PREP(ASPEED_ADC_OP_MODE, > + ASPEED_ADC_OP_MODE_NORMAL) | > + ASPEED_ADC_ENGINE_ENABLE, > data->base + ASPEED_REG_ENGINE_CONTROL); > > /* Wait for initial sequence complete. */ > @@ -245,10 +265,12 @@ static int aspeed_adc_probe(struct platform_device *pdev) > if (ret) > goto clk_enable_error; > > - adc_engine_control_reg_val = GENMASK(31, 16) | > - ASPEED_OPERATION_MODE_NORMAL | ASPEED_ENGINE_ENABLE; > + adc_engine_control_reg_val = > + ASPEED_ADC_CTRL_CHANNEL | > + FIELD_PREP(ASPEED_ADC_OP_MODE, ASPEED_ADC_OP_MODE_NORMAL) | > + ASPEED_ADC_ENGINE_ENABLE; > writel(adc_engine_control_reg_val, > - data->base + ASPEED_REG_ENGINE_CONTROL); > + data->base + ASPEED_REG_ENGINE_CONTROL); > > model_data = of_device_get_match_data(&pdev->dev); > indio_dev->name = model_data->model_name; > @@ -264,8 +286,8 @@ static int aspeed_adc_probe(struct platform_device *pdev) > return 0; > > iio_register_error: > - writel(ASPEED_OPERATION_MODE_POWER_DOWN, > - data->base + ASPEED_REG_ENGINE_CONTROL); > + writel(FIELD_PREP(ASPEED_ADC_OP_MODE, ASPEED_ADC_OP_MODE_PWR_DOWN), > + data->base + ASPEED_REG_ENGINE_CONTROL); > clk_disable_unprepare(data->clk_scaler->clk); > clk_enable_error: > poll_timeout_error: > @@ -283,8 +305,8 @@ static int aspeed_adc_remove(struct platform_device *pdev) > struct aspeed_adc_data *data = iio_priv(indio_dev); > > iio_device_unregister(indio_dev); > - writel(ASPEED_OPERATION_MODE_POWER_DOWN, > - data->base + ASPEED_REG_ENGINE_CONTROL); > + writel(FIELD_PREP(ASPEED_ADC_OP_MODE, ASPEED_ADC_OP_MODE_PWR_DOWN), > + data->base + ASPEED_REG_ENGINE_CONTROL); Ideally these white space changes would be in a precursor patch. At the very least mention them in the patch description. They are good thing to tidy up, but they do add noise to this patch. > clk_disable_unprepare(data->clk_scaler->clk); > reset_control_assert(data->rst); > clk_hw_unregister_divider(data->clk_scaler); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-08-29 15:04 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-24 9:12 [RESEND v4 00/15] Add support for ast2600 ADC Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` [RESEND v4 01/15] dt-bindings: iio: adc: Add ast2600-adc bindings Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` [RESEND v4 02/15] iio: adc: aspeed: completes the bitfield declare Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-29 15:07 ` Jonathan Cameron [this message] 2021-08-29 15:07 ` Jonathan Cameron 2021-08-24 9:12 ` [RESEND v4 03/15] iio: adc: aspeed: set driver data when adc probe Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-29 15:08 ` Jonathan Cameron 2021-08-29 15:08 ` Jonathan Cameron 2021-08-24 9:12 ` [RESEND v4 04/15] iio: adc: aspeed: Keep model data to driver data Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` [RESEND v4 05/15] iio: adc: aspeed: Refactory model data structure Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-29 15:13 ` Jonathan Cameron 2021-08-29 15:13 ` Jonathan Cameron 2021-08-24 9:12 ` [RESEND v4 06/15] iio: adc: aspeed: Add vref config function Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` [RESEND v4 07/15] iio: adc: aspeed: Set num_channels with model data Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` [RESEND v4 08/15] iio: adc: aspeed: Use model_data to set clk scaler Billy Tsai 2021-08-25 11:52 ` kernel test robot 2021-08-25 11:52 ` kernel test robot 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` [RESEND v4 09/15] iio: adc: aspeed: Use devm_add_action_or_reset Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` [RESEND v4 10/15] iio: adc: aspeed: Support ast2600 adc Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-29 15:31 ` Jonathan Cameron 2021-08-29 15:31 ` Jonathan Cameron 2021-08-24 9:12 ` [RESEND v4 11/15] iio: adc: aspeed: Fix the calculate error of clock Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-29 15:33 ` Jonathan Cameron 2021-08-29 15:33 ` Jonathan Cameron 2021-08-24 9:12 ` [RESEND v4 12/15] iio: adc: aspeed: Add func to set sampling rate Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-29 15:36 ` Jonathan Cameron 2021-08-29 15:36 ` Jonathan Cameron 2021-08-30 8:35 ` Billy Tsai 2021-08-30 8:35 ` Billy Tsai 2021-08-30 9:52 ` Jonathan Cameron 2021-08-30 9:52 ` Jonathan Cameron 2021-08-24 9:12 ` [RESEND v4 13/15] iio: adc: aspeed: Add compensation phase Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` [RESEND v4 14/15] iio: adc: aspeed: Support battery sensing Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-29 15:43 ` Jonathan Cameron 2021-08-29 15:43 ` Jonathan Cameron 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` [RESEND v4 15/15] iio: adc: aspeed: Get and set trimming data Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai 2021-08-24 9:12 ` Billy Tsai [not found] ` <202108250006.17P06IgG097015@twspam01.aspeedtech.com> 2021-08-29 15:20 ` [RESEND v4 08/15] iio: adc: aspeed: Use model_data to set clk scaler Jonathan Cameron 2021-08-29 15:20 ` Jonathan Cameron [not found] ` <202108250004.17P04FdD094082@twspam01.aspeedtech.com> 2021-08-29 15:25 ` [RESEND v4 09/15] iio: adc: aspeed: Use devm_add_action_or_reset Jonathan Cameron 2021-08-29 15:25 ` Jonathan Cameron [not found] ` <202108250006.17P066YP096721@twspam01.aspeedtech.com> 2021-08-29 15:39 ` [RESEND v4 13/15] iio: adc: aspeed: Add compensation phase Jonathan Cameron 2021-08-29 15:39 ` Jonathan Cameron [not found] ` <202108250007.17P07NFj097422@twspam01.aspeedtech.com> 2021-08-29 15:45 ` [RESEND v4 15/15] iio: adc: aspeed: Get and set trimming data Jonathan Cameron 2021-08-29 15:45 ` Jonathan Cameron
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210829160708.2b1a26c0@jic23-huawei \ --to=jic23@kernel.org \ --cc=BMC-SW@aspeedtech.com \ --cc=andrew@aj.id.au \ --cc=billy_tsai@aspeedtech.com \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=joel@jms.id.au \ --cc=lars@metafoo.de \ --cc=lgirdwood@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-aspeed@lists.ozlabs.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=p.zabel@pengutronix.de \ --cc=pmeerw@pmeerw.net \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.