Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1711441

[PATCH v5 8/9] ARM: pxa/spitz: Remove hardcoded partitioning, use sharpslpart parser

Show all headers | View raw

With the introduction of sharpslpart partition parser we can now read the
offsets from NAND: we specify the list of the parsers as platform data, with
cmdlinepart and ofpart parsers first allowing to override the part. table
written in NAND. This is done here in the board file.

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 arch/arm/mach-pxa/spitz.c | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 67d66c7..defefa3 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -739,21 +739,6 @@ static inline void spitz_lcd_init(void) {}
  * NAND Flash
  ******************************************************************************/
 #if defined(CONFIG_MTD_NAND_SHARPSL) || defined(CONFIG_MTD_NAND_SHARPSL_MODULE)
-static struct mtd_partition spitz_nand_partitions[] = {
-	{
-		.name = "System Area",
-		.offset = 0,
-		.size = 7 * 1024 * 1024,
-	}, {
-		.name = "Root Filesystem",
-		.offset = 7 * 1024 * 1024,
-	}, {
-		.name = "Home Filesystem",
-		.offset = MTDPART_OFS_APPEND,
-		.size = MTDPART_SIZ_FULL,
-	},
-};
-
 static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
 
 static struct nand_bbt_descr spitz_nand_bbt = {
@@ -808,10 +793,16 @@ static const struct mtd_ooblayout_ops akita_ooblayout_ops = {
 	.free = akita_ooblayout_free,
 };
 
+static const char * const probes[] = {
+	"cmdlinepart",
+	"ofpart",
+	"sharpslpart",
+	NULL,
+};
+
 static struct sharpsl_nand_platform_data spitz_nand_pdata = {
 	.badblock_pattern	= &spitz_nand_bbt,
-	.partitions		= spitz_nand_partitions,
-	.nr_partitions		= ARRAY_SIZE(spitz_nand_partitions),
+	.part_parsers		= probes,
 };
 
 static struct resource spitz_nand_resources[] = {
@@ -834,14 +825,7 @@ static struct platform_device spitz_nand_device = {
 
 static void __init spitz_nand_init(void)
 {
-	if (machine_is_spitz()) {
-		spitz_nand_partitions[1].size = 5 * 1024 * 1024;
-	} else if (machine_is_akita()) {
-		spitz_nand_partitions[1].size = 58 * 1024 * 1024;
-		spitz_nand_bbt.len = 1;
-		spitz_nand_pdata.ecc_layout = &akita_ooblayout_ops;
-	} else if (machine_is_borzoi()) {
-		spitz_nand_partitions[1].size = 32 * 1024 * 1024;
+	if (machine_is_akita() || machine_is_borzoi()) {
 		spitz_nand_bbt.len = 1;
 		spitz_nand_pdata.ecc_layout = &akita_ooblayout_ops;
 	}
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v5 0/9] mtd: sharpslpart partition parser Andrea Adami <andrea.adami@gmail.com> - 2017-08-14 22:50 +0200
  [PATCH v5 9/9] ARM: pxa/poodle: Remove hardcoded partitioning, use sharpslpart parser Andrea Adami <andrea.adami@gmail.com> - 2017-08-14 22:50 +0200
  [PATCH v5 2/9] mtd: nand: sharpsl: Add partition parsers platform data Andrea Adami <andrea.adami@gmail.com> - 2017-08-14 22:50 +0200
  [PATCH v5 8/9] ARM: pxa/spitz: Remove hardcoded partitioning, use sharpslpart parser Andrea Adami <andrea.adami@gmail.com> - 2017-08-14 22:50 +0200
  [PATCH v5 7/9] ARM: pxa/tosa: Remove hardcoded partitioning, use sharpslpart parser Andrea Adami <andrea.adami@gmail.com> - 2017-08-14 22:50 +0200
  [PATCH v5 3/9] mfd: tmio: Add partition parsers platform data Andrea Adami <andrea.adami@gmail.com> - 2017-08-14 22:50 +0200
    Re: [PATCH v5 3/9] mfd: tmio: Add partition parsers platform data Lee Jones <lee.jones@linaro.org> - 2017-08-15 09:00 +0200
      Re: [PATCH v5 3/9] mfd: tmio: Add partition parsers platform data Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-08-19 09:30 +0200
        Re: [PATCH v5 3/9] mfd: tmio: Add partition parsers platform data Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-08-19 11:30 +0200
        Re: [PATCH v5 3/9] mfd: tmio: Add partition parsers platform data Lee Jones <lee.jones@linaro.org> - 2017-08-21 09:30 +0200
    Re: [PATCH v5 3/9] mfd: tmio: Add partition parsers platform data Wolfram Sang <wsa@the-dreams.de> - 2017-08-19 10:30 +0200
  [PATCH v5 4/9] mtd: nand: sharpsl: Register partitions using the parsers Andrea Adami <andrea.adami@gmail.com> - 2017-08-14 23:00 +0200
  [PATCH v5 1/9] mtd: sharpslpart: Add sharpslpart partition parser Andrea Adami <andrea.adami@gmail.com> - 2017-08-14 23:00 +0200
    Re: [PATCH v5 1/9] mtd: sharpslpart: Add sharpslpart partition  parser Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-08-17 10:20 +0200
  [PATCH v5 5/9] mtd: nand: tmio: Register partitions using the parsers Andrea Adami <andrea.adami@gmail.com> - 2017-08-14 23:00 +0200
    Re: [PATCH v5 5/9] mtd: nand: tmio: Register partitions using the  parsers Wolfram Sang <wsa@the-dreams.de> - 2017-08-19 10:30 +0200
  [PATCH v5 6/9] ARM: pxa/corgi: Remove hardcoded partitioning, use sharpslpart parser Andrea Adami <andrea.adami@gmail.com> - 2017-08-14 23:00 +0200
  Re: [PATCH v5 0/9] mtd: sharpslpart partition parser Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-08-21 22:20 +0200
    Re: [PATCH v5 0/9] mtd: sharpslpart partition parser Robert Jarzmik <robert.jarzmik@free.fr> - 2017-08-23 21:40 +0200
      Re: [PATCH v5 0/9] mtd: sharpslpart partition parser Andrea Adami <andrea.adami@gmail.com> - 2017-08-24 11:40 +0200
        Re: [PATCH v5 0/9] mtd: sharpslpart partition parser Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-08-24 11:50 +0200

csiph-web