From: Benjamin Gaignard <benjamin.gaignard@linaro.org>
To: labbott@redhat.com, sumit.semwal@linaro.org,
gregkh@linuxfoundation.org, yudongbin@hisilicon.com,
puck.chen@hisilicon.com, linux-kernel@vger.kernel.org
Cc: linaro-kernel@lists.linaro.org, kernel@stlinux.com,
Benjamin Gaignard <benjamin.gaignard@linaro.org>
Subject: [PATCH 2/3] add STIH4xx ION driver
Date: Wed, 26 Oct 2016 15:32:27 +0200 [thread overview]
Message-ID: <1477488748-10065-3-git-send-email-benjamin.gaignard@linaro.org> (raw)
In-Reply-To: <1477488748-10065-1-git-send-email-benjamin.gaignard@linaro.org>
This the same driver that Hisilicon one.
Change the list of heap to fit with sti SoC needs.
Rename/prefix some functions and structure with sti
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
---
drivers/staging/android/ion/Kconfig | 7 ++
drivers/staging/android/ion/Makefile | 2 +
drivers/staging/android/ion/sti/Makefile | 1 +
drivers/staging/android/ion/sti/sti_ion.c | 103 ++++++++++++++++++++++++++++++
4 files changed, 113 insertions(+)
create mode 100644 drivers/staging/android/ion/sti/Makefile
create mode 100644 drivers/staging/android/ion/sti/sti_ion.c
diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig
index c8fb413..eb47230 100644
--- a/drivers/staging/android/ion/Kconfig
+++ b/drivers/staging/android/ion/Kconfig
@@ -42,6 +42,13 @@ config ION_HISI
source "drivers/staging/android/ion/hisilicon/Kconfig"
+config ION_STI
+ bool "stih4xx ION Driver"
+ depends on ARCH_STI && ION
+ select ION_OF
+ help
+ Choose this option if you wish to use ion on STIH4xx SoC.
+
config ION_OF
bool "Devicetree support for Ion"
depends on ION && OF_ADDRESS
diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile
index 5d630a0..bc02ea4 100644
--- a/drivers/staging/android/ion/Makefile
+++ b/drivers/staging/android/ion/Makefile
@@ -9,5 +9,7 @@ endif
obj-$(CONFIG_ION_DUMMY) += ion_dummy_driver.o
obj-$(CONFIG_ION_TEGRA) += tegra/
obj-$(CONFIG_ION_HISI) += hisilicon/
+obj-$(CONFIG_ION_STI) += sti/
+
obj-$(CONFIG_ION_OF) += ion_of.o
diff --git a/drivers/staging/android/ion/sti/Makefile b/drivers/staging/android/ion/sti/Makefile
new file mode 100644
index 0000000..5690431
--- /dev/null
+++ b/drivers/staging/android/ion/sti/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_ION_STI) += sti_ion.o
diff --git a/drivers/staging/android/ion/sti/sti_ion.c b/drivers/staging/android/ion/sti/sti_ion.c
new file mode 100644
index 0000000..4c0f52b
--- /dev/null
+++ b/drivers/staging/android/ion/sti/sti_ion.c
@@ -0,0 +1,103 @@
+/*
+ * STIH4xx ION Driver
+ *
+ * Copyright (c) 2016 STMicroelectronics
+ *
+ * Author: Benjamin Gaignard <benjamin.gaignard@st.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/err.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include "../ion_priv.h"
+#include "../ion.h"
+#include "../ion_of.h"
+
+struct sti_ion_dev {
+ struct ion_heap **heaps;
+ struct ion_device *idev;
+ struct ion_platform_data *data;
+};
+
+static struct ion_of_heap sti_heaps[] = {
+ PLATFORM_HEAP("st,cma", 0, ION_HEAP_TYPE_DMA, "cma"),
+ {}
+};
+
+static int sti_ion_probe(struct platform_device *pdev)
+{
+ struct sti_ion_dev *ipdev;
+ int i;
+
+ ipdev = devm_kzalloc(&pdev->dev, sizeof(*ipdev), GFP_KERNEL);
+ if (!ipdev)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, ipdev);
+
+ ipdev->idev = ion_device_create(NULL);
+ if (IS_ERR(ipdev->idev))
+ return PTR_ERR(ipdev->idev);
+
+ ipdev->data = ion_parse_dt(pdev, sti_heaps);
+ if (IS_ERR(ipdev->data))
+ return PTR_ERR(ipdev->data);
+
+ ipdev->heaps = devm_kzalloc(&pdev->dev,
+ sizeof(struct ion_heap) * ipdev->data->nr,
+ GFP_KERNEL);
+ if (!ipdev->heaps) {
+ ion_destroy_platform_data(ipdev->data);
+ return -ENOMEM;
+ }
+
+ for (i = 0; i < ipdev->data->nr; i++) {
+ ipdev->heaps[i] = ion_heap_create(&ipdev->data->heaps[i]);
+ if (!ipdev->heaps) {
+ ion_destroy_platform_data(ipdev->data);
+ return -ENOMEM;
+ }
+ ion_device_add_heap(ipdev->idev, ipdev->heaps[i]);
+ }
+ return 0;
+}
+
+static int sti_ion_remove(struct platform_device *pdev)
+{
+ struct sti_ion_dev *ipdev;
+ int i;
+
+ ipdev = platform_get_drvdata(pdev);
+
+ for (i = 0; i < ipdev->data->nr; i++)
+ ion_heap_destroy(ipdev->heaps[i]);
+
+ ion_destroy_platform_data(ipdev->data);
+ ion_device_destroy(ipdev->idev);
+
+ return 0;
+}
+
+static const struct of_device_id sti_ion_match_table[] = {
+ {.compatible = "st,sti-ion"},
+ {},
+};
+
+static struct platform_driver sti_ion_driver = {
+ .probe = sti_ion_probe,
+ .remove = sti_ion_remove,
+ .driver = {
+ .name = "ion-sti",
+ .of_match_table = sti_ion_match_table,
+ },
+};
+
+module_platform_driver(sti_ion_driver);
--
1.9.1
next prev parent reply other threads:[~2016-10-26 13:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-26 13:32 [PATCH 0/3] add ION driver for STIh4xx SoC Benjamin Gaignard
2016-10-26 13:32 ` [PATCH 1/3] add binding for STIh4xx ION driver Benjamin Gaignard
2016-10-26 13:32 ` Benjamin Gaignard [this message]
2016-10-26 13:32 ` [PATCH 3/3] add STIH4xx ION driver in DT Benjamin Gaignard
2016-10-26 13:51 ` [PATCH 0/3] add ION driver for STIh4xx SoC Sumit Semwal
2016-10-26 14:41 ` Benjamin Gaignard
2016-10-26 14:44 ` Sumit Semwal
2016-10-26 15:05 ` Benjamin Gaignard
2016-10-26 23:25 ` Laura Abbott
2016-11-07 10:17 ` Benjamin Gaignard
2016-11-07 22:17 ` Laura Abbott
2016-11-08 9:18 ` Benjamin Gaignard
2016-11-09 4:49 ` Laura Abbott
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477488748-10065-3-git-send-email-benjamin.gaignard@linaro.org \
--to=benjamin.gaignard@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=kernel@stlinux.com \
--cc=labbott@redhat.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=puck.chen@hisilicon.com \
--cc=sumit.semwal@linaro.org \
--cc=yudongbin@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).