[PATCH] media: coda: Fix probe() if reset controller is missing

2016-06-18 Thread Alexander Shiyan
Commit 39b4da71ca334354f30941067f214ea2f2b92f3e (reset: use ENOTSUPP
instead of ENOSYS) changed return value for reset controller if it missing.
This patch changes the CODA driver to handle this value.

Signed-off-by: Alexander Shiyan <shc_w...@mail.ru>
---
 drivers/media/platform/coda/coda-common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/coda/coda-common.c 
b/drivers/media/platform/coda/coda-common.c
index 133ab9f..098653d 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2226,7 +2226,7 @@ static int coda_probe(struct platform_device *pdev)
dev->rstc = devm_reset_control_get_optional(>dev, NULL);
if (IS_ERR(dev->rstc)) {
ret = PTR_ERR(dev->rstc);
-   if (ret == -ENOENT || ret == -ENOSYS) {
+   if (ret == -ENOENT || ret == -ENOTSUPP) {
dev->rstc = NULL;
} else {
dev_err(>dev, "failed get reset control: %d\n",
-- 
2.4.9

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: Kconfig symbol MX1_VIDEO

2014-06-27 Thread Alexander Shiyan
Fri, 27 Jun 2014 10:18:19 +0200 от Paul Bolle pebo...@tiscali.nl:
 Alexander,
 
 Your patch [media] media: mx1_camera: Remove driver landed in today's
 linux-next (ie, next-20140627), as commit 90b055898e9d. It is archived
 at http://www.spinics.net/lists/linux-media/msg76764.html .
 
 It removes the Kconfig symbols MX1_VIDEO en VIDEO_MX1. It only removes
 the code depending on VIDEO_MX1 (ie, in
 drivers/media/platform/soc_camera).
 
 A previous version of that patch is archived at
 http://www.spinics.net/lists/linux-media/msg76432.html . (Please, next
 time you submit a second version of a patch mark it as a v2 and add some
 info below the --- marker about the differences to the first version.)
 That previous version removed the code depending on both symbols. But a
 quick glance at the discussion about that patch shows that you were
 asked to not remove the code depending on MX1_VIDEO (ie, in
 arch/arm/mach-imx/).
 
 Would you perhaps know whether a patch to remove the arch/arm/mach-imx/
 code is pending somewhere?

Patch to remove MX1_VIDEO part from arch/arm/mach-imx is scheduled.
I expect to update the Shawn git repository to the linux-next branch.

---



Re: [PATCH 1/2] media: mx2-emmaprp: Add devicetree support

2014-05-28 Thread Alexander Shiyan
Wed, 28 May 2014 11:46:38 +0200 от Sylwester Nawrocki s.nawro...@samsung.com:
 On 27/05/14 09:47, Alexander Shiyan wrote:
  This patch adds devicetree support for the Freescale enhanced Multimedia
  Accelerator (eMMA) video Pre-processor (PrP).
  
  Signed-off-by: Alexander Shiyan shc_w...@mail.ru
  ---

...

 Could you also fix the remaining checkpatch warnings:
 
 
 WARNING: Use a single space after To:
 #35: 
 To:   linux-media@vger.kernel.org
 
 WARNING: Use a single space after Cc:
 #36: 
 Cc:   Mauro Carvalho Chehab m.che...@samsung.com,
 
 ERROR: DOS line endings
 #67: FILE: drivers/media/platform/mx2_emmaprp.c:21:
 +#include linux/of.h^M$
...
 [PATCH 1_2] media: mx2-emmaprp: Add devicetree support.eml has style 
 problems, please review.

...support.eml ?

All of these warnings is a result of email export.

---



[PATCH 2/2] media: mx2-emmaprp: Add DT bindings documentation

2014-05-27 Thread Alexander Shiyan
This patch adds DT binding documentation for the Freescale enhanced
Multimedia Accelerator (eMMA) video Pre-processor (PrP).

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 .../devicetree/bindings/media/fsl-imx-emmaprp.txt| 20 
 1 file changed, 20 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt

diff --git a/Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt 
b/Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt
new file mode 100644
index 000..d78b1b6
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt
@@ -0,0 +1,20 @@
+* Freescale enhanced Multimedia Accelerator (eMMA) video Pre-processor (PrP)
+  for i.MX21  i.MX27 SoCs.
+
+Required properties:
+- compatible : Shall contain fsl,imx21-emmaprp for compatible with
+   the one integrated on i.MX21 SoC.
+- reg: Offset and length of the register set for the device.
+- interrupts : Should contain eMMA PrP interrupt number.
+- clocks : Should contain the ahb and ipg clocks, in the order
+   determined by the clock-names property.
+- clock-names: Should be ahb, ipg.
+
+Example:
+   emmaprp: emmaprp@10026400 {
+   compatible = fsl,imx27-emmaprp, fsl,imx21-emmaprp;
+   reg = 0x10026400 0x100;
+   interrupts = 51;
+   clocks = clks 49, clks 68;
+   clock-names = ipg, ahb;
+   };
-- 
1.8.5.5

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 1/2] media: mx2-emmaprp: Add devicetree support

2014-05-27 Thread Alexander Shiyan
This patch adds devicetree support for the Freescale enhanced Multimedia
Accelerator (eMMA) video Pre-processor (PrP).

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 drivers/media/platform/mx2_emmaprp.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/drivers/media/platform/mx2_emmaprp.c 
b/drivers/media/platform/mx2_emmaprp.c
index fa8f7ca..0646bda 100644
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -18,6 +18,7 @@
  */
 #include linux/module.h
 #include linux/clk.h
+#include linux/of.h
 #include linux/slab.h
 #include linux/interrupt.h
 #include linux/io.h
@@ -1005,12 +1006,19 @@ static int emmaprp_remove(struct platform_device *pdev)
return 0;
 }
 
+static const struct of_device_id __maybe_unused emmaprp_dt_ids[] = {
+   { .compatible = fsl,imx21-emmaprp, },
+   { }
+};
+MODULE_DEVICE_TABLE(of, emmaprp_dt_ids);
+
 static struct platform_driver emmaprp_pdrv = {
.probe  = emmaprp_probe,
.remove = emmaprp_remove,
.driver = {
.name   = MEM2MEM_NAME,
.owner  = THIS_MODULE,
+   .of_match_table = of_match_ptr(emmaprp_dt_ids),
},
 };
 module_platform_driver(emmaprp_pdrv);
-- 
1.8.5.5

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH RESEND] media: m2m-deinterlace: Convert to devm* API

