Commit 176538d9 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

Merge tag 'cfi/for-5.7' into mtd/next 

HyperBus changes

* Print err msg when compatible is wrong or missing
* Move mapping of direct access window from core to individual drivers
parents 17872f51 b6fe8bc6

drivers/mtd/hyperbus/hbmc-am654.c

+12 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mux/consumer.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/types.h>
@@ -57,8 +58,10 @@ static const struct hyperbus_ops am654_hbmc_ops = { 


static int am654_hbmc_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct device *dev = &pdev->dev;

	struct am654_hbmc_priv *priv;

	struct resource res;

	int ret;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -67,6 +70,10 @@ static int am654_hbmc_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, priv);



	ret = of_address_to_resource(np, 0, &res);

	if (ret)

		return ret;



	if (of_property_read_bool(dev->of_node, "mux-controls")) {

		struct mux_control *control = devm_mux_control_get(dev, NULL);
@@ -88,6 +95,11 @@ static int am654_hbmc_probe(struct platform_device *pdev) 
		goto disable_pm;

	}



	priv->hbdev.map.size = resource_size(&res);

	priv->hbdev.map.virt = devm_ioremap_resource(dev, &res);

	if (IS_ERR(priv->hbdev.map.virt))

		return PTR_ERR(priv->hbdev.map.virt);



	priv->ctlr.dev = dev;

	priv->ctlr.ops = &am654_hbmc_ops;

	priv->hbdev.ctlr = &priv->ctlr;

drivers/mtd/hyperbus/hyperbus-core.c

+3 −12
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/mtd/map.h>

#include <linux/mtd/mtd.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/types.h>



static struct hyperbus_device *map_to_hbdev(struct map_info *map)
@@ -62,7 +61,6 @@ int hyperbus_register_device(struct hyperbus_device *hbdev) 
	struct hyperbus_ctlr *ctlr;

	struct device_node *np;

	struct map_info *map;

	struct resource res;

	struct device *dev;

	int ret;
@@ -73,22 +71,15 @@ int hyperbus_register_device(struct hyperbus_device *hbdev) 


	np = hbdev->np;

	ctlr = hbdev->ctlr;

	if (!of_device_is_compatible(np, "cypress,hyperflash"))

	if (!of_device_is_compatible(np, "cypress,hyperflash")) {

		dev_err(ctlr->dev, "\"cypress,hyperflash\" compatible missing\n");

		return -ENODEV;

	}



	hbdev->memtype = HYPERFLASH;



	ret = of_address_to_resource(np, 0, &res);

	if (ret)

		return ret;



	dev = ctlr->dev;

	map = &hbdev->map;

	map->size = resource_size(&res);

	map->virt = devm_ioremap_resource(dev, &res);

	if (IS_ERR(map->virt))

		return PTR_ERR(map->virt);



	map->name = dev_name(dev);

	map->bankwidth = 2;

	map->device_node = np;