ARM Sunxi Platform Development
 help / color / mirror / Atom feed
From: Andre Przywara <andre.przywara@arm.com>
To: Jagan Teki <jagan@amarulasolutions.com>, u-boot@lists.denx.de
Cc: Yixun Lan <dlan@gentoo.org>, Tom Rini <trini@konsulko.com>,
	Jernej Skrabec <jernej.skrabec@gmail.com>,
	Samuel Holland <samuel@sholland.org>,
	linux-sunxi@lists.linux.dev
Subject: [PATCH v2 1/3] sunxi: fix return_to_fel() prototype
Date: Thu, 17 Apr 2025 01:05:37 +0100	[thread overview]
Message-ID: <20250417000539.3709-2-andre.przywara@arm.com> (raw)
In-Reply-To: <20250417000539.3709-1-andre.przywara@arm.com>

In some sys_proto header file we describe the prototype of the
return_to_fel() function, which is implemented in assembly.
The order of the arguments listed there is wrong: the stack pointer is
expected in r0/w0, and the return address in r1/w1.

Fix the order to match the code. This is purely cosmetic, as the callers
and the assembly code are already agreeing on this.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
 arch/arm/include/asm/arch-sunxi/sys_proto.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h b/arch/arm/include/asm/arch-sunxi/sys_proto.h
index 92c7721a530..43ee0fdd558 100644
--- a/arch/arm/include/asm/arch-sunxi/sys_proto.h
+++ b/arch/arm/include/asm/arch-sunxi/sys_proto.h
@@ -17,10 +17,10 @@ void sdelay(unsigned long);
  * This returns back into the BROM after U-Boot SPL has performed its initial
  * init. It uses the provided lr and sp to do so.
  *
- * @lr:		BROM link register value (return address)
  * @sp:		BROM stack pointer
+ * @lr:		BROM link register value (return address)
  */
-void return_to_fel(uint32_t lr, uint32_t sp);
+void return_to_fel(uint32_t sp, uint32_t lr);
 
 /* Board / SoC level designware gmac init */
 #if !defined CONFIG_XPL_BUILD && defined CONFIG_SUN7I_GMAC
-- 
2.46.3


  reply	other threads:[~2025-04-17  0:06 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-17  0:05 [PATCH v2 0/3] sunxi: add "fake" FEL button feature Andre Przywara
2025-04-17  0:05 ` Andre Przywara [this message]
2025-04-17  0:05 ` [PATCH v2 2/3] sunxi: add "fake" FEL pin support Andre Przywara
2025-04-17  3:39   ` Yixun Lan
2025-04-17  4:08     ` Yixun Lan
2025-04-21 21:42     ` Andre Przywara
2025-04-18 11:28   ` Quentin Schulz
2025-04-18 22:51     ` Yixun Lan
2025-04-21 21:29     ` Andre Przywara
2025-04-22 10:49       ` Quentin Schulz
2025-04-22 12:11         ` Andre Przywara
2025-04-22 14:30           ` Quentin Schulz
2025-05-12 12:39             ` Andre Przywara
2025-05-15 15:13               ` Quentin Schulz
2025-04-17  0:05 ` [PATCH v2 3/3] sunxi: x96_mate: Add "fake" FEL key definition Andre Przywara
2025-04-17  4:10 ` [PATCH v2 0/3] sunxi: add "fake" FEL button feature Yixun Lan

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=20250417000539.3709-2-andre.przywara@arm.com \
    --to=andre.przywara@arm.com \
    --cc=dlan@gentoo.org \
    --cc=jagan@amarulasolutions.com \
    --cc=jernej.skrabec@gmail.com \
    --cc=linux-sunxi@lists.linux.dev \
    --cc=samuel@sholland.org \
    --cc=trini@konsulko.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox