diff mbox series

[U-Boot,u-boot] ARM: arch-meson: fix writel arguments order

Message ID 1513085019-8071-1-git-send-email-narmstrong@baylibre.com
State Accepted
Commit 3ef3fbbf9bfb50e78c46823adc6a7989cc1eb129
Delegated to: Tom Rini
Headers show
Series [U-Boot,u-boot] ARM: arch-meson: fix writel arguments order | expand

Commit Message

Neil Armstrong Dec. 12, 2017, 1:23 p.m. UTC 
From: Hans Verkuil <hans.verkuil@cisco.com>

Using writel causes a "Synchronous Abort". Invert the arguments.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm/mach-meson/eth.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Thanks Hans for finding this stupid error !

Neil

Comments

Neil Armstrong Dec. 18, 2017, 11:57 a.m. UTC | #1 
On 12/12/2017 14:23, Neil Armstrong wrote:
> From: Hans Verkuil <hans.verkuil@cisco.com>
> 
> Using writel causes a "Synchronous Abort". Invert the arguments.
> 
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  arch/arm/mach-meson/eth.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Thanks Hans for finding this stupid error !
> 
> Neil
> 
> diff --git a/arch/arm/mach-meson/eth.c b/arch/arm/mach-meson/eth.c
> index 2debe93..8c6577b 100644
> --- a/arch/arm/mach-meson/eth.c
> +++ b/arch/arm/mach-meson/eth.c
> @@ -38,8 +38,8 @@ void meson_gx_eth_init(phy_interface_t mode, unsigned int flags)
>  		/* Use GXL RMII Internal PHY */
>  		if (IS_ENABLED(CONFIG_MESON_GXL) &&
>  		    (flags & MESON_GXL_USE_INTERNAL_RMII_PHY)) {
> -			writel(GXBB_ETH_REG_2, 0x10110181);
> -			writel(GXBB_ETH_REG_3, 0xe40908ff);
> +			writel(0x10110181, GXBB_ETH_REG_2);
> +			writel(0xe40908ff, GXBB_ETH_REG_3);
>  		}
>  
>  		break;
> 

Hi Tom,

Can this be merged ?
This error breaks boot on 3 boards.

Thanks,
Neil
Tom Rini Dec. 18, 2017, 11:37 p.m. UTC | #2 
On Tue, Dec 12, 2017 at 02:23:39PM +0100, Neil Armstrong wrote:

> From: Hans Verkuil <hans.verkuil@cisco.com>
> 
> Using writel causes a "Synchronous Abort". Invert the arguments.
> 
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/arm/mach-meson/eth.c b/arch/arm/mach-meson/eth.c
index 2debe93..8c6577b 100644
--- a/arch/arm/mach-meson/eth.c
+++ b/arch/arm/mach-meson/eth.c
@@ -38,8 +38,8 @@  void meson_gx_eth_init(phy_interface_t mode, unsigned int flags)
 		/* Use GXL RMII Internal PHY */
 		if (IS_ENABLED(CONFIG_MESON_GXL) &&
 		    (flags & MESON_GXL_USE_INTERNAL_RMII_PHY)) {
-			writel(GXBB_ETH_REG_2, 0x10110181);
-			writel(GXBB_ETH_REG_3, 0xe40908ff);
+			writel(0x10110181, GXBB_ETH_REG_2);
+			writel(0xe40908ff, GXBB_ETH_REG_3);
 		}
 
 		break;