* [PATCH v3] media: soc_camera: rcar_vin: Add rcar fallback compatibility string
@ 2016-01-13 17:58 ` Yoshihiro Kaneko
0 siblings, 0 replies; 12+ messages in thread
From: Yoshihiro Kaneko @ 2016-01-13 17:58 UTC (permalink / raw)
To: linux-media; +Cc: Guennadi Liakhovetski, Simon Horman, Magnus Damm, linux-sh
Add fallback compatibility string for R-Car Gen2 and Gen3, This is
in keeping with the fallback scheme being adopted wherever appropriate
for drivers for Renesas SoCs.
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
---
This patch is based on the for-4.6-1 branch of Guennadi's v4l-dvb tree.
v3 [Yoshihiro Kaneko]
* rebased to for-4.6-1 branch of Guennadi's tree.
v2 [Yoshihiro Kaneko]
* As suggested by Geert Uytterhoeven
drivers/media/platform/soc_camera/rcar_vin.c:
- The generic compatibility values are listed at the end of the
rcar_vin_of_table[].
Documentation/devicetree/bindings/media/rcar_vin.txt | 8 +++++++-
drivers/media/platform/soc_camera/rcar_vin.c | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt
index 619193c..e1a92c9 100644
--- a/Documentation/devicetree/bindings/media/rcar_vin.txt
+++ b/Documentation/devicetree/bindings/media/rcar_vin.txt
@@ -6,6 +6,8 @@ family of devices. The current blocks are always slaves and suppot one input
channel which can be either RGB, YUYV or BT656.
- compatible: Must be one of the following
+ - "renesas,rcar-gen2-vin" for R-Car Gen2 Series
+ - "renesas,rcar-gen3-vin" for R-Car Gen3 Series
- "renesas,vin-r8a7795" for the R8A7795 device
- "renesas,vin-r8a7794" for the R8A7794 device
- "renesas,vin-r8a7793" for the R8A7793 device
@@ -13,6 +15,10 @@ channel which can be either RGB, YUYV or BT656.
- "renesas,vin-r8a7790" for the R8A7790 device
- "renesas,vin-r8a7779" for the R8A7779 device
- "renesas,vin-r8a7778" for the R8A7778 device
+
+ When compatible with the generic version, nodes must list the SoC-specific
+ version corresponding to the platform first followed by the generic version.
+
- reg: the register base and size for the device registers
- interrupts: the interrupt for the device
- clocks: Reference to the parent clock
@@ -37,7 +43,7 @@ Device node example
};
vin0: vin@0xe6ef0000 {
- compatible = "renesas,vin-r8a7790";
+ compatible = "renesas,vin-r8a7790","renesas,rcar-gen2-vin";
clocks = <&mstp8_clks R8A7790_CLK_VIN0>;
reg = <0 0xe6ef0000 0 0x1000>;
interrupts = <0 188 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index dc75a80..b72a048 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -1826,6 +1826,8 @@ static const struct of_device_id rcar_vin_of_table[] = {
{ .compatible = "renesas,vin-r8a7790", .data = (void *)RCAR_GEN2 },
{ .compatible = "renesas,vin-r8a7779", .data = (void *)RCAR_H1 },
{ .compatible = "renesas,vin-r8a7778", .data = (void *)RCAR_M1 },
+ { .compatible = "renesas,rcar-gen2-vin", .data = (void *)RCAR_GEN2 },
+ { .compatible = "renesas,rcar-gen3-vin", .data = (void *)RCAR_GEN3 },
{ },
};
MODULE_DEVICE_TABLE(of, rcar_vin_of_table);
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v3] media: soc_camera: rcar_vin: Add rcar fallback compatibility string
@ 2016-01-13 17:58 ` Yoshihiro Kaneko
0 siblings, 0 replies; 12+ messages in thread
From: Yoshihiro Kaneko @ 2016-01-13 17:58 UTC (permalink / raw)
To: linux-media; +Cc: Guennadi Liakhovetski, Simon Horman, Magnus Damm, linux-sh
Add fallback compatibility string for R-Car Gen2 and Gen3, This is
in keeping with the fallback scheme being adopted wherever appropriate
for drivers for Renesas SoCs.
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
---
This patch is based on the for-4.6-1 branch of Guennadi's v4l-dvb tree.
v3 [Yoshihiro Kaneko]
* rebased to for-4.6-1 branch of Guennadi's tree.
v2 [Yoshihiro Kaneko]
* As suggested by Geert Uytterhoeven
drivers/media/platform/soc_camera/rcar_vin.c:
- The generic compatibility values are listed at the end of the
rcar_vin_of_table[].
Documentation/devicetree/bindings/media/rcar_vin.txt | 8 +++++++-
drivers/media/platform/soc_camera/rcar_vin.c | 2 ++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt
index 619193c..e1a92c9 100644
--- a/Documentation/devicetree/bindings/media/rcar_vin.txt
+++ b/Documentation/devicetree/bindings/media/rcar_vin.txt
@@ -6,6 +6,8 @@ family of devices. The current blocks are always slaves and suppot one input
channel which can be either RGB, YUYV or BT656.
- compatible: Must be one of the following
+ - "renesas,rcar-gen2-vin" for R-Car Gen2 Series
+ - "renesas,rcar-gen3-vin" for R-Car Gen3 Series
- "renesas,vin-r8a7795" for the R8A7795 device
- "renesas,vin-r8a7794" for the R8A7794 device
- "renesas,vin-r8a7793" for the R8A7793 device
@@ -13,6 +15,10 @@ channel which can be either RGB, YUYV or BT656.
- "renesas,vin-r8a7790" for the R8A7790 device
- "renesas,vin-r8a7779" for the R8A7779 device
- "renesas,vin-r8a7778" for the R8A7778 device
+
+ When compatible with the generic version, nodes must list the SoC-specific
+ version corresponding to the platform first followed by the generic version.
+
- reg: the register base and size for the device registers
- interrupts: the interrupt for the device
- clocks: Reference to the parent clock
@@ -37,7 +43,7 @@ Device node example
};
vin0: vin@0xe6ef0000 {
- compatible = "renesas,vin-r8a7790";
+ compatible = "renesas,vin-r8a7790","renesas,rcar-gen2-vin";
clocks = <&mstp8_clks R8A7790_CLK_VIN0>;
reg = <0 0xe6ef0000 0 0x1000>;
interrupts = <0 188 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index dc75a80..b72a048 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -1826,6 +1826,8 @@ static const struct of_device_id rcar_vin_of_table[] = {
{ .compatible = "renesas,vin-r8a7790", .data = (void *)RCAR_GEN2 },
{ .compatible = "renesas,vin-r8a7779", .data = (void *)RCAR_H1 },
{ .compatible = "renesas,vin-r8a7778", .data = (void *)RCAR_M1 },
+ { .compatible = "renesas,rcar-gen2-vin", .data = (void *)RCAR_GEN2 },
+ { .compatible = "renesas,rcar-gen3-vin", .data = (void *)RCAR_GEN3 },
{ },
};
MODULE_DEVICE_TABLE(of, rcar_vin_of_table);
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v3] media: soc_camera: rcar_vin: Add ARGB8888 caputre format support
@ 2016-01-13 17:59 ` Yoshihiro Kaneko
0 siblings, 0 replies; 12+ messages in thread
From: Yoshihiro Kaneko @ 2016-01-13 17:59 UTC (permalink / raw)
To: linux-media; +Cc: Guennadi Liakhovetski, Simon Horman, Magnus Damm, linux-sh
From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
This patch adds ARGB8888 capture format support for R-Car Gen3.
Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
---
This patch is based on the for-4.6-1 branch of Guennadi's v4l-dvb tree.
v3 [Yoshihiro Kaneko]
* rebased to for-4.6-1 branch of Guennadi's tree.
v2 [Yoshihiro Kaneko]
* As suggested by Sergei Shtylyov
- fix the coding style of the braces.
drivers/media/platform/soc_camera/rcar_vin.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index dc75a80..466c63a 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -124,7 +124,7 @@
#define VNDMR_EXRGB (1 << 8)
#define VNDMR_BPSM (1 << 4)
#define VNDMR_DTMD_YCSEP (1 << 1)
-#define VNDMR_DTMD_ARGB1555 (1 << 0)
+#define VNDMR_DTMD_ARGB (1 << 0)
/* Video n Data Mode Register 2 bits */
#define VNDMR2_VPS (1 << 30)
@@ -643,7 +643,7 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
output_is_yuv = true;
break;
case V4L2_PIX_FMT_RGB555X:
- dmr = VNDMR_DTMD_ARGB1555;
+ dmr = VNDMR_DTMD_ARGB;
break;
case V4L2_PIX_FMT_RGB565:
dmr = 0;
@@ -654,6 +654,14 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
dmr = VNDMR_EXRGB;
break;
}
+ case V4L2_PIX_FMT_ARGB32:
+ if (priv->chip = RCAR_GEN3) {
+ dmr = VNDMR_EXRGB | VNDMR_DTMD_ARGB;
+ } else {
+ dev_err(icd->parent, "Not support format\n");
+ return -EINVAL;
+ }
+ break;
default:
dev_warn(icd->parent, "Invalid fourcc format (0x%x)\n",
icd->current_fmt->host_fmt->fourcc);
@@ -1304,6 +1312,14 @@ static const struct soc_mbus_pixelfmt rcar_vin_formats[] = {
.order = SOC_MBUS_ORDER_LE,
.layout = SOC_MBUS_LAYOUT_PACKED,
},
+ {
+ .fourcc = V4L2_PIX_FMT_ARGB32,
+ .name = "ARGB8888",
+ .bits_per_sample = 32,
+ .packing = SOC_MBUS_PACKING_NONE,
+ .order = SOC_MBUS_ORDER_LE,
+ .layout = SOC_MBUS_LAYOUT_PACKED,
+ },
};
static int rcar_vin_get_formats(struct soc_camera_device *icd, unsigned int idx,
@@ -1611,6 +1627,7 @@ static int rcar_vin_set_fmt(struct soc_camera_device *icd,
case V4L2_PIX_FMT_RGB32:
can_scale = priv->chip != RCAR_E1;
break;
+ case V4L2_PIX_FMT_ARGB32:
case V4L2_PIX_FMT_UYVY:
case V4L2_PIX_FMT_YUYV:
case V4L2_PIX_FMT_RGB565:
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v3] media: soc_camera: rcar_vin: Add ARGB8888 caputre format support
@ 2016-01-13 17:59 ` Yoshihiro Kaneko
0 siblings, 0 replies; 12+ messages in thread
From: Yoshihiro Kaneko @ 2016-01-13 17:59 UTC (permalink / raw)
To: linux-media; +Cc: Guennadi Liakhovetski, Simon Horman, Magnus Damm, linux-sh
From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
This patch adds ARGB8888 capture format support for R-Car Gen3.
Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
---
This patch is based on the for-4.6-1 branch of Guennadi's v4l-dvb tree.
v3 [Yoshihiro Kaneko]
* rebased to for-4.6-1 branch of Guennadi's tree.
v2 [Yoshihiro Kaneko]
* As suggested by Sergei Shtylyov
- fix the coding style of the braces.
drivers/media/platform/soc_camera/rcar_vin.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index dc75a80..466c63a 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -124,7 +124,7 @@
#define VNDMR_EXRGB (1 << 8)
#define VNDMR_BPSM (1 << 4)
#define VNDMR_DTMD_YCSEP (1 << 1)
-#define VNDMR_DTMD_ARGB1555 (1 << 0)
+#define VNDMR_DTMD_ARGB (1 << 0)
/* Video n Data Mode Register 2 bits */
#define VNDMR2_VPS (1 << 30)
@@ -643,7 +643,7 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
output_is_yuv = true;
break;
case V4L2_PIX_FMT_RGB555X:
- dmr = VNDMR_DTMD_ARGB1555;
+ dmr = VNDMR_DTMD_ARGB;
break;
case V4L2_PIX_FMT_RGB565:
dmr = 0;
@@ -654,6 +654,14 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
dmr = VNDMR_EXRGB;
break;
}
+ case V4L2_PIX_FMT_ARGB32:
+ if (priv->chip == RCAR_GEN3) {
+ dmr = VNDMR_EXRGB | VNDMR_DTMD_ARGB;
+ } else {
+ dev_err(icd->parent, "Not support format\n");
+ return -EINVAL;
+ }
+ break;
default:
dev_warn(icd->parent, "Invalid fourcc format (0x%x)\n",
icd->current_fmt->host_fmt->fourcc);
@@ -1304,6 +1312,14 @@ static const struct soc_mbus_pixelfmt rcar_vin_formats[] = {
.order = SOC_MBUS_ORDER_LE,
.layout = SOC_MBUS_LAYOUT_PACKED,
},
+ {
+ .fourcc = V4L2_PIX_FMT_ARGB32,
+ .name = "ARGB8888",
+ .bits_per_sample = 32,
+ .packing = SOC_MBUS_PACKING_NONE,
+ .order = SOC_MBUS_ORDER_LE,
+ .layout = SOC_MBUS_LAYOUT_PACKED,
+ },
};
static int rcar_vin_get_formats(struct soc_camera_device *icd, unsigned int idx,
@@ -1611,6 +1627,7 @@ static int rcar_vin_set_fmt(struct soc_camera_device *icd,
case V4L2_PIX_FMT_RGB32:
can_scale = priv->chip != RCAR_E1;
break;
+ case V4L2_PIX_FMT_ARGB32:
case V4L2_PIX_FMT_UYVY:
case V4L2_PIX_FMT_YUYV:
case V4L2_PIX_FMT_RGB565:
--
1.9.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v3] media: soc_camera: rcar_vin: Add ARGB8888 caputre format support
2016-01-13 17:59 ` Yoshihiro Kaneko
@ 2016-01-13 18:18 ` kbuild test robot
-1 siblings, 0 replies; 12+ messages in thread
From: kbuild test robot @ 2016-01-13 18:18 UTC (permalink / raw)
To: linux-sh
[-- Attachment #1: Type: text/plain, Size: 1723 bytes --]
Hi Koji,
[auto build test ERROR on linuxtv-media/master]
[also build test ERROR on v4.4 next-20160113]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Yoshihiro-Kaneko/media-soc_camera-rcar_vin-Add-ARGB8888-caputre-format-support/20160114-020157
base: git://linuxtv.org/media_tree.git master
config: xtensa-allyesconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=xtensa
All errors (new ones prefixed by >>):
drivers/media/platform/soc_camera/rcar_vin.c: In function 'rcar_vin_setup':
>> drivers/media/platform/soc_camera/rcar_vin.c:657:21: error: 'RCAR_GEN3' undeclared (first use in this function)
if (priv->chip == RCAR_GEN3) {
^
drivers/media/platform/soc_camera/rcar_vin.c:657:21: note: each undeclared identifier is reported only once for each function it appears in
vim +/RCAR_GEN3 +657 drivers/media/platform/soc_camera/rcar_vin.c
651 if (priv->chip == RCAR_GEN2 || priv->chip == RCAR_H1 ||
652 priv->chip == RCAR_E1) {
653 dmr = VNDMR_EXRGB;
654 break;
655 }
656 case V4L2_PIX_FMT_ARGB32:
> 657 if (priv->chip == RCAR_GEN3) {
658 dmr = VNDMR_EXRGB | VNDMR_DTMD_ARGB;
659 } else {
660 dev_err(icd->parent, "Not support format\n");
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 43269 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] media: soc_camera: rcar_vin: Add ARGB8888 caputre format support
@ 2016-01-13 18:18 ` kbuild test robot
0 siblings, 0 replies; 12+ messages in thread
From: kbuild test robot @ 2016-01-13 18:18 UTC (permalink / raw)
To: Yoshihiro Kaneko
Cc: kbuild-all, linux-media, Guennadi Liakhovetski, Simon Horman,
Magnus Damm, linux-sh
[-- Attachment #1: Type: text/plain, Size: 1723 bytes --]
Hi Koji,
[auto build test ERROR on linuxtv-media/master]
[also build test ERROR on v4.4 next-20160113]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Yoshihiro-Kaneko/media-soc_camera-rcar_vin-Add-ARGB8888-caputre-format-support/20160114-020157
base: git://linuxtv.org/media_tree.git master
config: xtensa-allyesconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=xtensa
All errors (new ones prefixed by >>):
drivers/media/platform/soc_camera/rcar_vin.c: In function 'rcar_vin_setup':
>> drivers/media/platform/soc_camera/rcar_vin.c:657:21: error: 'RCAR_GEN3' undeclared (first use in this function)
if (priv->chip == RCAR_GEN3) {
^
drivers/media/platform/soc_camera/rcar_vin.c:657:21: note: each undeclared identifier is reported only once for each function it appears in
vim +/RCAR_GEN3 +657 drivers/media/platform/soc_camera/rcar_vin.c
651 if (priv->chip == RCAR_GEN2 || priv->chip == RCAR_H1 ||
652 priv->chip == RCAR_E1) {
653 dmr = VNDMR_EXRGB;
654 break;
655 }
656 case V4L2_PIX_FMT_ARGB32:
> 657 if (priv->chip == RCAR_GEN3) {
658 dmr = VNDMR_EXRGB | VNDMR_DTMD_ARGB;
659 } else {
660 dev_err(icd->parent, "Not support format\n");
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 43269 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] media: soc_camera: rcar_vin: Add ARGB8888 caputre format support
2016-01-13 17:59 ` Yoshihiro Kaneko
@ 2016-01-13 18:27 ` Sergei Shtylyov
-1 siblings, 0 replies; 12+ messages in thread
From: Sergei Shtylyov @ 2016-01-13 18:27 UTC (permalink / raw)
To: Yoshihiro Kaneko, linux-media
Cc: Guennadi Liakhovetski, Simon Horman, Magnus Damm, linux-sh
Hello.
On 01/13/2016 08:59 PM, Yoshihiro Kaneko wrote:
> From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
>
> This patch adds ARGB8888 capture format support for R-Car Gen3.
>
> Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
> ---
>
> This patch is based on the for-4.6-1 branch of Guennadi's v4l-dvb tree.
>
> v3 [Yoshihiro Kaneko]
> * rebased to for-4.6-1 branch of Guennadi's tree.
>
> v2 [Yoshihiro Kaneko]
> * As suggested by Sergei Shtylyov
> - fix the coding style of the braces.
>
> drivers/media/platform/soc_camera/rcar_vin.c | 21 +++++++++++++++++++--
> 1 file changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
> index dc75a80..466c63a 100644
> --- a/drivers/media/platform/soc_camera/rcar_vin.c
> +++ b/drivers/media/platform/soc_camera/rcar_vin.c
[...]
> @@ -654,6 +654,14 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
> dmr = VNDMR_EXRGB;
> break;
> }
> + case V4L2_PIX_FMT_ARGB32:
> + if (priv->chip = RCAR_GEN3) {
> + dmr = VNDMR_EXRGB | VNDMR_DTMD_ARGB;
> + } else {
> + dev_err(icd->parent, "Not support format\n");
"Unsupported format" please.
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] media: soc_camera: rcar_vin: Add ARGB8888 caputre format support
@ 2016-01-13 18:27 ` Sergei Shtylyov
0 siblings, 0 replies; 12+ messages in thread
From: Sergei Shtylyov @ 2016-01-13 18:27 UTC (permalink / raw)
To: Yoshihiro Kaneko, linux-media
Cc: Guennadi Liakhovetski, Simon Horman, Magnus Damm, linux-sh
Hello.
On 01/13/2016 08:59 PM, Yoshihiro Kaneko wrote:
> From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
>
> This patch adds ARGB8888 capture format support for R-Car Gen3.
>
> Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
> ---
>
> This patch is based on the for-4.6-1 branch of Guennadi's v4l-dvb tree.
>
> v3 [Yoshihiro Kaneko]
> * rebased to for-4.6-1 branch of Guennadi's tree.
>
> v2 [Yoshihiro Kaneko]
> * As suggested by Sergei Shtylyov
> - fix the coding style of the braces.
>
> drivers/media/platform/soc_camera/rcar_vin.c | 21 +++++++++++++++++++--
> 1 file changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
> index dc75a80..466c63a 100644
> --- a/drivers/media/platform/soc_camera/rcar_vin.c
> +++ b/drivers/media/platform/soc_camera/rcar_vin.c
[...]
> @@ -654,6 +654,14 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
> dmr = VNDMR_EXRGB;
> break;
> }
> + case V4L2_PIX_FMT_ARGB32:
> + if (priv->chip == RCAR_GEN3) {
> + dmr = VNDMR_EXRGB | VNDMR_DTMD_ARGB;
> + } else {
> + dev_err(icd->parent, "Not support format\n");
"Unsupported format" please.
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] media: soc_camera: rcar_vin: Add rcar fallback compatibility string
2016-01-13 17:58 ` Yoshihiro Kaneko
@ 2016-01-23 17:37 ` Guennadi Liakhovetski
-1 siblings, 0 replies; 12+ messages in thread
From: Guennadi Liakhovetski @ 2016-01-23 17:37 UTC (permalink / raw)
To: Yoshihiro Kaneko; +Cc: linux-media, Simon Horman, Magnus Damm, linux-sh
Hi Kaneko-san,
On Thu, 14 Jan 2016, Yoshihiro Kaneko wrote:
> Add fallback compatibility string for R-Car Gen2 and Gen3, This is
> in keeping with the fallback scheme being adopted wherever appropriate
> for drivers for Renesas SoCs.
>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
> ---
>
> This patch is based on the for-4.6-1 branch of Guennadi's v4l-dvb tree.
>
> v3 [Yoshihiro Kaneko]
> * rebased to for-4.6-1 branch of Guennadi's tree.
>
> v2 [Yoshihiro Kaneko]
> * As suggested by Geert Uytterhoeven
> drivers/media/platform/soc_camera/rcar_vin.c:
> - The generic compatibility values are listed at the end of the
> rcar_vin_of_table[].
>
> Documentation/devicetree/bindings/media/rcar_vin.txt | 8 +++++++-
> drivers/media/platform/soc_camera/rcar_vin.c | 2 ++
I might be wrong in this specific case, please, correct me someone, but
doesn't Documentation/devicetree/bindings/submitting-patches.txt tell us
to submit bindings patches separately from the drivers part?
Thanks
Guennadi
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt
> index 619193c..e1a92c9 100644
> --- a/Documentation/devicetree/bindings/media/rcar_vin.txt
> +++ b/Documentation/devicetree/bindings/media/rcar_vin.txt
> @@ -6,6 +6,8 @@ family of devices. The current blocks are always slaves and suppot one input
> channel which can be either RGB, YUYV or BT656.
>
> - compatible: Must be one of the following
> + - "renesas,rcar-gen2-vin" for R-Car Gen2 Series
> + - "renesas,rcar-gen3-vin" for R-Car Gen3 Series
> - "renesas,vin-r8a7795" for the R8A7795 device
> - "renesas,vin-r8a7794" for the R8A7794 device
> - "renesas,vin-r8a7793" for the R8A7793 device
> @@ -13,6 +15,10 @@ channel which can be either RGB, YUYV or BT656.
> - "renesas,vin-r8a7790" for the R8A7790 device
> - "renesas,vin-r8a7779" for the R8A7779 device
> - "renesas,vin-r8a7778" for the R8A7778 device
> +
> + When compatible with the generic version, nodes must list the SoC-specific
> + version corresponding to the platform first followed by the generic version.
> +
> - reg: the register base and size for the device registers
> - interrupts: the interrupt for the device
> - clocks: Reference to the parent clock
> @@ -37,7 +43,7 @@ Device node example
> };
>
> vin0: vin@0xe6ef0000 {
> - compatible = "renesas,vin-r8a7790";
> + compatible = "renesas,vin-r8a7790","renesas,rcar-gen2-vin";
> clocks = <&mstp8_clks R8A7790_CLK_VIN0>;
> reg = <0 0xe6ef0000 0 0x1000>;
> interrupts = <0 188 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
> index dc75a80..b72a048 100644
> --- a/drivers/media/platform/soc_camera/rcar_vin.c
> +++ b/drivers/media/platform/soc_camera/rcar_vin.c
> @@ -1826,6 +1826,8 @@ static const struct of_device_id rcar_vin_of_table[] = {
> { .compatible = "renesas,vin-r8a7790", .data = (void *)RCAR_GEN2 },
> { .compatible = "renesas,vin-r8a7779", .data = (void *)RCAR_H1 },
> { .compatible = "renesas,vin-r8a7778", .data = (void *)RCAR_M1 },
> + { .compatible = "renesas,rcar-gen2-vin", .data = (void *)RCAR_GEN2 },
> + { .compatible = "renesas,rcar-gen3-vin", .data = (void *)RCAR_GEN3 },
> { },
> };
> MODULE_DEVICE_TABLE(of, rcar_vin_of_table);
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] media: soc_camera: rcar_vin: Add rcar fallback compatibility string
@ 2016-01-23 17:37 ` Guennadi Liakhovetski
0 siblings, 0 replies; 12+ messages in thread
From: Guennadi Liakhovetski @ 2016-01-23 17:37 UTC (permalink / raw)
To: Yoshihiro Kaneko; +Cc: linux-media, Simon Horman, Magnus Damm, linux-sh
Hi Kaneko-san,
On Thu, 14 Jan 2016, Yoshihiro Kaneko wrote:
> Add fallback compatibility string for R-Car Gen2 and Gen3, This is
> in keeping with the fallback scheme being adopted wherever appropriate
> for drivers for Renesas SoCs.
>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
> ---
>
> This patch is based on the for-4.6-1 branch of Guennadi's v4l-dvb tree.
>
> v3 [Yoshihiro Kaneko]
> * rebased to for-4.6-1 branch of Guennadi's tree.
>
> v2 [Yoshihiro Kaneko]
> * As suggested by Geert Uytterhoeven
> drivers/media/platform/soc_camera/rcar_vin.c:
> - The generic compatibility values are listed at the end of the
> rcar_vin_of_table[].
>
> Documentation/devicetree/bindings/media/rcar_vin.txt | 8 +++++++-
> drivers/media/platform/soc_camera/rcar_vin.c | 2 ++
I might be wrong in this specific case, please, correct me someone, but
doesn't Documentation/devicetree/bindings/submitting-patches.txt tell us
to submit bindings patches separately from the drivers part?
Thanks
Guennadi
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt
> index 619193c..e1a92c9 100644
> --- a/Documentation/devicetree/bindings/media/rcar_vin.txt
> +++ b/Documentation/devicetree/bindings/media/rcar_vin.txt
> @@ -6,6 +6,8 @@ family of devices. The current blocks are always slaves and suppot one input
> channel which can be either RGB, YUYV or BT656.
>
> - compatible: Must be one of the following
> + - "renesas,rcar-gen2-vin" for R-Car Gen2 Series
> + - "renesas,rcar-gen3-vin" for R-Car Gen3 Series
> - "renesas,vin-r8a7795" for the R8A7795 device
> - "renesas,vin-r8a7794" for the R8A7794 device
> - "renesas,vin-r8a7793" for the R8A7793 device
> @@ -13,6 +15,10 @@ channel which can be either RGB, YUYV or BT656.
> - "renesas,vin-r8a7790" for the R8A7790 device
> - "renesas,vin-r8a7779" for the R8A7779 device
> - "renesas,vin-r8a7778" for the R8A7778 device
> +
> + When compatible with the generic version, nodes must list the SoC-specific
> + version corresponding to the platform first followed by the generic version.
> +
> - reg: the register base and size for the device registers
> - interrupts: the interrupt for the device
> - clocks: Reference to the parent clock
> @@ -37,7 +43,7 @@ Device node example
> };
>
> vin0: vin@0xe6ef0000 {
> - compatible = "renesas,vin-r8a7790";
> + compatible = "renesas,vin-r8a7790","renesas,rcar-gen2-vin";
> clocks = <&mstp8_clks R8A7790_CLK_VIN0>;
> reg = <0 0xe6ef0000 0 0x1000>;
> interrupts = <0 188 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
> index dc75a80..b72a048 100644
> --- a/drivers/media/platform/soc_camera/rcar_vin.c
> +++ b/drivers/media/platform/soc_camera/rcar_vin.c
> @@ -1826,6 +1826,8 @@ static const struct of_device_id rcar_vin_of_table[] = {
> { .compatible = "renesas,vin-r8a7790", .data = (void *)RCAR_GEN2 },
> { .compatible = "renesas,vin-r8a7779", .data = (void *)RCAR_H1 },
> { .compatible = "renesas,vin-r8a7778", .data = (void *)RCAR_M1 },
> + { .compatible = "renesas,rcar-gen2-vin", .data = (void *)RCAR_GEN2 },
> + { .compatible = "renesas,rcar-gen3-vin", .data = (void *)RCAR_GEN3 },
> { },
> };
> MODULE_DEVICE_TABLE(of, rcar_vin_of_table);
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] media: soc_camera: rcar_vin: Add rcar fallback compatibility string
2016-01-23 17:37 ` Guennadi Liakhovetski
@ 2016-01-25 8:57 ` Geert Uytterhoeven
-1 siblings, 0 replies; 12+ messages in thread
From: Geert Uytterhoeven @ 2016-01-25 8:57 UTC (permalink / raw)
To: Guennadi Liakhovetski
Cc: Yoshihiro Kaneko, Linux Media Mailing List, Simon Horman,
Magnus Damm, Linux-sh list
Hi Guennadi,
On Sat, Jan 23, 2016 at 6:37 PM, Guennadi Liakhovetski
<g.liakhovetski@gmx.de> wrote:
> On Thu, 14 Jan 2016, Yoshihiro Kaneko wrote:
>> Add fallback compatibility string for R-Car Gen2 and Gen3, This is
>> in keeping with the fallback scheme being adopted wherever appropriate
>> for drivers for Renesas SoCs.
>>
>> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
>> ---
>>
>> This patch is based on the for-4.6-1 branch of Guennadi's v4l-dvb tree.
>>
>> v3 [Yoshihiro Kaneko]
>> * rebased to for-4.6-1 branch of Guennadi's tree.
>>
>> v2 [Yoshihiro Kaneko]
>> * As suggested by Geert Uytterhoeven
>> drivers/media/platform/soc_camera/rcar_vin.c:
>> - The generic compatibility values are listed at the end of the
>> rcar_vin_of_table[].
>>
>> Documentation/devicetree/bindings/media/rcar_vin.txt | 8 +++++++-
>> drivers/media/platform/soc_camera/rcar_vin.c | 2 ++
>
> I might be wrong in this specific case, please, correct me someone, but
> doesn't Documentation/devicetree/bindings/submitting-patches.txt tell us
> to submit bindings patches separately from the drivers part?
I think that mostly applies to new bindings and new drivers.
For small updates (e.g. adding a new compatible value), these tend to be
submitted as a single patch.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3] media: soc_camera: rcar_vin: Add rcar fallback compatibility string
@ 2016-01-25 8:57 ` Geert Uytterhoeven
0 siblings, 0 replies; 12+ messages in thread
From: Geert Uytterhoeven @ 2016-01-25 8:57 UTC (permalink / raw)
To: Guennadi Liakhovetski
Cc: Yoshihiro Kaneko, Linux Media Mailing List, Simon Horman,
Magnus Damm, Linux-sh list
Hi Guennadi,
On Sat, Jan 23, 2016 at 6:37 PM, Guennadi Liakhovetski
<g.liakhovetski@gmx.de> wrote:
> On Thu, 14 Jan 2016, Yoshihiro Kaneko wrote:
>> Add fallback compatibility string for R-Car Gen2 and Gen3, This is
>> in keeping with the fallback scheme being adopted wherever appropriate
>> for drivers for Renesas SoCs.
>>
>> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
>> ---
>>
>> This patch is based on the for-4.6-1 branch of Guennadi's v4l-dvb tree.
>>
>> v3 [Yoshihiro Kaneko]
>> * rebased to for-4.6-1 branch of Guennadi's tree.
>>
>> v2 [Yoshihiro Kaneko]
>> * As suggested by Geert Uytterhoeven
>> drivers/media/platform/soc_camera/rcar_vin.c:
>> - The generic compatibility values are listed at the end of the
>> rcar_vin_of_table[].
>>
>> Documentation/devicetree/bindings/media/rcar_vin.txt | 8 +++++++-
>> drivers/media/platform/soc_camera/rcar_vin.c | 2 ++
>
> I might be wrong in this specific case, please, correct me someone, but
> doesn't Documentation/devicetree/bindings/submitting-patches.txt tell us
> to submit bindings patches separately from the drivers part?
I think that mostly applies to new bindings and new drivers.
For small updates (e.g. adding a new compatible value), these tend to be
submitted as a single patch.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-01-25 8:57 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-13 17:58 [PATCH v3] media: soc_camera: rcar_vin: Add rcar fallback compatibility string Yoshihiro Kaneko
2016-01-13 17:58 ` Yoshihiro Kaneko
2016-01-13 17:59 ` [PATCH v3] media: soc_camera: rcar_vin: Add ARGB8888 caputre format support Yoshihiro Kaneko
2016-01-13 17:59 ` Yoshihiro Kaneko
2016-01-13 18:27 ` Sergei Shtylyov
2016-01-13 18:27 ` Sergei Shtylyov
2016-01-13 18:18 ` kbuild test robot
2016-01-13 18:18 ` kbuild test robot
2016-01-23 17:37 ` [PATCH v3] media: soc_camera: rcar_vin: Add rcar fallback compatibility string Guennadi Liakhovetski
2016-01-23 17:37 ` Guennadi Liakhovetski
2016-01-25 8:57 ` Geert Uytterhoeven
2016-01-25 8:57 ` Geert Uytterhoeven
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.