* [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver
@ 2017-04-27 18:25 Kieran Bingham
2017-04-27 18:26 ` [PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous subdevs Kieran Bingham
` (5 more replies)
0 siblings, 6 replies; 16+ messages in thread
From: Kieran Bingham @ 2017-04-27 18:25 UTC (permalink / raw)
To: laurent.pinchart, niklas.soderlund, sakari.ailus
Cc: linux-media, linux-renesas-soc, linux-kernel, Kieran Bingham
From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
This is an RFC for the Analog Devices ADV748x driver, and follows on from a
previous posting by Niklas Söderlund [0] of an earlier incarnation of this
driver.
This is an early posting of the driver following the release early, release
often method after quite a bit of refactoring in an attempt to bring it
closer to mainline.
Aside from a few bug fixes, and considerable refactoring this driver:
- is refactored to multiple object files
- defines multiple sub devices for the output paths.
- has independant controls for both HDMI and Analog video paths
- extends V4L2 async matching to support 'ports' on V4L2_ASYNC_MATCH_OF
The ADV7481 and ADV7482 support two video pipelines which can run independently
of each other, with each pipeline terminating in a CSI-2 output: TXA (4-Lane)
and TXB (1-Lane)
The ADV7480 (Not yet included here), ADV7481, and ADV7482 are all derivatives,
with the following features
Analog HDMI MHL 4-Lane 1-Lane
In In CSI CSI
ADV7480 X X X
ADV7481 X X X X X
ADV7482 X X X X
This RFC statically routes the HDMI in through the TXA and the CVBS through the
TXB for early development, though I anticipate splitting the TXA/HDMI and
TXB/AFE (Analog Front End) into distinct sub devices, allowing configurable
routing. This split is dependant upon on-going 'incremental binding' work being
done and thus is not yet included in this RFC.
Further potential development areas include:
- ADV7480 Support (No AFE)
- MHL support (Not present on ADV7482)
- EDID support
- CEC Support
- Configurable I2C addressing
- Interrupt handling for format changes and hotplug detect.
However, this driver and series is functional without the above, though if
there are mandatory areas which block mainline integration please let me know
and I will prioritise that in development.
Particular topics for discussion and review requested here include:
- Device tree bindings specification and port listings review
- Async Subdev port matching on V4L2_ASYNC_MATCH_OF
There are two implementations possible for the subdevice matching:
A) Matching on a root dev-node, with a port specification
B) Creating a new V4L2_ASYNC_MATCH_OF_ENDPOINT
This series posts an initial version utilising Method A.
Here we extend the subdevice and allow the drivers to assign defined 'port'
numbers to subdevices so that they can be distinguised against a common root
of_node.
This method involves the least change overall, and doesn't require the ADV7482
to parse it's device tree in advance.
Method B) is an option I have also considered, but requires as stated that the
driver must parse it's device tree, and instead of passing a root of_node, would
pass the endpoint for matching.
The difficulty here will be in communicating to the consumer / async-notifier
that instead of the V4L2_ASYNC_MATCH_OF, a V4L2_ASYNC_MATCH_OF_ENDPOINT should
be used. Thoughts on this would be appreciated.
This series presents the following patches:
[PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous
[PATCH 2/5] rcar-vin: Match sources against ports if specified.
[PATCH 3/5] media: i2c: adv748x: add adv748x driver
[PATCH 4/5] arm64: dts: r8a7795: salvator-x: enable VIN, CSI and ADV7482
[PATCH 5/5] arm64: dts: r8a7796: salvator-x: enable VIN, CSI and ADV7482
Patch 1 provides V4L2 support for the 'Method A' mentioned above.
Patch 2 is dependant upon Niklas' rcar-vin series [1], and adds support to the
binding multiple subdevices from a single DT node.
Patch 3 is the new driver
Patch 4 and 5 add support to the Salvator-X platforms where this code has been
tested
I appreciate that there are still some 'rough edges' in the driver, which is
still under development, but all comments are welcome.
[0] http://www.mail-archive.com/linux-renesas-soc@vger.kernel.org/msg05196.html
[1] https://git.ragnatech.se/linux rcar-vin-elinux-v7
Kieran Bingham (5):
v4l2-subdev: Provide a port mapping for asynchronous subdevs
rcar-vin: Match sources against ports if specified.
media: i2c: adv748x: add adv748x driver
arm64: dts: r8a7795: salvator-x: enable VIN, CSI and ADV7482
arm64: dts: r8a7796: salvator-x: enable VIN, CSI and ADV7482
.../devicetree/bindings/media/i2c/adv748x.txt | 63 ++
MAINTAINERS | 6 +
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 129 ++++
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 129 ++++
drivers/media/i2c/Kconfig | 10 +
drivers/media/i2c/Makefile | 1 +
drivers/media/i2c/adv748x/Makefile | 6 +
drivers/media/i2c/adv748x/adv748x-afe.c | 614 ++++++++++++++++++
drivers/media/i2c/adv748x/adv748x-core.c | 573 +++++++++++++++++
drivers/media/i2c/adv748x/adv748x-hdmi.c | 690 +++++++++++++++++++++
drivers/media/i2c/adv748x/adv748x.h | 157 +++++
drivers/media/platform/rcar-vin/rcar-core.c | 15 +-
drivers/media/v4l2-core/v4l2-async.c | 7 +
drivers/media/v4l2-core/v4l2-subdev.c | 1 +
include/media/v4l2-async.h | 1 +
include/media/v4l2-subdev.h | 2 +
16 files changed, 2397 insertions(+), 7 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/i2c/adv748x.txt
create mode 100644 drivers/media/i2c/adv748x/Makefile
create mode 100644 drivers/media/i2c/adv748x/adv748x-afe.c
create mode 100644 drivers/media/i2c/adv748x/adv748x-core.c
create mode 100644 drivers/media/i2c/adv748x/adv748x-hdmi.c
create mode 100644 drivers/media/i2c/adv748x/adv748x.h
--
2.7.4
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous subdevs
2017-04-27 18:25 [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver Kieran Bingham
@ 2017-04-27 18:26 ` Kieran Bingham
2017-04-27 21:43 ` Sakari Ailus
2017-04-27 18:26 ` [PATCH 2/5] rcar-vin: Match sources against ports if specified Kieran Bingham
` (4 subsequent siblings)
5 siblings, 1 reply; 16+ messages in thread
From: Kieran Bingham @ 2017-04-27 18:26 UTC (permalink / raw)
To: laurent.pinchart, niklas.soderlund, sakari.ailus
Cc: linux-media, linux-renesas-soc, linux-kernel, Kieran Bingham
From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Devices such as the the ADV748x support multiple parallel stream routes
through a single chip. This leads towards needing to provide multiple
distinct entities and subdevs from a single device-tree node.
To distinguish these separate outputs, the device-tree binding must
specify each endpoint link with a unique (to the device) non-zero port
number.
This number allows async subdev registrations to identify the correct
subdevice to bind and link.
Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
---
drivers/media/v4l2-core/v4l2-async.c | 7 +++++++
drivers/media/v4l2-core/v4l2-subdev.c | 1 +
include/media/v4l2-async.h | 1 +
include/media/v4l2-subdev.h | 2 ++
4 files changed, 11 insertions(+)
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index 1815e54e8a38..875e6ce646ec 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -42,6 +42,13 @@ static bool match_devname(struct v4l2_subdev *sd,
static bool match_of(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
{
+ /*
+ * If set, we must match the device tree port, with the subdev port.
+ * This is a fast match, so do this first
+ */
+ if (sd->port && sd->port != asd->match.of.port)
+ return -1;
+
return !of_node_cmp(of_node_full_name(sd->of_node),
of_node_full_name(asd->match.of.node));
}
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index da78497ae5ed..67f816f90ac3 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -607,6 +607,7 @@ void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops)
sd->flags = 0;
sd->name[0] = '\0';
sd->grp_id = 0;
+ sd->port = 0;
sd->dev_priv = NULL;
sd->host_priv = NULL;
#if defined(CONFIG_MEDIA_CONTROLLER)
diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
index 5b501309b6a7..2988960613ec 100644
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -56,6 +56,7 @@ struct v4l2_async_subdev {
union {
struct {
const struct device_node *node;
+ u32 port;
} of;
struct {
const char *name;
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index 0ab1c5df6fac..1c1731b491e5 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -782,6 +782,7 @@ struct v4l2_subdev_platform_data {
* @ctrl_handler: The control handler of this subdev. May be NULL.
* @name: Name of the sub-device. Please notice that the name must be unique.
* @grp_id: can be used to group similar subdevs. Value is driver-specific
+ * @port: driver-specific value to bind multiple subdevs with a single DT node.
* @dev_priv: pointer to private data
* @host_priv: pointer to private data used by the device where the subdev
* is attached.
@@ -814,6 +815,7 @@ struct v4l2_subdev {
struct v4l2_ctrl_handler *ctrl_handler;
char name[V4L2_SUBDEV_NAME_SIZE];
u32 grp_id;
+ u32 port;
void *dev_priv;
void *host_priv;
struct video_device *devnode;
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 2/5] rcar-vin: Match sources against ports if specified.
2017-04-27 18:25 [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver Kieran Bingham
2017-04-27 18:26 ` [PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous subdevs Kieran Bingham
@ 2017-04-27 18:26 ` Kieran Bingham
2017-04-27 18:26 ` [PATCH 3/5] media: i2c: adv748x: add adv748x driver Kieran Bingham
` (3 subsequent siblings)
5 siblings, 0 replies; 16+ messages in thread
From: Kieran Bingham @ 2017-04-27 18:26 UTC (permalink / raw)
To: laurent.pinchart, niklas.soderlund, sakari.ailus
Cc: linux-media, linux-renesas-soc, linux-kernel, Kieran Bingham
From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
If an endpoint source specifies a port number, then it may have
multiple entities provided by one DT node. In this event, match
against both the DT node and it's relevant port.
Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
---
drivers/media/platform/rcar-vin/rcar-core.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
index a530dc388b95..afe382c9a55d 100644
--- a/drivers/media/platform/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/rcar-vin/rcar-core.c
@@ -782,7 +782,8 @@ static int rvin_group_notify_bound(struct v4l2_async_notifier *notifier,
return 0;
}
- if (vin->group->source[i].asd.match.of.node == new) {
+ if (vin->group->source[i].asd.match.of.node == new &&
+ subdev->port == vin->group->source[i].asd.match.of.port) {
vin_dbg(vin, "Bound source %s\n", subdev->name);
vin->group->source[i].subdev = subdev;
mutex_unlock(&vin->group->lock);
@@ -820,7 +821,7 @@ static struct device_node *rvin_group_get_bridge(struct rvin_dev *vin,
static struct device_node *
rvin_group_get_source(struct rvin_dev *vin,
struct device_node *bridge,
- unsigned int *remote_pad)
+ unsigned int *remote_port)
{
struct device_node *source, *ep, *rp;
struct v4l2_mbus_config mbus_cfg;
@@ -844,7 +845,7 @@ rvin_group_get_source(struct rvin_dev *vin,
rp = of_graph_get_remote_port(ep);
of_graph_parse_endpoint(rp, &endpoint);
of_node_put(rp);
- *remote_pad = endpoint.id;
+ *remote_port = endpoint.id;
source = of_graph_get_remote_port_parent(ep);
of_node_put(ep);
@@ -861,7 +862,7 @@ rvin_group_get_source(struct rvin_dev *vin,
static int rvin_group_graph_parse(struct rvin_dev *vin, unsigned long *bitmap)
{
struct device_node *ep, *bridge, *source;
- unsigned int i, remote_pad = 0;
+ unsigned int i, remote_port = 0;
u32 val;
int ret;
@@ -910,7 +911,7 @@ static int rvin_group_graph_parse(struct rvin_dev *vin, unsigned long *bitmap)
if (bridge == NULL)
continue;
- source = rvin_group_get_source(vin, bridge, &remote_pad);
+ source = rvin_group_get_source(vin, bridge, &remote_port);
of_node_put(bridge);
if (IS_ERR(source))
return PTR_ERR(source);
@@ -922,14 +923,14 @@ static int rvin_group_graph_parse(struct rvin_dev *vin, unsigned long *bitmap)
vin->group->bridge[i].asd.match.of.node = bridge;
vin->group->bridge[i].asd.match_type = V4L2_ASYNC_MATCH_OF;
vin->group->source[i].asd.match.of.node = source;
+ vin->group->source[i].asd.match.of.port = remote_port;
vin->group->source[i].asd.match_type = V4L2_ASYNC_MATCH_OF;
- vin->group->source[i].source_pad = remote_pad;
*bitmap |= BIT(i);
vin_dbg(vin, "Handle bridge %s and source %s pad %d\n",
of_node_full_name(bridge), of_node_full_name(source),
- remote_pad);
+ remote_port);
}
/* All our sources are CSI-2 */
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 3/5] media: i2c: adv748x: add adv748x driver
2017-04-27 18:25 [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver Kieran Bingham
2017-04-27 18:26 ` [PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous subdevs Kieran Bingham
2017-04-27 18:26 ` [PATCH 2/5] rcar-vin: Match sources against ports if specified Kieran Bingham
@ 2017-04-27 18:26 ` Kieran Bingham
2017-04-27 18:26 ` [PATCH 4/5] arm64: dts: r8a7795: salvator-x: enable VIN, CSI and ADV7482 Kieran Bingham
` (2 subsequent siblings)
5 siblings, 0 replies; 16+ messages in thread
From: Kieran Bingham @ 2017-04-27 18:26 UTC (permalink / raw)
To: laurent.pinchart, niklas.soderlund, sakari.ailus
Cc: linux-media, linux-renesas-soc, linux-kernel, Kieran Bingham
From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Provide basic support for the ADV7481 and ADV7482.
The driver is modelled with 2 subdevices to allow simultaneous streaming
from the AFE (Analog front end) and HDMI inputs.
Presently the HDMI is hardcoded to link to the TXA CSI bus, whilst the
AFE is linked to the TXB CSI bus.
The driver is based on a prototype by Koji Matsuoka in the Renesas BSP,
and an earlier rework by Niklas Söderlund.
Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
---
.../devicetree/bindings/media/i2c/adv748x.txt | 63 ++
MAINTAINERS | 6 +
drivers/media/i2c/Kconfig | 10 +
drivers/media/i2c/Makefile | 1 +
drivers/media/i2c/adv748x/Makefile | 6 +
drivers/media/i2c/adv748x/adv748x-afe.c | 614 ++++++++++++++++++
drivers/media/i2c/adv748x/adv748x-core.c | 573 +++++++++++++++++
drivers/media/i2c/adv748x/adv748x-hdmi.c | 690 +++++++++++++++++++++
drivers/media/i2c/adv748x/adv748x.h | 157 +++++
9 files changed, 2120 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/i2c/adv748x.txt
create mode 100644 drivers/media/i2c/adv748x/Makefile
create mode 100644 drivers/media/i2c/adv748x/adv748x-afe.c
create mode 100644 drivers/media/i2c/adv748x/adv748x-core.c
create mode 100644 drivers/media/i2c/adv748x/adv748x-hdmi.c
create mode 100644 drivers/media/i2c/adv748x/adv748x.h
diff --git a/Documentation/devicetree/bindings/media/i2c/adv748x.txt b/Documentation/devicetree/bindings/media/i2c/adv748x.txt
new file mode 100644
index 000000000000..487d8865c939
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/i2c/adv748x.txt
@@ -0,0 +1,63 @@
+* Analog Devices ADV748X video decoder with HDMI receiver
+
+The ADV7481, and ADV7482 are multi format video decoders with an integrated
+HDMI receiver. It can output CSI-2 on two independent outputs TXA and TXB from
+three input sources HDMI, analog and TTL.
+
+Required Properties:
+
+ - compatible: Must contain one of the following
+ - "adi,adv7481" for the ADV7481
+ - "adi,adv7482" for the ADV7482
+
+ - reg: I2C slave address
+
+The device node must contain one 'port' child node per device input and output
+port, in accordance with the video interface bindings defined in
+Documentation/devicetree/bindings/media/video-interfaces.txt. The port nodes
+are numbered as follows.
+
+ Name Type Port
+------------------------------------------------------------
+ AIN1 sink 1
+ AIN2 sink 2
+ AIN3 sink 3
+ AIN4 sink 4
+ AIN5 sink 5
+ AIN6 sink 6
+ AIN7 sink 7
+ AIN8 sink 8
+ HDMI sink 9
+ TTL sink 10
+ TXA source 11
+ TXB source 12
+
+The digital output port node must contain at least one source endpoint.
+
+Example:
+
+ video_receiver@70 {
+ compatible = "adi,adv7482";
+ reg = <0x70>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@11 {
+ reg = <11>;
+ adv7482_txa: endpoint@1 {
+ clock-lanes = <0>;
+ data-lanes = <1 2 3 4>;
+ remote-endpoint = <&csi40_in>;
+ };
+ };
+
+ port@12 {
+ reg = <12>;
+ adv7482_txb: endpoint@1 {
+ clock-lanes = <0>;
+ data-lanes = <1>;
+ remote-endpoint = <&csi20_in>;
+ };
+ };
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index c265a5fe4848..30c0168df508 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -774,6 +774,12 @@ L: linux-media@vger.kernel.org
S: Maintained
F: drivers/media/i2c/adv7511*
+ANALOG DEVICES INC ADV748X DRIVER
+M: Kieran Bingham <kieran.bingham@ideasonboard.com>
+L: linux-media@vger.kernel.org
+S: Maintained
+F: drivers/media/i2c/adv748x/*
+
ANALOG DEVICES INC ADV7604 DRIVER
M: Hans Verkuil <hans.verkuil@cisco.com>
L: linux-media@vger.kernel.org
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index cee1dae6e014..6b0ea68a0ec8 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -204,6 +204,16 @@ config VIDEO_ADV7183
To compile this driver as a module, choose M here: the
module will be called adv7183.
+config VIDEO_ADV748X
+ tristate "Analog Devices ADV748x decoder"
+ depends on VIDEO_V4L2 && I2C
+ ---help---
+ V4l2 subdevice driver for the Analog Devices
+ ADV7481 and ADV7482 HDMI/Analog video decoder.
+
+ To compile this driver as a module, choose M here: the
+ module will be called adv748x.
+
config VIDEO_ADV7604
tristate "Analog Devices ADV7604 decoder"
depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index 5bc7bbeb5499..f331ec0b93c9 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -1,6 +1,7 @@
msp3400-objs := msp3400-driver.o msp3400-kthreads.o
obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o
+obj-$(CONFIG_VIDEO_ADV748X) += adv748x/
obj-$(CONFIG_VIDEO_SMIAPP) += smiapp/
obj-$(CONFIG_VIDEO_ET8EK8) += et8ek8/
obj-$(CONFIG_VIDEO_CX25840) += cx25840/
diff --git a/drivers/media/i2c/adv748x/Makefile b/drivers/media/i2c/adv748x/Makefile
new file mode 100644
index 000000000000..fa7524ca02eb
--- /dev/null
+++ b/drivers/media/i2c/adv748x/Makefile
@@ -0,0 +1,6 @@
+adv748x-objs := \
+ adv748x-core.o \
+ adv748x-afe.o \
+ adv748x-hdmi.o
+
+obj-$(CONFIG_VIDEO_ADV748X) += adv748x.o
diff --git a/drivers/media/i2c/adv748x/adv748x-afe.c b/drivers/media/i2c/adv748x/adv748x-afe.c
new file mode 100644
index 000000000000..f68f522575c8
--- /dev/null
+++ b/drivers/media/i2c/adv748x/adv748x-afe.c
@@ -0,0 +1,614 @@
+/*
+ * Driver for Analog Devices ADV748X 8 channel analog front end (AFE) receiver
+ * with standard definition processor (SDP)
+ *
+ * Copyright (C) 2017 Renesas Electronics Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/v4l2-dv-timings.h>
+
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-dv-timings.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-of.h>
+
+#include "adv748x.h"
+
+enum adv748x_afe_pads {
+ ADV748X_AFE_SINK = 0,
+ ADV748X_AFE_SOURCE = 1,
+};
+
+/* -----------------------------------------------------------------------------
+ * SDP
+ */
+
+#define ADV748X_AFE_INPUT_CVBS_AIN1 0x00
+#define ADV748X_AFE_INPUT_CVBS_AIN2 0x01
+#define ADV748X_AFE_INPUT_CVBS_AIN3 0x02
+#define ADV748X_AFE_INPUT_CVBS_AIN4 0x03
+#define ADV748X_AFE_INPUT_CVBS_AIN5 0x04
+#define ADV748X_AFE_INPUT_CVBS_AIN6 0x05
+#define ADV748X_AFE_INPUT_CVBS_AIN7 0x06
+#define ADV748X_AFE_INPUT_CVBS_AIN8 0x07
+
+#define ADV748X_AFE_STD_AD_PAL_BG_NTSC_J_SECAM 0x0
+#define ADV748X_AFE_STD_AD_PAL_BG_NTSC_J_SECAM_PED 0x1
+#define ADV748X_AFE_STD_AD_PAL_N_NTSC_J_SECAM 0x2
+#define ADV748X_AFE_STD_AD_PAL_N_NTSC_M_SECAM 0x3
+#define ADV748X_AFE_STD_NTSC_J 0x4
+#define ADV748X_AFE_STD_NTSC_M 0x5
+#define ADV748X_AFE_STD_PAL60 0x6
+#define ADV748X_AFE_STD_NTSC_443 0x7
+#define ADV748X_AFE_STD_PAL_BG 0x8
+#define ADV748X_AFE_STD_PAL_N 0x9
+#define ADV748X_AFE_STD_PAL_M 0xa
+#define ADV748X_AFE_STD_PAL_M_PED 0xb
+#define ADV748X_AFE_STD_PAL_COMB_N 0xc
+#define ADV748X_AFE_STD_PAL_COMB_N_PED 0xd
+#define ADV748X_AFE_STD_PAL_SECAM 0xe
+#define ADV748X_AFE_STD_PAL_SECAM_PED 0xf
+
+static int adv748x_afe_read_ro_map(struct adv748x_state *state, u8 reg)
+{
+ int ret;
+
+ /* Select SDP Read-Only Main Map */
+ ret = sdp_write(state, 0x0e, 0x01);
+ if (ret < 0)
+ return ret;
+
+ return sdp_read(state, reg);
+}
+
+static int adv748x_afe_status(struct adv748x_state *state, u32 *signal,
+ v4l2_std_id *std)
+{
+ int info;
+
+ /* Read status from reg 0x10 of SDP RO Map */
+ info = adv748x_afe_read_ro_map(state, 0x10);
+ if (info < 0)
+ return info;
+
+ if (signal)
+ *signal = info & BIT(0) ? 0 : V4L2_IN_ST_NO_SIGNAL;
+
+ if (std) {
+ *std = V4L2_STD_UNKNOWN;
+
+ /* Standard not valid if there is no signal */
+ if (info & BIT(0)) {
+ switch (info & 0x70) {
+ case 0x00:
+ *std = V4L2_STD_NTSC;
+ break;
+ case 0x10:
+ *std = V4L2_STD_NTSC_443;
+ break;
+ case 0x20:
+ *std = V4L2_STD_PAL_M;
+ break;
+ case 0x30:
+ *std = V4L2_STD_PAL_60;
+ break;
+ case 0x40:
+ *std = V4L2_STD_PAL;
+ break;
+ case 0x50:
+ *std = V4L2_STD_SECAM;
+ break;
+ case 0x60:
+ *std = V4L2_STD_PAL_Nc | V4L2_STD_PAL_N;
+ break;
+ case 0x70:
+ *std = V4L2_STD_SECAM;
+ break;
+ default:
+ *std = V4L2_STD_UNKNOWN;
+ break;
+ }
+ }
+ }
+
+ return 0;
+}
+
+static void adv748x_afe_fill_format(struct adv748x_state *state,
+ struct v4l2_mbus_framefmt *fmt)
+{
+ v4l2_std_id std;
+
+ memset(fmt, 0, sizeof(*fmt));
+
+ fmt->code = MEDIA_BUS_FMT_UYVY8_2X8;
+ fmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
+ fmt->field = V4L2_FIELD_INTERLACED;
+
+ fmt->width = 720;
+
+ if (state->afe.curr_norm == V4L2_STD_ALL)
+ adv748x_afe_status(state, NULL, &std);
+ else
+ std = state->afe.curr_norm;
+
+ fmt->height = std & V4L2_STD_525_60 ? 480 : 576;
+}
+
+static int adv748x_afe_std(v4l2_std_id std)
+{
+ if (std == V4L2_STD_ALL)
+ return ADV748X_AFE_STD_AD_PAL_BG_NTSC_J_SECAM;
+ if (std == V4L2_STD_PAL_60)
+ return ADV748X_AFE_STD_PAL60;
+ if (std == V4L2_STD_NTSC_443)
+ return ADV748X_AFE_STD_NTSC_443;
+ if (std == V4L2_STD_PAL_N)
+ return ADV748X_AFE_STD_PAL_N;
+ if (std == V4L2_STD_PAL_M)
+ return ADV748X_AFE_STD_PAL_M;
+ if (std == V4L2_STD_PAL_Nc)
+ return ADV748X_AFE_STD_PAL_COMB_N;
+ if (std & V4L2_STD_PAL)
+ return ADV748X_AFE_STD_PAL_BG;
+ if (std & V4L2_STD_NTSC)
+ return ADV748X_AFE_STD_NTSC_M;
+ if (std & V4L2_STD_SECAM)
+ return ADV748X_AFE_STD_PAL_SECAM;
+
+ return -EINVAL;
+}
+
+static int adv748x_afe_set_video_standard(struct adv748x_state *state,
+ v4l2_std_id std)
+{
+ int sdpstd;
+
+ sdpstd = adv748x_afe_std(std);
+ if (sdpstd < 0)
+ return sdpstd;
+
+ sdp_clrset(state, 0x02, 0xf0, (sdpstd & 0xf) << 4);
+
+ return 0;
+}
+
+static int adv748x_afe_g_pixelaspect(struct v4l2_subdev *sd,
+ struct v4l2_fract *aspect)
+{
+ struct adv748x_state *state = adv748x_afe_to_state(sd);
+ v4l2_std_id std;
+
+ if (state->afe.curr_norm == V4L2_STD_ALL)
+ adv748x_afe_status(state, NULL, &std);
+ else
+ std = state->afe.curr_norm;
+
+ if (std & V4L2_STD_525_60) {
+ aspect->numerator = 11;
+ aspect->denominator = 10;
+ } else {
+ aspect->numerator = 54;
+ aspect->denominator = 59;
+ }
+
+ return 0;
+}
+
+/* -----------------------------------------------------------------------------
+ * v4l2_subdev_video_ops
+ */
+
+static int adv748x_afe_g_std(struct v4l2_subdev *sd, v4l2_std_id *norm)
+{
+ struct adv748x_state *state = adv748x_afe_to_state(sd);
+
+ if (state->afe.curr_norm == V4L2_STD_ALL)
+ adv748x_afe_status(state, NULL, norm);
+ else
+ *norm = state->afe.curr_norm;
+
+ return 0;
+}
+
+
+static int adv748x_afe_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
+{
+ struct adv748x_state *state = adv748x_afe_to_state(sd);
+ int ret;
+
+ ret = mutex_lock_interruptible(&state->mutex);
+ if (ret)
+ return ret;
+
+ ret = adv748x_afe_set_video_standard(state, std);
+ if (ret < 0)
+ goto out;
+
+ state->afe.curr_norm = std;
+
+out:
+ mutex_unlock(&state->mutex);
+ return ret;
+}
+
+static int adv748x_afe_querystd(struct v4l2_subdev *sd, v4l2_std_id *std)
+{
+ struct adv748x_state *state = adv748x_afe_to_state(sd);
+ int ret;
+
+ ret = mutex_lock_interruptible(&state->mutex);
+ if (ret)
+ return ret;
+
+ if (state->afe.streaming) {
+ ret = -EBUSY;
+ goto unlock;
+ }
+
+ /* Set auto detect mode */
+ ret = adv748x_afe_set_video_standard(state, V4L2_STD_ALL);
+ if (ret)
+ goto unlock;
+
+ msleep(100);
+
+ /* Read detected standard */
+ ret = adv748x_afe_status(state, NULL, std);
+unlock:
+ mutex_unlock(&state->mutex);
+
+ return ret;
+}
+
+static int adv748x_afe_g_tvnorms(struct v4l2_subdev *sd, v4l2_std_id *norm)
+{
+ *norm = V4L2_STD_ALL;
+
+ return 0;
+}
+
+static int adv748x_afe_g_input_status(struct v4l2_subdev *sd, u32 *status)
+{
+ struct adv748x_state *state = adv748x_afe_to_state(sd);
+ int ret;
+
+ ret = mutex_lock_interruptible(&state->mutex);
+ if (ret)
+ return ret;
+
+ ret = adv748x_afe_status(state, status, NULL);
+
+ mutex_unlock(&state->mutex);
+ return ret;
+}
+
+static int adv748x_afe_s_stream(struct v4l2_subdev *sd, int enable)
+{
+ struct adv748x_state *state = adv748x_afe_to_state(sd);
+ int ret, signal = V4L2_IN_ST_NO_SIGNAL;
+
+ ret = mutex_lock_interruptible(&state->mutex);
+ if (ret)
+ return ret;
+
+ ret = adv748x_txb_power(state, enable);
+ if (ret)
+ goto error;
+
+ state->afe.streaming = enable;
+
+ adv748x_afe_status(state, &signal, NULL);
+ if (signal != V4L2_IN_ST_NO_SIGNAL)
+ adv_dbg(state, "Detected SDP signal\n");
+ else
+ adv_info(state, "Couldn't detect SDP video signal\n");
+
+error:
+ mutex_unlock(&state->mutex);
+ return ret;
+}
+
+static const struct v4l2_subdev_video_ops adv748x_afe_video_ops = {
+ .g_std = adv748x_afe_g_std,
+ .s_std = adv748x_afe_s_std,
+ .querystd = adv748x_afe_querystd,
+ .g_tvnorms = adv748x_afe_g_tvnorms,
+ .g_input_status = adv748x_afe_g_input_status,
+ .s_stream = adv748x_afe_s_stream,
+ .g_pixelaspect = adv748x_afe_g_pixelaspect,
+};
+
+/* -----------------------------------------------------------------------------
+ * v4l2_subdev_pad_ops
+ */
+
+static int adv748x_afe_enum_mbus_code(struct v4l2_subdev *sd,
+ struct v4l2_subdev_pad_config *cfg,
+ struct v4l2_subdev_mbus_code_enum *code)
+{
+ if (code->index != 0)
+ return -EINVAL;
+
+ switch (code->pad) {
+ case ADV748X_AFE_SOURCE:
+ case ADV748X_AFE_SINK:
+ code->code = MEDIA_BUS_FMT_UYVY8_2X8;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+
+static int adv748x_afe_get_pad_format(struct v4l2_subdev *sd,
+ struct v4l2_subdev_pad_config *cfg,
+ struct v4l2_subdev_format *format)
+{
+ struct adv748x_state *state = adv748x_afe_to_state(sd);
+
+ switch (format->pad) {
+ case ADV748X_AFE_SOURCE:
+ case ADV748X_AFE_SINK:
+ adv748x_afe_fill_format(state, &format->format);
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+ struct v4l2_mbus_framefmt *fmt;
+
+ fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
+ format->format.code = fmt->code;
+ }
+
+ return 0;
+}
+
+static int adv748x_afe_set_pad_format(struct v4l2_subdev *sd,
+ struct v4l2_subdev_pad_config *cfg,
+ struct v4l2_subdev_format *format)
+{
+ struct adv748x_state *state = adv748x_afe_to_state(sd);
+
+ switch (format->pad) {
+ case ADV748X_AFE_SOURCE:
+ case ADV748X_AFE_SINK:
+ adv748x_afe_fill_format(state, &format->format);
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+ struct v4l2_mbus_framefmt *fmt;
+
+ fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
+ fmt->code = format->format.code;
+ }
+
+ return 0;
+}
+
+static const struct v4l2_subdev_pad_ops adv748x_afe_pad_ops = {
+ .enum_mbus_code = adv748x_afe_enum_mbus_code,
+ .set_fmt = adv748x_afe_set_pad_format,
+ .get_fmt = adv748x_afe_get_pad_format,
+};
+
+/* -----------------------------------------------------------------------------
+ * v4l2_subdev_ops
+ */
+
+static const struct v4l2_subdev_ops adv748x_afe_ops = {
+ .video = &adv748x_afe_video_ops,
+ .pad = &adv748x_afe_pad_ops,
+};
+
+/* -----------------------------------------------------------------------------
+ * Controls
+ */
+
+/* Contrast */
+#define ADV748X_AFE_REG_CON 0x08 /*Unsigned */
+#define ADV748X_AFE_CON_MIN 0
+#define ADV748X_AFE_CON_DEF 128
+#define ADV748X_AFE_CON_MAX 255
+/* Brightness*/
+#define ADV748X_AFE_REG_BRI 0x0a /*Signed */
+#define ADV748X_AFE_BRI_MIN -128
+#define ADV748X_AFE_BRI_DEF 0
+#define ADV748X_AFE_BRI_MAX 127
+/* Hue */
+#define ADV748X_AFE_REG_HUE 0x0b /*Signed, inverted */
+#define ADV748X_AFE_HUE_MIN -127
+#define ADV748X_AFE_HUE_DEF 0
+#define ADV748X_AFE_HUE_MAX 128
+
+/* Saturation */
+#define ADV748X_AFE_REG_SD_SAT_CB 0xe3
+#define ADV748X_AFE_REG_SD_SAT_CR 0xe4
+#define ADV748X_AFE_SAT_MIN 0
+#define ADV748X_AFE_SAT_DEF 128
+#define ADV748X_AFE_SAT_MAX 255
+
+static int __adv748x_afe_s_ctrl(struct v4l2_ctrl *ctrl,
+ struct adv748x_state *state)
+{
+ int ret;
+
+ ret = sdp_write(state, 0x0e, 0x00);
+ if (ret < 0)
+ return ret;
+
+ switch (ctrl->id) {
+ case V4L2_CID_BRIGHTNESS:
+ if (ctrl->val < ADV748X_AFE_BRI_MIN ||
+ ctrl->val > ADV748X_AFE_BRI_MAX)
+ return -ERANGE;
+
+ ret = sdp_write(state, ADV748X_AFE_REG_BRI, ctrl->val);
+ break;
+ case V4L2_CID_HUE:
+ if (ctrl->val < ADV748X_AFE_HUE_MIN ||
+ ctrl->val > ADV748X_AFE_HUE_MAX)
+ return -ERANGE;
+
+ /* Hue is inverted according to HSL chart */
+ ret = sdp_write(state, ADV748X_AFE_REG_HUE, -ctrl->val);
+ break;
+ case V4L2_CID_CONTRAST:
+ if (ctrl->val < ADV748X_AFE_CON_MIN ||
+ ctrl->val > ADV748X_AFE_CON_MAX)
+ return -ERANGE;
+
+ ret = sdp_write(state, ADV748X_AFE_REG_CON, ctrl->val);
+ break;
+ case V4L2_CID_SATURATION:
+ if (ctrl->val < ADV748X_AFE_SAT_MIN ||
+ ctrl->val > ADV748X_AFE_SAT_MAX)
+ return -ERANGE;
+ /*
+ * This could be V4L2_CID_BLUE_BALANCE/V4L2_CID_RED_BALANCE
+ * Let's not confuse the user, everybody understands saturation
+ */
+ ret = sdp_write(state, ADV748X_AFE_REG_SD_SAT_CB, ctrl->val);
+ if (ret)
+ break;
+ ret = sdp_write(state, ADV748X_AFE_REG_SD_SAT_CR, ctrl->val);
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return ret;
+}
+
+static int adv748x_afe_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+ struct adv748x_state *state =
+ container_of(ctrl->handler, struct adv748x_state, afe.ctrl_hdl);
+ int ret;
+
+ ret = mutex_lock_interruptible(&state->mutex);
+ if (ret)
+ return ret;
+
+ ret = __adv748x_afe_s_ctrl(ctrl, state);
+
+ mutex_unlock(&state->mutex);
+
+ return ret;
+}
+
+static int adv748x_afe_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
+{
+ struct adv748x_state *state =
+ container_of(ctrl->handler, struct adv748x_state, afe.ctrl_hdl);
+ unsigned int width, height, fps;
+ v4l2_std_id std;
+
+ switch (ctrl->id) {
+ case V4L2_CID_PIXEL_RATE:
+ width = 720;
+ if (state->afe.curr_norm == V4L2_STD_ALL)
+ adv748x_afe_status(state, NULL, &std);
+ else
+ std = state->afe.curr_norm;
+
+ height = std & V4L2_STD_525_60 ? 480 : 576;
+ fps = std & V4L2_STD_525_60 ? 30 : 25;
+
+ *ctrl->p_new.p_s64 = width * height * fps;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static const struct v4l2_ctrl_ops adv748x_afe_ctrl_ops = {
+ .s_ctrl = adv748x_afe_s_ctrl,
+ .g_volatile_ctrl = adv748x_afe_g_volatile_ctrl,
+};
+
+static int adv748x_afe_init_controls(struct adv748x_state *state)
+{
+ struct v4l2_ctrl *ctrl;
+
+ v4l2_ctrl_handler_init(&state->afe.ctrl_hdl, 5);
+
+ v4l2_ctrl_new_std(&state->afe.ctrl_hdl, &adv748x_afe_ctrl_ops,
+ V4L2_CID_BRIGHTNESS, ADV748X_AFE_BRI_MIN,
+ ADV748X_AFE_BRI_MAX, 1, ADV748X_AFE_BRI_DEF);
+ v4l2_ctrl_new_std(&state->afe.ctrl_hdl, &adv748x_afe_ctrl_ops,
+ V4L2_CID_CONTRAST, ADV748X_AFE_CON_MIN,
+ ADV748X_AFE_CON_MAX, 1, ADV748X_AFE_CON_DEF);
+ v4l2_ctrl_new_std(&state->afe.ctrl_hdl, &adv748x_afe_ctrl_ops,
+ V4L2_CID_SATURATION, ADV748X_AFE_SAT_MIN,
+ ADV748X_AFE_SAT_MAX, 1, ADV748X_AFE_SAT_DEF);
+ v4l2_ctrl_new_std(&state->afe.ctrl_hdl, &adv748x_afe_ctrl_ops,
+ V4L2_CID_HUE, ADV748X_AFE_HUE_MIN,
+ ADV748X_AFE_HUE_MAX, 1, ADV748X_AFE_HUE_DEF);
+ ctrl = v4l2_ctrl_new_std(&state->afe.ctrl_hdl, &adv748x_afe_ctrl_ops,
+ V4L2_CID_PIXEL_RATE, 1, INT_MAX, 1, 1);
+ if (ctrl)
+ ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
+
+ state->afe.sd.ctrl_handler = &state->afe.ctrl_hdl;
+ if (state->afe.ctrl_hdl.error) {
+ v4l2_ctrl_handler_free(&state->afe.ctrl_hdl);
+ return state->afe.ctrl_hdl.error;
+ }
+
+ return v4l2_ctrl_handler_setup(&state->afe.ctrl_hdl);
+}
+
+int adv748x_afe_probe(struct adv748x_state *state)
+{
+ int ret;
+
+ state->afe.streaming = false;
+ state->afe.curr_norm = V4L2_STD_ALL;
+
+ adv748x_subdev_init(&state->afe.sd, state, &adv748x_afe_ops,
+ "cvbs/txb");
+
+ /* CVBS is currently statically routed to TXB */
+ state->afe.sd.port = ADV748X_PORT_TXB;
+
+ state->afe.pads[ADV748X_AFE_SINK].flags = MEDIA_PAD_FL_SINK;
+ state->afe.pads[ADV748X_AFE_SOURCE].flags = MEDIA_PAD_FL_SOURCE;
+
+ ret = media_entity_pads_init(&state->afe.sd.entity, 2, state->afe.pads);
+
+ ret = adv748x_afe_init_controls(state);
+ if (ret)
+ return ret;
+
+ ret = v4l2_async_register_subdev(&state->afe.sd);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+void adv748x_afe_remove(struct adv748x_state *state)
+{
+ v4l2_async_unregister_subdev(&state->afe.sd);
+ media_entity_cleanup(&state->afe.sd.entity);
+ v4l2_ctrl_handler_free(&state->afe.ctrl_hdl);
+}
diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c
new file mode 100644
index 000000000000..256d0b57ca43
--- /dev/null
+++ b/drivers/media/i2c/adv748x/adv748x-core.c
@@ -0,0 +1,573 @@
+/*
+ * Driver for Analog Devices ADV748X HDMI receiver with AFE
+ *
+ * Copyright (C) 2017 Renesas Electronics Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * Authors:
+ * Koji Matsuoka <koji.matsuoka.xm@renesas.com>
+ * Niklas Söderlund <niklas.soderlund@ragnatech.se>
+ * Kieran Bingham <kieran.bingham@ideasonboard.com>
+ */
+
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/v4l2-dv-timings.h>
+
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-dv-timings.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-of.h>
+
+#include "adv748x.h"
+
+/* -----------------------------------------------------------------------------
+ * Register manipulation
+ */
+
+/**
+ * struct adv748x_reg_value - Register write instruction
+ * @addr: I2C slave address
+ * @reg: I2c register
+ * @value: value to write to @addr at @reg
+ */
+struct adv748x_reg_value {
+ u8 addr;
+ u8 reg;
+ u8 value;
+};
+
+static int adv748x_write_regs(struct adv748x_state *state,
+ const struct adv748x_reg_value *regs)
+{
+ struct i2c_msg msg;
+ u8 data_buf[2];
+ int ret = -EINVAL;
+
+ if (!state->client->adapter) {
+ adv_err(state, "No adapter for regs write\n");
+ return -ENODEV;
+ }
+
+ msg.flags = 0;
+ msg.len = 2;
+ msg.buf = &data_buf[0];
+
+ while (regs->addr != ADV748X_I2C_EOR) {
+
+ if (regs->addr == ADV748X_I2C_WAIT)
+ msleep(regs->value);
+ else {
+ msg.addr = regs->addr;
+ data_buf[0] = regs->reg;
+ data_buf[1] = regs->value;
+
+ ret = i2c_transfer(state->client->adapter, &msg, 1);
+ if (ret < 0) {
+ adv_err(state,
+ "Error regs addr: 0x%02x reg: 0x%02x\n",
+ regs->addr, regs->reg);
+ break;
+ }
+ }
+ regs++;
+ }
+
+ return (ret < 0) ? ret : 0;
+}
+
+int adv748x_write(struct adv748x_state *state, u8 addr, u8 reg, u8 value)
+{
+ struct adv748x_reg_value regs[2];
+ int ret;
+
+ regs[0].addr = addr;
+ regs[0].reg = reg;
+ regs[0].value = value;
+ regs[1].addr = ADV748X_I2C_EOR;
+ regs[1].reg = 0xFF;
+ regs[1].value = 0xFF;
+
+ ret = adv748x_write_regs(state, regs);
+
+ return ret;
+}
+
+int adv748x_read(struct adv748x_state *state, u8 addr, u8 reg)
+{
+ struct i2c_msg msg[2];
+ u8 reg_buf, data_buf;
+ int ret;
+
+ if (!state->client->adapter) {
+ adv_err(state, "No adapter reading addr: 0x%02x reg: 0x%02x\n",
+ addr, reg);
+ return -ENODEV;
+ }
+
+ msg[0].addr = addr;
+ msg[0].flags = 0;
+ msg[0].len = 1;
+ msg[0].buf = ®_buf;
+ msg[1].addr = addr;
+ msg[1].flags = I2C_M_RD;
+ msg[1].len = 1;
+ msg[1].buf = &data_buf;
+
+ reg_buf = reg;
+
+ ret = i2c_transfer(state->client->adapter, msg, 2);
+ if (ret < 0) {
+ trace_printk("Error reading addr: 0x%02x reg: 0x%02x\n",
+ addr, reg);
+ adv_err(state, "Error reading addr: 0x%02x reg: 0x%02x\n",
+ addr, reg);
+ return ret;
+ }
+
+ return data_buf;
+}
+
+/* -----------------------------------------------------------------------------
+ * TXA and TXB
+ */
+
+static const struct adv748x_reg_value adv748x_power_up_txa_4lane[] = {
+
+ {ADV748X_I2C_TXA, 0x00, 0x84}, /* Enable 4-lane MIPI */
+ {ADV748X_I2C_TXA, 0x00, 0xA4}, /* Set Auto DPHY Timing */
+
+ {ADV748X_I2C_TXA, 0x31, 0x82}, /* ADI Required Write */
+ {ADV748X_I2C_TXA, 0x1E, 0x40}, /* ADI Required Write */
+ {ADV748X_I2C_TXA, 0xDA, 0x01}, /* i2c_mipi_pll_en - 1'b1 */
+ {ADV748X_I2C_WAIT, 0x00, 0x02}, /* delay 2 */
+ {ADV748X_I2C_TXA, 0x00, 0x24 }, /* Power-up CSI-TX */
+ {ADV748X_I2C_WAIT, 0x00, 0x01}, /* delay 1 */
+ {ADV748X_I2C_TXA, 0xC1, 0x2B}, /* ADI Required Write */
+ {ADV748X_I2C_WAIT, 0x00, 0x01}, /* delay 1 */
+ {ADV748X_I2C_TXA, 0x31, 0x80}, /* ADI Required Write */
+
+ {ADV748X_I2C_EOR, 0xFF, 0xFF} /* End of register table */
+};
+
+static const struct adv748x_reg_value adv748x_power_down_txa_4lane[] = {
+
+ {ADV748X_I2C_TXA, 0x31, 0x82}, /* ADI Required Write */
+ {ADV748X_I2C_TXA, 0x1E, 0x00}, /* ADI Required Write */
+ {ADV748X_I2C_TXA, 0x00, 0x84}, /* Enable 4-lane MIPI */
+ {ADV748X_I2C_TXA, 0xDA, 0x01}, /* i2c_mipi_pll_en - 1'b1 */
+ {ADV748X_I2C_TXA, 0xC1, 0x3B}, /* ADI Required Write */
+
+ {ADV748X_I2C_EOR, 0xFF, 0xFF} /* End of register table */
+};
+
+static const struct adv748x_reg_value adv748x_power_up_txb_1lane[] = {
+
+ {ADV748X_I2C_TXB, 0x00, 0x81}, /* Enable 1-lane MIPI */
+ {ADV748X_I2C_TXB, 0x00, 0xA1}, /* Set Auto DPHY Timing */
+
+ {ADV748X_I2C_TXB, 0x31, 0x82}, /* ADI Required Write */
+ {ADV748X_I2C_TXB, 0x1E, 0x40}, /* ADI Required Write */
+ {ADV748X_I2C_TXB, 0xDA, 0x01}, /* i2c_mipi_pll_en - 1'b1 */
+ {ADV748X_I2C_WAIT, 0x00, 0x02}, /* delay 2 */
+ {ADV748X_I2C_TXB, 0x00, 0x21 }, /* Power-up CSI-TX */
+ {ADV748X_I2C_WAIT, 0x00, 0x01}, /* delay 1 */
+ {ADV748X_I2C_TXB, 0xC1, 0x2B}, /* ADI Required Write */
+ {ADV748X_I2C_WAIT, 0x00, 0x01}, /* delay 1 */
+ {ADV748X_I2C_TXB, 0x31, 0x80}, /* ADI Required Write */
+
+ {ADV748X_I2C_EOR, 0xFF, 0xFF} /* End of register table */
+};
+
+static const struct adv748x_reg_value adv748x_power_down_txb_1lane[] = {
+
+ {ADV748X_I2C_TXB, 0x31, 0x82}, /* ADI Required Write */
+ {ADV748X_I2C_TXB, 0x1E, 0x00}, /* ADI Required Write */
+ {ADV748X_I2C_TXB, 0x00, 0x81}, /* Enable 4-lane MIPI */
+ {ADV748X_I2C_TXB, 0xDA, 0x01}, /* i2c_mipi_pll_en - 1'b1 */
+ {ADV748X_I2C_TXB, 0xC1, 0x3B}, /* ADI Required Write */
+
+ {ADV748X_I2C_EOR, 0xFF, 0xFF} /* End of register table */
+};
+
+int adv748x_txa_power(struct adv748x_state *state, bool on)
+{
+ int val, ret;
+
+ val = txa_read(state, 0x1e);
+ if (val < 0)
+ return val;
+
+ if (on && ((val & 0x40) == 0))
+ ret = adv748x_write_regs(state, adv748x_power_up_txa_4lane);
+ else
+ ret = adv748x_write_regs(state, adv748x_power_down_txa_4lane);
+
+ return ret;
+}
+
+int adv748x_txb_power(struct adv748x_state *state, bool on)
+{
+ int val, ret;
+
+ val = txb_read(state, 0x1e);
+ if (val < 0)
+ return val;
+
+ if (on && ((val & 0x40) == 0))
+ ret = adv748x_write_regs(state, adv748x_power_up_txb_1lane);
+ else
+ ret = adv748x_write_regs(state, adv748x_power_down_txb_1lane);
+
+ return ret;
+}
+
+/* -----------------------------------------------------------------------------
+ * Media Operations
+ */
+
+static const struct media_entity_operations adv748x_media_ops = {
+ .link_validate = v4l2_subdev_link_validate,
+};
+
+/* -----------------------------------------------------------------------------
+ * HW setup
+ */
+
+static const struct adv748x_reg_value adv748x_sw_reset[] = {
+
+ {ADV748X_I2C_IO, 0xFF, 0xFF}, /* SW reset */
+ {ADV748X_I2C_WAIT, 0x00, 0x05}, /* delay 5 */
+ {ADV748X_I2C_IO, 0x01, 0x76}, /* ADI Required Write */
+ {ADV748X_I2C_IO, 0xF2, 0x01}, /* Enable I2C Read Auto-Increment */
+ {ADV748X_I2C_EOR, 0xFF, 0xFF} /* End of register table */
+};
+
+static const struct adv748x_reg_value adv748x_set_slave_address[] = {
+ {ADV748X_I2C_IO, 0xF3, ADV748X_I2C_DPLL * 2}, /* DPLL */
+ {ADV748X_I2C_IO, 0xF4, ADV748X_I2C_CP * 2}, /* CP */
+ {ADV748X_I2C_IO, 0xF5, ADV748X_I2C_HDMI * 2}, /* HDMI */
+ {ADV748X_I2C_IO, 0xF6, ADV748X_I2C_EDID * 2}, /* EDID */
+ {ADV748X_I2C_IO, 0xF7, ADV748X_I2C_REPEATER * 2}, /* HDMI RX Repeater */
+ {ADV748X_I2C_IO, 0xF8, ADV748X_I2C_INFOFRAME * 2},/* HDMI RX InfoFrame*/
+ {ADV748X_I2C_IO, 0xFA, ADV748X_I2C_CEC * 2}, /* CEC */
+ {ADV748X_I2C_IO, 0xFB, ADV748X_I2C_SDP * 2}, /* SDP */
+ {ADV748X_I2C_IO, 0xFC, ADV748X_I2C_TXB * 2}, /* CSI-TXB */
+ {ADV748X_I2C_IO, 0xFD, ADV748X_I2C_TXA * 2}, /* CSI-TXA */
+ {ADV748X_I2C_EOR, 0xFF, 0xFF} /* End of register table */
+};
+
+/* Supported Formats For Script Below */
+/* - 01-29 HDMI to MIPI TxA CSI 4-Lane - RGB888: */
+static const struct adv748x_reg_value adv748x_init_txa_4lane[] = {
+ /* Disable chip powerdown & Enable HDMI Rx block */
+ {ADV748X_I2C_IO, 0x00, 0x40},
+
+ {ADV748X_I2C_REPEATER, 0x40, 0x83}, /* Enable HDCP 1.1 */
+
+ {ADV748X_I2C_HDMI, 0x00, 0x08}, /* Foreground Channel = A */
+ {ADV748X_I2C_HDMI, 0x98, 0xFF}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0x99, 0xA3}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0x9A, 0x00}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0x9B, 0x0A}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0x9D, 0x40}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0xCB, 0x09}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0x3D, 0x10}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0x3E, 0x7B}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0x3F, 0x5E}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0x4E, 0xFE}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0x4F, 0x18}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0x57, 0xA3}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0x58, 0x04}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0x85, 0x10}, /* ADI Required Write */
+
+ {ADV748X_I2C_HDMI, 0x83, 0x00}, /* Enable All Terminations */
+ {ADV748X_I2C_HDMI, 0xA3, 0x01}, /* ADI Required Write */
+ {ADV748X_I2C_HDMI, 0xBE, 0x00}, /* ADI Required Write */
+
+ {ADV748X_I2C_HDMI, 0x6C, 0x01}, /* HPA Manual Enable */
+ {ADV748X_I2C_HDMI, 0xF8, 0x01}, /* HPA Asserted */
+ {ADV748X_I2C_HDMI, 0x0F, 0x00}, /* Audio Mute Speed Set to Fastest */
+ /* (Smallest Step Size) */
+
+ {ADV748X_I2C_IO, 0x04, 0x02}, /* RGB Out of CP */
+ {ADV748X_I2C_IO, 0x12, 0xF0}, /* CSC Depends on ip Packets, SDR 444 */
+ {ADV748X_I2C_IO, 0x17, 0x80}, /* Luma & Chroma can reach 254d */
+ {ADV748X_I2C_IO, 0x03, 0x86}, /* CP-Insert_AV_Code */
+
+ {ADV748X_I2C_CP, 0x7C, 0x00}, /* ADI Required Write */
+
+ {ADV748X_I2C_IO, 0x0C, 0xE0}, /* Enable LLC_DLL & Double LLC Timing */
+ {ADV748X_I2C_IO, 0x0E, 0xDD}, /* LLC/PIX/SPI PINS TRISTATED AUD */
+ /* Outputs Enabled */
+ {ADV748X_I2C_IO, 0x10, 0xA0}, /* Enable 4-lane CSI Tx & Pixel Port */
+
+ {ADV748X_I2C_TXA, 0x00, 0x84}, /* Enable 4-lane MIPI */
+ {ADV748X_I2C_TXA, 0x00, 0xA4}, /* Set Auto DPHY Timing */
+ {ADV748X_I2C_TXA, 0xDB, 0x10}, /* ADI Required Write */
+ {ADV748X_I2C_TXA, 0xD6, 0x07}, /* ADI Required Write */
+ {ADV748X_I2C_TXA, 0xC4, 0x0A}, /* ADI Required Write */
+ {ADV748X_I2C_TXA, 0x71, 0x33}, /* ADI Required Write */
+ {ADV748X_I2C_TXA, 0x72, 0x11}, /* ADI Required Write */
+ {ADV748X_I2C_TXA, 0xF0, 0x00}, /* i2c_dphy_pwdn - 1'b0 */
+
+ {ADV748X_I2C_TXA, 0x31, 0x82}, /* ADI Required Write */
+ {ADV748X_I2C_TXA, 0x1E, 0x40}, /* ADI Required Write */
+ {ADV748X_I2C_TXA, 0xDA, 0x01}, /* i2c_mipi_pll_en - 1'b1 */
+ {ADV748X_I2C_WAIT, 0x00, 0x02}, /* delay 2 */
+ {ADV748X_I2C_TXA, 0x00, 0x24 }, /* Power-up CSI-TX */
+ {ADV748X_I2C_WAIT, 0x00, 0x01}, /* delay 1 */
+ {ADV748X_I2C_TXA, 0xC1, 0x2B}, /* ADI Required Write */
+ {ADV748X_I2C_WAIT, 0x00, 0x01}, /* delay 1 */
+ {ADV748X_I2C_TXA, 0x31, 0x80}, /* ADI Required Write */
+
+#ifdef REL_DGB_FORCE_TO_SEND_COLORBAR
+ {ADV748X_I2C_CP, 0x37, 0x81}, /* Output Colorbars Pattern */
+#endif
+ {ADV748X_I2C_EOR, 0xFF, 0xFF} /* End of register table */
+};
+
+/* TODO:KPB: This may be 'private' to CVBS?, and is currently duplicated! */
+#define ADV748X_SDP_INPUT_CVBS_AIN8 0x07
+
+/* 02-01 Analog CVBS to MIPI TX-B CSI 1-Lane - */
+/* Autodetect CVBS Single Ended In Ain 1 - MIPI Out */
+static const struct adv748x_reg_value adv748x_init_txb_1lane[] = {
+
+ {ADV748X_I2C_IO, 0x00, 0x30}, /* Disable chip powerdown powerdown Rx */
+ {ADV748X_I2C_IO, 0xF2, 0x01}, /* Enable I2C Read Auto-Increment */
+
+ {ADV748X_I2C_IO, 0x0E, 0xFF}, /* LLC/PIX/AUD/SPI PINS TRISTATED */
+
+ {ADV748X_I2C_SDP, 0x0f, 0x00}, /* Exit Power Down Mode */
+ {ADV748X_I2C_SDP, 0x52, 0xCD},/* ADI Required Write */
+ /* TODO: do not use hard codeded INSEL */
+ {ADV748X_I2C_SDP, 0x00, ADV748X_SDP_INPUT_CVBS_AIN8},
+ {ADV748X_I2C_SDP, 0x0E, 0x80}, /* ADI Required Write */
+ {ADV748X_I2C_SDP, 0x9C, 0x00}, /* ADI Required Write */
+ {ADV748X_I2C_SDP, 0x9C, 0xFF}, /* ADI Required Write */
+ {ADV748X_I2C_SDP, 0x0E, 0x00}, /* ADI Required Write */
+
+ /* ADI recommended writes for improved video quality */
+ {ADV748X_I2C_SDP, 0x80, 0x51}, /* ADI Required Write */
+ {ADV748X_I2C_SDP, 0x81, 0x51}, /* ADI Required Write */
+ {ADV748X_I2C_SDP, 0x82, 0x68}, /* ADI Required Write */
+
+ {ADV748X_I2C_SDP, 0x03, 0x42}, /* Tri-S Output , PwrDwn 656 pads */
+ {ADV748X_I2C_SDP, 0x04, 0xB5}, /* ITU-R BT.656-4 compatible */
+ {ADV748X_I2C_SDP, 0x13, 0x00}, /* ADI Required Write */
+
+ {ADV748X_I2C_SDP, 0x17, 0x41}, /* Select SH1 */
+ {ADV748X_I2C_SDP, 0x31, 0x12}, /* ADI Required Write */
+ {ADV748X_I2C_SDP, 0xE6, 0x4F}, /* V bit end pos manually in NTSC */
+
+#ifdef REL_DGB_FORCE_TO_SEND_COLORBAR
+ {ADV748X_I2C_SDP, 0x0C, 0x01}, /* ColorBar */
+ {ADV748X_I2C_SDP, 0x14, 0x01}, /* ColorBar */
+#endif
+ /* Enable 1-Lane MIPI Tx, */
+ /* enable pixel output and route SD through Pixel port */
+ {ADV748X_I2C_IO, 0x10, 0x70},
+
+ {ADV748X_I2C_TXB, 0x00, 0x81}, /* Enable 1-lane MIPI */
+ {ADV748X_I2C_TXB, 0x00, 0xA1}, /* Set Auto DPHY Timing */
+ {ADV748X_I2C_TXB, 0xD2, 0x40}, /* ADI Required Write */
+ {ADV748X_I2C_TXB, 0xC4, 0x0A}, /* ADI Required Write */
+ {ADV748X_I2C_TXB, 0x71, 0x33}, /* ADI Required Write */
+ {ADV748X_I2C_TXB, 0x72, 0x11}, /* ADI Required Write */
+ {ADV748X_I2C_TXB, 0xF0, 0x00}, /* i2c_dphy_pwdn - 1'b0 */
+ {ADV748X_I2C_TXB, 0x31, 0x82}, /* ADI Required Write */
+ {ADV748X_I2C_TXB, 0x1E, 0x40}, /* ADI Required Write */
+ {ADV748X_I2C_TXB, 0xDA, 0x01}, /* i2c_mipi_pll_en - 1'b1 */
+
+ {ADV748X_I2C_WAIT, 0x00, 0x02}, /* delay 2 */
+ {ADV748X_I2C_TXB, 0x00, 0x21 }, /* Power-up CSI-TX */
+ {ADV748X_I2C_WAIT, 0x00, 0x01}, /* delay 1 */
+ {ADV748X_I2C_TXB, 0xC1, 0x2B}, /* ADI Required Write */
+ {ADV748X_I2C_WAIT, 0x00, 0x01}, /* delay 1 */
+ {ADV748X_I2C_TXB, 0x31, 0x80}, /* ADI Required Write */
+
+ {ADV748X_I2C_EOR, 0xFF, 0xFF} /* End of register table */
+};
+
+static int adv748x_reset(struct adv748x_state *state)
+{
+ int ret;
+
+ ret = adv748x_write_regs(state, adv748x_sw_reset);
+ if (ret < 0)
+ return ret;
+
+ ret = adv748x_write_regs(state, adv748x_set_slave_address);
+ if (ret < 0)
+ return ret;
+
+ /* Init and power down TXA */
+ ret = adv748x_write_regs(state, adv748x_init_txa_4lane);
+ if (ret)
+ return ret;
+ adv748x_txa_power(state, 0);
+ /* Set VC 0 */
+ txa_clrset(state, 0x0d, 0xc0, 0x00);
+
+ /* Init and power down TXB */
+ ret = adv748x_write_regs(state, adv748x_init_txb_1lane);
+ if (ret)
+ return ret;
+ adv748x_txb_power(state, 0);
+ /* Set VC 0 */
+ txb_clrset(state, 0x0d, 0xc0, 0x00);
+
+ /* Disable chip powerdown & Enable HDMI Rx block */
+ io_write(state, 0x00, 0x40);
+
+ /* Enable 4-lane CSI Tx & Pixel Port */
+ io_write(state, 0x10, 0xe0);
+
+ /* Use vid_std and v_freq as freerun resolution for CP */
+ cp_clrset(state, 0xc9, 0x01, 0x01);
+
+ return 0;
+}
+
+static int adv748x_print_info(struct adv748x_state *state)
+{
+ int msb, lsb;
+
+ lsb = io_read(state, 0xdf);
+ msb = io_read(state, 0xe0);
+
+ if (lsb < 0 || msb < 0) {
+ adv_err(state, "Failed to read chip revision\n");
+ return -EIO;
+ }
+
+ adv_info(state, "chip found @ 0x%02x revision %02x%02x\n",
+ state->client->addr << 1, lsb, msb);
+
+ return 0;
+}
+
+/* -----------------------------------------------------------------------------
+ * i2c driver
+ */
+
+void adv748x_subdev_init(struct v4l2_subdev *sd, struct adv748x_state *state,
+ const struct v4l2_subdev_ops *ops, const char *ident)
+{
+ v4l2_subdev_init(sd, ops);
+ sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
+
+ /* the owner is the same as the i2c_client's driver owner */
+ sd->owner = state->dev->driver->owner;
+ sd->dev = state->dev;
+
+ v4l2_set_subdevdata(sd, state);
+
+ /* initialize name */
+ snprintf(sd->name, sizeof(sd->name), "%s %d-%04x %s",
+ state->dev->driver->name,
+ i2c_adapter_id(state->client->adapter),
+ state->client->addr, ident);
+
+ sd->entity.function = MEDIA_ENT_F_ATV_DECODER;
+ sd->entity.ops = &adv748x_media_ops;
+}
+
+static int adv748x_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+{
+ struct adv748x_state *state;
+
+ int ret;
+
+ /* Check if the adapter supports the needed features */
+ if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+ return -EIO;
+
+ state = devm_kzalloc(&client->dev, sizeof(struct adv748x_state),
+ GFP_KERNEL);
+ if (!state)
+ return -ENOMEM;
+
+ mutex_init(&state->mutex);
+
+ state->dev = &client->dev;
+ state->client = client;
+ i2c_set_clientdata(client, state);
+ /* SW reset ADV748X to its default values */
+ ret = adv748x_reset(state);
+ if (ret) {
+ adv_err(state, "Failed to reset hardware");
+ return ret;
+ }
+
+ ret = adv748x_print_info(state);
+ if (ret)
+ return ret;
+
+ /* Initialise HDMI */
+ ret = adv748x_hdmi_probe(state);
+ if (ret) {
+ adv_err(state, "Failed to probe HDMI");
+ return ret;
+ }
+
+ /* Initialise AFE */
+ ret = adv748x_afe_probe(state);
+ if (ret) {
+ adv_err(state, "Failed to probe AFE");
+ return ret;
+ }
+
+ return 0;
+}
+
+static int adv748x_remove(struct i2c_client *client)
+{
+ struct adv748x_state *state = i2c_get_clientdata(client);
+
+ adv748x_afe_remove(state);
+ adv748x_hdmi_remove(state);
+
+ mutex_destroy(&state->mutex);
+
+ return 0;
+}
+
+static const struct i2c_device_id adv748x_id[] = {
+ { "adv7481", 0 },
+ { "adv7482", 0 },
+ { },
+};
+
+static const struct of_device_id adv748x_of_table[] = {
+ { .compatible = "adi,adv7481", },
+ { .compatible = "adi,adv7482", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, adv748x_of_ids);
+
+static struct i2c_driver adv748x_driver = {
+ .driver = {
+ .name = "adv748x",
+ .of_match_table = of_match_ptr(adv748x_of_table),
+ },
+ .probe = adv748x_probe,
+ .remove = adv748x_remove,
+ .id_table = adv748x_id,
+};
+
+module_i2c_driver(adv748x_driver);
+
+MODULE_AUTHOR("Kieran Bingham <kieran.bingham@ideasonboard.com>");
+MODULE_DESCRIPTION("ADV748X video decoder");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/media/i2c/adv748x/adv748x-hdmi.c b/drivers/media/i2c/adv748x/adv748x-hdmi.c
new file mode 100644
index 000000000000..d9bae395b802
--- /dev/null
+++ b/drivers/media/i2c/adv748x/adv748x-hdmi.c
@@ -0,0 +1,690 @@
+/*
+ * Driver for Analog Devices ADV748X HDMI receiver and Component Processor (CP)
+ *
+ * Copyright (C) 2017 Renesas Electronics Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/v4l2-dv-timings.h>
+
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-dv-timings.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-of.h>
+
+#include "adv748x.h"
+
+enum adv748x_hdmi_pads {
+ ADV748X_HDMI_SINK = 0,
+ ADV748X_HDMI_SOURCE = 1,
+};
+
+/* -----------------------------------------------------------------------------
+ * HDMI and CP
+ */
+
+#define ADV748X_HDMI_MIN_WIDTH 640
+#define ADV748X_HDMI_MAX_WIDTH 1920
+#define ADV748X_HDMI_MIN_HEIGHT 480
+#define ADV748X_HDMI_MAX_HEIGHT 1200
+#define ADV748X_HDMI_MIN_PIXELCLOCK 0 /* unknown */
+#define ADV748X_HDMI_MAX_PIXELCLOCK 162000000
+
+static const struct v4l2_dv_timings_cap adv748x_hdmi_timings_cap = {
+ .type = V4L2_DV_BT_656_1120,
+ /* keep this initialization for compatibility with GCC < 4.4.6 */
+ .reserved = { 0 },
+ /* Min pixelclock value is unknown */
+ V4L2_INIT_BT_TIMINGS(ADV748X_HDMI_MIN_WIDTH, ADV748X_HDMI_MAX_WIDTH,
+ ADV748X_HDMI_MIN_HEIGHT, ADV748X_HDMI_MAX_HEIGHT,
+ ADV748X_HDMI_MIN_PIXELCLOCK,
+ ADV748X_HDMI_MAX_PIXELCLOCK,
+ V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT,
+ V4L2_DV_BT_CAP_INTERLACED |
+ V4L2_DV_BT_CAP_PROGRESSIVE)
+};
+
+struct adv748x_hdmi_video_standards {
+ struct v4l2_dv_timings timings;
+ u8 vid_std;
+ u8 v_freq;
+};
+
+static const struct adv748x_hdmi_video_standards
+adv748x_hdmi_video_standards[] = {
+ { V4L2_DV_BT_CEA_720X480I59_94, 0x40, 0x00 },
+ { V4L2_DV_BT_CEA_720X576I50, 0x41, 0x01 },
+ { V4L2_DV_BT_CEA_720X480P59_94, 0x4a, 0x00 },
+ { V4L2_DV_BT_CEA_720X576P50, 0x4b, 0x00 },
+ { V4L2_DV_BT_CEA_1280X720P60, 0x53, 0x00 },
+ { V4L2_DV_BT_CEA_1280X720P50, 0x53, 0x01 },
+ { V4L2_DV_BT_CEA_1280X720P30, 0x53, 0x02 },
+ { V4L2_DV_BT_CEA_1280X720P25, 0x53, 0x03 },
+ { V4L2_DV_BT_CEA_1280X720P24, 0x53, 0x04 },
+ { V4L2_DV_BT_CEA_1920X1080I60, 0x54, 0x00 },
+ { V4L2_DV_BT_CEA_1920X1080I50, 0x54, 0x01 },
+ { V4L2_DV_BT_CEA_1920X1080P60, 0x5e, 0x00 },
+ { V4L2_DV_BT_CEA_1920X1080P50, 0x5e, 0x01 },
+ { V4L2_DV_BT_CEA_1920X1080P30, 0x5e, 0x02 },
+ { V4L2_DV_BT_CEA_1920X1080P25, 0x5e, 0x03 },
+ { V4L2_DV_BT_CEA_1920X1080P24, 0x5e, 0x04 },
+ /* SVGA */
+ { V4L2_DV_BT_DMT_800X600P56, 0x80, 0x00 },
+ { V4L2_DV_BT_DMT_800X600P60, 0x81, 0x00 },
+ { V4L2_DV_BT_DMT_800X600P72, 0x82, 0x00 },
+ { V4L2_DV_BT_DMT_800X600P75, 0x83, 0x00 },
+ { V4L2_DV_BT_DMT_800X600P85, 0x84, 0x00 },
+ /* SXGA */
+ { V4L2_DV_BT_DMT_1280X1024P60, 0x85, 0x00 },
+ { V4L2_DV_BT_DMT_1280X1024P75, 0x86, 0x00 },
+ /* VGA */
+ { V4L2_DV_BT_DMT_640X480P60, 0x88, 0x00 },
+ { V4L2_DV_BT_DMT_640X480P72, 0x89, 0x00 },
+ { V4L2_DV_BT_DMT_640X480P75, 0x8a, 0x00 },
+ { V4L2_DV_BT_DMT_640X480P85, 0x8b, 0x00 },
+ /* XGA */
+ { V4L2_DV_BT_DMT_1024X768P60, 0x8c, 0x00 },
+ { V4L2_DV_BT_DMT_1024X768P70, 0x8d, 0x00 },
+ { V4L2_DV_BT_DMT_1024X768P75, 0x8e, 0x00 },
+ { V4L2_DV_BT_DMT_1024X768P85, 0x8f, 0x00 },
+ /* UXGA */
+ { V4L2_DV_BT_DMT_1600X1200P60, 0x96, 0x00 },
+ /* End of standards */
+ { },
+};
+
+static void adv748x_hdmi_fill_format(struct adv748x_state *state,
+ struct v4l2_mbus_framefmt *fmt)
+{
+ memset(fmt, 0, sizeof(*fmt));
+
+ fmt->code = MEDIA_BUS_FMT_RGB888_1X24;
+ fmt->colorspace = V4L2_COLORSPACE_SRGB;
+ fmt->field = state->hdmi.timings.bt.interlaced ?
+ V4L2_FIELD_INTERLACED : V4L2_FIELD_NONE;
+
+ fmt->width = state->hdmi.timings.bt.width;
+ fmt->height = state->hdmi.timings.bt.height;
+}
+
+static void adv748x_fill_optional_dv_timings(struct adv748x_state *state,
+ struct v4l2_dv_timings *timings)
+{
+ v4l2_find_dv_timings_cap(timings, &adv748x_hdmi_timings_cap,
+ 250000, NULL, NULL);
+}
+
+static bool adv748x_hdmi_have_signal(struct adv748x_state *state)
+{
+ int val;
+
+ /* Check that VERT_FILTER and DG_REGEN is locked */
+ val = hdmi_read(state, 0x07);
+ return !!((val & BIT(7)) && (val & BIT(5)));
+}
+
+static unsigned int adv748x_hdmi_read_pixelclock(struct adv748x_state *state)
+{
+ int a, b;
+
+ a = hdmi_read(state, 0x51);
+ b = hdmi_read(state, 0x52);
+ if (a < 0 || b < 0)
+ return 0;
+ return ((a << 1) | (b >> 7)) * 1000000 + (b & 0x7f) * 1000000 / 128;
+}
+
+static int adv748x_hdmi_set_video_timings(struct adv748x_state *state,
+ const struct v4l2_dv_timings *timings)
+{
+ const struct adv748x_hdmi_video_standards *stds =
+ adv748x_hdmi_video_standards;
+ int i;
+
+ for (i = 0; stds[i].timings.bt.width; i++) {
+ if (!v4l2_match_dv_timings(timings, &stds[i].timings, 250000,
+ false))
+ continue;
+ /*
+ * The resolution of 720p, 1080i and 1080p is Hsync width of
+ * 40 pixelclock cycles. These resolutions must be shifted
+ * horizontally to the left in active video mode.
+ */
+ switch (stds[i].vid_std) {
+ case 0x53: /* 720p */
+ cp_write(state, 0x8B, 0x43);
+ cp_write(state, 0x8C, 0xD8);
+ cp_write(state, 0x8B, 0x4F);
+ cp_write(state, 0x8D, 0xD8);
+ break;
+ case 0x54: /* 1080i */
+ case 0x5e: /* 1080p */
+ cp_write(state, 0x8B, 0x43);
+ cp_write(state, 0x8C, 0xD4);
+ cp_write(state, 0x8B, 0x4F);
+ cp_write(state, 0x8D, 0xD4);
+ break;
+ default:
+ cp_write(state, 0x8B, 0x40);
+ cp_write(state, 0x8C, 0x00);
+ cp_write(state, 0x8B, 0x40);
+ cp_write(state, 0x8D, 0x00);
+ break;
+ }
+
+ io_write(state, 0x05, stds[i].vid_std);
+ io_clrset(state, 0x03, 0x70, stds[i].v_freq << 4);
+
+ return 0;
+ }
+
+ return -EINVAL;
+}
+
+/* -----------------------------------------------------------------------------
+ * v4l2_subdev_video_ops
+ */
+
+static int adv748x_hdmi_s_dv_timings(struct v4l2_subdev *sd,
+ struct v4l2_dv_timings *timings)
+{
+ struct adv748x_state *state = adv748x_hdmi_to_state(sd);
+ struct v4l2_bt_timings *bt;
+ int ret;
+
+ if (!timings)
+ return -EINVAL;
+
+ if (v4l2_match_dv_timings(&state->hdmi.timings, timings, 0, false))
+ return 0;
+
+ bt = &timings->bt;
+
+ if (!v4l2_valid_dv_timings(timings, &adv748x_hdmi_timings_cap,
+ NULL, NULL))
+ return -ERANGE;
+
+ adv748x_fill_optional_dv_timings(state, timings);
+
+ ret = adv748x_hdmi_set_video_timings(state, timings);
+ if (ret)
+ return ret;
+
+ state->hdmi.timings = *timings;
+
+ cp_clrset(state, 0x91, 0x40, bt->interlaced ? 0x40 : 0x00);
+
+ return 0;
+}
+
+static int adv748x_hdmi_g_dv_timings(struct v4l2_subdev *sd,
+ struct v4l2_dv_timings *timings)
+{
+ struct adv748x_state *state = adv748x_hdmi_to_state(sd);
+
+ *timings = state->hdmi.timings;
+
+ return 0;
+}
+
+static int adv748x_hdmi_query_dv_timings(struct v4l2_subdev *sd,
+ struct v4l2_dv_timings *timings)
+{
+ struct adv748x_state *state = adv748x_hdmi_to_state(sd);
+ struct v4l2_bt_timings *bt = &timings->bt;
+ int tmp;
+
+ if (!timings)
+ return -EINVAL;
+
+ memset(timings, 0, sizeof(struct v4l2_dv_timings));
+
+ if (!adv748x_hdmi_have_signal(state))
+ return -ENOLINK;
+
+ timings->type = V4L2_DV_BT_656_1120;
+
+ bt->interlaced = hdmi_read(state, 0x0b) & BIT(5) ?
+ V4L2_DV_INTERLACED : V4L2_DV_PROGRESSIVE;
+
+ bt->width = hdmi_read16(state, 0x07, 0x1fff);
+ bt->height = hdmi_read16(state, 0x09, 0x1fff);
+ bt->hfrontporch = hdmi_read16(state, 0x20, 0x1fff);
+ bt->hsync = hdmi_read16(state, 0x22, 0x1fff);
+ bt->hbackporch = hdmi_read16(state, 0x24, 0x1fff);
+ bt->vfrontporch = hdmi_read16(state, 0x2a, 0x3fff) / 2;
+ bt->vsync = hdmi_read16(state, 0x2e, 0x3fff) / 2;
+ bt->vbackporch = hdmi_read16(state, 0x32, 0x3fff) / 2;
+
+ bt->pixelclock = adv748x_hdmi_read_pixelclock(state);
+
+ tmp = hdmi_read(state, 0x05);
+ bt->polarities = (tmp & BIT(4) ? V4L2_DV_VSYNC_POS_POL : 0) |
+ (tmp & BIT(5) ? V4L2_DV_HSYNC_POS_POL : 0);
+
+ if (bt->interlaced == V4L2_DV_INTERLACED) {
+ bt->height += hdmi_read16(state, 0x0b, 0x1fff);
+ bt->il_vfrontporch = hdmi_read16(state, 0x2c, 0x3fff) / 2;
+ bt->il_vsync = hdmi_read16(state, 0x30, 0x3fff) / 2;
+ bt->il_vbackporch = hdmi_read16(state, 0x34, 0x3fff) / 2;
+ }
+
+ adv748x_fill_optional_dv_timings(state, timings);
+
+ if (!adv748x_hdmi_have_signal(state)) {
+ adv_info(state, "HDMI signal lost during readout\n");
+ return -ENOLINK;
+ }
+
+ /*
+ * TODO: No interrupt handling is implemented yet.
+ * There should be an IRQ when a cable is plugged and a the new
+ * timings figured out and stored to state. This the next best thing
+ */
+ state->hdmi.timings = *timings;
+
+ adv_dbg(state, "HDMI %dx%d%c clock: %llu Hz pol: %x "
+ "hfront: %d hsync: %d hback: %d "
+ "vfront: %d vsync: %d vback: %d "
+ "il_vfron: %d il_vsync: %d il_vback: %d\n",
+ bt->width, bt->height,
+ bt->interlaced == V4L2_DV_INTERLACED ? 'i' : 'p',
+ bt->pixelclock, bt->polarities,
+ bt->hfrontporch, bt->hsync, bt->hbackporch,
+ bt->vfrontporch, bt->vsync, bt->vbackporch,
+ bt->il_vfrontporch, bt->il_vsync, bt->il_vbackporch);
+
+ return 0;
+}
+
+static int adv748x_hdmi_g_input_status(struct v4l2_subdev *sd, u32 *status)
+{
+ struct adv748x_state *state = adv748x_hdmi_to_state(sd);
+ int ret;
+
+ ret = mutex_lock_interruptible(&state->mutex);
+ if (ret)
+ return ret;
+
+ *status = adv748x_hdmi_have_signal(state) ? 0 : V4L2_IN_ST_NO_SIGNAL;
+
+ mutex_unlock(&state->mutex);
+
+ return ret;
+}
+
+static int adv748x_hdmi_s_stream(struct v4l2_subdev *sd, int enable)
+{
+ struct adv748x_state *state = adv748x_hdmi_to_state(sd);
+ int ret;
+
+ ret = mutex_lock_interruptible(&state->mutex);
+ if (ret)
+ return ret;
+
+ ret = adv748x_txa_power(state, enable);
+ if (ret)
+ goto error;
+
+ if (adv748x_hdmi_have_signal(state))
+ adv_dbg(state, "Detected HDMI signal\n");
+ else
+ adv_info(state, "Couldn't detect HDMI video signal\n");
+
+error:
+ mutex_unlock(&state->mutex);
+ return ret;
+}
+
+static int adv748x_hdmi_g_pixelaspect(struct v4l2_subdev *sd,
+ struct v4l2_fract *aspect)
+{
+ aspect->numerator = 1;
+ aspect->denominator = 1;
+
+ return 0;
+}
+
+static const struct v4l2_subdev_video_ops adv748x_video_ops_hdmi = {
+ .s_dv_timings = adv748x_hdmi_s_dv_timings,
+ .g_dv_timings = adv748x_hdmi_g_dv_timings,
+ .query_dv_timings = adv748x_hdmi_query_dv_timings,
+ .g_input_status = adv748x_hdmi_g_input_status,
+ .s_stream = adv748x_hdmi_s_stream,
+ .g_pixelaspect = adv748x_hdmi_g_pixelaspect,
+};
+
+/* -----------------------------------------------------------------------------
+ * v4l2_subdev_pad_ops
+ */
+
+static int adv748x_hdmi_enum_mbus_code(struct v4l2_subdev *sd,
+ struct v4l2_subdev_pad_config *cfg,
+ struct v4l2_subdev_mbus_code_enum *code)
+{
+ if (code->index != 0)
+ return -EINVAL;
+
+ switch (code->pad) {
+ case ADV748X_HDMI_SOURCE:
+ case ADV748X_HDMI_SINK:
+ code->code = MEDIA_BUS_FMT_RGB888_1X24;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int adv748x_hdmi_get_pad_format(struct v4l2_subdev *sd,
+ struct v4l2_subdev_pad_config *cfg,
+ struct v4l2_subdev_format *format)
+{
+ struct adv748x_state *state = adv748x_hdmi_to_state(sd);
+
+ switch (format->pad) {
+ case ADV748X_HDMI_SOURCE:
+ case ADV748X_HDMI_SINK:
+ adv748x_hdmi_fill_format(state, &format->format);
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+ struct v4l2_mbus_framefmt *fmt;
+
+ fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
+ format->format.code = fmt->code;
+ }
+
+ return 0;
+}
+
+static int adv748x_hdmi_set_pad_format(struct v4l2_subdev *sd,
+ struct v4l2_subdev_pad_config *cfg,
+ struct v4l2_subdev_format *format)
+{
+ struct adv748x_state *state = adv748x_hdmi_to_state(sd);
+
+ switch (format->pad) {
+ case ADV748X_HDMI_SOURCE:
+ case ADV748X_HDMI_SINK:
+ adv748x_hdmi_fill_format(state, &format->format);
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+ struct v4l2_mbus_framefmt *fmt;
+
+ fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
+ fmt->code = format->format.code;
+ }
+
+ return 0;
+}
+
+static bool adv748x_hdmi_check_dv_timings(const struct v4l2_dv_timings *timings,
+ void *hdl)
+{
+ const struct adv748x_hdmi_video_standards *stds =
+ adv748x_hdmi_video_standards;
+ unsigned int i;
+
+ for (i = 0; stds[i].timings.bt.width; i++)
+ if (v4l2_match_dv_timings(timings, &stds[i].timings, 0, false))
+ return true;
+
+ return false;
+}
+
+static int adv748x_hdmi_enum_dv_timings(struct v4l2_subdev *sd,
+ struct v4l2_enum_dv_timings *timings)
+{
+ return v4l2_enum_dv_timings_cap(timings, &adv748x_hdmi_timings_cap,
+ adv748x_hdmi_check_dv_timings, NULL);
+}
+
+static int adv748x_hdmi_dv_timings_cap(struct v4l2_subdev *sd,
+ struct v4l2_dv_timings_cap *cap)
+{
+ *cap = adv748x_hdmi_timings_cap;
+ return 0;
+}
+
+static const struct v4l2_subdev_pad_ops adv748x_pad_ops_hdmi = {
+ .enum_mbus_code = adv748x_hdmi_enum_mbus_code,
+ .set_fmt = adv748x_hdmi_set_pad_format,
+ .get_fmt = adv748x_hdmi_get_pad_format,
+ .dv_timings_cap = adv748x_hdmi_dv_timings_cap,
+ .enum_dv_timings = adv748x_hdmi_enum_dv_timings,
+};
+
+/* -----------------------------------------------------------------------------
+ * v4l2_subdev_ops
+ */
+
+static const struct v4l2_subdev_ops adv748x_ops_hdmi = {
+ .video = &adv748x_video_ops_hdmi,
+ .pad = &adv748x_pad_ops_hdmi,
+};
+
+/* -----------------------------------------------------------------------------
+ * Controls
+ */
+
+/* Contrast Control */
+#define ADV748X_HDMI_CON_REG 0x3a /* Contrast (unsigned) */
+#define ADV748X_HDMI_CON_MIN 0 /* Minimum contrast */
+#define ADV748X_HDMI_CON_DEF 128 /* Default */
+#define ADV748X_HDMI_CON_MAX 255 /* Maximum contrast */
+
+/* Saturation Control */
+#define ADV748X_HDMI_SAT_REG 0x3b /* Saturation (unsigned) */
+#define ADV748X_HDMI_SAT_MIN 0 /* Minimum saturation */
+#define ADV748X_HDMI_SAT_DEF 128 /* Default */
+#define ADV748X_HDMI_SAT_MAX 255 /* Maximum saturation */
+
+/* Brightness Control */
+#define ADV748X_HDMI_BRI_REG 0x3c /* Brightness (signed) */
+#define ADV748X_HDMI_BRI_MIN -128 /* Luma is -512d */
+#define ADV748X_HDMI_BRI_DEF 0 /* Luma is 0 */
+#define ADV748X_HDMI_BRI_MAX 127 /* Luma is 508d */
+
+/* Hue Control */
+#define ADV748X_HDMI_HUE_REG 0x3d /* Hue (unsigned) */
+#define ADV748X_HDMI_HUE_MIN 0 /* -90 degree */
+#define ADV748X_HDMI_HUE_DEF 0 /* -90 degree */
+#define ADV748X_HDMI_HUE_MAX 255 /* +90 degree */
+
+/* Video adjustment register */
+#define ADV748X_HDMI_VID_ADJ_REG 0x3e
+/* Video adjustment mask */
+#define ADV748X_HDMI_VID_ADJ_MASK 0x7F
+/* Enable color controls */
+#define ADV748X_HDMI_VID_ADJ_ENABLE 0x80
+
+static int __adv748x_hdmi_s_ctrl(struct v4l2_ctrl *ctrl,
+ struct adv748x_state *state)
+{
+ int ret;
+
+ /* Enable video adjustment first */
+ ret = cp_read(state, ADV748X_HDMI_VID_ADJ_REG);
+ if (ret < 0)
+ return ret;
+ ret |= ADV748X_HDMI_VID_ADJ_ENABLE;
+
+ ret = cp_write(state, ADV748X_HDMI_VID_ADJ_REG, ret);
+ if (ret < 0)
+ return ret;
+
+ switch (ctrl->id) {
+ case V4L2_CID_BRIGHTNESS:
+ if (ctrl->val < ADV748X_HDMI_BRI_MIN ||
+ ctrl->val > ADV748X_HDMI_BRI_MAX)
+ return -ERANGE;
+
+ ret = cp_write(state, ADV748X_HDMI_BRI_REG, ctrl->val);
+ break;
+ case V4L2_CID_HUE:
+ if (ctrl->val < ADV748X_HDMI_HUE_MIN ||
+ ctrl->val > ADV748X_HDMI_HUE_MAX)
+ return -ERANGE;
+
+ ret = cp_write(state, ADV748X_HDMI_HUE_REG, ctrl->val);
+ break;
+ case V4L2_CID_CONTRAST:
+ if (ctrl->val < ADV748X_HDMI_CON_MIN ||
+ ctrl->val > ADV748X_HDMI_CON_MAX)
+ return -ERANGE;
+
+ ret = cp_write(state, ADV748X_HDMI_CON_REG, ctrl->val);
+ break;
+ case V4L2_CID_SATURATION:
+ if (ctrl->val < ADV748X_HDMI_SAT_MIN ||
+ ctrl->val > ADV748X_HDMI_SAT_MAX)
+ return -ERANGE;
+
+ ret = cp_write(state, ADV748X_HDMI_SAT_REG, ctrl->val);
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return ret;
+}
+
+static int adv748x_hdmi_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+ struct adv748x_state *state = container_of(ctrl->handler,
+ struct adv748x_state, hdmi.ctrl_hdl);
+ int ret;
+
+ ret = mutex_lock_interruptible(&state->mutex);
+ if (ret)
+ return ret;
+
+ ret = __adv748x_hdmi_s_ctrl(ctrl, state);
+
+ mutex_unlock(&state->mutex);
+
+ return ret;
+}
+
+static int adv748x_hdmi_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
+{
+ struct adv748x_state *state = container_of(ctrl->handler,
+ struct adv748x_state, hdmi.ctrl_hdl);
+ unsigned int width, height, fps;
+
+ switch (ctrl->id) {
+ case V4L2_CID_PIXEL_RATE:
+ {
+ struct v4l2_dv_timings timings;
+ struct v4l2_bt_timings *bt = &timings.bt;
+
+ adv748x_hdmi_query_dv_timings(&state->hdmi.sd, &timings);
+
+ width = bt->width;
+ height = bt->height;
+ fps = DIV_ROUND_CLOSEST(bt->pixelclock,
+ V4L2_DV_BT_FRAME_WIDTH(bt) *
+ V4L2_DV_BT_FRAME_HEIGHT(bt));
+
+ *ctrl->p_new.p_s64 = width * height * fps;
+ break;
+ }
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static const struct v4l2_ctrl_ops adv748x_hdmi_ctrl_ops = {
+ .s_ctrl = adv748x_hdmi_s_ctrl,
+ .g_volatile_ctrl = adv748x_hdmi_g_volatile_ctrl,
+};
+
+static int adv748x_hdmi_init_controls(struct adv748x_state *state)
+{
+ struct v4l2_ctrl *ctrl;
+
+ v4l2_ctrl_handler_init(&state->hdmi.ctrl_hdl, 5);
+
+ v4l2_ctrl_new_std(&state->hdmi.ctrl_hdl, &adv748x_hdmi_ctrl_ops,
+ V4L2_CID_BRIGHTNESS, ADV748X_HDMI_BRI_MIN,
+ ADV748X_HDMI_BRI_MAX, 1, ADV748X_HDMI_BRI_DEF);
+ v4l2_ctrl_new_std(&state->hdmi.ctrl_hdl, &adv748x_hdmi_ctrl_ops,
+ V4L2_CID_CONTRAST, ADV748X_HDMI_CON_MIN,
+ ADV748X_HDMI_CON_MAX, 1, ADV748X_HDMI_CON_DEF);
+ v4l2_ctrl_new_std(&state->hdmi.ctrl_hdl, &adv748x_hdmi_ctrl_ops,
+ V4L2_CID_SATURATION, ADV748X_HDMI_SAT_MIN,
+ ADV748X_HDMI_SAT_MAX, 1, ADV748X_HDMI_SAT_DEF);
+ v4l2_ctrl_new_std(&state->hdmi.ctrl_hdl, &adv748x_hdmi_ctrl_ops,
+ V4L2_CID_HUE, ADV748X_HDMI_HUE_MIN,
+ ADV748X_HDMI_HUE_MAX, 1, ADV748X_HDMI_HUE_DEF);
+ ctrl = v4l2_ctrl_new_std(&state->hdmi.ctrl_hdl, &adv748x_hdmi_ctrl_ops,
+ V4L2_CID_PIXEL_RATE, 1, INT_MAX, 1, 1);
+ if (ctrl)
+ ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
+
+ state->hdmi.sd.ctrl_handler = &state->hdmi.ctrl_hdl;
+ if (state->hdmi.ctrl_hdl.error) {
+ v4l2_ctrl_handler_free(&state->hdmi.ctrl_hdl);
+ return state->hdmi.ctrl_hdl.error;
+ }
+
+ return v4l2_ctrl_handler_setup(&state->hdmi.ctrl_hdl);
+}
+
+int adv748x_hdmi_probe(struct adv748x_state *state)
+{
+ static const struct v4l2_dv_timings cea720x480 =
+ V4L2_DV_BT_CEA_720X480I59_94;
+ int ret;
+
+ state->hdmi.timings = cea720x480;
+
+ adv748x_subdev_init(&state->hdmi.sd, state, &adv748x_ops_hdmi,
+ "hdmi/txa");
+
+ /* HDMI is currently statically routed to TXA */
+ state->hdmi.sd.port = ADV748X_PORT_TXA;
+
+ state->hdmi.pads[ADV748X_HDMI_SINK].flags = MEDIA_PAD_FL_SINK;
+ state->hdmi.pads[ADV748X_HDMI_SOURCE].flags = MEDIA_PAD_FL_SOURCE;
+
+ ret = media_entity_pads_init(&state->hdmi.sd.entity, 2,
+ state->hdmi.pads);
+ if (ret)
+ return ret;
+
+ ret = adv748x_hdmi_init_controls(state);
+ if (ret)
+ return ret;
+
+ ret = v4l2_async_register_subdev(&state->hdmi.sd);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+void adv748x_hdmi_remove(struct adv748x_state *state)
+{
+ v4l2_async_unregister_subdev(&state->hdmi.sd);
+ media_entity_cleanup(&state->hdmi.sd.entity);
+ v4l2_ctrl_handler_free(&state->hdmi.ctrl_hdl);
+}
diff --git a/drivers/media/i2c/adv748x/adv748x.h b/drivers/media/i2c/adv748x/adv748x.h
new file mode 100644
index 000000000000..c1f7f270be78
--- /dev/null
+++ b/drivers/media/i2c/adv748x/adv748x.h
@@ -0,0 +1,157 @@
+/*
+ * Driver for Analog Devices ADV748X video decoder and HDMI receiver
+ *
+ * Copyright (C) 2017 Renesas Electronics Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * Authors:
+ * Koji Matsuoka <koji.matsuoka.xm@renesas.com>
+ * Niklas Söderlund <niklas.soderlund@ragnatech.se>
+ * Kieran Bingham <kieran.bingham@ideasonboard.com>
+ */
+
+#include <linux/i2c.h>
+
+#ifndef _ADV748X_H_
+#define _ADV748X_H_
+
+/* I2C slave addresses */
+#define ADV748X_I2C_IO 0x70 /* IO Map */
+#define ADV748X_I2C_DPLL 0x26 /* DPLL Map */
+#define ADV748X_I2C_CP 0x22 /* CP Map */
+#define ADV748X_I2C_HDMI 0x34 /* HDMI Map */
+#define ADV748X_I2C_EDID 0x36 /* EDID Map */
+#define ADV748X_I2C_REPEATER 0x32 /* HDMI RX Repeater Map */
+#define ADV748X_I2C_INFOFRAME 0x31 /* HDMI RX InfoFrame Map */
+#define ADV748X_I2C_CEC 0x41 /* CEC Map */
+#define ADV748X_I2C_SDP 0x79 /* SDP Map */
+#define ADV748X_I2C_TXB 0x48 /* CSI-TXB Map */
+#define ADV748X_I2C_TXA 0x4A /* CSI-TXA Map */
+#define ADV748X_I2C_WAIT 0xFE /* Wait x mesec */
+#define ADV748X_I2C_EOR 0xFF /* End Mark */
+
+/**
+ * enum adv748x_ports - Device tree port number definitions
+ *
+ * The ADV748X ports define the mapping between subdevices
+ * and the device tree specification
+ */
+enum adv748x_ports {
+ ADV748X_PORT_AIN1 = 1,
+ ADV748X_PORT_AIN2 = 2,
+ ADV748X_PORT_AIN3 = 3,
+ ADV748X_PORT_AIN4 = 4,
+ ADV748X_PORT_AIN5 = 5,
+ ADV748X_PORT_AIN6 = 6,
+ ADV748X_PORT_AIN7 = 7,
+ ADV748X_PORT_AIN8 = 8,
+ ADV748X_PORT_HDMI = 9,
+ ADV748X_PORT_TTL = 10,
+ ADV748X_PORT_TXA = 11,
+ ADV748X_PORT_TXB = 12,
+};
+
+/**
+ * struct adv748x_hdmi - State of HDMI entity
+ * @timings: Timings for {g,s}_dv_timings
+ */
+struct adv748x_hdmi {
+ struct media_pad pads[2];
+ struct v4l2_ctrl_handler ctrl_hdl;
+ struct v4l2_subdev sd;
+
+ struct v4l2_dv_timings timings;
+};
+
+/**
+ * struct adv748x_afe - State of AFE sink
+ * @streaming: Flag if AFE is currently streaming
+ * @curr_norm: Current video standard
+ */
+struct adv748x_afe {
+ struct media_pad pads[2];
+ struct v4l2_ctrl_handler ctrl_hdl;
+ struct v4l2_subdev sd;
+
+ bool streaming;
+ v4l2_std_id curr_norm;
+};
+
+/**
+ * struct adv748x_state - State of ADV748X
+ * @dev: (OF) device
+ * @client: I2C client
+ * @sd: v4l2 subdevice
+ * @mutex: protect against sink state changes while streaming
+ *
+ * @pads: media pads exposed
+ *
+ * @cp: state of CP HDMI
+ * @sdp: state of SDP
+ *
+ * @ctrl_hdl control handler
+ */
+struct adv748x_state {
+ struct device *dev;
+ struct i2c_client *client;
+
+
+ struct mutex mutex;
+
+ struct adv748x_hdmi hdmi;
+ struct adv748x_afe afe;
+};
+
+#define adv748x_hdmi_to_state(a) container_of(a, struct adv748x_state, hdmi.sd)
+#define adv748x_afe_to_state(a) container_of(a, struct adv748x_state, afe.sd)
+
+#define adv_err(a, fmt, arg...) dev_err(a->dev, fmt, ##arg)
+#define adv_info(a, fmt, arg...) dev_info(a->dev, fmt, ##arg)
+#define adv_dbg(a, fmt, arg...) dev_dbg(a->dev, fmt, ##arg)
+
+/* Register handling */
+int adv748x_read(struct adv748x_state *state, u8 addr, u8 reg);
+int adv748x_write(struct adv748x_state *state, u8 addr, u8 reg, u8 value);
+
+#define io_read(s, r) adv748x_read(s, ADV748X_I2C_IO, r)
+#define io_write(s, r, v) adv748x_write(s, ADV748X_I2C_IO, r, v)
+#define io_clrset(s, r, m, v) io_write(s, r, (io_read(s, r) & ~m) | v)
+
+#define hdmi_read(s, r) adv748x_read(s, ADV748X_I2C_HDMI, r)
+#define hdmi_read16(s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, r+1)) & m)
+#define hdmi_write(s, r, v) adv748x_write(s, ADV748X_I2C_HDMI, r, v)
+#define hdmi_clrset(s, r, m, v) hdmi_write(s, r, (hdmi_read(s, r) & ~m) | v)
+
+#define sdp_read(s, r) adv748x_read(s, ADV748X_I2C_SDP, r)
+#define sdp_write(s, r, v) adv748x_write(s, ADV748X_I2C_SDP, r, v)
+#define sdp_clrset(s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~m) | v)
+
+#define cp_read(s, r) adv748x_read(s, ADV748X_I2C_CP, r)
+#define cp_write(s, r, v) adv748x_write(s, ADV748X_I2C_CP, r, v)
+#define cp_clrset(s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~m) | v)
+
+#define txa_read(s, r) adv748x_read(s, ADV748X_I2C_TXA, r)
+#define txa_write(s, r, v) adv748x_write(s, ADV748X_I2C_TXA, r, v)
+#define txa_clrset(s, r, m, v) txa_write(s, r, (txa_read(s, r) & ~m) | v)
+
+#define txb_read(s, r) adv748x_read(s, ADV748X_I2C_TXB, r)
+#define txb_write(s, r, v) adv748x_write(s, ADV748X_I2C_TXB, r, v)
+#define txb_clrset(s, r, m, v) txb_write(s, r, (txb_read(s, r) & ~m) | v)
+
+void adv748x_subdev_init(struct v4l2_subdev *sd, struct adv748x_state *state,
+ const struct v4l2_subdev_ops *ops, const char *ident);
+
+int adv748x_hdmi_probe(struct adv748x_state *state);
+void adv748x_hdmi_remove(struct adv748x_state *state);
+
+int adv748x_afe_probe(struct adv748x_state *state);
+void adv748x_afe_remove(struct adv748x_state *state);
+
+int adv748x_txa_power(struct adv748x_state *state, bool on);
+int adv748x_txb_power(struct adv748x_state *state, bool on);
+
+#endif /* _ADV748X_H_ */
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 4/5] arm64: dts: r8a7795: salvator-x: enable VIN, CSI and ADV7482
2017-04-27 18:25 [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver Kieran Bingham
` (2 preceding siblings ...)
2017-04-27 18:26 ` [PATCH 3/5] media: i2c: adv748x: add adv748x driver Kieran Bingham
@ 2017-04-27 18:26 ` Kieran Bingham
2017-04-28 8:52 ` Sergei Shtylyov
2017-04-27 18:26 ` [PATCH 5/5] arm64: dts: r8a7796: " Kieran Bingham
2017-04-28 7:09 ` [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver Simon Horman
5 siblings, 1 reply; 16+ messages in thread
From: Kieran Bingham @ 2017-04-27 18:26 UTC (permalink / raw)
To: laurent.pinchart, niklas.soderlund, sakari.ailus
Cc: linux-media, linux-renesas-soc, linux-kernel, Kieran Bingham
From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Provide bindings between the VIN, CSI and the ADV7482 on the r8a7795.
Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
---
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 129 +++++++++++++++++++++
1 file changed, 129 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 27b9bae60dc0..a20623faa9d2 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -196,6 +196,22 @@
};
};
};
+
+ hdmi {
+ port {
+ hdmi_in: endpoint {
+ remote-endpoint = <&adv7482_hdmi>;
+ };
+ };
+ };
+
+ cvbs {
+ port {
+ cvbs_in: endpoint {
+ remote-endpoint = <&adv7482_ain8>;
+ };
+ };
+ };
};
&du {
@@ -387,6 +403,50 @@
};
};
+&i2c4 {
+ status = "okay";
+
+ clock-frequency = <100000>;
+
+ video_receiver@70 {
+ compatible = "adi,adv7482";
+ reg = <0x70>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@8 {
+ adv7482_ain8: endpoint@1 {
+ remote-endpoint = <&cvbs_in>;
+ };
+ };
+
+ port@9 {
+ adv7482_hdmi: endpoint@1 {
+ remote-endpoint = <&hdmi_in>;
+ };
+ };
+
+ port@11 {
+ reg = <11>;
+ adv7482_txa: endpoint@1 {
+ clock-lanes = <0>;
+ data-lanes = <1 2 3 4>;
+ remote-endpoint = <&csi40_in>;
+ };
+ };
+
+ port@12 {
+ reg = <12>;
+ adv7482_txb: endpoint@1 {
+ clock-lanes = <0>;
+ data-lanes = <1>;
+ remote-endpoint = <&csi20_in>;
+ };
+ };
+ };
+};
+
&rcar_sound {
pinctrl-0 = <&sound_pins &sound_clk_pins>;
pinctrl-names = "default";
@@ -577,3 +637,72 @@
&pciec1 {
status = "okay";
};
+
+&vin0 {
+ status = "okay";
+};
+
+&vin1 {
+ status = "okay";
+};
+
+&vin2 {
+ status = "okay";
+};
+
+&vin3 {
+ status = "okay";
+};
+
+&vin4 {
+ status = "okay";
+};
+
+&vin5 {
+ status = "okay";
+};
+
+&vin6 {
+ status = "okay";
+};
+
+&vin7 {
+ status = "okay";
+};
+
+&csi20 {
+ status = "okay";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ csi20_in: endpoint@0 {
+ clock-lanes = <0>;
+ data-lanes = <1>;
+ remote-endpoint = <&adv7482_txb>;
+ };
+ };
+ };
+};
+
+&csi40 {
+ status = "okay";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+
+ csi40_in: endpoint@0 {
+ clock-lanes = <0>;
+ data-lanes = <1 2 3 4>;
+ remote-endpoint = <&adv7482_txa>;
+ };
+ };
+ };
+};
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 5/5] arm64: dts: r8a7796: salvator-x: enable VIN, CSI and ADV7482
2017-04-27 18:25 [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver Kieran Bingham
` (3 preceding siblings ...)
2017-04-27 18:26 ` [PATCH 4/5] arm64: dts: r8a7795: salvator-x: enable VIN, CSI and ADV7482 Kieran Bingham
@ 2017-04-27 18:26 ` Kieran Bingham
2017-04-28 7:09 ` [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver Simon Horman
5 siblings, 0 replies; 16+ messages in thread
From: Kieran Bingham @ 2017-04-27 18:26 UTC (permalink / raw)
To: laurent.pinchart, niklas.soderlund, sakari.ailus
Cc: linux-media, linux-renesas-soc, linux-kernel, Kieran Bingham
From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Provide bindings between the VIN, CSI and the ADV7482 on the r8a7796.
Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
---
arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 129 +++++++++++++++++++++
1 file changed, 129 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
index 2637e4042705..d6f25e1ab455 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
@@ -102,6 +102,22 @@
states = <3300000 1
1800000 0>;
};
+
+ hdmi {
+ port {
+ hdmi_in: endpoint {
+ remote-endpoint = <&adv7482_hdmi>;
+ };
+ };
+ };
+
+ cvbs {
+ port {
+ cvbs_in: endpoint {
+ remote-endpoint = <&adv7482_ain8>;
+ };
+ };
+ };
};
&pfc {
@@ -261,3 +277,116 @@
timeout-sec = <60>;
status = "okay";
};
+
+&i2c4 {
+ status = "okay";
+
+ clock-frequency = <100000>;
+
+ video_receiver@70 {
+ compatible = "adi,adv7482";
+ reg = <0x70>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@8 {
+ adv7482_ain8: endpoint@1 {
+ remote-endpoint = <&cvbs_in>;
+ };
+ };
+
+ port@9 {
+ adv7482_hdmi: endpoint@1 {
+ remote-endpoint = <&hdmi_in>;
+ };
+ };
+
+ port@11 {
+ reg = <11>;
+ adv7482_txa: endpoint@1 {
+ clock-lanes = <0>;
+ data-lanes = <1 2 3 4>;
+ remote-endpoint = <&csi40_in>;
+ };
+ };
+
+ port@12 {
+ reg = <12>;
+ adv7482_txb: endpoint@1 {
+ clock-lanes = <0>;
+ data-lanes = <1>;
+ remote-endpoint = <&csi20_in>;
+ };
+ };
+ };
+};
+
+&vin0 {
+ status = "okay";
+};
+
+&vin1 {
+ status = "okay";
+};
+
+&vin2 {
+ status = "okay";
+};
+
+&vin3 {
+ status = "okay";
+};
+
+&vin4 {
+ status = "okay";
+};
+
+&vin5 {
+ status = "okay";
+};
+
+&vin6 {
+ status = "okay";
+};
+
+&vin7 {
+ status = "okay";
+};
+
+&csi20 {
+ status = "okay";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ csi20_in: endpoint@0 {
+ clock-lanes = <0>;
+ data-lanes = <1>;
+ remote-endpoint = <&adv7482_txb>;
+ };
+ };
+ };
+};
+
+&csi40 {
+ status = "okay";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+
+ csi40_in: endpoint@0 {
+ clock-lanes = <0>;
+ data-lanes = <1 2 3 4>;
+ remote-endpoint = <&adv7482_txa>;
+ };
+ };
+ };
+};
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous subdevs
2017-04-27 18:26 ` [PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous subdevs Kieran Bingham
@ 2017-04-27 21:43 ` Sakari Ailus
2017-04-27 22:13 ` Kieran Bingham
0 siblings, 1 reply; 16+ messages in thread
From: Sakari Ailus @ 2017-04-27 21:43 UTC (permalink / raw)
To: Kieran Bingham
Cc: laurent.pinchart, niklas.soderlund, linux-media,
linux-renesas-soc, linux-kernel, Kieran Bingham
Hi Kieran,
Could I ask you to rebase your patches on top of my V4L2 fwnode patches
here?
<URL:https://git.linuxtv.org/sailus/media_tree.git/log/?h=v4l2-acpi>
It depends on the fwnode graph patches, merged here:
<URL:https://git.linuxtv.org/sailus/media_tree.git/log/?h=v4l2-acpi-merge>
I expect the fwnode graph patches in v4.12 so we'll have them in media-tree
master soon.
(I'm pushing these branches right now, it may take a while until it's really
there.)
On Thu, Apr 27, 2017 at 07:26:00PM +0100, Kieran Bingham wrote:
> From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
>
> Devices such as the the ADV748x support multiple parallel stream routes
> through a single chip. This leads towards needing to provide multiple
> distinct entities and subdevs from a single device-tree node.
>
> To distinguish these separate outputs, the device-tree binding must
> specify each endpoint link with a unique (to the device) non-zero port
> number.
>
> This number allows async subdev registrations to identify the correct
> subdevice to bind and link.
>
> Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> ---
> drivers/media/v4l2-core/v4l2-async.c | 7 +++++++
> drivers/media/v4l2-core/v4l2-subdev.c | 1 +
> include/media/v4l2-async.h | 1 +
> include/media/v4l2-subdev.h | 2 ++
> 4 files changed, 11 insertions(+)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
> index 1815e54e8a38..875e6ce646ec 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -42,6 +42,13 @@ static bool match_devname(struct v4l2_subdev *sd,
>
> static bool match_of(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
> {
> + /*
> + * If set, we must match the device tree port, with the subdev port.
> + * This is a fast match, so do this first
> + */
> + if (sd->port && sd->port != asd->match.of.port)
Zero is an entirely valid value for a port. I think it'd be good not to
depend on non-zero port values for port matching.
> + return -1;
Any particular reason to return -1 from a function with bool return type?
> +
> return !of_node_cmp(of_node_full_name(sd->of_node),
> of_node_full_name(asd->match.of.node));
> }
> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
> index da78497ae5ed..67f816f90ac3 100644
> --- a/drivers/media/v4l2-core/v4l2-subdev.c
> +++ b/drivers/media/v4l2-core/v4l2-subdev.c
> @@ -607,6 +607,7 @@ void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops)
> sd->flags = 0;
> sd->name[0] = '\0';
> sd->grp_id = 0;
> + sd->port = 0;
> sd->dev_priv = NULL;
> sd->host_priv = NULL;
> #if defined(CONFIG_MEDIA_CONTROLLER)
> diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
> index 5b501309b6a7..2988960613ec 100644
> --- a/include/media/v4l2-async.h
> +++ b/include/media/v4l2-async.h
> @@ -56,6 +56,7 @@ struct v4l2_async_subdev {
> union {
> struct {
> const struct device_node *node;
> + u32 port;
What if instead of storing the device's OF node, you'd store the port node
and used that for matching?
Would that also solve the problem or do I miss something?
> } of;
> struct {
> const char *name;
> diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
> index 0ab1c5df6fac..1c1731b491e5 100644
> --- a/include/media/v4l2-subdev.h
> +++ b/include/media/v4l2-subdev.h
> @@ -782,6 +782,7 @@ struct v4l2_subdev_platform_data {
> * @ctrl_handler: The control handler of this subdev. May be NULL.
> * @name: Name of the sub-device. Please notice that the name must be unique.
> * @grp_id: can be used to group similar subdevs. Value is driver-specific
> + * @port: driver-specific value to bind multiple subdevs with a single DT node.
> * @dev_priv: pointer to private data
> * @host_priv: pointer to private data used by the device where the subdev
> * is attached.
> @@ -814,6 +815,7 @@ struct v4l2_subdev {
> struct v4l2_ctrl_handler *ctrl_handler;
> char name[V4L2_SUBDEV_NAME_SIZE];
> u32 grp_id;
> + u32 port;
> void *dev_priv;
> void *host_priv;
> struct video_device *devnode;
--
Kind regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi XMPP: sailus@retiisi.org.uk
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous subdevs
2017-04-27 21:43 ` Sakari Ailus
@ 2017-04-27 22:13 ` Kieran Bingham
2017-04-27 22:49 ` Sakari Ailus
0 siblings, 1 reply; 16+ messages in thread
From: Kieran Bingham @ 2017-04-27 22:13 UTC (permalink / raw)
To: Sakari Ailus, Kieran Bingham
Cc: laurent.pinchart, niklas.soderlund, linux-media,
linux-renesas-soc, linux-kernel
Hi Sakari,
Thanks for taking a look
On 27/04/17 22:43, Sakari Ailus wrote:
> Hi Kieran,
>
> Could I ask you to rebase your patches on top of my V4L2 fwnode patches
> here?
>
> <URL:https://git.linuxtv.org/sailus/media_tree.git/log/?h=v4l2-acpi>
>
> It depends on the fwnode graph patches, merged here:
>
> <URL:https://git.linuxtv.org/sailus/media_tree.git/log/?h=v4l2-acpi-merge>
>
> I expect the fwnode graph patches in v4.12 so we'll have them in media-tree
> master soon.
>
> (I'm pushing these branches right now, it may take a while until it's really
> there.)
Sure, I'll merge those into my base.
> On Thu, Apr 27, 2017 at 07:26:00PM +0100, Kieran Bingham wrote:
>> From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
>>
>> Devices such as the the ADV748x support multiple parallel stream routes
>> through a single chip. This leads towards needing to provide multiple
>> distinct entities and subdevs from a single device-tree node.
>>
>> To distinguish these separate outputs, the device-tree binding must
>> specify each endpoint link with a unique (to the device) non-zero port
>> number.
>>
>> This number allows async subdev registrations to identify the correct
>> subdevice to bind and link.
>>
>> Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
>> ---
>> drivers/media/v4l2-core/v4l2-async.c | 7 +++++++
>> drivers/media/v4l2-core/v4l2-subdev.c | 1 +
>> include/media/v4l2-async.h | 1 +
>> include/media/v4l2-subdev.h | 2 ++
>> 4 files changed, 11 insertions(+)
>>
>> diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
>> index 1815e54e8a38..875e6ce646ec 100644
>> --- a/drivers/media/v4l2-core/v4l2-async.c
>> +++ b/drivers/media/v4l2-core/v4l2-async.c
>> @@ -42,6 +42,13 @@ static bool match_devname(struct v4l2_subdev *sd,
>>
>> static bool match_of(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
>> {
>> + /*
>> + * If set, we must match the device tree port, with the subdev port.
>> + * This is a fast match, so do this first
>> + */
>> + if (sd->port && sd->port != asd->match.of.port)
>
> Zero is an entirely valid value for a port. I think it'd be good not to
> depend on non-zero port values for port matching.
Well then that pretty much dashes my chances on not parsing the DT in the ADV
driver.
>> + return -1;
>
> Any particular reason to return -1 from a function with bool return type?
Ahem, I clearly can't read ;-)
I think my mindset was thinking strcmp or something...
>> +
>> return !of_node_cmp(of_node_full_name(sd->of_node),
>> of_node_full_name(asd->match.of.node));
>> }
>> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
>> index da78497ae5ed..67f816f90ac3 100644
>> --- a/drivers/media/v4l2-core/v4l2-subdev.c
>> +++ b/drivers/media/v4l2-core/v4l2-subdev.c
>> @@ -607,6 +607,7 @@ void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops)
>> sd->flags = 0;
>> sd->name[0] = '\0';
>> sd->grp_id = 0;
>> + sd->port = 0;
>> sd->dev_priv = NULL;
>> sd->host_priv = NULL;
>> #if defined(CONFIG_MEDIA_CONTROLLER)
>> diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
>> index 5b501309b6a7..2988960613ec 100644
>> --- a/include/media/v4l2-async.h
>> +++ b/include/media/v4l2-async.h
>> @@ -56,6 +56,7 @@ struct v4l2_async_subdev {
>> union {
>> struct {
>> const struct device_node *node;
>> + u32 port;
>
> What if instead of storing the device's OF node, you'd store the port node
> and used that for matching?
>
> Would that also solve the problem or do I miss something?
Actually - I was 'trying' to prevent having to parse the DT in the adv748x
driver if I didn't need to.
Once I have to parse the DT, then yes, I think storing the endpoint node is
probably the best thing to compare against.
And actually - you might have just solved my open question in the cover letter ...
I had got stuck in my mindset that if I were to use the endpoint 'leaf' node as
a comparator - that it would be 'instead' of the root node.
But actually - it could just be root-node + leaf-node to compare, which then
allows us the fallback of comparing just the root nodes if the leaf isn't set.
I'll respin with this either tomorrow or early next week.
>
>> } of;
>> struct {
>> const char *name;
>> diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
>> index 0ab1c5df6fac..1c1731b491e5 100644
>> --- a/include/media/v4l2-subdev.h
>> +++ b/include/media/v4l2-subdev.h
>> @@ -782,6 +782,7 @@ struct v4l2_subdev_platform_data {
>> * @ctrl_handler: The control handler of this subdev. May be NULL.
>> * @name: Name of the sub-device. Please notice that the name must be unique.
>> * @grp_id: can be used to group similar subdevs. Value is driver-specific
>> + * @port: driver-specific value to bind multiple subdevs with a single DT node.
>> * @dev_priv: pointer to private data
>> * @host_priv: pointer to private data used by the device where the subdev
>> * is attached.
>> @@ -814,6 +815,7 @@ struct v4l2_subdev {
>> struct v4l2_ctrl_handler *ctrl_handler;
>> char name[V4L2_SUBDEV_NAME_SIZE];
>> u32 grp_id;
>> + u32 port;
>> void *dev_priv;
>> void *host_priv;
>> struct video_device *devnode;
>
Regards
Kieran
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous subdevs
2017-04-27 22:13 ` Kieran Bingham
@ 2017-04-27 22:49 ` Sakari Ailus
2017-04-28 0:00 ` Kieran Bingham
0 siblings, 1 reply; 16+ messages in thread
From: Sakari Ailus @ 2017-04-27 22:49 UTC (permalink / raw)
To: Kieran Bingham
Cc: Kieran Bingham, laurent.pinchart, niklas.soderlund, linux-media,
linux-renesas-soc, linux-kernel
Hi Kieran,
On Thu, Apr 27, 2017 at 11:13:50PM +0100, Kieran Bingham wrote:
> Hi Sakari,
>
> Thanks for taking a look
Sure! :-)
>
> On 27/04/17 22:43, Sakari Ailus wrote:
> > Hi Kieran,
> >
> > Could I ask you to rebase your patches on top of my V4L2 fwnode patches
> > here?
> >
> > <URL:https://git.linuxtv.org/sailus/media_tree.git/log/?h=v4l2-acpi>
> >
> > It depends on the fwnode graph patches, merged here:
> >
> > <URL:https://git.linuxtv.org/sailus/media_tree.git/log/?h=v4l2-acpi-merge>
> >
> > I expect the fwnode graph patches in v4.12 so we'll have them in media-tree
> > master soon.
> >
> > (I'm pushing these branches right now, it may take a while until it's really
> > there.)
>
> Sure, I'll merge those into my base.
>
> > On Thu, Apr 27, 2017 at 07:26:00PM +0100, Kieran Bingham wrote:
> >> From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> >>
> >> Devices such as the the ADV748x support multiple parallel stream routes
> >> through a single chip. This leads towards needing to provide multiple
> >> distinct entities and subdevs from a single device-tree node.
> >>
> >> To distinguish these separate outputs, the device-tree binding must
> >> specify each endpoint link with a unique (to the device) non-zero port
> >> number.
> >>
> >> This number allows async subdev registrations to identify the correct
> >> subdevice to bind and link.
> >>
> >> Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> >> ---
> >> drivers/media/v4l2-core/v4l2-async.c | 7 +++++++
> >> drivers/media/v4l2-core/v4l2-subdev.c | 1 +
> >> include/media/v4l2-async.h | 1 +
> >> include/media/v4l2-subdev.h | 2 ++
> >> 4 files changed, 11 insertions(+)
> >>
> >> diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
> >> index 1815e54e8a38..875e6ce646ec 100644
> >> --- a/drivers/media/v4l2-core/v4l2-async.c
> >> +++ b/drivers/media/v4l2-core/v4l2-async.c
> >> @@ -42,6 +42,13 @@ static bool match_devname(struct v4l2_subdev *sd,
> >>
> >> static bool match_of(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
> >> {
> >> + /*
> >> + * If set, we must match the device tree port, with the subdev port.
> >> + * This is a fast match, so do this first
> >> + */
> >> + if (sd->port && sd->port != asd->match.of.port)
> >
> > Zero is an entirely valid value for a port. I think it'd be good not to
> > depend on non-zero port values for port matching.
>
> Well then that pretty much dashes my chances on not parsing the DT in the ADV
> driver.
Hmm. I guess there's no really a way to avoid it. But we could make it
easier
>
>
>
> >> + return -1;
> >
> > Any particular reason to return -1 from a function with bool return type?
>
> Ahem, I clearly can't read ;-)
> I think my mindset was thinking strcmp or something...
But -1 is perfectly valid. If you wanted to make it look really interesting,
you could return -!false and still have exactly the same functionality. ;-)
>
>
> >> +
> >> return !of_node_cmp(of_node_full_name(sd->of_node),
> >> of_node_full_name(asd->match.of.node));
> >> }
> >> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
> >> index da78497ae5ed..67f816f90ac3 100644
> >> --- a/drivers/media/v4l2-core/v4l2-subdev.c
> >> +++ b/drivers/media/v4l2-core/v4l2-subdev.c
> >> @@ -607,6 +607,7 @@ void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops)
> >> sd->flags = 0;
> >> sd->name[0] = '\0';
> >> sd->grp_id = 0;
> >> + sd->port = 0;
> >> sd->dev_priv = NULL;
> >> sd->host_priv = NULL;
> >> #if defined(CONFIG_MEDIA_CONTROLLER)
> >> diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
> >> index 5b501309b6a7..2988960613ec 100644
> >> --- a/include/media/v4l2-async.h
> >> +++ b/include/media/v4l2-async.h
> >> @@ -56,6 +56,7 @@ struct v4l2_async_subdev {
> >> union {
> >> struct {
> >> const struct device_node *node;
> >> + u32 port;
> >
> > What if instead of storing the device's OF node, you'd store the port node
> > and used that for matching?
> >
> > Would that also solve the problem or do I miss something?
>
> Actually - I was 'trying' to prevent having to parse the DT in the adv748x
> driver if I didn't need to.
>
> Once I have to parse the DT, then yes, I think storing the endpoint node is
> probably the best thing to compare against.
>
> And actually - you might have just solved my open question in the cover letter ...
>
> I had got stuck in my mindset that if I were to use the endpoint 'leaf' node as
> a comparator - that it would be 'instead' of the root node.
>
> But actually - it could just be root-node + leaf-node to compare, which then
> allows us the fallback of comparing just the root nodes if the leaf isn't set.
>
> I'll respin with this either tomorrow or early next week.
Endpoints are indeed another option.
Is there something that would prevent switching from device node matching to
port / endpoint matching altogether? I don't think the driver changes should
be difficult to make.
Supporting different options there will be painful as it will likely require
help from the driver to implement both --- separately.
>
> >
> >> } of;
> >> struct {
> >> const char *name;
> >> diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
> >> index 0ab1c5df6fac..1c1731b491e5 100644
> >> --- a/include/media/v4l2-subdev.h
> >> +++ b/include/media/v4l2-subdev.h
> >> @@ -782,6 +782,7 @@ struct v4l2_subdev_platform_data {
> >> * @ctrl_handler: The control handler of this subdev. May be NULL.
> >> * @name: Name of the sub-device. Please notice that the name must be unique.
> >> * @grp_id: can be used to group similar subdevs. Value is driver-specific
> >> + * @port: driver-specific value to bind multiple subdevs with a single DT node.
> >> * @dev_priv: pointer to private data
> >> * @host_priv: pointer to private data used by the device where the subdev
> >> * is attached.
> >> @@ -814,6 +815,7 @@ struct v4l2_subdev {
> >> struct v4l2_ctrl_handler *ctrl_handler;
> >> char name[V4L2_SUBDEV_NAME_SIZE];
> >> u32 grp_id;
> >> + u32 port;
> >> void *dev_priv;
> >> void *host_priv;
> >> struct video_device *devnode;
> >
--
Kind regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi XMPP: sailus@retiisi.org.uk
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous subdevs
2017-04-27 22:49 ` Sakari Ailus
@ 2017-04-28 0:00 ` Kieran Bingham
0 siblings, 0 replies; 16+ messages in thread
From: Kieran Bingham @ 2017-04-28 0:00 UTC (permalink / raw)
To: Sakari Ailus
Cc: Kieran Bingham, laurent.pinchart, niklas.soderlund, linux-media,
linux-renesas-soc, linux-kernel
On 27/04/17 23:49, Sakari Ailus wrote:
> Hi Kieran,
>
> On Thu, Apr 27, 2017 at 11:13:50PM +0100, Kieran Bingham wrote:
>> Hi Sakari,
>>
>> Thanks for taking a look
>
> Sure! :-)
>
>>
>> On 27/04/17 22:43, Sakari Ailus wrote:
>>> Hi Kieran,
>>>
>>> Could I ask you to rebase your patches on top of my V4L2 fwnode patches
>>> here?
>>>
>>> <URL:https://git.linuxtv.org/sailus/media_tree.git/log/?h=v4l2-acpi>
>>>
>>> It depends on the fwnode graph patches, merged here:
>>>
>>> <URL:https://git.linuxtv.org/sailus/media_tree.git/log/?h=v4l2-acpi-merge>
>>>
>>> I expect the fwnode graph patches in v4.12 so we'll have them in media-tree
>>> master soon.
>>>
>>> (I'm pushing these branches right now, it may take a while until it's really
>>> there.)
>>
>> Sure, I'll merge those into my base.
>>
>>> On Thu, Apr 27, 2017 at 07:26:00PM +0100, Kieran Bingham wrote:
>>>> From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
>>>>
>>>> Devices such as the the ADV748x support multiple parallel stream routes
>>>> through a single chip. This leads towards needing to provide multiple
>>>> distinct entities and subdevs from a single device-tree node.
>>>>
>>>> To distinguish these separate outputs, the device-tree binding must
>>>> specify each endpoint link with a unique (to the device) non-zero port
>>>> number.
>>>>
>>>> This number allows async subdev registrations to identify the correct
>>>> subdevice to bind and link.
>>>>
>>>> Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
>>>> ---
>>>> drivers/media/v4l2-core/v4l2-async.c | 7 +++++++
>>>> drivers/media/v4l2-core/v4l2-subdev.c | 1 +
>>>> include/media/v4l2-async.h | 1 +
>>>> include/media/v4l2-subdev.h | 2 ++
>>>> 4 files changed, 11 insertions(+)
>>>>
>>>> diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
>>>> index 1815e54e8a38..875e6ce646ec 100644
>>>> --- a/drivers/media/v4l2-core/v4l2-async.c
>>>> +++ b/drivers/media/v4l2-core/v4l2-async.c
>>>> @@ -42,6 +42,13 @@ static bool match_devname(struct v4l2_subdev *sd,
>>>>
>>>> static bool match_of(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
>>>> {
>>>> + /*
>>>> + * If set, we must match the device tree port, with the subdev port.
>>>> + * This is a fast match, so do this first
>>>> + */
>>>> + if (sd->port && sd->port != asd->match.of.port)
>>>
>>> Zero is an entirely valid value for a port. I think it'd be good not to
>>> depend on non-zero port values for port matching.
>>
>> Well then that pretty much dashes my chances on not parsing the DT in the ADV
>> driver.
>
> Hmm. I guess there's no really a way to avoid it. But we could make it
> easier
>
>>
>>
>>
>>>> + return -1;
>>>
>>> Any particular reason to return -1 from a function with bool return type?
>>
>> Ahem, I clearly can't read ;-)
>> I think my mindset was thinking strcmp or something...
>
> But -1 is perfectly valid. If you wanted to make it look really interesting,
> you could return -!false and still have exactly the same functionality. ;-)
I'll consider -!false a recommendation for my next patch :D
>>>> +
>>>> return !of_node_cmp(of_node_full_name(sd->of_node),
>>>> of_node_full_name(asd->match.of.node));
>>>> }
>>>> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
>>>> index da78497ae5ed..67f816f90ac3 100644
>>>> --- a/drivers/media/v4l2-core/v4l2-subdev.c
>>>> +++ b/drivers/media/v4l2-core/v4l2-subdev.c
>>>> @@ -607,6 +607,7 @@ void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops *ops)
>>>> sd->flags = 0;
>>>> sd->name[0] = '\0';
>>>> sd->grp_id = 0;
>>>> + sd->port = 0;
>>>> sd->dev_priv = NULL;
>>>> sd->host_priv = NULL;
>>>> #if defined(CONFIG_MEDIA_CONTROLLER)
>>>> diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
>>>> index 5b501309b6a7..2988960613ec 100644
>>>> --- a/include/media/v4l2-async.h
>>>> +++ b/include/media/v4l2-async.h
>>>> @@ -56,6 +56,7 @@ struct v4l2_async_subdev {
>>>> union {
>>>> struct {
>>>> const struct device_node *node;
>>>> + u32 port;
>>>
>>> What if instead of storing the device's OF node, you'd store the port node
>>> and used that for matching?
>>>
>>> Would that also solve the problem or do I miss something?
>>
>> Actually - I was 'trying' to prevent having to parse the DT in the adv748x
>> driver if I didn't need to.
>>
>> Once I have to parse the DT, then yes, I think storing the endpoint node is
>> probably the best thing to compare against.
>>
>> And actually - you might have just solved my open question in the cover letter ...
>>
>> I had got stuck in my mindset that if I were to use the endpoint 'leaf' node as
>> a comparator - that it would be 'instead' of the root node.
>>
>> But actually - it could just be root-node + leaf-node to compare, which then
>> allows us the fallback of comparing just the root nodes if the leaf isn't set.
>>
>> I'll respin with this either tomorrow or early next week.
>
> Endpoints are indeed another option.
>
> Is there something that would prevent switching from device node matching to
> port / endpoint matching altogether? I don't think the driver changes should
> be difficult to make.
>
> Supporting different options there will be painful as it will likely require
> help from the driver to implement both --- separately.
Ok - so a bit of pain either way...
IMO - 'endpoint' matching is 'more correct' as then we are tying the subdev with
precisely the object that it is linking to.
It looks like there are 11 users of v4l2_async_notifier_register(), so yes,
hopefully it might not actually be so much effort to go through and adapt each
to match to the endpoint of_node instead!
I'll have a go at this and see how far I get down the rabbit hole.
>>>> } of;
>>>> struct {
>>>> const char *name;
>>>> diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
>>>> index 0ab1c5df6fac..1c1731b491e5 100644
>>>> --- a/include/media/v4l2-subdev.h
>>>> +++ b/include/media/v4l2-subdev.h
>>>> @@ -782,6 +782,7 @@ struct v4l2_subdev_platform_data {
>>>> * @ctrl_handler: The control handler of this subdev. May be NULL.
>>>> * @name: Name of the sub-device. Please notice that the name must be unique.
>>>> * @grp_id: can be used to group similar subdevs. Value is driver-specific
>>>> + * @port: driver-specific value to bind multiple subdevs with a single DT node.
>>>> * @dev_priv: pointer to private data
>>>> * @host_priv: pointer to private data used by the device where the subdev
>>>> * is attached.
>>>> @@ -814,6 +815,7 @@ struct v4l2_subdev {
>>>> struct v4l2_ctrl_handler *ctrl_handler;
>>>> char name[V4L2_SUBDEV_NAME_SIZE];
>>>> u32 grp_id;
>>>> + u32 port;
>>>> void *dev_priv;
>>>> void *host_priv;
>>>> struct video_device *devnode;
>>>
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver
2017-04-27 18:25 [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver Kieran Bingham
` (4 preceding siblings ...)
2017-04-27 18:26 ` [PATCH 5/5] arm64: dts: r8a7796: " Kieran Bingham
@ 2017-04-28 7:09 ` Simon Horman
2017-04-28 8:47 ` Kieran Bingham
5 siblings, 1 reply; 16+ messages in thread
From: Simon Horman @ 2017-04-28 7:09 UTC (permalink / raw)
To: Kieran Bingham
Cc: laurent.pinchart, niklas.soderlund, sakari.ailus, linux-media,
linux-renesas-soc, linux-kernel, Kieran Bingham
On Thu, Apr 27, 2017 at 07:25:59PM +0100, Kieran Bingham wrote:
> From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
>
> This is an RFC for the Analog Devices ADV748x driver, and follows on from a
> previous posting by Niklas Söderlund [0] of an earlier incarnation of this
> driver.
...
> This series presents the following patches:
>
> [PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous
> [PATCH 2/5] rcar-vin: Match sources against ports if specified.
> [PATCH 3/5] media: i2c: adv748x: add adv748x driver
> [PATCH 4/5] arm64: dts: r8a7795: salvator-x: enable VIN, CSI and ADV7482
> [PATCH 5/5] arm64: dts: r8a7796: salvator-x: enable VIN, CSI and ADV7482
I am marking the above dts patches as "RFC" and do not plan to apply them
unless you ping me or repost them. Assuming they don't cause any
regressions I would be happy to consider applying them as soon as their
dependencies are accepted.
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver
2017-04-28 7:09 ` [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver Simon Horman
@ 2017-04-28 8:47 ` Kieran Bingham
2017-05-01 8:32 ` Simon Horman
0 siblings, 1 reply; 16+ messages in thread
From: Kieran Bingham @ 2017-04-28 8:47 UTC (permalink / raw)
To: Simon Horman, Kieran Bingham
Cc: laurent.pinchart, niklas.soderlund, sakari.ailus, linux-media,
linux-renesas-soc, linux-kernel
Hi Simon,
On 28/04/17 08:09, Simon Horman wrote:
> On Thu, Apr 27, 2017 at 07:25:59PM +0100, Kieran Bingham wrote:
>> From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
>>
>> This is an RFC for the Analog Devices ADV748x driver, and follows on from a
>> previous posting by Niklas Söderlund [0] of an earlier incarnation of this
>> driver.
>
> ...
>
>> This series presents the following patches:
>>
>> [PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous
>> [PATCH 2/5] rcar-vin: Match sources against ports if specified.
>> [PATCH 3/5] media: i2c: adv748x: add adv748x driver
>> [PATCH 4/5] arm64: dts: r8a7795: salvator-x: enable VIN, CSI and ADV7482
>> [PATCH 5/5] arm64: dts: r8a7796: salvator-x: enable VIN, CSI and ADV7482
>
> I am marking the above dts patches as "RFC" and do not plan to apply them
> unless you ping me or repost them.
Yes, sorry - the whole series was supposed to be marked as RFC, but I didn't
think about it - and apparently only applied the tag to the cover letter.
Apologies for any confusion.
> Assuming they don't cause any
> regressions I would be happy to consider applying them as soon as their
> dependencies are accepted.
Does that mean you've done a cursory glance over the content ? :-)
In this instance, the port numbers need to revert back to a zero-base, but I
would appreciate an eye on how and where I've put the representation of the
physical hdmi/cvbs connectors. Having modified plenty of DT, but not actually
submitted much - I still feel 'new' at it - so I'm sure I may not have followed
the standards quite right yet.
The dts patches are based heavily on the previous posting by Niklas, but I have
extended to put the extra hdmi and cvbs links in.
Regards
--
Kieran
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 4/5] arm64: dts: r8a7795: salvator-x: enable VIN, CSI and ADV7482
2017-04-27 18:26 ` [PATCH 4/5] arm64: dts: r8a7795: salvator-x: enable VIN, CSI and ADV7482 Kieran Bingham
@ 2017-04-28 8:52 ` Sergei Shtylyov
2017-04-28 10:04 ` Geert Uytterhoeven
0 siblings, 1 reply; 16+ messages in thread
From: Sergei Shtylyov @ 2017-04-28 8:52 UTC (permalink / raw)
To: Kieran Bingham, laurent.pinchart, niklas.soderlund, sakari.ailus
Cc: linux-media, linux-renesas-soc, linux-kernel, Kieran Bingham
Hello!
On 4/27/2017 9:26 PM, Kieran Bingham wrote:
> From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
>
> Provide bindings between the VIN, CSI and the ADV7482 on the r8a7795.
>
> Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> ---
> arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 129 +++++++++++++++++++++
> 1 file changed, 129 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
> index 27b9bae60dc0..a20623faa9d2 100644
> --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
> +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
[...]
> @@ -387,6 +403,50 @@
> };
> };
>
> +&i2c4 {
> + status = "okay";
> +
> + clock-frequency = <100000>;
> +
> + video_receiver@70 {
Hyphens are preferred in the node names.
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 4/5] arm64: dts: r8a7795: salvator-x: enable VIN, CSI and ADV7482
2017-04-28 8:52 ` Sergei Shtylyov
@ 2017-04-28 10:04 ` Geert Uytterhoeven
2017-04-28 10:05 ` Kieran Bingham
0 siblings, 1 reply; 16+ messages in thread
From: Geert Uytterhoeven @ 2017-04-28 10:04 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: Kieran Bingham, Laurent Pinchart, Niklas Söderlund,
Sakari Ailus, Linux Media Mailing List, Linux-Renesas,
linux-kernel, Kieran Bingham
On Fri, Apr 28, 2017 at 10:52 AM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> On 4/27/2017 9:26 PM, Kieran Bingham wrote:
>> --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
>> +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
>
> [...]
>>
>> @@ -387,6 +403,50 @@
>> };
>> };
>>
>> +&i2c4 {
>> + status = "okay";
>> +
>> + clock-frequency = <100000>;
>> +
>> + video_receiver@70 {
>
>
> Hyphens are preferred in the node names.
Definitely: make W=1 dtbs
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] 16+ messages in thread
* Re: [PATCH 4/5] arm64: dts: r8a7795: salvator-x: enable VIN, CSI and ADV7482
2017-04-28 10:04 ` Geert Uytterhoeven
@ 2017-04-28 10:05 ` Kieran Bingham
0 siblings, 0 replies; 16+ messages in thread
From: Kieran Bingham @ 2017-04-28 10:05 UTC (permalink / raw)
To: Geert Uytterhoeven, Sergei Shtylyov
Cc: Kieran Bingham, Laurent Pinchart, Niklas Söderlund,
Sakari Ailus, Linux Media Mailing List, Linux-Renesas,
linux-kernel
On 28/04/17 11:04, Geert Uytterhoeven wrote:
> On Fri, Apr 28, 2017 at 10:52 AM, Sergei Shtylyov
> <sergei.shtylyov@cogentembedded.com> wrote:
>> On 4/27/2017 9:26 PM, Kieran Bingham wrote:
>>> --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
>>> +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
>>
>> [...]
>>>
>>> @@ -387,6 +403,50 @@
>>> };
>>> };
>>>
>>> +&i2c4 {
>>> + status = "okay";
>>> +
>>> + clock-frequency = <100000>;
>>> +
>>> + video_receiver@70 {
>>
>>
>> Hyphens are preferred in the node names.
>
> Definitely: make W=1 dtbs
Thanks guys, - I didn't know about that one.
I'll update my build script so it's always in place :)
--
Regards
Kieran
> 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] 16+ messages in thread
* Re: [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver
2017-04-28 8:47 ` Kieran Bingham
@ 2017-05-01 8:32 ` Simon Horman
0 siblings, 0 replies; 16+ messages in thread
From: Simon Horman @ 2017-05-01 8:32 UTC (permalink / raw)
To: kieran.bingham
Cc: Kieran Bingham, laurent.pinchart, niklas.soderlund, sakari.ailus,
linux-media, linux-renesas-soc, linux-kernel
On Fri, Apr 28, 2017 at 09:47:05AM +0100, Kieran Bingham wrote:
> Hi Simon,
>
> On 28/04/17 08:09, Simon Horman wrote:
> > On Thu, Apr 27, 2017 at 07:25:59PM +0100, Kieran Bingham wrote:
> >> From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> >>
> >> This is an RFC for the Analog Devices ADV748x driver, and follows on from a
> >> previous posting by Niklas Söderlund [0] of an earlier incarnation of this
> >> driver.
> >
> > ...
> >
> >> This series presents the following patches:
> >>
> >> [PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous
> >> [PATCH 2/5] rcar-vin: Match sources against ports if specified.
> >> [PATCH 3/5] media: i2c: adv748x: add adv748x driver
> >> [PATCH 4/5] arm64: dts: r8a7795: salvator-x: enable VIN, CSI and ADV7482
> >> [PATCH 5/5] arm64: dts: r8a7796: salvator-x: enable VIN, CSI and ADV7482
> >
> > I am marking the above dts patches as "RFC" and do not plan to apply them
> > unless you ping me or repost them.
>
> Yes, sorry - the whole series was supposed to be marked as RFC, but I didn't
> think about it - and apparently only applied the tag to the cover letter.
>
> Apologies for any confusion.
It was clear enough, though an tag RFC in every patch would be better.
In any case I was referring to how I have handled these patches in
patchwork.
Apologies for any confusion.
> > Assuming they don't cause any
> > regressions I would be happy to consider applying them as soon as their
> > dependencies are accepted.
>
> Does that mean you've done a cursory glance over the content ? :-)
Yes, I did take a quick glance.
> In this instance, the port numbers need to revert back to a zero-base,
> but I would appreciate an eye on how and where I've put the
> representation of the physical hdmi/cvbs connectors. Having modified
> plenty of DT, but not actually submitted much - I still feel 'new' at it
> - so I'm sure I may not have followed the standards quite right yet.
Assuming you are talking about where in the DT file the hdmi and cvbs nodes
should go, I think this is somewhat arbitrary so long as they are within
the top-level node - what you have looks good to me.
> The dts patches are based heavily on the previous posting by Niklas, but I have
> extended to put the extra hdmi and cvbs links in.
>
> Regards
> --
> Kieran
>
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2017-05-01 8:33 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-27 18:25 [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver Kieran Bingham
2017-04-27 18:26 ` [PATCH 1/5] v4l2-subdev: Provide a port mapping for asynchronous subdevs Kieran Bingham
2017-04-27 21:43 ` Sakari Ailus
2017-04-27 22:13 ` Kieran Bingham
2017-04-27 22:49 ` Sakari Ailus
2017-04-28 0:00 ` Kieran Bingham
2017-04-27 18:26 ` [PATCH 2/5] rcar-vin: Match sources against ports if specified Kieran Bingham
2017-04-27 18:26 ` [PATCH 3/5] media: i2c: adv748x: add adv748x driver Kieran Bingham
2017-04-27 18:26 ` [PATCH 4/5] arm64: dts: r8a7795: salvator-x: enable VIN, CSI and ADV7482 Kieran Bingham
2017-04-28 8:52 ` Sergei Shtylyov
2017-04-28 10:04 ` Geert Uytterhoeven
2017-04-28 10:05 ` Kieran Bingham
2017-04-27 18:26 ` [PATCH 5/5] arm64: dts: r8a7796: " Kieran Bingham
2017-04-28 7:09 ` [PATCH 0/5] RFC: ADV748x HDMI/Analog video receiver Simon Horman
2017-04-28 8:47 ` Kieran Bingham
2017-05-01 8:32 ` Simon Horman
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).