diff mbox

s5p-jpeg: Add initial device tree support for S5PV210/Exynos4210 SoCs

Message ID 1376856867-17771-1-git-send-email-s.nawrocki@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sylwester Nawrocki Aug. 18, 2013, 8:14 p.m. UTC
This patch enables the JPEG codec on S5PV210 and Exynos4210 SoCs. There are
some differences in newer versions of the JPEG codec IP on SoCs like Exynos4x12
and Exynos5 series and support for them will be added in subsequent patches.

Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
 .../bindings/media/exynos-jpeg-codec.txt           |   11 +++++++++++
 drivers/media/platform/s5p-jpeg/jpeg-core.c        |   12 +++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt

Comments

On 08/18/2013 10:14 PM, Sylwester Nawrocki wrote:
> This patch enables the JPEG codec on S5PV210 and Exynos4210 SoCs. There are
> some differences in newer versions of the JPEG codec IP on SoCs like Exynos4x12
> and Exynos5 series and support for them will be added in subsequent patches.
> 
> Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

Could a DT maintainer review/Ack the binding in this patch ?

> ---
>  .../bindings/media/exynos-jpeg-codec.txt           |   11 +++++++++++
>  drivers/media/platform/s5p-jpeg/jpeg-core.c        |   12 +++++++++++-
>  2 files changed, 22 insertions(+), 1 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt
> 
> diff --git a/Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt b/Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt
> new file mode 100644
> index 0000000..937b755
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt
> @@ -0,0 +1,11 @@
> +Samsung S5P/EXYNOS SoC series JPEG codec
> +
> +Required properties:
> +
> +- compatible	: should be one of:
> +		  "samsung,s5pv210-jpeg", "samsung,exynos4210-jpeg";
> +- reg		: address and length of the JPEG codec IP register set;
> +- interrupts	: specifies the JPEG codec IP interrupt;
> +- clocks	: should contain the JPEG codec IP gate clock specifier, from the
> +		  common clock bindings;
> +- clock-names	: should contain "jpeg" entry.
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> index 15d2396..88c5beb 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
> +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> @@ -17,6 +17,7 @@
>  #include <linux/io.h>
>  #include <linux/kernel.h>
>  #include <linux/module.h>
> +#include <linux/of.h>
>  #include <linux/platform_device.h>
>  #include <linux/pm_runtime.h>
>  #include <linux/slab.h>
> @@ -1513,10 +1514,20 @@ static const struct dev_pm_ops s5p_jpeg_pm_ops = {
>  	.runtime_resume	 = s5p_jpeg_runtime_resume,
>  };
>  
> +#ifdef CONFIG_OF
> +static const struct of_device_id s5p_jpeg_of_match[] = {
> +	{ .compatible = "samsung,s5pv210-jpeg" },
> +	{ .compatible = "samsung,exynos4210-jpeg" },
> +	{ /* sentinel */ },
> +};
> +MODULE_DEVICE_TABLE(of, s5p_jpeg_of_match);
> +#endif
> +
>  static struct platform_driver s5p_jpeg_driver = {
>  	.probe = s5p_jpeg_probe,
>  	.remove = s5p_jpeg_remove,
>  	.driver = {
> +		.of_match_table = of_match_ptr(s5p_jpeg_of_match),
>  		.owner = THIS_MODULE,
>  		.name = S5P_JPEG_M2M_NAME,
>  		.pm = &s5p_jpeg_pm_ops,
> @@ -1528,4 +1539,3 @@ module_platform_driver(s5p_jpeg_driver);
>  MODULE_AUTHOR("Andrzej Pietrasiewicz <andrzej.p@samsung.com>");
>  MODULE_DESCRIPTION("Samsung JPEG codec driver");
>  MODULE_LICENSE("GPL");
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stephen Warren Aug. 23, 2013, 10:45 p.m. UTC | #2
On 08/23/2013 10:01 AM, Sylwester Nawrocki wrote:
> On 08/18/2013 10:14 PM, Sylwester Nawrocki wrote:
>> This patch enables the JPEG codec on S5PV210 and Exynos4210 SoCs. There are
>> some differences in newer versions of the JPEG codec IP on SoCs like Exynos4x12
>> and Exynos5 series and support for them will be added in subsequent patches.
>>
>> Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
>> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> 
> Could a DT maintainer review/Ack the binding in this patch ?

The binding looks reasonable to me, so,
Acked-by: Stephen Warren <swarren@nvidia.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
On 08/24/2013 12:45 AM, Stephen Warren wrote:
> On 08/23/2013 10:01 AM, Sylwester Nawrocki wrote:
>> > On 08/18/2013 10:14 PM, Sylwester Nawrocki wrote:
>>> >> This patch enables the JPEG codec on S5PV210 and Exynos4210 SoCs. There are
>>> >> some differences in newer versions of the JPEG codec IP on SoCs like Exynos4x12
>>> >> and Exynos5 series and support for them will be added in subsequent patches.
>>> >>
>>> >> Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
>>> >> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>> > 
>> > Could a DT maintainer review/Ack the binding in this patch ?
>
> The binding looks reasonable to me, so,
> Acked-by: Stephen Warren <swarren@nvidia.com>

Thanks Stephen, I've queued this for v3.13.

--
Regards,
Sylwester
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt b/Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt
new file mode 100644
index 0000000..937b755
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt
@@ -0,0 +1,11 @@ 
+Samsung S5P/EXYNOS SoC series JPEG codec
+
+Required properties:
+
+- compatible	: should be one of:
+		  "samsung,s5pv210-jpeg", "samsung,exynos4210-jpeg";
+- reg		: address and length of the JPEG codec IP register set;
+- interrupts	: specifies the JPEG codec IP interrupt;
+- clocks	: should contain the JPEG codec IP gate clock specifier, from the
+		  common clock bindings;
+- clock-names	: should contain "jpeg" entry.
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index 15d2396..88c5beb 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -17,6 +17,7 @@ 
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
@@ -1513,10 +1514,20 @@  static const struct dev_pm_ops s5p_jpeg_pm_ops = {
 	.runtime_resume	 = s5p_jpeg_runtime_resume,
 };
 
+#ifdef CONFIG_OF
+static const struct of_device_id s5p_jpeg_of_match[] = {
+	{ .compatible = "samsung,s5pv210-jpeg" },
+	{ .compatible = "samsung,exynos4210-jpeg" },
+	{ /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, s5p_jpeg_of_match);
+#endif
+
 static struct platform_driver s5p_jpeg_driver = {
 	.probe = s5p_jpeg_probe,
 	.remove = s5p_jpeg_remove,
 	.driver = {
+		.of_match_table = of_match_ptr(s5p_jpeg_of_match),
 		.owner = THIS_MODULE,
 		.name = S5P_JPEG_M2M_NAME,
 		.pm = &s5p_jpeg_pm_ops,
@@ -1528,4 +1539,3 @@  module_platform_driver(s5p_jpeg_driver);
 MODULE_AUTHOR("Andrzej Pietrasiewicz <andrzej.p@samsung.com>");
 MODULE_DESCRIPTION("Samsung JPEG codec driver");
 MODULE_LICENSE("GPL");
-