iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: rawnand: ams-delta: Use struct gpio_nand_platdata

Browse Source 
In order to be able to move the hardcoded Amstrad Delta partition info
from the driver code to the board file, reuse gpio_nand_platdata
structure owned by "gpio-nand" driver and try to obtain information
on device partitions from device platform data.

Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200212003929.6682-3-jmkrzyszt@gmail.com
This commit is contained in:
Janusz Krzysztofik 2020-02-12 01:39:17 +01:00 committed by Miquel Raynal
parent 91a1abfb75
commit 1698ea3213
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mtd/nand/raw/ams-delta.c
View File

@ -19,6 +19,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/nand-gpio.h>
#include <linux/mtd/rawnand.h> #include <linux/mtd/rawnand.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
@ -220,12 +221,20 @@ static const struct nand_controller_ops ams_delta_ops = {
*/ */
static int ams_delta_init(struct platform_device *pdev) static int ams_delta_init(struct platform_device *pdev)
{ {
struct gpio_nand_platdata *pdata = dev_get_platdata(&pdev->dev);
const struct mtd_partition *partitions = partition_info;
int num_partitions = ARRAY_SIZE(partition_info);
struct ams_delta_nand *priv; struct ams_delta_nand *priv;
struct nand_chip *this; struct nand_chip *this;
struct mtd_info *mtd; struct mtd_info *mtd;
struct gpio_descs *data_gpiods; struct gpio_descs *data_gpiods;
int err = 0; int err = 0;
if (pdata) {
partitions = pdata->parts;
num_partitions = pdata->num_parts;
}
/* Allocate memory for MTD device structure and private data */ /* Allocate memory for MTD device structure and private data */
priv = devm_kzalloc(&pdev->dev, sizeof(struct ams_delta_nand), priv = devm_kzalloc(&pdev->dev, sizeof(struct ams_delta_nand),
GFP_KERNEL); GFP_KERNEL);
@ -326,8 +335,7 @@ static int ams_delta_init(struct platform_device *pdev)
return err; return err;
/* Register the partitions */ /* Register the partitions */
err = mtd_device_register(mtd, partition_info, err = mtd_device_register(mtd, partitions, num_partitions);
ARRAY_SIZE(partition_info));
if (err) if (err)
goto err_nand_cleanup; goto err_nand_cleanup;