From: Billy Tsai <billy_tsai@aspeedtech.com> To: <jic23@kernel.org>, <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> Cc: <BMC-SW@aspeedtech.com> Subject: [RESEND v4 05/15] iio: adc: aspeed: Refactory model data structure Date: Tue, 24 Aug 2021 17:12:33 +0800 [thread overview] Message-ID: <20210824091243.9393-6-billy_tsai@aspeedtech.com> (raw) In-Reply-To: <20210824091243.9393-1-billy_tsai@aspeedtech.com> This patch refactory the model data structure to distinguish the function form differnet version of aspeed adc. - Rename the vref_voltag to vref_fixed and add vref driver data When driver probe will check vref_fixed value and store it to vref which isn't const value. - Add num_channels Make num_channles of iio device can be changed by differnet model_data - Add need_prescaler flag and scaler_bit_width The need_prescaler flag used to tell the driver the clock divider needs another prescaler and the scaler_bit_width to set the clock divider bitfiled width. Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com> --- drivers/iio/adc/aspeed_adc.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c index d85aa31ee3b1..f03c7921d534 100644 --- a/drivers/iio/adc/aspeed_adc.c +++ b/drivers/iio/adc/aspeed_adc.c @@ -63,8 +63,11 @@ struct aspeed_adc_model_data { const char *model_name; unsigned int min_sampling_rate; // Hz unsigned int max_sampling_rate; // Hz - unsigned int vref_voltage; // mV + unsigned int vref_fixed; // mV bool wait_init_sequence; + bool need_prescaler; + u8 scaler_bit_width; + unsigned int num_channels; }; struct aspeed_adc_data { @@ -75,6 +78,7 @@ struct aspeed_adc_data { struct clk_hw *clk_prescaler; struct clk_hw *clk_scaler; struct reset_control *rst; + int vref; }; #define ASPEED_CHAN(_idx, _data_reg_addr) { \ @@ -118,7 +122,7 @@ static int aspeed_adc_read_raw(struct iio_dev *indio_dev, return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: - *val = data->model_data->vref_voltage; + *val = data->model_data->vref_fixed; *val2 = ASPEED_RESOLUTION_BITS; return IIO_VAL_FRACTIONAL_LOG2; @@ -312,17 +316,23 @@ static int aspeed_adc_remove(struct platform_device *pdev) static const struct aspeed_adc_model_data ast2400_model_data = { .model_name = "ast2400-adc", - .vref_voltage = 2500, // mV + .vref_fixed = 2500, // mV .min_sampling_rate = 10000, .max_sampling_rate = 500000, + .need_prescaler = true, + .scaler_bit_width = 10, + .num_channels = 16, }; static const struct aspeed_adc_model_data ast2500_model_data = { .model_name = "ast2500-adc", - .vref_voltage = 1800, // mV + .vref_fixed = 1800, // mV .min_sampling_rate = 1, .max_sampling_rate = 1000000, .wait_init_sequence = true, + .need_prescaler = true, + .scaler_bit_width = 10, + .num_channels = 16, }; static const struct of_device_id aspeed_adc_matches[] = { -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Billy Tsai <billy_tsai@aspeedtech.com> To: <jic23@kernel.org>, <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> Cc: <BMC-SW@aspeedtech.com> Subject: [RESEND v4 05/15] iio: adc: aspeed: Refactory model data structure Date: Tue, 24 Aug 2021 17:12:33 +0800 [thread overview] Message-ID: <20210824091243.9393-6-billy_tsai@aspeedtech.com> (raw) In-Reply-To: <20210824091243.9393-1-billy_tsai@aspeedtech.com> This patch refactory the model data structure to distinguish the function form differnet version of aspeed adc. - Rename the vref_voltag to vref_fixed and add vref driver data When driver probe will check vref_fixed value and store it to vref which isn't const value. - Add num_channels Make num_channles of iio device can be changed by differnet model_data - Add need_prescaler flag and scaler_bit_width The need_prescaler flag used to tell the driver the clock divider needs another prescaler and the scaler_bit_width to set the clock divider bitfiled width. Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com> --- drivers/iio/adc/aspeed_adc.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c index d85aa31ee3b1..f03c7921d534 100644 --- a/drivers/iio/adc/aspeed_adc.c +++ b/drivers/iio/adc/aspeed_adc.c @@ -63,8 +63,11 @@ struct aspeed_adc_model_data { const char *model_name; unsigned int min_sampling_rate; // Hz unsigned int max_sampling_rate; // Hz - unsigned int vref_voltage; // mV + unsigned int vref_fixed; // mV bool wait_init_sequence; + bool need_prescaler; + u8 scaler_bit_width; + unsigned int num_channels; }; struct aspeed_adc_data { @@ -75,6 +78,7 @@ struct aspeed_adc_data { struct clk_hw *clk_prescaler; struct clk_hw *clk_scaler; struct reset_control *rst; + int vref; }; #define ASPEED_CHAN(_idx, _data_reg_addr) { \ @@ -118,7 +122,7 @@ static int aspeed_adc_read_raw(struct iio_dev *indio_dev, return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: - *val = data->model_data->vref_voltage; + *val = data->model_data->vref_fixed; *val2 = ASPEED_RESOLUTION_BITS; return IIO_VAL_FRACTIONAL_LOG2; @@ -312,17 +316,23 @@ static int aspeed_adc_remove(struct platform_device *pdev) static const struct aspeed_adc_model_data ast2400_model_data = { .model_name = "ast2400-adc", - .vref_voltage = 2500, // mV + .vref_fixed = 2500, // mV .min_sampling_rate = 10000, .max_sampling_rate = 500000, + .need_prescaler = true, + .scaler_bit_width = 10, + .num_channels = 16, }; static const struct aspeed_adc_model_data ast2500_model_data = { .model_name = "ast2500-adc", - .vref_voltage = 1800, // mV + .vref_fixed = 1800, // mV .min_sampling_rate = 1, .max_sampling_rate = 1000000, .wait_init_sequence = true, + .need_prescaler = true, + .scaler_bit_width = 10, + .num_channels = 16, }; static const struct of_device_id aspeed_adc_matches[] = { -- 2.25.1 _______________________________________________ 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-24 9:14 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 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 ` Billy Tsai [this message] 2021-08-24 9:12 ` [RESEND v4 05/15] iio: adc: aspeed: Refactory model data structure 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=20210824091243.9393-6-billy_tsai@aspeedtech.com \ --to=billy_tsai@aspeedtech.com \ --cc=BMC-SW@aspeedtech.com \ --cc=andrew@aj.id.au \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=jic23@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.