All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] MIPS: BCM63xx: fix 6328 boot selection bit
@ 2020-05-26 11:03 ` Álvaro Fernández Rojas
  0 siblings, 0 replies; 6+ messages in thread
From: Álvaro Fernández Rojas @ 2020-05-26 11:03 UTC (permalink / raw)
  To: tsbogend, f.fainelli, jonas.gorski, bcm-kernel-feedback-list,
	linux-mips, linux-arm-kernel, linux-kernel
  Cc: Álvaro Fernández Rojas

MISC_STRAP_BUS_BOOT_SEL_SHIFT is 18 according to Broadcom's GPL source code.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
index bc3444cd4ef2..9ceb5e72889f 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
@@ -1367,8 +1367,8 @@
 #define MISC_STRAPBUS_6328_REG		0x240
 #define STRAPBUS_6328_FCVO_SHIFT	7
 #define STRAPBUS_6328_FCVO_MASK		(0x1f << STRAPBUS_6328_FCVO_SHIFT)
-#define STRAPBUS_6328_BOOT_SEL_SERIAL	(1 << 28)
-#define STRAPBUS_6328_BOOT_SEL_NAND	(0 << 28)
+#define STRAPBUS_6328_BOOT_SEL_SERIAL	(1 << 18)
+#define STRAPBUS_6328_BOOT_SEL_NAND	(0 << 18)
 
 /*************************************************************************
  * _REG relative to RSET_PCIE
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH] MIPS: BCM63xx: fix 6328 boot selection bit
@ 2020-05-26 11:03 ` Álvaro Fernández Rojas
  0 siblings, 0 replies; 6+ messages in thread
From: Álvaro Fernández Rojas @ 2020-05-26 11:03 UTC (permalink / raw)
  To: tsbogend, f.fainelli, jonas.gorski, bcm-kernel-feedback-list,
	linux-mips, linux-arm-kernel, linux-kernel
  Cc: Álvaro Fernández Rojas

MISC_STRAP_BUS_BOOT_SEL_SHIFT is 18 according to Broadcom's GPL source code.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
index bc3444cd4ef2..9ceb5e72889f 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
@@ -1367,8 +1367,8 @@
 #define MISC_STRAPBUS_6328_REG		0x240
 #define STRAPBUS_6328_FCVO_SHIFT	7
 #define STRAPBUS_6328_FCVO_MASK		(0x1f << STRAPBUS_6328_FCVO_SHIFT)
-#define STRAPBUS_6328_BOOT_SEL_SERIAL	(1 << 28)
-#define STRAPBUS_6328_BOOT_SEL_NAND	(0 << 28)
+#define STRAPBUS_6328_BOOT_SEL_SERIAL	(1 << 18)
+#define STRAPBUS_6328_BOOT_SEL_NAND	(0 << 18)
 
 /*************************************************************************
  * _REG relative to RSET_PCIE
-- 
2.26.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] MIPS: BCM63xx: fix 6328 boot selection bit
  2020-05-26 11:03 ` Álvaro Fernández Rojas
@ 2020-05-26 16:15   ` Florian Fainelli
  -1 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2020-05-26 16:15 UTC (permalink / raw)
  To: Álvaro Fernández Rojas, tsbogend, jonas.gorski,
	bcm-kernel-feedback-list, linux-mips, linux-arm-kernel,
	linux-kernel



On 5/26/2020 4:03 AM, Álvaro Fernández Rojas wrote:
> MISC_STRAP_BUS_BOOT_SEL_SHIFT is 18 according to Broadcom's GPL source code.
> 
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

This is correct:

Acked-by: Florian Fainelli <f.fainelli@gmail.com>

Fixes: e5766aea5b9b ("MIPS: BCM63XX: Add basic BCM6328 support")

> ---
>  arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
> index bc3444cd4ef2..9ceb5e72889f 100644
> --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
> +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
> @@ -1367,8 +1367,8 @@
>  #define MISC_STRAPBUS_6328_REG		0x240
>  #define STRAPBUS_6328_FCVO_SHIFT	7
>  #define STRAPBUS_6328_FCVO_MASK		(0x1f << STRAPBUS_6328_FCVO_SHIFT)
> -#define STRAPBUS_6328_BOOT_SEL_SERIAL	(1 << 28)
> -#define STRAPBUS_6328_BOOT_SEL_NAND	(0 << 28)
> +#define STRAPBUS_6328_BOOT_SEL_SERIAL	(1 << 18)
> +#define STRAPBUS_6328_BOOT_SEL_NAND	(0 << 18)
>  
>  /*************************************************************************
>   * _REG relative to RSET_PCIE
> 

-- 
Florian

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] MIPS: BCM63xx: fix 6328 boot selection bit
@ 2020-05-26 16:15   ` Florian Fainelli
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2020-05-26 16:15 UTC (permalink / raw)
  To: Álvaro Fernández Rojas, tsbogend, jonas.gorski,
	bcm-kernel-feedback-list, linux-mips, linux-arm-kernel,
	linux-kernel



On 5/26/2020 4:03 AM, Álvaro Fernández Rojas wrote:
> MISC_STRAP_BUS_BOOT_SEL_SHIFT is 18 according to Broadcom's GPL source code.
> 
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

This is correct:

Acked-by: Florian Fainelli <f.fainelli@gmail.com>

Fixes: e5766aea5b9b ("MIPS: BCM63XX: Add basic BCM6328 support")

> ---
>  arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
> index bc3444cd4ef2..9ceb5e72889f 100644
> --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
> +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
> @@ -1367,8 +1367,8 @@
>  #define MISC_STRAPBUS_6328_REG		0x240
>  #define STRAPBUS_6328_FCVO_SHIFT	7
>  #define STRAPBUS_6328_FCVO_MASK		(0x1f << STRAPBUS_6328_FCVO_SHIFT)
> -#define STRAPBUS_6328_BOOT_SEL_SERIAL	(1 << 28)
> -#define STRAPBUS_6328_BOOT_SEL_NAND	(0 << 28)
> +#define STRAPBUS_6328_BOOT_SEL_SERIAL	(1 << 18)
> +#define STRAPBUS_6328_BOOT_SEL_NAND	(0 << 18)
>  
>  /*************************************************************************
>   * _REG relative to RSET_PCIE
> 

-- 
Florian

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] MIPS: BCM63xx: fix 6328 boot selection bit
  2020-05-26 11:03 ` Álvaro Fernández Rojas
@ 2020-05-27 11:33   ` Thomas Bogendoerfer
  -1 siblings, 0 replies; 6+ messages in thread
From: Thomas Bogendoerfer @ 2020-05-27 11:33 UTC (permalink / raw)
  To: Álvaro Fernández Rojas
  Cc: f.fainelli, jonas.gorski, bcm-kernel-feedback-list, linux-mips,
	linux-arm-kernel, linux-kernel

On Tue, May 26, 2020 at 01:03:24PM +0200, Álvaro Fernández Rojas wrote:
> MISC_STRAP_BUS_BOOT_SEL_SHIFT is 18 according to Broadcom's GPL source code.
> 
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
>  arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

applied to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] MIPS: BCM63xx: fix 6328 boot selection bit
@ 2020-05-27 11:33   ` Thomas Bogendoerfer
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Bogendoerfer @ 2020-05-27 11:33 UTC (permalink / raw)
  To: Álvaro Fernández Rojas
  Cc: f.fainelli, linux-kernel, linux-mips, bcm-kernel-feedback-list,
	jonas.gorski, linux-arm-kernel

On Tue, May 26, 2020 at 01:03:24PM +0200, Álvaro Fernández Rojas wrote:
> MISC_STRAP_BUS_BOOT_SEL_SHIFT is 18 according to Broadcom's GPL source code.
> 
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
>  arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

applied to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-05-27 11:38 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-26 11:03 [PATCH] MIPS: BCM63xx: fix 6328 boot selection bit Álvaro Fernández Rojas
2020-05-26 11:03 ` Álvaro Fernández Rojas
2020-05-26 16:15 ` Florian Fainelli
2020-05-26 16:15   ` Florian Fainelli
2020-05-27 11:33 ` Thomas Bogendoerfer
2020-05-27 11:33   ` Thomas Bogendoerfer

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.