2014-05-23 Thread Alexander Shiyan
Replace resource handling in the driver with managed device resource.

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 drivers/media/platform/m2m-deinterlace.c | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/media/platform/m2m-deinterlace.c 
b/drivers/media/platform/m2m-deinterlace.c
index c21d14f..d36c507 100644
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -1002,7 +1002,7 @@ static int deinterlace_probe(struct platform_device *pdev)
dma_cap_mask_t mask;
int ret = 0;
 
-   pcdev = kzalloc(sizeof *pcdev, GFP_KERNEL);
+   pcdev = devm_kzalloc(pdev-dev, sizeof(*pcdev), GFP_KERNEL);
if (!pcdev)
return -ENOMEM;
 
@@ -1012,7 +1012,7 @@ static int deinterlace_probe(struct platform_device *pdev)
dma_cap_set(DMA_INTERLEAVE, mask);
pcdev-dma_chan = dma_request_channel(mask, NULL, pcdev);
if (!pcdev-dma_chan)
-   goto free_dev;
+   return -ENODEV;
 
if (!dma_has_cap(DMA_INTERLEAVE, pcdev-dma_chan-device-cap_mask)) {
v4l2_err(pcdev-v4l2_dev, DMA does not support INTERLEAVE\n);
@@ -1078,8 +1078,6 @@ unreg_dev:
v4l2_device_unregister(pcdev-v4l2_dev);
 rel_dma:
dma_release_channel(pcdev-dma_chan);
-free_dev:
-   kfree(pcdev);
 
return ret;
 }
@@ -1094,7 +1092,6 @@ static int deinterlace_remove(struct platform_device 
*pdev)
v4l2_device_unregister(pcdev-v4l2_dev);
vb2_dma_contig_cleanup_ctx(pcdev-alloc_ctx);
dma_release_channel(pcdev-dma_chan);
-   kfree(pcdev);
 
return 0;
 }
-- 
1.8.5.5

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 2/2] media: mx2_camera: Change Kconfig dependency

2014-05-23 Thread Alexander Shiyan
This patch change MACH_MX27 dependency to SOC_IMX27 for MX2 camera
driver, since MACH_MX27 symbol is scheduled for removal.

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 drivers/media/platform/soc_camera/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/soc_camera/Kconfig 
b/drivers/media/platform/soc_camera/Kconfig
index 122e03a..fc62897 100644
--- a/drivers/media/platform/soc_camera/Kconfig
+++ b/drivers/media/platform/soc_camera/Kconfig
@@ -63,7 +63,7 @@ config VIDEO_OMAP1
 
 config VIDEO_MX2
tristate i.MX27 Camera Sensor Interface driver
-   depends on VIDEO_DEV  SOC_CAMERA  MACH_MX27
+   depends on VIDEO_DEV  SOC_CAMERA  SOC_IMX27
select VIDEOBUF2_DMA_CONTIG
---help---
  This is a v4l2 driver for the i.MX27 Camera Sensor Interface
-- 
1.8.5.5

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 1/2] media: mx1_camera: Remove driver

2014-05-23 Thread Alexander Shiyan
That driver hasn't been really maintained for a long time. It doesn't
compile in any way, it includes non-existent headers, has no users,
and marked as BROKEN more than year. Due to these factors, mx1_camera
is now removed from the tree.

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 drivers/media/platform/soc_camera/Kconfig  |  13 -
 drivers/media/platform/soc_camera/Makefile |   1 -
 drivers/media/platform/soc_camera/mx1_camera.c | 866 -
 3 files changed, 880 deletions(-)
 delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c

diff --git a/drivers/media/platform/soc_camera/Kconfig 
b/drivers/media/platform/soc_camera/Kconfig
index af39c46..122e03a 100644
--- a/drivers/media/platform/soc_camera/Kconfig
+++ b/drivers/media/platform/soc_camera/Kconfig
@@ -17,19 +17,6 @@ config SOC_CAMERA_PLATFORM
help
  This is a generic SoC camera platform driver, useful for testing
 
-config MX1_VIDEO
-   bool
-
-config VIDEO_MX1
-   tristate i.MX1/i.MXL CMOS Sensor Interface driver
-   depends on BROKEN
-   depends on VIDEO_DEV  ARCH_MX1  SOC_CAMERA
-   select FIQ
-   select VIDEOBUF_DMA_CONTIG
-   select MX1_VIDEO
-   ---help---
- This is a v4l2 driver for the i.MX1/i.MXL CMOS Sensor Interface
-
 config VIDEO_MX3
