| Message ID | 20200526110324.1324754-1-noltari@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 2038e0416518b30bb40857fbafa3733a6bae93ca |
| Headers | show |
| Series | MIPS: BCM63xx: fix 6328 boot selection bit | expand |
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 >
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.
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
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(-)