All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 1/2] spl_spi: Read default speed and mode values from DT
Date: Mon, 19 Nov 2018 20:08:40 +0100	[thread overview]
Message-ID: <7828272b-a824-d56f-9e46-159d7d959859@gmail.com> (raw)
In-Reply-To: <1542648790-21362-2-git-send-email-patrick.delaunay@st.com>

On 19.11.2018 18:33, Patrick Delaunay wrote:
> In case of DT boot, don't read default speed and mode for SPI from
> CONFIG_*, instead read from DT node.
>
> Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>

I was commenting about code duplication, which is better now, so:

Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>

I do think it would be nice to invert the logic. That way, we could get 
completely rid of those two CONFIG_SF_DEFAULT settings for DM_SPI_FLASH 
boards (and eventually for all boards - when's the deadline for that?). 
But there are other places that still do it like you do here, so it's 
probably better to change them all at once...

Simon

> ---
>
> Changes in v2:
> - use variables to avoid duplicated code
>
>   common/spl/spl_spi.c | 10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
> index 8cd4830..b348b45 100644
> --- a/common/spl/spl_spi.c
> +++ b/common/spl/spl_spi.c
> @@ -74,15 +74,21 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
>   	unsigned payload_offs = CONFIG_SYS_SPI_U_BOOT_OFFS;
>   	struct spi_flash *flash;
>   	struct image_header *header;
> +	unsigned int max_hz = CONFIG_SF_DEFAULT_SPEED;
> +	unsigned int spi_mode = CONFIG_SF_DEFAULT_MODE;
>   
> +#ifdef CONFIG_DM_SPI_FLASH
> +	/* In DM mode defaults will be taken from DT */
> +	max_hz = 0, spi_mode = 0;
> +#endif
>   	/*
>   	 * Load U-Boot image from SPI flash into RAM
>   	 */
>   
>   	flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS,
>   				CONFIG_SF_DEFAULT_CS,
> -				CONFIG_SF_DEFAULT_SPEED,
> -				CONFIG_SF_DEFAULT_MODE);
> +				max_hz,
> +				spi_mode);
>   	if (!flash) {
>   		puts("SPI probe failed.\n");
>   		return -ENODEV;

  reply	other threads:[~2018-11-19 19:08 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-19 17:33 [U-Boot] [PATCH v2 0/2] Read default speed and mode values from DT Patrick Delaunay
2018-11-19 17:33 ` [U-Boot] [PATCH v2 1/2] spl_spi: " Patrick Delaunay
2018-11-19 19:08   ` Simon Goldschmidt [this message]
2018-11-27  8:06     ` Patrick DELAUNAY
2018-11-27  8:11       ` Simon Goldschmidt
2018-11-27 12:33         ` Patrick DELAUNAY
2018-11-27 12:54           ` Simon Goldschmidt
2018-12-10 11:01             ` Patrick DELAUNAY
2018-12-10 22:48   ` Adam Ford
2018-12-13 16:04     ` Patrick DELAUNAY
2018-11-19 17:33 ` [U-Boot] [PATCH v2 2/2] splash: sf: " Patrick Delaunay
2018-12-10 15:50 ` [U-Boot] [PATCH v2 0/2] " Adam Ford
2018-12-13 16:17   ` Patrick DELAUNAY

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=7828272b-a824-d56f-9e46-159d7d959859@gmail.com \
    --to=simon.k.r.goldschmidt@gmail.com \
    --cc=u-boot@lists.denx.de \
    /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.