tristate i.MX3x Camera Sensor Interface driver
depends on VIDEO_DEV  MX3_IPU  SOC_CAMERA
diff --git a/drivers/media/platform/soc_camera/Makefile 
b/drivers/media/platform/soc_camera/Makefile
index 8aed26d..2826382 100644
--- a/drivers/media/platform/soc_camera/Makefile
+++ b/drivers/media/platform/soc_camera/Makefile
@@ -7,7 +7,6 @@ obj-$(CONFIG_SOC_CAMERA_PLATFORM)   += soc_camera_platform.o
 
 # soc-camera host drivers have to be linked after camera drivers
 obj-$(CONFIG_VIDEO_ATMEL_ISI)  += atmel-isi.o
-obj-$(CONFIG_VIDEO_MX1)+= mx1_camera.o
 obj-$(CONFIG_VIDEO_MX2)+= mx2_camera.o
 obj-$(CONFIG_VIDEO_MX3)+= mx3_camera.o
 obj-$(CONFIG_VIDEO_OMAP1)  += omap1_camera.o
diff --git a/drivers/media/platform/soc_camera/mx1_camera.c 
b/drivers/media/platform/soc_camera/mx1_camera.c
deleted file mode 100644
index fea3e61..000
--- a/drivers/media/platform/soc_camera/mx1_camera.c
+++ /dev/null
@@ -1,866 +0,0 @@
-/*
- * V4L2 Driver for i.MXL/i.MXL camera (CSI) host
- *
- * Copyright (C) 2008, Paulius Zaleckas paulius.zalec...@teltonika.lt
- * Copyright (C) 2009, Darius Augulis augulis.dar...@gmail.com
- *
- * Based on PXA SoC camera driver
- * Copyright (C) 2006, Sascha Hauer, Pengutronix
- * Copyright (C) 2008, Guennadi Liakhovetski ker...@pengutronix.de
- *
- * 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/clk.h
-#include linux/delay.h
-#include linux/device.h
-#include linux/dma-mapping.h
-#include linux/errno.h
-#include linux/fs.h
-#include linux/init.h
-#include linux/interrupt.h
-#include linux/io.h
-#include linux/kernel.h
-#include linux/mm.h
-#include linux/module.h
-#include linux/moduleparam.h
-#include linux/platform_device.h
-#include linux/sched.h
-#include linux/slab.h
-#include linux/time.h
-#include linux/videodev2.h
-
-#include media/soc_camera.h
-#include media/v4l2-common.h
-#include media/v4l2-dev.h
-#include media/videobuf-dma-contig.h
-#include media/soc_mediabus.h
-
-#include asm/dma.h
-#include asm/fiq.h
-#include mach/dma-mx1-mx2.h
-#include mach/hardware.h
-#include mach/irqs.h
-#include linux/platform_data/camera-mx1.h
-
-/*
- * CSI registers
- */
-#define CSICR1 0x00/* CSI Control Register 1 */
-#define CSISR  0x08/* CSI Status Register */
-#define CSIRXR 0x10/* CSI RxFIFO Register */
-
-#define CSICR1_RXFF_LEVEL(x)   (((x)  0x3)  19)
-#define CSICR1_SOF_POL (1  17)
-#define CSICR1_SOF_INTEN   (1  16)
-#define CSICR1_MCLKDIV(x)  (((x)  0xf)  12)
-#define CSICR1_MCLKEN  (1  9)
-#define CSICR1_FCC (1  8)
-#define CSICR1_BIG_ENDIAN  (1  7)
-#define CSICR1_CLR_RXFIFO  (1  5)
-#define CSICR1_GCLK_MODE   (1  4)
-#define CSICR1_DATA_POL(1  2)
-#define CSICR1_REDGE   (1  1)
-#define CSICR1_EN  (1  0)
-
-#define CSISR_SFF_OR_INT   (1  25)
-#define CSISR_RFF_OR_INT   (1  24)
-#define CSISR_STATFF_INT   (1  21)
-#define CSISR_RXFF_INT (1  18)
-#define CSISR_SOF_INT  (1  16)
-#define CSISR_DRDY (1  0)
-
-#define DRIVER_VERSION 0.0.2
-#define DRIVER_NAME mx1-camera
-
-#define CSI_IRQ_MASK   (CSISR_SFF_OR_INT | CSISR_RFF_OR_INT | \
-   CSISR_STATFF_INT | CSISR_RXFF_INT | CSISR_SOF_INT)
-
-#define CSI_BUS_FLAGS  (V4L2_MBUS_MASTER | V4L2_MBUS_HSYNC_ACTIVE_HIGH

Re: [PATCH 3/3] media: mx2-emmaprp: Add devicetree support

2014-05-14 Thread Alexander Shiyan
Wed, 14 May 2014 12:49:03 +0200 от Sylwester Nawrocki s.nawro...@samsung.com:
 On 13/05/14 19:23, Alexander Shiyan wrote:
  Tue, 13 May 2014 19:09:30 +0200 от Sylwester Nawrocki 
  s.nawro...@samsung.com:
   Hi,
   
   On 02/05/14 09:18, Alexander Shiyan wrote:
This patch adds devicetree support for the Freescale enhanced 
Multimedia
Accelerator (eMMA) video Pre-processor (PrP).

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 .../devicetree/bindings/media/fsl-imx-emmaprp.txt | 19 
+++
 drivers/media/platform/mx2_emmaprp.c  |  8 
 2 files changed, 27 insertions(+)
 create mode 100644 
Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt

