brcm63xx: drop support for caldata in brcm63xxpart
Now that we always provide these partitions through DT, we don't need to pass their data through parser data from board files anymore. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>v19.07.3_mercusys_ac12_duma
Jonas Gorski
7 years ago
parent
474cde6123
commit
092ac42e1e
@ -1,41 +0,0 @@
|
||||
From 266c506f4b262bd6aba0776a03d82c98e65d9906 Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jonas.gorski@gmail.com>
|
||||
Date: Tue, 1 May 2012 17:32:36 +0200
|
||||
Subject: [PATCH 63/79] MTD: physmap: allow passing pp_data
|
||||
|
||||
---
|
||||
drivers/mtd/maps/physmap.c | 4 +++-
|
||||
include/linux/mtd/physmap.h | 1 +
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/mtd/maps/physmap.c
|
||||
+++ b/drivers/mtd/maps/physmap.c
|
||||
@@ -96,6 +96,7 @@ static int physmap_flash_probe(struct pl
|
||||
{
|
||||
struct physmap_flash_data *physmap_data;
|
||||
struct physmap_flash_info *info;
|
||||
+ struct mtd_part_parser_data *pp_data;
|
||||
const char * const *probe_type;
|
||||
const char * const *part_types;
|
||||
int err = 0;
|
||||
@@ -186,8 +187,9 @@ static int physmap_flash_probe(struct pl
|
||||
spin_lock_init(&info->vpp_lock);
|
||||
|
||||
part_types = physmap_data->part_probe_types ? : part_probe_types;
|
||||
+ pp_data = physmap_data->pp_data ? physmap_data->pp_data : NULL;
|
||||
|
||||
- mtd_device_parse_register(info->cmtd, part_types, NULL,
|
||||
+ mtd_device_parse_register(info->cmtd, part_types, pp_data,
|
||||
physmap_data->parts, physmap_data->nr_parts);
|
||||
return 0;
|
||||
|
||||
--- a/include/linux/mtd/physmap.h
|
||||
+++ b/include/linux/mtd/physmap.h
|
||||
@@ -31,6 +31,7 @@ struct physmap_flash_data {
|
||||
char *probe_type;
|
||||
struct mtd_partition *parts;
|
||||
const char * const *part_probe_types;
|
||||
+ struct mtd_part_parser_data *pp_data;
|
||||
};
|
||||
|
||||
#endif /* __LINUX_MTD_PHYSMAP__ */
|
||||
@ -1,40 +0,0 @@
|
||||
From 7f17dfe9009beb07a3de0e380932a725293829df Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jonas.gorski@gmail.com>
|
||||
Date: Tue, 1 May 2012 17:33:03 +0200
|
||||
Subject: [PATCH 64/79] MTD: m25p80: allow passing pp_data
|
||||
|
||||
---
|
||||
drivers/mtd/devices/m25p80.c | 5 +++--
|
||||
include/linux/spi/flash.h | 2 ++
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -261,7 +261,8 @@ static int m25p_probe(struct spi_device
|
||||
return ret;
|
||||
|
||||
return mtd_device_parse_register(&nor->mtd,
|
||||
- data ? data->part_probe_types : NULL, NULL,
|
||||
+ data ? data->part_probe_types : NULL,
|
||||
+ data ? data->pp_data : NULL,
|
||||
data ? data->parts : NULL,
|
||||
data ? data->nr_parts : 0);
|
||||
}
|
||||
--- a/include/linux/spi/flash.h
|
||||
+++ b/include/linux/spi/flash.h
|
||||
@@ -12,6 +12,7 @@ struct mtd_part_parser_data;
|
||||
* with chips that can't be queried for JEDEC or other IDs
|
||||
* @part_probe_types: optional list of MTD parser names to use for
|
||||
* partitioning
|
||||
+ * @pp_data: optional partition parser data.
|
||||
*
|
||||
* Board init code (in arch/.../mach-xxx/board-yyy.c files) can
|
||||
* provide information about SPI flash parts (such as DataFlash) to
|
||||
@@ -28,6 +29,7 @@ struct flash_platform_data {
|
||||
char *type;
|
||||
|
||||
const char **part_probe_types;
|
||||
+ struct mtd_part_parser_data *pp_data;
|
||||
/* we'll likely add more ... use JEDEC IDs, etc */
|
||||
};
|
||||
|
||||
@ -1,119 +0,0 @@
|
||||
Allow bcm63xxpart to receive a caldata offset if calibration data is
|
||||
contained in flash.
|
||||
---
|
||||
drivers/mtd/bcm63xxpart.c | 51 ++++++++++++++++++++++++++++++++++++---
|
||||
include/linux/mtd/partitions.h | 2 +
|
||||
2 files changed, 49 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/drivers/mtd/bcm63xxpart.c
|
||||
+++ b/drivers/mtd/bcm63xxpart.c
|
||||
@@ -53,10 +53,12 @@ static int bcm63xx_parse_cfe_partitions(
|
||||
struct mtd_partition *parts;
|
||||
int ret;
|
||||
size_t retlen;
|
||||
- unsigned int rootfsaddr, kerneladdr, spareaddr;
|
||||
+ unsigned int rootfsaddr, kerneladdr, spareaddr, nvramaddr;
|
||||
unsigned int rootfslen, kernellen, sparelen, totallen;
|
||||
unsigned int cfelen, nvramlen;
|
||||
unsigned int cfe_erasesize;
|
||||
+ unsigned int caldatalen1 = 0, caldataaddr1 = 0;
|
||||
+ unsigned int caldatalen2 = 0, caldataaddr2 = 0;
|
||||
int i;
|
||||
u32 computed_crc;
|
||||
bool rootfs_first = false;
|
||||
@@ -70,6 +72,24 @@ static int bcm63xx_parse_cfe_partitions(
|
||||
cfelen = cfe_erasesize;
|
||||
nvramlen = bcm63xx_nvram_get_psi_size() * SZ_1K;
|
||||
nvramlen = roundup(nvramlen, cfe_erasesize);
|
||||
+ nvramaddr = master->size - nvramlen;
|
||||
+
|
||||
+ if (data) {
|
||||
+ if (data->caldata[0]) {
|
||||
+ caldatalen1 = cfe_erasesize;
|
||||
+ caldataaddr1 = rounddown(data->caldata[0],
|
||||
+ cfe_erasesize);
|
||||
+ }
|
||||
+ if (data->caldata[1]) {
|
||||
+ caldatalen2 = cfe_erasesize;
|
||||
+ caldataaddr2 = rounddown(data->caldata[1],
|
||||
+ cfe_erasesize);
|
||||
+ }
|
||||
+ if (caldataaddr1 == caldataaddr2) {
|
||||
+ caldataaddr2 = 0;
|
||||
+ caldatalen2 = 0;
|
||||
+ }
|
||||
+ }
|
||||
|
||||
/* Allocate memory for buffer */
|
||||
buf = vmalloc(sizeof(struct bcm_tag));
|
||||
@@ -121,7 +141,7 @@ static int bcm63xx_parse_cfe_partitions(
|
||||
rootfsaddr = 0;
|
||||
spareaddr = cfelen;
|
||||
}
|
||||
- sparelen = master->size - spareaddr - nvramlen;
|
||||
+ sparelen = min_not_zero(nvramaddr, caldataaddr1) - spareaddr;
|
||||
|
||||
/* Determine number of partitions */
|
||||
if (rootfslen > 0)
|
||||
@@ -130,6 +150,12 @@ static int bcm63xx_parse_cfe_partitions(
|
||||
if (kernellen > 0)
|
||||
nrparts++;
|
||||
|
||||
+ if (caldatalen1 > 0)
|
||||
+ nrparts++;
|
||||
+
|
||||
+ if (caldatalen2 > 0)
|
||||
+ nrparts++;
|
||||
+
|
||||
/* Ask kernel for more memory */
|
||||
parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL);
|
||||
if (!parts) {
|
||||
@@ -167,15 +193,32 @@ static int bcm63xx_parse_cfe_partitions(
|
||||
curpart++;
|
||||
}
|
||||
|
||||
+ if (caldatalen1 > 0) {
|
||||
+ if (caldatalen2 > 0)
|
||||
+ parts[curpart].name = "cal_data1";
|
||||
+ else
|
||||
+ parts[curpart].name = "cal_data";
|
||||
+ parts[curpart].offset = caldataaddr1;
|
||||
+ parts[curpart].size = caldatalen1;
|
||||
+ curpart++;
|
||||
+ }
|
||||
+
|
||||
+ if (caldatalen2 > 0) {
|
||||
+ parts[curpart].name = "cal_data2";
|
||||
+ parts[curpart].offset = caldataaddr2;
|
||||
+ parts[curpart].size = caldatalen2;
|
||||
+ curpart++;
|
||||
+ }
|
||||
+
|
||||
parts[curpart].name = "nvram";
|
||||
- parts[curpart].offset = master->size - nvramlen;
|
||||
+ parts[curpart].offset = nvramaddr;
|
||||
parts[curpart].size = nvramlen;
|
||||
curpart++;
|
||||
|
||||
/* Global partition "linux" to make easy firmware upgrade */
|
||||
parts[curpart].name = "linux";
|
||||
parts[curpart].offset = cfelen;
|
||||
- parts[curpart].size = master->size - cfelen - nvramlen;
|
||||
+ parts[curpart].size = min_not_zero(nvramaddr, caldataaddr1) - cfelen;
|
||||
|
||||
for (i = 0; i < nrparts; i++)
|
||||
pr_info("Partition %d is %s offset %llx and length %llx\n", i,
|
||||
--- a/include/linux/mtd/partitions.h
|
||||
+++ b/include/linux/mtd/partitions.h
|
||||
@@ -56,9 +56,11 @@ struct device_node;
|
||||
/**
|
||||
* struct mtd_part_parser_data - used to pass data to MTD partition parsers.
|
||||
* @origin: for RedBoot, start address of MTD device
|
||||
+ * @caldata: for CFE, start address of wifi calibration data
|
||||
*/
|
||||
struct mtd_part_parser_data {
|
||||
unsigned long origin;
|
||||
+ unsigned long caldata[2];
|
||||
};
|
||||
|
||||
|
||||
@ -1,84 +0,0 @@
|
||||
From 977f8a30103b9c4992cab8f49357fe0d4274004f Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Gorski <jonas.gorski@gmail.com>
|
||||
Date: Thu, 3 May 2012 14:55:26 +0200
|
||||
Subject: [PATCH 69/80] MIPS: BCM63XX: pass caldata info to flash
|
||||
|
||||
---
|
||||
arch/mips/bcm63xx/boards/board_common.c | 2 +-
|
||||
arch/mips/bcm63xx/dev-flash.c | 9 ++++++++-
|
||||
arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h | 4 +++-
|
||||
3 files changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/arch/mips/bcm63xx/boards/board_common.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_common.c
|
||||
@@ -255,7 +255,7 @@ int __init board_register_devices(void)
|
||||
if (board.num_spis)
|
||||
spi_register_board_info(board.spis, board.num_spis);
|
||||
|
||||
- bcm63xx_flash_register();
|
||||
+ bcm63xx_flash_register(board.has_caldata, board.caldata);
|
||||
|
||||
bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
|
||||
bcm63xx_led_data.leds = board.leds;
|
||||
--- a/arch/mips/bcm63xx/dev-flash.c
|
||||
+++ b/arch/mips/bcm63xx/dev-flash.c
|
||||
@@ -39,12 +39,15 @@ static struct mtd_partition mtd_partitio
|
||||
}
|
||||
};
|
||||
|
||||
+static struct mtd_part_parser_data bcm63xx_parser_data;
|
||||
+
|
||||
static const char *bcm63xx_part_types[] = { "bcm63xxpart", "RedBoot", NULL };
|
||||
|
||||
static struct physmap_flash_data flash_data = {
|
||||
.width = 2,
|
||||
.parts = mtd_partitions,
|
||||
.part_probe_types = bcm63xx_part_types,
|
||||
+ .pp_data = &bcm63xx_parser_data,
|
||||
};
|
||||
|
||||
static struct resource mtd_resources[] = {
|
||||
@@ -72,6 +75,7 @@ void __init bcm63xx_flash_force_phys_bas
|
||||
|
||||
static struct flash_platform_data bcm63xx_flash_data = {
|
||||
.part_probe_types = bcm63xx_part_types,
|
||||
+ .pp_data = &bcm63xx_parser_data,
|
||||
};
|
||||
|
||||
static struct spi_board_info bcm63xx_spi_flash_info[] = {
|
||||
@@ -237,10 +241,14 @@ void __init bcm63xx_flash_detect(void)
|
||||
}
|
||||
}
|
||||
|
||||
-int __init bcm63xx_flash_register(void)
|
||||
+int __init bcm63xx_flash_register(int num_caldata, struct ath9k_caldata *caldata)
|
||||
{
|
||||
struct device_node *np;
|
||||
u32 val;
|
||||
+ unsigned int i;
|
||||
+
|
||||
+ for (i = 0; i < num_caldata; i++)
|
||||
+ bcm63xx_parser_data.caldata[i] = caldata[i].caldata_offset;
|
||||
|
||||
switch (flash_type) {
|
||||
case BCM63XX_FLASH_TYPE_PARALLEL:
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
|
||||
@@ -1,6 +1,8 @@
|
||||
#ifndef __BCM63XX_FLASH_H
|
||||
#define __BCM63XX_FLASH_H
|
||||
|
||||
+#include <board_bcm963xx.h>
|
||||
+
|
||||
enum {
|
||||
BCM63XX_FLASH_TYPE_PARALLEL,
|
||||
BCM63XX_FLASH_TYPE_SERIAL,
|
||||
@@ -11,7 +13,7 @@ void bcm63xx_flash_detect(void);
|
||||
|
||||
void bcm63xx_flash_force_phys_base_address(u32 start, u32 end);
|
||||
|
||||
-int __init bcm63xx_flash_register(void);
|
||||
+int __init bcm63xx_flash_register(int num_caldata, struct ath9k_caldata *caldata);
|
||||
|
||||
int bcm63xx_flash_get_type(void);
|
||||
|
||||
Loading…
Reference in New Issue