Skip to contentSkip to conversation

MIPS: BCM63xx: fix 6328 boot selection bit

PATCH Applied Álvaro Fernández Rojas 3 participants 3 messages May 26, 2020 – May 27, 2020 MIPS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MIPS: BCM63xx: fix 6328 boot selection bit

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

---
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +2 -2
index bc3444cd4ef2..9ceb5e72889f 100644
@@ -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
Signature · 1 line
2.26.2
Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Álvaro Fernández Rojas

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

This is correct:

Fixes e5766aea5b9b ("MIPS: BCM63XX: Add basic BCM6328 support")
Quoted 20 lines
---
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +2 -2
index bc3444cd4ef2..9ceb5e72889f 100644
@@ -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
Signature · 1 line
Florian
maintainer Applied
#2 lore raw
In reply to Álvaro Fernández Rojas
Quoted 6 lines · Álvaro Fernández Rojas

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

---
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

applied to mips-next.

Thomas.

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