diff --git 
a/Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt 
b/Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt
new file mode 100644
index 000..9e8238f
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt
@@ -0,0 +1,19 @@
+* Freescale enhanced Multimedia Accelerator (eMMA) video 
Pre-processor (PrP)
+  for i.MX.
+
+Required properties:
+- compatible : Shall contain fsl,imx21-emmaprp.
+- reg: Offset and length of the register set for the device.
+- interrupts : Should contain eMMA PrP interrupt number.
+- clocks : Should contain the ahb and ipg clocks, in the order
+   determined by the clock-names property.
+- clock-names: Should be ahb, ipg.
+
+Example:
+ emmaprp: emmaprp@10026400 {
+ compatible = fsl,imx27-emmaprp, fsl,imx21-emmaprp;
   
   Is fsl,imx27-emmaprp compatible documented somewhere ?
 
  The overall structure of the eMMA module is slightly different.
  As for the part of the PrP, according to the datasheet they are compatible.
 
 Then can we please have all the valid compatible strings listed at the
 'compatible' property's description above ? I think it is useful to have
 an indication to which SoC each of them apply in documentation of the
 binding.

Traditionally, i.MX drivers uses youngest chip for compatibility string.
The best example of this: drivers/bus/imx-weim.c

---



Re: [PATCH 3/3] media: mx2-emmaprp: Add devicetree support

2014-05-13 Thread Alexander Shiyan
Tue, 13 May 2014 19:09:30 +0200 от Sylwester Nawrocki s.nawro...@samsung.com:
 Hi,
 
 On 02/05/14 09:18, Alexander Shiyan wrote:
  This patch adds devicetree support for the Freescale enhanced Multimedia
  Accelerator (eMMA) video Pre-processor (PrP).
  
  Signed-off-by: Alexander Shiyan shc_w...@mail.ru
  ---
   .../devicetree/bindings/media/fsl-imx-emmaprp.txt | 19 
  +++
   drivers/media/platform/mx2_emmaprp.c  |  8 
   2 files changed, 27 insertions(+)
   create mode 100644 
  Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt
  
  diff --git a/Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt 
  b/Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt
  new file mode 100644
  index 000..9e8238f
  --- /dev/null
  +++ b/Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt
  @@ -0,0 +1,19 @@
  +* Freescale enhanced Multimedia Accelerator (eMMA) video Pre-processor 
  (PrP)
  +  for i.MX.
  +
  +Required properties:
  +- compatible : Shall contain fsl,imx21-emmaprp.
  +- reg: Offset and length of the register set for the device.
  +- interrupts : Should contain eMMA PrP interrupt number.
  +- clocks : Should contain the ahb and ipg clocks, in the order
  +   determined by the clock-names property.
  +- clock-names: Should be ahb, ipg.
  +
  +Example:
  +   emmaprp: emmaprp@10026400 {
  +   compatible = fsl,imx27-emmaprp, fsl,imx21-emmaprp;
 
 Is fsl,imx27-emmaprp compatible documented somewhere ?

The overall structure of the eMMA module is slightly different.
As for the part of the PrP, according to the datasheet they are compatible.

...

---



Re: [PATCH] media: mx1_camera: Remove driver

2014-05-12 Thread Alexander Shiyan
Mon, 12 May 2014 22:25:34 +0800 от Shawn Guo shawn@freescale.com:
 On Mon, May 12, 2014 at 06:18:00PM +0400, Alexander Shiyan wrote:
  Mon, 12 May 2014 22:09:34 +0800 от Shawn Guo shawn@freescale.com:
   On Sun, May 11, 2014 at 10:09:11AM +0400, Alexander Shiyan wrote:
That driver hasn't been really maintained for a long time. It doesn't
compile in any way, it includes non-existent headers, has no users,
and marked as broken more than year. Due to these factors, mx1_camera
is now removed from the tree.

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 arch/arm/mach-imx/Makefile  |   3 -
 arch/arm/mach-imx/devices/Kconfig   |   3 -
 arch/arm/mach-imx/devices/Makefile  |   1 -
 arch/arm/mach-imx/devices/devices-common.h  |  10 -
 arch/arm/mach-imx/devices/platform-mx1-camera.c |  42 --
 arch/arm/mach-imx/mx1-camera-fiq-ksym.c |  18 -
 arch/arm/mach-imx/mx1-camera-fiq.S  |  35 -
 drivers/media/platform/soc_camera/Kconfig   |  13 -
 drivers/media/platform/soc_camera/Makefile  |   1 -
 drivers/media/platform/soc_camera/mx1_camera.c  | 866 

 include/linux/platform_data/camera-mx1.h|  35 -
 11 files changed, 1027 deletions(-)
 delete mode 100644 arch/arm/mach-imx/devices/platform-mx1-camera.c
 delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq-ksym.c
 delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq.S
 delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c
 delete mode 100644 include/linux/platform_data/camera-mx1.h
   
   Can this patch be split into arch and driver part?  Recently, arm-soc
   folks do not want to have arch changes go via driver tree, unless that's
   absolutely necessary.
  
  Can this patch be applied through arm-soc (imx) tree if it will be approved
  by the linux-media maintainers?
 
 Yes, it can, if linux-media maintainers want.  But I still prefer to two
 patches, since I do not see any thing requiring it be one.  Doing that
 will ensure we do not run into any merge conflicts.

ARM part and linux-media part are interconnected by using single header
linux/platform_data/camera-mx1.h. So removing a driver in a separated
patch will touch ARM part in any case.

---



[PATCH] media: mx1_camera: Remove driver

2014-05-11 Thread Alexander Shiyan
That driver hasn't been really maintained for a long time. It doesn't
compile in any way, it includes non-existent headers, has no users,
and marked as broken more than year. Due to these factors, mx1_camera
is now removed from the tree.

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 arch/arm/mach-imx/Makefile  |   3 -
 arch/arm/mach-imx/devices/Kconfig   |   3 -
 arch/arm/mach-imx/devices/Makefile  |   1 -
 arch/arm/mach-imx/devices/devices-common.h  |  10 -
 arch/arm/mach-imx/devices/platform-mx1-camera.c |  42 --
 arch/arm/mach-imx/mx1-camera-fiq-ksym.c |  18 -
 arch/arm/mach-imx/mx1-camera-fiq.S  |  35 -
 drivers/media/platform/soc_camera/Kconfig   |  13 -
 drivers/media/platform/soc_camera/Makefile  |   1 -
 drivers/media/platform/soc_camera/mx1_camera.c  | 866 
 include/linux/platform_data/camera-mx1.h|  35 -
 11 files changed, 1027 deletions(-)
 delete mode 100644 arch/arm/mach-imx/devices/platform-mx1-camera.c
 delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq-ksym.c
 delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq.S
 delete mode 100644 drivers/media/platform/soc_camera/mx1_camera.c
 delete mode 100644 include/linux/platform_data/camera-mx1.h

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 8dd377b..0bdec2a 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -38,9 +38,6 @@ obj-y += ssi-fiq.o
 obj-y += ssi-fiq-ksym.o
 endif
 
-# Support for CMOS sensor interface
-obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
-
 # i.MX1 based machines
 obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
 obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
diff --git a/arch/arm/mach-imx/devices/Kconfig 
b/arch/arm/mach-imx/devices/Kconfig
index 2d260a5..846c019 100644
--- a/arch/arm/mach-imx/devices/Kconfig
+++ b/arch/arm/mach-imx/devices/Kconfig
@@ -49,9 +49,6 @@ config IMX_HAVE_PLATFORM_IMX_UDC
 config IMX_HAVE_PLATFORM_IPU_CORE
bool
 
-config IMX_HAVE_PLATFORM_MX1_CAMERA
-   bool
-
 config IMX_HAVE_PLATFORM_MX2_CAMERA
bool
 
diff --git a/arch/arm/mach-imx/devices/Makefile 
b/arch/arm/mach-imx/devices/Makefile
index 1cbc14c..d421c34 100644
--- a/arch/arm/mach-imx/devices/Makefile
+++ b/arch/arm/mach-imx/devices/Makefile
@@ -18,7 +18,6 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UDC) += platform-imx_udc.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_IPU_CORE) += platform-ipu-core.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_MX1_CAMERA) += platform-mx1-camera.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_CAMERA) += platform-mx2-camera.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI) += platform-mxc-ehci.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_MMC) += platform-mxc-mmc.o
diff --git a/arch/arm/mach-imx/devices/devices-common.h 
b/arch/arm/mach-imx/devices/devices-common.h
index 61352a8..c8169da 100644
--- a/arch/arm/mach-imx/devices/devices-common.h
+++ b/arch/arm/mach-imx/devices/devices-common.h
@@ -208,16 +208,6 @@ struct platform_device *__init imx_add_mx3_sdc_fb(
const struct imx_ipu_core_data *data,
struct mx3fb_platform_data *pdata);
 
