brcm63xx: update variant detection patches and fix VARID shift
The variant id field shift was wrong, causing the variant detection to fail. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 41295
This commit is contained in:
parent
f695fa358a
commit
21d65bb185
18 changed files with 45 additions and 29 deletions
|
@ -11,7 +11,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|||
|
||||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -1092,7 +1092,8 @@ static int m25p_probe(struct spi_device
|
||||
@@ -1093,7 +1093,8 @@ static int m25p_probe(struct spi_device
|
||||
/* partitions should match sector boundaries; and it may be good to
|
||||
* use readonly partitions for writeprotected sectors (BP2..BP0).
|
||||
*/
|
||||
|
|
|
@ -60,7 +60,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|||
/*
|
||||
* Write an address range to the flash chip. Data must be written in
|
||||
* FLASH_PAGESIZE chunks. The address range may be any size provided
|
||||
@@ -987,6 +1009,9 @@ static int m25p_probe(struct spi_device
|
||||
@@ -988,6 +1010,9 @@ static int m25p_probe(struct spi_device
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
From c50acd37b425a8a907a6f7f93aa2e658256e79ce Mon Sep 17 00:00:00 2001
|
||||
From 994ed2c168ce27483724cd0c387f752d1ccd30e7 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sat, 7 Dec 2013 14:08:36 +0100
|
||||
Subject: [PATCH 40/53] MIPS: BCM63XX: add a new cpu variant helper
|
||||
Subject: [PATCH 20/45] MIPS: BCM63XX: add a new cpu variant helper
|
||||
|
||||
---
|
||||
arch/mips/bcm63xx/cpu.c | 10 ++++++++++
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
From 9cd8b4a2ee9d0e6a5b91845bdd6f4b7e114fc8c4 Mon Sep 17 00:00:00 2001
|
||||
From 3bd8e2535265f06f79ed9c0ad788405441e091dc Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sat, 7 Dec 2013 14:22:41 +0100
|
||||
Subject: [PATCH 41/53] MIPS: BCM63XX: define variant id field
|
||||
Subject: [PATCH 21/45] MIPS: BCM63XX: define variant id field
|
||||
|
||||
Some SoC have a variant id field in the chip id register.
|
||||
|
||||
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
---
|
||||
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
@ -13,7 +16,7 @@ Subject: [PATCH 41/53] MIPS: BCM63XX: define variant id field
|
|||
#define PERF_REV_REG 0x0
|
||||
#define REV_CHIPID_SHIFT 16
|
||||
#define REV_CHIPID_MASK (0xffff << REV_CHIPID_SHIFT)
|
||||
+#define REV_VARID_SHIFT 8
|
||||
+#define REV_VARID_SHIFT 12
|
||||
+#define REV_VARID_MASK (0xf << REV_VARID_SHIFT)
|
||||
#define REV_REVID_SHIFT 0
|
||||
#define REV_REVID_MASK (0xff << REV_REVID_SHIFT)
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
From 6c8d94aaf5e2f0a3327e4f69ccd980bd5617f925 Mon Sep 17 00:00:00 2001
|
||||
From d59120f23279ef62a48d9f94847254b061d0a8b6 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sat, 7 Dec 2013 14:30:59 +0100
|
||||
Subject: [PATCH 42/53] MIPS: BCM63XX: detect bcm6328 variants
|
||||
Subject: [PATCH 22/45] MIPS: BCM63XX: detect BCM6328 variants
|
||||
|
||||
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
---
|
||||
arch/mips/bcm63xx/cpu.c | 10 ++++++++++
|
||||
arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 8 ++++++--
|
|
@ -1,7 +1,7 @@
|
|||
From dc48adb13a99086d1f484d3379a918626c5b1658 Mon Sep 17 00:00:00 2001
|
||||
From 04458c3db8eb79da21ecde40ab36a1dde52bef06 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sat, 7 Dec 2013 14:33:28 +0100
|
||||
Subject: [PATCH 43/53] MIPS: BCM63XX: detect BCM6362 variants
|
||||
Subject: [PATCH 23/45] MIPS: BCM63XX: detect BCM6362 variants
|
||||
|
||||
---
|
||||
arch/mips/bcm63xx/cpu.c | 8 ++++++++
|
||||
|
|
|
@ -1,8 +1,12 @@
|
|||
From 311b0246d51e09d13464e76abb0e231c855dd333 Mon Sep 17 00:00:00 2001
|
||||
From 825cc67e56b5e624a05f6850a86d91508b786848 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sat, 7 Dec 2013 14:36:56 +0100
|
||||
Subject: [PATCH 44/53] MIPS: BCM63XX: add support for BCM6368 variants
|
||||
Subject: [PATCH 24/44] MIPS: BCM63XX: detect BCM6368 variants
|
||||
|
||||
The DSL-less BCM6368 variant BCM6367 uses a different chip id. Apart
|
||||
from missing DSL, there is no difference to BCM6368, so treat it such.
|
||||
|
||||
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
---
|
||||
arch/mips/bcm63xx/cpu.c | 4 ++++
|
||||
arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 3 +++
|
|
@ -572,7 +572,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||
#define REV_CHIPID_MASK (0xffff << REV_CHIPID_SHIFT)
|
||||
+#define REV_LONG_CHIPID_SHIFT 12
|
||||
+#define REV_LONG_CHIPID_MASK (0xfffff << REV_LONG_CHIPID_SHIFT)
|
||||
#define REV_VARID_SHIFT 8
|
||||
#define REV_VARID_SHIFT 12
|
||||
#define REV_VARID_MASK (0xf << REV_VARID_SHIFT)
|
||||
#define REV_REVID_SHIFT 0
|
||||
@@ -211,6 +213,52 @@
|
||||
|
|
|
@ -10,7 +10,7 @@ Subject: [PATCH 64/79] MTD: m25p80: allow passing pp_data
|
|||
|
||||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -976,6 +976,9 @@ static int m25p_probe(struct spi_device
|
||||
@@ -977,6 +977,9 @@ static int m25p_probe(struct spi_device
|
||||
dev_warn(&spi->dev, "unrecognized id %s\n", data->type);
|
||||
}
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|||
|
||||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -1313,7 +1313,8 @@ static int m25p_probe(struct spi_device
|
||||
@@ -1314,7 +1314,8 @@ static int m25p_probe(struct spi_device
|
||||
/* partitions should match sector boundaries; and it may be good to
|
||||
* use readonly partitions for writeprotected sectors (BP2..BP0).
|
||||
*/
|
||||
|
|
|
@ -60,7 +60,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
|||
/*
|
||||
* Write an address range to the flash chip. Data must be written in
|
||||
* FLASH_PAGESIZE chunks. The address range may be any size provided
|
||||
@@ -1158,6 +1180,9 @@ static int m25p_probe(struct spi_device
|
||||
@@ -1159,6 +1181,9 @@ static int m25p_probe(struct spi_device
|
||||
if (!flash->command)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||
|
||||
--- a/drivers/usb/host/ohci.h
|
||||
+++ b/drivers/usb/host/ohci.h
|
||||
@@ -639,7 +639,7 @@ static inline u32 hc32_to_cpup (const st
|
||||
@@ -641,7 +641,7 @@ static inline u32 hc32_to_cpup (const st
|
||||
* some big-endian SOC implementations. Same thing happens with PSW access.
|
||||
*/
|
||||
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
From 9cd8b4a2ee9d0e6a5b91845bdd6f4b7e114fc8c4 Mon Sep 17 00:00:00 2001
|
||||
From 3bd8e2535265f06f79ed9c0ad788405441e091dc Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sat, 7 Dec 2013 14:22:41 +0100
|
||||
Subject: [PATCH 41/53] MIPS: BCM63XX: define variant id field
|
||||
Subject: [PATCH 21/45] MIPS: BCM63XX: define variant id field
|
||||
|
||||
Some SoC have a variant id field in the chip id register.
|
||||
|
||||
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
---
|
||||
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
@ -13,7 +16,7 @@ Subject: [PATCH 41/53] MIPS: BCM63XX: define variant id field
|
|||
#define PERF_REV_REG 0x0
|
||||
#define REV_CHIPID_SHIFT 16
|
||||
#define REV_CHIPID_MASK (0xffff << REV_CHIPID_SHIFT)
|
||||
+#define REV_VARID_SHIFT 8
|
||||
+#define REV_VARID_SHIFT 12
|
||||
+#define REV_VARID_MASK (0xf << REV_VARID_SHIFT)
|
||||
#define REV_REVID_SHIFT 0
|
||||
#define REV_REVID_MASK (0xff << REV_REVID_SHIFT)
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
From 6c8d94aaf5e2f0a3327e4f69ccd980bd5617f925 Mon Sep 17 00:00:00 2001
|
||||
From d59120f23279ef62a48d9f94847254b061d0a8b6 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sat, 7 Dec 2013 14:30:59 +0100
|
||||
Subject: [PATCH 42/53] MIPS: BCM63XX: detect bcm6328 variants
|
||||
Subject: [PATCH 22/45] MIPS: BCM63XX: detect BCM6328 variants
|
||||
|
||||
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
---
|
||||
arch/mips/bcm63xx/cpu.c | 10 ++++++++++
|
||||
arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 8 ++++++--
|
|
@ -1,7 +1,7 @@
|
|||
From dc48adb13a99086d1f484d3379a918626c5b1658 Mon Sep 17 00:00:00 2001
|
||||
From 04458c3db8eb79da21ecde40ab36a1dde52bef06 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sat, 7 Dec 2013 14:33:28 +0100
|
||||
Subject: [PATCH 43/53] MIPS: BCM63XX: detect BCM6362 variants
|
||||
Subject: [PATCH 23/45] MIPS: BCM63XX: detect BCM6362 variants
|
||||
|
||||
---
|
||||
arch/mips/bcm63xx/cpu.c | 8 ++++++++
|
||||
|
|
|
@ -1,8 +1,12 @@
|
|||
From 311b0246d51e09d13464e76abb0e231c855dd333 Mon Sep 17 00:00:00 2001
|
||||
From 825cc67e56b5e624a05f6850a86d91508b786848 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jogo@openwrt.org>
|
||||
Date: Sat, 7 Dec 2013 14:36:56 +0100
|
||||
Subject: [PATCH 44/53] MIPS: BCM63XX: add support for BCM6368 variants
|
||||
Subject: [PATCH 24/44] MIPS: BCM63XX: detect BCM6368 variants
|
||||
|
||||
The DSL-less BCM6368 variant BCM6367 uses a different chip id. Apart
|
||||
from missing DSL, there is no difference to BCM6368, so treat it such.
|
||||
|
||||
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
---
|
||||
arch/mips/bcm63xx/cpu.c | 4 ++++
|
||||
arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 3 +++
|
|
@ -572,7 +572,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||
#define REV_CHIPID_MASK (0xffff << REV_CHIPID_SHIFT)
|
||||
+#define REV_LONG_CHIPID_SHIFT 12
|
||||
+#define REV_LONG_CHIPID_MASK (0xfffff << REV_LONG_CHIPID_SHIFT)
|
||||
#define REV_VARID_SHIFT 8
|
||||
#define REV_VARID_SHIFT 12
|
||||
#define REV_VARID_MASK (0xf << REV_VARID_SHIFT)
|
||||
#define REV_REVID_SHIFT 0
|
||||
@@ -211,6 +213,52 @@
|
||||
|
|
|
@ -10,7 +10,7 @@ Subject: [PATCH 64/79] MTD: m25p80: allow passing pp_data
|
|||
|
||||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -1149,6 +1149,9 @@ static int m25p_probe(struct spi_device
|
||||
@@ -1150,6 +1150,9 @@ static int m25p_probe(struct spi_device
|
||||
dev_warn(&spi->dev, "unrecognized id %s\n", data->type);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue