All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: Beniamin Bia <biabeniamin@outlook.com>
Cc: <lars@metafoo.de>, <Michael.Hennerich@analog.com>,
	<knaack.h@gmx.de>, <pmeerw@pmeerw.net>,
	<gregkh@linuxfoundation.org>, <linux-iio@vger.kernel.org>,
	<devel@driverdev.osuosl.org>, <linux-kernel@vger.kernel.org>,
	Beniamin Bia <biabeniamin@gmail.com>,
	Beniamin Bia <beniamin.bia@analog.com>
Subject: Re: [PATCH v2 1/2] staging: iio: frequency: ad9833: Get frequency value statically
Date: Sat, 2 Feb 2019 17:05:47 +0000	[thread overview]
Message-ID: <20190202170547.586078d7@archlinux> (raw)
In-Reply-To: <20190201150138.31481-1-biabeniamin@outlook.com>

On Fri, 1 Feb 2019 17:01:37 +0200
Beniamin Bia <biabeniamin@outlook.com> wrote:

> From: Beniamin Bia <biabeniamin@gmail.com>
> 
> The values from platform data were replaced by statically values.
> This was just a intermediate step of taking this driver out of staging and
> load data from device tree.
> 
> Signed-off-by: Beniamin Bia <beniamin.bia@analog.com>
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.

Thanks,

Jonathan
> ---
> Changes in v2:
>         - The platform data structure was removed and the values are
>           written directly
>  drivers/staging/iio/frequency/ad9834.c | 21 +++++++------------
>  drivers/staging/iio/frequency/ad9834.h | 28 --------------------------
>  2 files changed, 7 insertions(+), 42 deletions(-)
> 
> diff --git a/drivers/staging/iio/frequency/ad9834.c b/drivers/staging/iio/frequency/ad9834.c
> index 995acdd7c942..f4f5eaa15e30 100644
> --- a/drivers/staging/iio/frequency/ad9834.c
> +++ b/drivers/staging/iio/frequency/ad9834.c
> @@ -391,16 +391,11 @@ static const struct iio_info ad9833_info = {
>  
>  static int ad9834_probe(struct spi_device *spi)
>  {
> -	struct ad9834_platform_data *pdata = dev_get_platdata(&spi->dev);
>  	struct ad9834_state *st;
>  	struct iio_dev *indio_dev;
>  	struct regulator *reg;
>  	int ret;
>  
> -	if (!pdata) {
> -		dev_dbg(&spi->dev, "no platform data?\n");
> -		return -ENODEV;
> -	}
>  
>  	reg = devm_regulator_get(&spi->dev, "avdd");
>  	if (IS_ERR(reg))
> @@ -420,7 +415,7 @@ static int ad9834_probe(struct spi_device *spi)
>  	spi_set_drvdata(spi, indio_dev);
>  	st = iio_priv(indio_dev);
>  	mutex_init(&st->lock);
> -	st->mclk = pdata->mclk;
> +	st->mclk = 25000000;
>  	st->spi = spi;
>  	st->devid = spi_get_device_id(spi)->driver_data;
>  	st->reg = reg;
> @@ -456,11 +451,9 @@ static int ad9834_probe(struct spi_device *spi)
>  	spi_message_add_tail(&st->freq_xfer[1], &st->freq_msg);
>  
>  	st->control = AD9834_B28 | AD9834_RESET;
> +	st->control |= AD9834_DIV2;
>  
> -	if (!pdata->en_div2)
> -		st->control |= AD9834_DIV2;
> -
> -	if (!pdata->en_signbit_msb_out && (st->devid == ID_AD9834))
> +	if (st->devid == ID_AD9834)
>  		st->control |= AD9834_SIGN_PIB;
>  
>  	st->data = cpu_to_be16(AD9834_REG_CMD | st->control);
> @@ -470,19 +463,19 @@ static int ad9834_probe(struct spi_device *spi)
>  		goto error_disable_reg;
>  	}
>  
> -	ret = ad9834_write_frequency(st, AD9834_REG_FREQ0, pdata->freq0);
> +	ret = ad9834_write_frequency(st, AD9834_REG_FREQ0, 1000000);
>  	if (ret)
>  		goto error_disable_reg;
>  
> -	ret = ad9834_write_frequency(st, AD9834_REG_FREQ1, pdata->freq1);
> +	ret = ad9834_write_frequency(st, AD9834_REG_FREQ1, 5000000);
>  	if (ret)
>  		goto error_disable_reg;
>  
> -	ret = ad9834_write_phase(st, AD9834_REG_PHASE0, pdata->phase0);
> +	ret = ad9834_write_phase(st, AD9834_REG_PHASE0, 512);
>  	if (ret)
>  		goto error_disable_reg;
>  
> -	ret = ad9834_write_phase(st, AD9834_REG_PHASE1, pdata->phase1);
> +	ret = ad9834_write_phase(st, AD9834_REG_PHASE1, 1024);
>  	if (ret)
>  		goto error_disable_reg;
>  
> diff --git a/drivers/staging/iio/frequency/ad9834.h b/drivers/staging/iio/frequency/ad9834.h
> index ae620f38eb49..da7e83ceedad 100644
> --- a/drivers/staging/iio/frequency/ad9834.h
> +++ b/drivers/staging/iio/frequency/ad9834.h
> @@ -8,32 +8,4 @@
>  #ifndef IIO_DDS_AD9834_H_
>  #define IIO_DDS_AD9834_H_
>  
> -/*
> - * TODO: struct ad7887_platform_data needs to go into include/linux/iio
> - */
> -
> -/**
> - * struct ad9834_platform_data - platform specific information
> - * @mclk:		master clock in Hz
> - * @freq0:		power up freq0 tuning word in Hz
> - * @freq1:		power up freq1 tuning word in Hz
> - * @phase0:		power up phase0 value [0..4095] correlates with 0..2PI
> - * @phase1:		power up phase1 value [0..4095] correlates with 0..2PI
> - * @en_div2:		digital output/2 is passed to the SIGN BIT OUT pin
> - * @en_signbit_msb_out:	the MSB (or MSB/2) of the DAC data is connected to the
> - *			SIGN BIT OUT pin. en_div2 controls whether it is the MSB
> - *			or MSB/2 that is output. if en_signbit_msb_out=false,
> - *			the on-board comparator is connected to SIGN BIT OUT
> - */
> -
> -struct ad9834_platform_data {
> -	unsigned int		mclk;
> -	unsigned int		freq0;
> -	unsigned int		freq1;
> -	unsigned short		phase0;
> -	unsigned short		phase1;
> -	bool			en_div2;
> -	bool			en_signbit_msb_out;
> -};
> -
>  #endif /* IIO_DDS_AD9834_H_ */


       reply	other threads:[~2019-02-02 17:05 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20190201150138.31481-1-biabeniamin@outlook.com>
2019-02-02 17:05 ` Jonathan Cameron [this message]
     [not found] ` <20190201150138.31481-2-biabeniamin@outlook.com>
2019-02-02 17:07   ` [PATCH v2 2/2] staging: iio: frequency: ad9833: Load clock using clock framework 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=20190202170547.586078d7@archlinux \
    --to=jic23@kernel.org \
    --cc=Michael.Hennerich@analog.com \
    --cc=beniamin.bia@analog.com \
    --cc=biabeniamin@gmail.com \
    --cc=biabeniamin@outlook.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=knaack.h@gmx.de \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    /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: link
Be 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.