diff for duplicates of <87vc9chf23.fsf@lebrac.rtp-net.org> diff --git a/a/1.txt b/N1/1.txt index 463b498..4d43ba2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -48,3 +48,10 @@ imx51. It's not perfect but it's enough for testing things. Arnaud +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: imx51-sahara.patch +Type: text/x-diff +Size: 5482 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130228/ba3ba53a/attachment-0001.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 72bf995..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: text/x-diff -Content-Disposition: inline; filename=imx51-sahara.patch diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index acea494..0000000 --- a/a/2.txt +++ /dev/null @@ -1,155 +0,0 @@ -Index: sascha-new/Documentation/devicetree/bindings/clock/imx5-clock.txt -=================================================================== ---- sascha-new.orig/Documentation/devicetree/bindings/clock/imx5-clock.txt 2013-02-27 22:30:39.000000000 +0100 -+++ sascha-new/Documentation/devicetree/bindings/clock/imx5-clock.txt 2013-02-27 22:36:07.007547186 +0100 -@@ -173,6 +173,7 @@ clocks and IDs. - can1_ipg_gate 158 - srtc_gate 159 - pata_gate 160 -+ sahara_gate 161 - - Examples (for mx53): - -Index: sascha-new/arch/arm/boot/dts/imx51-genesi-efika-sb.dts -=================================================================== ---- sascha-new.orig/arch/arm/boot/dts/imx51-genesi-efika-sb.dts 2013-02-27 22:30:39.000000000 +0100 -+++ sascha-new/arch/arm/boot/dts/imx51-genesi-efika-sb.dts 2013-02-27 22:36:07.043547182 +0100 -@@ -399,3 +399,6 @@ - status = "okay"; - }; - -+&sahara { -+ status = "okay"; -+}; -Index: sascha-new/arch/arm/boot/dts/imx51.dtsi -=================================================================== ---- sascha-new.orig/arch/arm/boot/dts/imx51.dtsi 2013-02-27 22:30:39.000000000 +0100 -+++ sascha-new/arch/arm/boot/dts/imx51.dtsi 2013-02-27 22:36:07.071547182 +0100 -@@ -678,6 +678,15 @@ - clock-names = "per", "ahb"; - status = "disabled"; - }; -+ -+ sahara: sahara@83ff8000 { -+ compatible = "fsl,imx51-sahara"; -+ reg = <0x83ff8000 0x4000>; -+ interrupts = <19>; -+ clocks = <&clks 161>, <&clks 0>; -+ clock-names = "ipg", "ahb"; -+ status = "disabled"; -+ }; - }; - }; - }; -Index: sascha-new/arch/arm/mach-imx/clk-imx51-imx53.c -=================================================================== ---- sascha-new.orig/arch/arm/mach-imx/clk-imx51-imx53.c 2013-02-27 22:30:39.000000000 +0100 -+++ sascha-new/arch/arm/mach-imx/clk-imx51-imx53.c 2013-02-27 22:36:07.015547183 +0100 -@@ -83,6 +83,7 @@ enum imx5_clks { - ssi2_root_gate, ssi3_root_gate, ssi_ext1_gate, ssi_ext2_gate, - epit1_ipg_gate, epit1_hf_gate, epit2_ipg_gate, epit2_hf_gate, - can_sel, can1_serial_gate, can1_ipg_gate, srtc_gate, pata_gate, -+ sahara_gate, - clk_max - }; - -@@ -346,6 +347,7 @@ int __init mx51_clocks_init(unsigned lon - clk[mipi_esc_gate] = imx_clk_gate2("mipi_esc_gate", "ipg", MXC_CCM_CCGR4, 10); - clk[mipi_hsp_gate] = imx_clk_gate2("mipi_hsp_gate", "ipg", MXC_CCM_CCGR4, 12); - clk[pata_gate] = imx_clk_gate2("pata_gate", "ipg", MXC_CCM_CCGR4, 0); -+ clk[sahara_gate] = imx_clk_gate2("sahara_gate", "ipg", MXC_CCM_CCGR4, 14); - - for (i = 0; i < ARRAY_SIZE(clk); i++) - if (IS_ERR(clk[i])) -Index: sascha-new/drivers/crypto/Kconfig -=================================================================== ---- sascha-new.orig/drivers/crypto/Kconfig 2013-02-27 22:30:59.000000000 +0100 -+++ sascha-new/drivers/crypto/Kconfig 2013-02-27 22:36:07.079547182 +0100 -@@ -278,7 +278,7 @@ config CRYPTO_DEV_PICOXCELL - - config CRYPTO_DEV_SAHARA - tristate "Support for SAHARA crypto accelerator" -- depends on MACH_MX27 && EXPERIMENTAL && OF -+ depends on ARCH_MXC && EXPERIMENTAL && OF - select CRYPTO_BLKCIPHER - select CRYPTO_AES - select CRYPTO_ECB -Index: sascha-new/drivers/crypto/sahara.c -=================================================================== ---- sascha-new.orig/drivers/crypto/sahara.c 2013-02-27 22:30:59.000000000 +0100 -+++ sascha-new/drivers/crypto/sahara.c 2013-02-27 22:45:40.359521961 +0100 -@@ -24,6 +24,7 @@ - #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" -@@ -859,14 +860,30 @@ static struct platform_device_id sahara_ - }; - MODULE_DEVICE_TABLE(platform, sahara_platform_ids); - -+struct sahara_data { -+ int version; -+}; -+ -+static struct sahara_data sahara_data_v3 = { -+ .version = 3, -+}; -+ -+static struct sahara_data sahara_data_v4 = { -+ .version = 4, -+}; -+ - static struct of_device_id sahara_dt_ids[] = { -- { .compatible = "fsl,imx27-sahara" }, -+ { .compatible = "fsl,imx51-sahara", .data = &sahara_data_v4, }, -+ { .compatible = "fsl,imx27-sahara", .data = &sahara_data_v3, }, - { /* sentinel */ } - }; - MODULE_DEVICE_TABLE(platform, sahara_dt_ids); - - static int sahara_probe(struct platform_device *pdev) - { -+ const struct of_device_id *of_id = -+ of_match_device(sahara_dt_ids, &pdev->dev); -+ const struct sahara_data *data; - struct sahara_dev *dev; - struct resource *res; - u32 version; -@@ -982,10 +999,13 @@ static int sahara_probe(struct platform_ - clk_prepare_enable(dev->clk_ipg); - clk_prepare_enable(dev->clk_ahb); - -+ data = of_id->data; -+ - version = sahara_read(dev, SAHARA_REG_VERSION); -- if (version != SAHARA_VERSION_3) { -- dev_err(&pdev->dev, "SAHARA version %d not supported\n", -- version); -+ /* sahara 4 version nr is not encoded in the same way as 2/3 */ -+ if ((version != data->version) && (((version >> 8) & 0xff) != data->version)) { -+ dev_err(&pdev->dev, "SAHARA version %d not supported (wanted %d)\n", -+ version, data->version); - err = -ENODEV; - goto err_algs; - } -@@ -1002,7 +1022,7 @@ static int sahara_probe(struct platform_ - if (err) - goto err_algs; - -- dev_info(&pdev->dev, "SAHARA version %d initialized\n", version); -+ dev_info(&pdev->dev, "SAHARA version %d initialized\n", data->version); - - return 0; - -@@ -1054,7 +1074,7 @@ static int sahara_remove(struct platform - - static struct platform_driver sahara_driver = { - .probe = sahara_probe, -- .remove = __devexit_p(sahara_remove), -+ .remove = sahara_remove, - .driver = { - .name = SAHARA_NAME, - .owner = THIS_MODULE, diff --git a/a/content_digest b/N1/content_digest index 47c5fc2..76cdf92 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,10 @@ "ref\01361961711-4603-1-git-send-email-javier.martin@vista-silicon.com\0" "ref\01361961711-4603-3-git-send-email-javier.martin@vista-silicon.com\0" - "From\0Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>\0" - "Subject\0Re: [PATCH v2 2/3] crypto: sahara: Add driver for SAHARA2 accelerator.\0" + "From\0arnaud.patard@rtp-net.org (Arnaud Patard (Rtp))\0" + "Subject\0[PATCH v2 2/3] crypto: sahara: Add driver for SAHARA2 accelerator.\0" "Date\0Thu, 28 Feb 2013 12:07:48 +0100\0" - "To\0Javier Martin <javier.martin@vista-silicon.com>\0" - "Cc\0linux-crypto@vger.kernel.org" - swarren@nvidia.com - herbert@gondor.apana.org.au - arnd@arndb.de - linux-doc@vger.kernel.org - devicetree-discuss@lists.ozlabs.org - kernel@pengutronix.de - shawn.guo@linaro.org - davem@davemloft.net - linux-arm-kernel@lists.infradead.org - " gcembed@gmail.com\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "Javier Martin <javier.martin@vista-silicon.com> writes:\n" "\n" @@ -66,164 +55,13 @@ "imx51. It's not perfect but it's enough for testing things.\n" "\n" "\n" - Arnaud - "\01:2\0" - "fn\0imx51-sahara.patch\0" - "b\0" - "Index: sascha-new/Documentation/devicetree/bindings/clock/imx5-clock.txt\n" - "===================================================================\n" - "--- sascha-new.orig/Documentation/devicetree/bindings/clock/imx5-clock.txt\t2013-02-27 22:30:39.000000000 +0100\n" - "+++ sascha-new/Documentation/devicetree/bindings/clock/imx5-clock.txt\t2013-02-27 22:36:07.007547186 +0100\n" - "@@ -173,6 +173,7 @@ clocks and IDs.\n" - " \tcan1_ipg_gate\t\t158\n" - " \tsrtc_gate\t\t159\n" - " \tpata_gate\t\t160\n" - "+\tsahara_gate\t\t161\n" - " \n" - " Examples (for mx53):\n" - " \n" - "Index: sascha-new/arch/arm/boot/dts/imx51-genesi-efika-sb.dts\n" - "===================================================================\n" - "--- sascha-new.orig/arch/arm/boot/dts/imx51-genesi-efika-sb.dts\t2013-02-27 22:30:39.000000000 +0100\n" - "+++ sascha-new/arch/arm/boot/dts/imx51-genesi-efika-sb.dts\t2013-02-27 22:36:07.043547182 +0100\n" - "@@ -399,3 +399,6 @@\n" - " \tstatus = \"okay\";\n" - " };\n" - " \n" - "+&sahara {\n" - "+\tstatus = \"okay\";\n" - "+};\n" - "Index: sascha-new/arch/arm/boot/dts/imx51.dtsi\n" - "===================================================================\n" - "--- sascha-new.orig/arch/arm/boot/dts/imx51.dtsi\t2013-02-27 22:30:39.000000000 +0100\n" - "+++ sascha-new/arch/arm/boot/dts/imx51.dtsi\t2013-02-27 22:36:07.071547182 +0100\n" - "@@ -678,6 +678,15 @@\n" - " \t\t\t\tclock-names = \"per\", \"ahb\";\n" - " \t\t\t\tstatus = \"disabled\";\n" - " \t\t\t};\n" - "+\n" - "+\t\t\tsahara: sahara@83ff8000 {\n" - "+\t\t\t\tcompatible = \"fsl,imx51-sahara\";\n" - "+\t\t\t\treg = <0x83ff8000 0x4000>;\n" - "+\t\t\t\tinterrupts = <19>;\n" - "+\t\t\t\tclocks = <&clks 161>, <&clks 0>;\n" - "+\t\t\t\tclock-names = \"ipg\", \"ahb\";\n" - "+\t\t\t\tstatus = \"disabled\";\n" - "+\t\t\t};\n" - " \t\t};\n" - " \t};\n" - " };\n" - "Index: sascha-new/arch/arm/mach-imx/clk-imx51-imx53.c\n" - "===================================================================\n" - "--- sascha-new.orig/arch/arm/mach-imx/clk-imx51-imx53.c\t2013-02-27 22:30:39.000000000 +0100\n" - "+++ sascha-new/arch/arm/mach-imx/clk-imx51-imx53.c\t2013-02-27 22:36:07.015547183 +0100\n" - "@@ -83,6 +83,7 @@ enum imx5_clks {\n" - " \tssi2_root_gate, ssi3_root_gate, ssi_ext1_gate, ssi_ext2_gate,\n" - " \tepit1_ipg_gate, epit1_hf_gate, epit2_ipg_gate, epit2_hf_gate,\n" - " \tcan_sel, can1_serial_gate, can1_ipg_gate, srtc_gate, pata_gate,\n" - "+\tsahara_gate,\n" - " \tclk_max\n" - " };\n" - " \n" - "@@ -346,6 +347,7 @@ int __init mx51_clocks_init(unsigned lon\n" - " \tclk[mipi_esc_gate] = imx_clk_gate2(\"mipi_esc_gate\", \"ipg\", MXC_CCM_CCGR4, 10);\n" - " \tclk[mipi_hsp_gate] = imx_clk_gate2(\"mipi_hsp_gate\", \"ipg\", MXC_CCM_CCGR4, 12);\n" - " \tclk[pata_gate] = imx_clk_gate2(\"pata_gate\", \"ipg\", MXC_CCM_CCGR4, 0);\n" - "+\tclk[sahara_gate] = imx_clk_gate2(\"sahara_gate\", \"ipg\", MXC_CCM_CCGR4, 14);\n" - " \n" - " \tfor (i = 0; i < ARRAY_SIZE(clk); i++)\n" - " \t\tif (IS_ERR(clk[i]))\n" - "Index: sascha-new/drivers/crypto/Kconfig\n" - "===================================================================\n" - "--- sascha-new.orig/drivers/crypto/Kconfig\t2013-02-27 22:30:59.000000000 +0100\n" - "+++ sascha-new/drivers/crypto/Kconfig\t2013-02-27 22:36:07.079547182 +0100\n" - "@@ -278,7 +278,7 @@ config CRYPTO_DEV_PICOXCELL\n" - " \n" - " config CRYPTO_DEV_SAHARA\n" - " \ttristate \"Support for SAHARA crypto accelerator\"\n" - "-\tdepends on MACH_MX27 && EXPERIMENTAL && OF\n" - "+\tdepends on ARCH_MXC && EXPERIMENTAL && OF\n" - " \tselect CRYPTO_BLKCIPHER\n" - " \tselect CRYPTO_AES\n" - " \tselect CRYPTO_ECB\n" - "Index: sascha-new/drivers/crypto/sahara.c\n" - "===================================================================\n" - "--- sascha-new.orig/drivers/crypto/sahara.c\t2013-02-27 22:30:59.000000000 +0100\n" - "+++ sascha-new/drivers/crypto/sahara.c\t2013-02-27 22:45:40.359521961 +0100\n" - "@@ -24,6 +24,7 @@\n" - " #include <linux/kernel.h>\n" - " #include <linux/module.h>\n" - " #include <linux/of.h>\n" - "+#include <linux/of_device.h>\n" - " #include <linux/platform_device.h>\n" - " \n" - " #define SAHARA_NAME \"sahara\"\n" - "@@ -859,14 +860,30 @@ static struct platform_device_id sahara_\n" - " };\n" - " MODULE_DEVICE_TABLE(platform, sahara_platform_ids);\n" - " \n" - "+struct sahara_data {\n" - "+\tint version;\n" - "+};\n" - "+\n" - "+static struct sahara_data sahara_data_v3 = {\n" - "+\t.version = 3,\n" - "+};\n" - "+\n" - "+static struct sahara_data sahara_data_v4 = {\n" - "+\t.version = 4,\n" - "+};\n" - "+\n" - " static struct of_device_id sahara_dt_ids[] = {\n" - "-\t{ .compatible = \"fsl,imx27-sahara\" },\n" - "+\t{ .compatible = \"fsl,imx51-sahara\", .data = &sahara_data_v4, },\n" - "+\t{ .compatible = \"fsl,imx27-sahara\", .data = &sahara_data_v3, },\n" - " \t{ /* sentinel */ }\n" - " };\n" - " MODULE_DEVICE_TABLE(platform, sahara_dt_ids);\n" - " \n" - " static int sahara_probe(struct platform_device *pdev)\n" - " {\n" - "+\tconst struct of_device_id *of_id =\n" - "+\t\tof_match_device(sahara_dt_ids, &pdev->dev);\n" - "+\tconst struct sahara_data *data;\n" - " \tstruct sahara_dev *dev;\n" - " \tstruct resource *res;\n" - " \tu32 version;\n" - "@@ -982,10 +999,13 @@ static int sahara_probe(struct platform_\n" - " \tclk_prepare_enable(dev->clk_ipg);\n" - " \tclk_prepare_enable(dev->clk_ahb);\n" - " \n" - "+\tdata = of_id->data;\n" - "+\n" - " \tversion = sahara_read(dev, SAHARA_REG_VERSION);\n" - "-\tif (version != SAHARA_VERSION_3) {\n" - "-\t\tdev_err(&pdev->dev, \"SAHARA version %d not supported\\n\",\n" - "-\t\t\tversion);\n" - "+\t/* sahara 4 version nr is not encoded in the same way as 2/3 */\n" - "+\tif ((version != data->version) && (((version >> 8) & 0xff) != data->version)) {\n" - "+\t\tdev_err(&pdev->dev, \"SAHARA version %d not supported (wanted %d)\\n\",\n" - "+\t\t\tversion, data->version);\n" - " \t\terr = -ENODEV;\n" - " \t\tgoto err_algs;\n" - " \t}\n" - "@@ -1002,7 +1022,7 @@ static int sahara_probe(struct platform_\n" - " \tif (err)\n" - " \t\tgoto err_algs;\n" - " \n" - "-\tdev_info(&pdev->dev, \"SAHARA version %d initialized\\n\", version);\n" - "+\tdev_info(&pdev->dev, \"SAHARA version %d initialized\\n\", data->version);\n" - " \n" - " \treturn 0;\n" - " \n" - "@@ -1054,7 +1074,7 @@ static int sahara_remove(struct platform\n" - " \n" - " static struct platform_driver sahara_driver = {\n" - " \t.probe\t\t= sahara_probe,\n" - "-\t.remove\t\t= __devexit_p(sahara_remove),\n" - "+\t.remove\t\t= sahara_remove,\n" - " \t.driver\t\t= {\n" - " \t\t.name\t= SAHARA_NAME,\n" - " \t\t.owner\t= THIS_MODULE," + "Arnaud\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: imx51-sahara.patch\n" + "Type: text/x-diff\n" + "Size: 5482 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130228/ba3ba53a/attachment-0001.bin> -0874ff8bb7618dd9583d594b42b34493988d949aefb864fc8a3b48019e3392fd +80da058e5ae37d3da33ac791902274efe3d8a7f838192d4703e2db67ae1b0f19
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.