Commit 5ed903b3 authored by Steffen Trumtrar's avatar Steffen Trumtrar Committed by Herbert Xu
Browse files

crypto: sahara - add support for i.MX53 



The Sahara on the i.MX53 is of version 4. Add support for probing the
device.

Signed-off-by: default avatarSteffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 20ec9d81

Documentation/devicetree/bindings/crypto/fsl-imx-sahara.txt

+1 −1
Original line number Diff line number Diff line 
Freescale SAHARA Cryptographic Accelerator included in some i.MX chips.

Currently only i.MX27 is supported.

Currently only i.MX27 and i.MX53 are supported.



Required properties:

- compatible : Should be "fsl,<soc>-sahara"

drivers/crypto/sahara.c

+17 −3
Original line number Diff line number Diff line
@@ -24,10 +24,12 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>



#define SAHARA_NAME "sahara"

#define SAHARA_VERSION_3	3

#define SAHARA_VERSION_4	4

#define SAHARA_TIMEOUT_MS	1000

#define SAHARA_MAX_HW_DESC	2

#define SAHARA_MAX_HW_LINK	20
@@ -130,6 +132,7 @@ struct sahara_aes_reqctx { 


struct sahara_dev {

	struct device		*device;

	unsigned int		version;

	void __iomem		*regs_base;

	struct clk		*clk_ipg;

	struct clk		*clk_ahb;
@@ -860,6 +863,7 @@ static struct platform_device_id sahara_platform_ids[] = { 
MODULE_DEVICE_TABLE(platform, sahara_platform_ids);



static struct of_device_id sahara_dt_ids[] = {

	{ .compatible = "fsl,imx53-sahara" },

	{ .compatible = "fsl,imx27-sahara" },

	{ /* sentinel */ }

};
@@ -973,13 +977,23 @@ static int sahara_probe(struct platform_device *pdev) 
	clk_prepare_enable(dev->clk_ahb);



	version = sahara_read(dev, SAHARA_REG_VERSION);

	if (version != SAHARA_VERSION_3) {

	if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx27-sahara")) {

		if (version != SAHARA_VERSION_3)

			err = -ENODEV;

	} else if (of_device_is_compatible(pdev->dev.of_node,

			"fsl,imx53-sahara")) {

		if (((version >> 8) & 0xff) != SAHARA_VERSION_4)

			err = -ENODEV;

		version = (version >> 8) & 0xff;

	}

	if (err == -ENODEV) {

		dev_err(&pdev->dev, "SAHARA version %d not supported\n",

				version);

		err = -ENODEV;

		goto err_algs;

	}



	dev->version = version;



	sahara_write(dev, SAHARA_CMD_RESET | SAHARA_CMD_MODE_BATCH,

		     SAHARA_REG_CMD);

	sahara_write(dev, SAHARA_CONTROL_SET_THROTTLE(0) |