aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2020-05-19 13:27:16 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2020-05-19 13:33:39 +0200
commitf996377a265895a30265c10edb63e56e60a67f14 (patch)
tree8f9c90d675a0075190eafa7ddbf0aea81afe7201
parent31697f92a25f8a6700978eedc658cadaacd2e5f2 (diff)
downloadupstream-f996377a265895a30265c10edb63e56e60a67f14.tar.gz
upstream-f996377a265895a30265c10edb63e56e60a67f14.tar.bz2
upstream-f996377a265895a30265c10edb63e56e60a67f14.zip
bcm63xx: bcm6328: fix strapbus boot sel
Boot selection bit is 18, not 28. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-rw-r--r--target/linux/bcm63xx/patches-5.4/150-mips-bcm63xx-bcm6328-fix-strapbus-boot-sel.patch13
-rw-r--r--target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch2
2 files changed, 14 insertions, 1 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/150-mips-bcm63xx-bcm6328-fix-strapbus-boot-sel.patch b/target/linux/bcm63xx/patches-5.4/150-mips-bcm63xx-bcm6328-fix-strapbus-boot-sel.patch
new file mode 100644
index 0000000000..17e9d7e888
--- /dev/null
+++ b/target/linux/bcm63xx/patches-5.4/150-mips-bcm63xx-bcm6328-fix-strapbus-boot-sel.patch
@@ -0,0 +1,13 @@
+--- 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
diff --git a/target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch b/target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch
index 7912c26696..0a3b34b743 100644
--- a/target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch
+++ b/target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch
@@ -153,4 +153,4 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+#define STRAPBUS_6328_HSSPI_CLK_FAST (1 << 4)
#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_SERIAL (1 << 18)