Commit 8e591300 authored by Florian Fainelli's avatar Florian Fainelli Committed by Miquel Raynal
Browse files

mtd: rawnand: brcmnand: Allow platform data instantation 



Make use of the recently refactored code in brcmnand_init_cs() and
derive the chip-select from the platform data that is supplied. Update
the various code paths to avoid relying on possibly non-existent
resources, too.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220107184614.2670254-8-f.fainelli@gmail.com
parent 02d1d0e4

drivers/mtd/nand/raw/brcmnand/brcmnand.c

+35 −10
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/delay.h>

#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/platform_data/brcmnand.h>

#include <linux/err.h>

#include <linux/completion.h>

#include <linux/interrupt.h>
@@ -2768,7 +2769,8 @@ static const struct nand_controller_ops brcmnand_controller_ops = { 
	.attach_chip = brcmnand_attach_chip,

};



static int brcmnand_init_cs(struct brcmnand_host *host)

static int brcmnand_init_cs(struct brcmnand_host *host,

			    const char * const *part_probe_types)

{

	struct brcmnand_controller *ctrl = host->ctrl;

	struct device *dev = ctrl->dev;
@@ -2821,7 +2823,7 @@ static int brcmnand_init_cs(struct brcmnand_host *host) 
	if (ret)

		return ret;



	ret = mtd_device_register(mtd, NULL, 0);

	ret = mtd_device_parse_register(mtd, part_probe_types, NULL, NULL, 0);

	if (ret)

		nand_cleanup(chip);
@@ -2990,17 +2992,15 @@ static int brcmnand_edu_setup(struct platform_device *pdev) 


int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc)

{

	struct brcmnand_platform_data *pd = dev_get_platdata(&pdev->dev);

	struct device *dev = &pdev->dev;

	struct device_node *dn = dev->of_node, *child;

	struct brcmnand_controller *ctrl;

	struct brcmnand_host *host;

	struct resource *res;

	int ret;



	/* We only support device-tree instantiation */

	if (!dn)

		return -ENODEV;



	if (!of_match_node(brcmnand_of_match, dn))

	if (dn && !of_match_node(brcmnand_of_match, dn))

		return -ENODEV;



	ctrl = devm_kzalloc(dev, sizeof(*ctrl), GFP_KERNEL);
@@ -3027,7 +3027,7 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc) 
	/* NAND register range */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	ctrl->nand_base = devm_ioremap_resource(dev, res);

	if (IS_ERR(ctrl->nand_base))

	if (IS_ERR(ctrl->nand_base) && !brcmnand_soc_has_ops(soc))

		return PTR_ERR(ctrl->nand_base);



	/* Enable clock before using NAND registers */
@@ -3171,7 +3171,6 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc) 


	for_each_available_child_of_node(dn, child) {

		if (of_device_is_compatible(child, "brcm,nandcs")) {

			struct brcmnand_host *host;



			host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);

			if (!host) {
@@ -3191,7 +3190,7 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc) 


			nand_set_flash_node(&host->chip, child);



			ret = brcmnand_init_cs(host);

			ret = brcmnand_init_cs(host, NULL);

			if (ret) {

				devm_kfree(dev, host);

				continue; /* Try all chip-selects */
@@ -3201,6 +3200,32 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc) 
		}

	}



	if (!list_empty(&ctrl->host_list))

		return 0;



	if (!pd) {

		ret = -ENODEV;

		goto err;

	}



	/* If we got there we must have been probing via platform data */

	host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);

	if (!host) {

		ret = -ENOMEM;

		goto err;

	}

	host->pdev = pdev;

	host->ctrl = ctrl;

	host->cs = pd->chip_select;

	host->chip.ecc.size = pd->ecc_stepsize;

	host->chip.ecc.strength = pd->ecc_strength;



	ret = brcmnand_init_cs(host, pd->part_probe_types);

	if (ret)

		goto err;



	list_add_tail(&host->node, &ctrl->host_list);



	/* No chip-selects could initialize properly */

	if (list_empty(&ctrl->host_list)) {

		ret = -ENODEV;