-#include linux/platform_data/camera-mx1.h
-struct imx_mx1_camera_data {
-   resource_size_t iobase;
-   resource_size_t iosize;
-   resource_size_t irq;
-};
-struct platform_device *__init imx_add_mx1_camera(
-   const struct imx_mx1_camera_data *data,
-   const struct mx1_camera_pdata *pdata);
-
 #include linux/platform_data/camera-mx2.h
 struct imx_mx2_camera_data {
const char *devid;
diff --git a/arch/arm/mach-imx/devices/platform-mx1-camera.c 
b/arch/arm/mach-imx/devices/platform-mx1-camera.c
deleted file mode 100644
index 2c67881..000
--- a/arch/arm/mach-imx/devices/platform-mx1-camera.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 Pengutronix
- * Uwe Kleine-Koenig u.kleine-koe...@pengutronix.de
- *
- * 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 ../hardware.h
-#include devices-common.h
-
-#define imx_mx1_camera_data_entry_single(soc, _size)   \
-   {   \
-   .iobase = soc ## _CSI ## _BASE_ADDR,\
-   .iosize = _size,\
-   .irq = soc ## _INT_CSI, \
-   }
-
-#ifdef CONFIG_SOC_IMX1
-const struct imx_mx1_camera_data imx1_mx1_camera_data __initconst =
-   imx_mx1_camera_data_entry_single(MX1, 10);
-#endif /* ifdef CONFIG_SOC_IMX1 */
-
-struct platform_device *__init imx_add_mx1_camera(
-   const struct imx_mx1_camera_data *data

[PATCH] ARM: i.MX: Remove excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27

2014-05-11 Thread Alexander Shiyan
This patch removes excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27.
Instead we use SOC_IMX*.

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 arch/arm/mach-imx/Kconfig | 12 
 arch/arm/mach-imx/devices/Kconfig |  2 +-
 drivers/media/platform/soc_camera/Kconfig |  2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index d56eb1a..c28fa7c 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -67,18 +67,8 @@ config IMX_HAVE_IOMUX_V1
 config ARCH_MXC_IOMUX_V3
bool
 
-config ARCH_MX1
-   bool
-
-config ARCH_MX25
-   bool
-
-config MACH_MX27
-   bool
-
 config SOC_IMX1
bool
-   select ARCH_MX1
select CPU_ARM920T
select IMX_HAVE_IOMUX_V1
select MXC_AVIC
@@ -91,7 +81,6 @@ config SOC_IMX21
 
 config SOC_IMX25
bool
-   select ARCH_MX25
select ARCH_MXC_IOMUX_V3
select CPU_ARM926T
select MXC_AVIC
@@ -103,7 +92,6 @@ config SOC_IMX27
select ARCH_HAS_OPP
select CPU_ARM926T
select IMX_HAVE_IOMUX_V1
-   select MACH_MX27
select MXC_AVIC
select PINCTRL_IMX27
 
diff --git a/arch/arm/mach-imx/devices/Kconfig 
b/arch/arm/mach-imx/devices/Kconfig
index 846c019..1f9d4a6 100644
--- a/arch/arm/mach-imx/devices/Kconfig
+++ b/arch/arm/mach-imx/devices/Kconfig
@@ -1,6 +1,6 @@
 config IMX_HAVE_PLATFORM_FEC
bool
-   default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51 || 
SOC_IMX53
+   default y if SOC_IMX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51 || 
SOC_IMX53
 
 config IMX_HAVE_PLATFORM_FLEXCAN
bool
diff --git a/drivers/media/platform/soc_camera/Kconfig 
b/drivers/media/platform/soc_camera/Kconfig
index 122e03a..f0ccedd 100644
--- a/drivers/media/platform/soc_camera/Kconfig
+++ b/drivers/media/platform/soc_camera/Kconfig
@@ -63,7 +63,7 @@ config VIDEO_OMAP1
 
 config VIDEO_MX2
tristate i.MX27 Camera Sensor Interface driver
-   depends on VIDEO_DEV  SOC_CAMERA  MACH_MX27
+   depends on VIDEO_DEV  SOC_CAMERA  SOC_IMX27
select VIDEOBUF2_DMA_CONTIG
---help---
  This is a v4l2 driver for the i.MX27 Camera Sensor Interface
-- 
1.8.3.2

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 1/3] media: mx2-emmaprp: Cleanup internal structure

2014-05-02 Thread Alexander Shiyan
There are no need to store resource struct and IRQ in the driver
internal structure.
This patch remove these fields and improve error handling by using
proper return codes from devm_ioremap_resource() and devm_request_irq().

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 drivers/media/platform/mx2_emmaprp.c | 34 ++
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/drivers/media/platform/mx2_emmaprp.c 
b/drivers/media/platform/mx2_emmaprp.c
index 0b7480e..85ce099 100644
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -207,10 +207,8 @@ struct emmaprp_dev {
struct mutexdev_mutex;
spinlock_t  irqlock;
 
-   int irq_emma;
void __iomem*base_emma;
struct clk  *clk_emma_ahb, *clk_emma_ipg;
-   struct resource *res_emma;
 
struct v4l2_m2m_dev *m2m_dev;
struct vb2_alloc_ctx*alloc_ctx;
@@ -901,9 +899,8 @@ static int emmaprp_probe(struct platform_device *pdev)
 {
struct emmaprp_dev *pcdev;
struct video_device *vfd;
-   struct resource *res_emma;
-   int irq_emma;
-   int ret;
+   struct resource *res;
+   int irq, ret;
 
pcdev = devm_kzalloc(pdev-dev, sizeof(*pcdev), GFP_KERNEL);
if (!pcdev)
@@ -920,12 +917,10 @@ static int emmaprp_probe(struct platform_device *pdev)
if (IS_ERR(pcdev-clk_emma_ahb))
return PTR_ERR(pcdev-clk_emma_ahb);
 
-   irq_emma = platform_get_irq(pdev, 0);
-   res_emma = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-   if (irq_emma  0 || res_emma == NULL) {
-   dev_err(pdev-dev, Missing platform resources data\n);
-   return -ENODEV;
-   }
+   res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+   pcdev-base_emma = devm_ioremap_resource(pdev-dev, res);
+   if (IS_ERR(pcdev-base_emma))
+   return PTR_ERR(pcdev-base_emma);
 
ret = v4l2_device_register(pdev-dev, pcdev-v4l2_dev);
if (ret)
@@ -952,20 +947,11 @@ static int emmaprp_probe(struct platform_device *pdev)
 
platform_set_drvdata(pdev, pcdev);
 
-   pcdev-base_emma = devm_ioremap_resource(pdev-dev, res_emma);
-   if (IS_ERR(pcdev-base_emma)) {
-   ret = PTR_ERR(pcdev-base_emma);
-   goto rel_vdev;
-   }
-
-   pcdev-irq_emma = irq_emma;
-   pcdev-res_emma = res_emma;
-
-   if (devm_request_irq(pdev-dev, pcdev-irq_emma, emmaprp_irq,
-0, MEM2MEM_NAME, pcdev)  0) {
-   ret = -ENODEV;
+   irq = platform_get_irq(pdev, 0);
+   ret = devm_request_irq(pdev-dev, irq, emmaprp_irq, 0,
+  dev_name(pdev-dev), pcdev);
+   if (ret)
goto rel_vdev;
-   }
 
pcdev-alloc_ctx = vb2_dma_contig_init_ctx(pdev-dev);
if (IS_ERR(pcdev-alloc_ctx)) {
-- 
1.8.3.2

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 2/3] media: mx2-emmaprp: Add missing mutex_destroy()

2014-05-02 Thread Alexander Shiyan
This patch adds the missing mutex_destroy(), when the driver is removed.

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 drivers/media/platform/mx2_emmaprp.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/media/platform/mx2_emmaprp.c 
b/drivers/media/platform/mx2_emmaprp.c
index 85ce099..fa8f7ca 100644
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -985,6 +985,8 @@ rel_vdev:
 unreg_dev:
v4l2_device_unregister(pcdev-v4l2_dev);
 
+   mutex_destroy(pcdev-dev_mutex);
+
return ret;
 }
 
@@ -998,6 +1000,7 @@ static int emmaprp_remove(struct platform_device *pdev)
v4l2_m2m_release(pcdev-m2m_dev);
vb2_dma_contig_cleanup_ctx(pcdev-alloc_ctx);
v4l2_device_unregister(pcdev-v4l2_dev);
+   mutex_destroy(pcdev-dev_mutex);
 
return 0;
 }
-- 
1.8.3.2

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 3/3] media: mx2-emmaprp: Add devicetree support

2014-05-02 Thread Alexander Shiyan
This patch adds devicetree support for the Freescale enhanced Multimedia
Accelerator (eMMA) video Pre-processor (PrP).

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 .../devicetree/bindings/media/fsl-imx-emmaprp.txt | 19 +++
 drivers/media/platform/mx2_emmaprp.c  |  8 
 2 files changed, 27 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt

diff --git a/Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt 
b/Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt
new file mode 100644
index 000..9e8238f
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/fsl-imx-emmaprp.txt
@@ -0,0 +1,19 @@
+* Freescale enhanced Multimedia Accelerator (eMMA) video Pre-processor (PrP)
+  for i.MX.
+
+Required properties:
+- compatible : Shall contain fsl,imx21-emmaprp.
+- reg: Offset and length of the register set for the device.
+- interrupts : Should contain eMMA PrP interrupt number.
+- clocks : Should contain the ahb and ipg clocks, in the order
+   determined by the clock-names property.
+- clock-names: Should be ahb, ipg.
+
+Example:
+   emmaprp: emmaprp@10026400 {
+   compatible = fsl,imx27-emmaprp, fsl,imx21-emmaprp;
+   reg = 0x10026400 0x100;
+   interrupts = 51;
+   clocks = clks 49, clks 68;
+   clock-names = ipg, ahb;
+   };
diff --git a/drivers/media/platform/mx2_emmaprp.c 
b/drivers/media/platform/mx2_emmaprp.c
index fa8f7ca..0646bda 100644
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -18,6 +18,7 @@
  */
 #include linux/module.h
 #include linux/clk.h
+#include linux/of.h
 #include linux/slab.h
 #include linux/interrupt.h
 #include linux/io.h
@@ -1005,12 +1006,19 @@ static int emmaprp_remove(struct platform_device *pdev)
return 0;
 }
 
+static const struct of_device_id __maybe_unused emmaprp_dt_ids[] = {
+   { .compatible = fsl,imx21-emmaprp, },
+   { }
+};
+MODULE_DEVICE_TABLE(of, emmaprp_dt_ids);
+
 static struct platform_driver emmaprp_pdrv = {
.probe  = emmaprp_probe,
.remove = emmaprp_remove,
.driver = {
.name   = MEM2MEM_NAME,
.owner  = THIS_MODULE,
+   .of_match_table = of_match_ptr(emmaprp_dt_ids),
},
 };
 module_platform_driver(emmaprp_pdrv);
-- 
1.8.3.2

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] media: coda: Use full device name for request_irq()

2014-04-26 Thread Alexander Shiyan
This will help to debug driver, allows us to see the full name of
the device through /proc/interrupts.

   CPU0
...
 69:  0  mxc-avic  53  10023000.coda
...

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 drivers/media/platform/coda.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 3e5199e..11023b1 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -3235,7 +3235,7 @@ static int coda_probe(struct platform_device *pdev)
}
 
if (devm_request_threaded_irq(pdev-dev, irq, NULL, coda_irq_handler,
-   IRQF_ONESHOT, CODA_NAME, dev)  0) {
+   IRQF_ONESHOT, dev_name(pdev-dev), dev)  0) {
dev_err(pdev-dev, failed to request irq\n);
return -ENOENT;
}
-- 
1.8.3.2

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] media: m2m-deinterlace: Convert to devm* API

2014-04-17 Thread Alexander Shiyan
Replace resource handling in the driver with managed device resource.

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 drivers/media/platform/m2m-deinterlace.c | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/media/platform/m2m-deinterlace.c 
b/drivers/media/platform/m2m-deinterlace.c
index c21d14f..d36c507 100644
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -1002,7 +1002,7 @@ static int deinterlace_probe(struct platform_device *pdev)
dma_cap_mask_t mask;
int ret = 0;
 
-   pcdev = kzalloc(sizeof *pcdev, GFP_KERNEL);
+   pcdev = devm_kzalloc(pdev-dev, sizeof(*pcdev), GFP_KERNEL);
if (!pcdev)
return -ENOMEM;
 
@@ -1012,7 +1012,7 @@ static int deinterlace_probe(struct platform_device *pdev)
dma_cap_set(DMA_INTERLEAVE, mask);
pcdev-dma_chan = dma_request_channel(mask, NULL, pcdev);
if (!pcdev-dma_chan)
-   goto free_dev;
+   return -ENODEV;
 
if (!dma_has_cap(DMA_INTERLEAVE, pcdev-dma_chan-device-cap_mask)) {
v4l2_err(pcdev-v4l2_dev, DMA does not support INTERLEAVE\n);
@@ -1078,8 +1078,6 @@ unreg_dev:
v4l2_device_unregister(pcdev-v4l2_dev);
 rel_dma:
dma_release_channel(pcdev-dma_chan);
-free_dev:
-   kfree(pcdev);
 
return ret;
 }
@@ -1094,7 +1092,6 @@ static int deinterlace_remove(struct platform_device 
*pdev)
v4l2_device_unregister(pcdev-v4l2_dev);
vb2_dma_contig_cleanup_ctx(pcdev-alloc_ctx);
dma_release_channel(pcdev-dma_chan);
-   kfree(pcdev);
 
return 0;
 }
-- 
1.8.3.2

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] media: dvb-frontends/stb6100.c: Fix buffer length check

2014-02-15 Thread Alexander Shiyan
Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 drivers/media/dvb-frontends/stb6100.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/dvb-frontends/stb6100.c 
b/drivers/media/dvb-frontends/stb6100.c
index cea175d..4ef8a5c 100644
--- a/drivers/media/dvb-frontends/stb6100.c
+++ b/drivers/media/dvb-frontends/stb6100.c
@@ -193,7 +193,7 @@ static int stb6100_write_reg_range(struct stb6100_state 
*state, u8 buf[], int st
.len= len + 1
};
 
-   if (1 + len  sizeof(buf)) {
+   if (1 + len  sizeof(cmdbuf)) {
printk(KERN_WARNING
   %s: i2c wr: len=%d is too big!\n,
   KBUILD_MODNAME, len);
-- 
1.8.3.2

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH RESEND] media: coda: Fix DT-driver data pointer for i.MX27

2013-07-19 Thread Alexander Shiyan
On Fri, 21 Jun 2013 09:30:14 +0200
Philipp Zabel p.za...@pengutronix.de wrote:

 Am Donnerstag, den 20.06.2013, 20:46 +0400 schrieb Alexander Shiyan:
  Signed-off-by: Alexander Shiyan shc_w...@mail.ru
  ---
   drivers/media/platform/coda.c | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
  
  diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
  index 48b8d7a..1c77781 100644
  --- a/drivers/media/platform/coda.c
  +++ b/drivers/media/platform/coda.c
  @@ -1924,7 +1924,7 @@ MODULE_DEVICE_TABLE(platform, coda_platform_ids);
   
   #ifdef CONFIG_OF
   static const struct of_device_id coda_dt_ids[] = {
  -   { .compatible = fsl,imx27-vpu, .data = coda_platform_ids[CODA_IMX27] 
  },
  +   { .compatible = fsl,imx27-vpu, .data = coda_devdata[CODA_IMX27] },
  { .compatible = fsl,imx53-vpu, .data = coda_devdata[CODA_IMX53] },
  { /* sentinel */ }
   };
 
 Acked-by: Philipp Zabel p.za...@pengutronix.de

Ping.

-- 
Alexander Shiyan shc_w...@mail.ru
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH RESEND] media: coda: Fix DT-driver data pointer for i.MX27

2013-06-20 Thread Alexander Shiyan

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 drivers/media/platform/coda.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 48b8d7a..1c77781 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -1924,7 +1924,7 @@ MODULE_DEVICE_TABLE(platform, coda_platform_ids);
 
 #ifdef CONFIG_OF
 static const struct of_device_id coda_dt_ids[] = {
-   { .compatible = fsl,imx27-vpu, .data = coda_platform_ids[CODA_IMX27] 
},
+   { .compatible = fsl,imx27-vpu, .data = coda_devdata[CODA_IMX27] },
{ .compatible = fsl,imx53-vpu, .data = coda_devdata[CODA_IMX53] },
{ /* sentinel */ }
 };
-- 
1.8.1.5

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] media: coda: Fix DT driver data pointer for i.MX27

2013-06-15 Thread Alexander Shiyan

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 drivers/media/platform/coda.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 48b8d7a..1c77781 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -1924,7 +1924,7 @@ MODULE_DEVICE_TABLE(platform, coda_platform_ids);
 
 #ifdef CONFIG_OF
 static const struct of_device_id coda_dt_ids[] = {
-   { .compatible = fsl,imx27-vpu, .data = coda_platform_ids[CODA_IMX27] 
},
+   { .compatible = fsl,imx27-vpu, .data = coda_devdata[CODA_IMX27] },
{ .compatible = fsl,imx53-vpu, .data = coda_devdata[CODA_IMX53] },
{ /* sentinel */ }
 };
-- 
1.8.1.5

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] media: coda: Fix compile breakage

2013-04-26 Thread Alexander Shiyan
Patch adds GENERIC_ALLOCATOR, if coda is selected.

drivers/built-in.o: In function `coda_remove':
:(.text+0x110634): undefined reference to `gen_pool_free'
drivers/built-in.o: In function `coda_probe':
:(.text+0x1107d4): undefined reference to `of_get_named_gen_pool'
:(.text+0x1108b8): undefined reference to `gen_pool_alloc'
:(.text+0x1108d0): undefined reference to `gen_pool_virt_to_phys'
:(.text+0x110918): undefined reference to `dev_get_gen_pool'

Signed-off-by: Alexander Shiyan shc_w...@mail.ru
---
 drivers/media/platform/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 0cbe1ff..414a769 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -145,6 +145,7 @@ config VIDEO_CODA
depends on VIDEO_DEV  VIDEO_V4L2  ARCH_MXC
select VIDEOBUF2_DMA_CONTIG
select V4L2_MEM2MEM_DEV
+   select GENERIC_ALLOCATOR
---help---
   Coda is a range of video codec IPs that supports
   H.264, MPEG-4, and other video formats.
-- 
1.8.1.5

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html