mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: "Daniel Krüger" <daniel.krueger@systec-electronic.com>
To: barebox@lists.infradead.org, s.hauer@pengutronix.de
Subject: Re: [PATCH] ARM: i.MX25/35: Fix bootsource detection
Date: Mon, 21 Nov 2016 16:52:16 +0100	[thread overview]
Message-ID: <f90b5d17-d316-2d71-b136-908f591e9839@systec-electronic.com> (raw)
In-Reply-To: <e424cfb4-6cf8-294f-9192-a6e13135f195@systec-electronic.com>

Hi,

I suspect, that the patch got scrambled by Thunderbird. Sorry for that.
I will try it again. Hopefully, then it will be OK.

Best regards,
  Daniel Krüger

Am 21.11.2016 um 13:41 schrieb Daniel Krüger:
> This fixes commit 0b47f95340d801a26643e5e1f4ee05287e8ae90e for i.MX25/35.
> Otherwise it was just "unknown".
> 
> Signed-off-by: Daniel Krueger <daniel.krueger@systec-electronic.com>
> ---
>  arch/arm/mach-imx/boot.c |   12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
> index b66c29d..4893060 100644
> --- a/arch/arm/mach-imx/boot.c
> +++ b/arch/arm/mach-imx/boot.c
> @@ -69,13 +69,13 @@ static const enum bootsource locations[4][4] = {
>   * Note also that I suspect that the boot source pins are only sampled at
>   * power up.
>   */
> -static void imx25_35_boot_save_loc(unsigned int ctrl, unsigned int type)
> +static enum bootsource imx25_35_boot_source(unsigned int ctrl, unsigned int type)
>  {
>      enum bootsource src;
> 
>      src = locations[ctrl][type];
> 
> -    bootsource_set(src);
> +    return src;
>  }
> 
>  void imx25_get_boot_source(enum bootsource *src, int *instance)
> @@ -84,8 +84,8 @@ void imx25_get_boot_source(enum bootsource *src, int *instance)
>      uint32_t val;
> 
>      val = readl(ccm_base + MX25_CCM_RCSR);
> -    imx25_35_boot_save_loc((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
> -                   (val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
> +    *src = imx25_35_boot_source((val >> MX25_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
> +                    (val >> MX25_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
>  }
> 
>  void imx25_boot_save_loc(void)
> @@ -105,8 +105,8 @@ void imx35_get_boot_source(enum bootsource *src, int *instance)
>      uint32_t val;
> 
>      val = readl(ccm_base + MX35_CCM_RCSR);
> -    imx25_35_boot_save_loc((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
> -                   (val >> MX36_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
> +    *src = imx25_35_boot_source((val >> MX35_CCM_RCSR_MEM_CTRL_SHIFT) & 0x3,
> +                    (val >> MX35_CCM_RCSR_MEM_TYPE_SHIFT) & 0x3);
>  }
> 
>  void imx35_boot_save_loc(void)

-- 

SYS TEC electronic GmbH
Am Windrad 2
08468 Heinsdorfergrund

Telefon : +49 (0) 3765 38600-0
Fax     : +49 (0) 3765 38600-4100
Email   : daniel.krueger@systec-electronic.com
Website : http://www.systec-electronic.com

Managing Directors  :
  Dipl.-Phys. Siegmar Schmidt, Dipl. Ing. (FH) Armin von Collrepp
Commercial registry : Amtsgericht Chemnitz, HRB 28082
USt.-Id Nr.         : DE150534010


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2016-11-21 15:52 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-21 12:41 Daniel Krüger
2016-11-21 15:52 ` Daniel Krüger [this message]

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=f90b5d17-d316-2d71-b136-908f591e9839@systec-electronic.com \
    --to=daniel.krueger@systec-electronic.com \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox