Re: [PATCH v2 2/2] adv7604: Use DT parsing in dummy creation
Hi Jean-Michel,
Thank you for the patch.
On Friday 29 August 2014 17:15:03 Jean-Michel Hautbois wrote:
This patch uses DT in order to parse addresses for dummy devices of adv7604.
The ADV7604 has thirteen 256-byte maps that can be accessed via the main
I²C ports. Each map has it own I²C address and acts
as a standard slave device on the I²C bus.
If nothing is defined, it uses default addresses.
The main prupose is using two adv76xx on the same i2c bus.
Signed-off-by: Jean-Michel Hautbois jean-michel.hautb...@vodalys.com
---
.../devicetree/bindings/media/i2c/adv7604.txt | 17 +-
drivers/media/i2c/adv7604.c| 60 ---
2 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/Documentation/devicetree/bindings/media/i2c/adv7604.txt
b/Documentation/devicetree/bindings/media/i2c/adv7604.txt index
c27cede..8486b5c 100644
--- a/Documentation/devicetree/bindings/media/i2c/adv7604.txt
+++ b/Documentation/devicetree/bindings/media/i2c/adv7604.txt
@@ -10,8 +10,12 @@ Required Properties:
- compatible: Must contain one of the following
- adi,adv7611 for the ADV7611
+- adi,adv7604 for the ADV7604
Addition of ADV7604 support is unrelated to the subject and needs to be split
into a separate patch.
- - reg: I2C slave address
+ - reg: I2C slave addresses
+The ADV7604 has thirteen 256-byte maps that can be accessed via the
main
+I²C ports. Each map has it own I²C address and acts
+as a standard slave device on the I²C bus.
- hpd-gpios: References to the GPIOs that control the HDMI hot-plug
detection pins, one per HDMI input. The active flag indicates the GPIO
@@ -32,6 +36,12 @@ The digital output port node must contain at least one
endpoint. Optional Properties:
- reset-gpios: Reference to the GPIO connected to the device's reset pin.
+ - reg-names : Names of maps with programmable addresses.
+ It can contain any map needing another address than default one.
+ Possible maps names are :
+ADV7604 : main, avlink, cec, infoframe, esdp, dpp, afe,
rep,
+ edid, hdmi, test, cp, vdp
+ADV7611 : main, cec, infoframe, afe, rep, edid, hdmi, cp
Optional Endpoint Properties:
@@ -50,7 +60,10 @@ Example:
hdmi_receiver@4c {
compatible = adi,adv7611;
- reg = 0x4c;
+ /* edid page will be accessible @ 0x66 on i2c bus */
+ /* other maps keep their default addresses */
+ reg = 0x4c 0x66;
+ reg-names = main, edid;
reset-gpios = ioexp 0 GPIO_ACTIVE_LOW;
hpd-gpios = ioexp 2 GPIO_ACTIVE_HIGH;
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index d4fa213..56037dd 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -326,6 +326,22 @@ static const struct adv7604_video_standards
adv7604_prim_mode_hdmi_gr[] = { { },
};
+static const char const *adv7604_secondary_names[] = {
+ main, /* ADV7604_PAGE_IO */
+ avlink, /* ADV7604_PAGE_AVLINK */
+ cec, /* ADV7604_PAGE_CEC */
+ infoframe, /* ADV7604_PAGE_INFOFRAME */
+ esdp, /* ADV7604_PAGE_ESDP */
+ dpp, /* ADV7604_PAGE_DPP */
+ afe, /* ADV7604_PAGE_AFE */
+ rep, /* ADV7604_PAGE_REP */
+ edid, /* ADV7604_PAGE_EDID */
+ hdmi, /* ADV7604_PAGE_HDMI */
+ test, /* ADV7604_PAGE_TEST */
+ cp, /* ADV7604_PAGE_CP */
+ vdp /* ADV7604_PAGE_VDP */
+};
+
/* ---
*/
static inline struct adv7604_state *to_state(struct v4l2_subdev *sd)
@@ -2528,13 +2544,31 @@ static void adv7604_unregister_clients(struct
adv7604_state *state) }
static struct i2c_client *adv7604_dummy_client(struct v4l2_subdev *sd,
- u8 addr, u8 io_reg)
+ unsigned int i)
{
struct i2c_client *client = v4l2_get_subdevdata(sd);
+ struct adv7604_platform_data *pdata = client-dev.platform_data;
+ unsigned int io_reg = 0xf2 + i;
+ unsigned int default_addr = io_read(sd, io_reg) 1;
This modifies the behaviour of the driver. It previously used fixed default
addresses in the DT case, and now defaults to whatever has been programmed in
the chip. This might not be an issue in itself, but it should be documented in
the commit message (and possibly split to a separate patch).
+ struct i2c_client *new_client;
+
+ if (IS_ENABLED(CONFIG_OF)) {
+ /* Try to find it in DT */
+ new_client = i2c_new_secondary_device(client,
+ adv7604_secondary_names[i], default_addr);
+ } else if (pdata) {
+ if (pdata-i2c_addresses[i])
+ new_client = i2c_new_dummy(client-adapter,
+ pdata-i2c_addresses[i]);
+ else
+
[PATCH v2 2/2] adv7604: Use DT parsing in dummy creation
This patch uses DT in order to parse addresses for dummy devices of adv7604.
The ADV7604 has thirteen 256-byte maps that can be accessed via the main
I²C ports. Each map has it own I²C address and acts
as a standard slave device on the I²C bus.
If nothing is defined, it uses default addresses.
The main prupose is using two adv76xx on the same i2c bus.
Signed-off-by: Jean-Michel Hautbois jean-michel.hautb...@vodalys.com
---
.../devicetree/bindings/media/i2c/adv7604.txt | 17 +-
drivers/media/i2c/adv7604.c| 60 ++
2 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/Documentation/devicetree/bindings/media/i2c/adv7604.txt
b/Documentation/devicetree/bindings/media/i2c/adv7604.txt
index c27cede..8486b5c 100644
--- a/Documentation/devicetree/bindings/media/i2c/adv7604.txt
+++ b/Documentation/devicetree/bindings/media/i2c/adv7604.txt
@@ -10,8 +10,12 @@ Required Properties:
- compatible: Must contain one of the following
- adi,adv7611 for the ADV7611
+- adi,adv7604 for the ADV7604
- - reg: I2C slave address
+ - reg: I2C slave addresses
+The ADV7604 has thirteen 256-byte maps that can be accessed via the main
+I²C ports. Each map has it own I²C address and acts
+as a standard slave device on the I²C bus.
- hpd-gpios: References to the GPIOs that control the HDMI hot-plug
detection pins, one per HDMI input. The active flag indicates the GPIO
@@ -32,6 +36,12 @@ The digital output port node must contain at least one
endpoint.
Optional Properties:
- reset-gpios: Reference to the GPIO connected to the device's reset pin.
+ - reg-names : Names of maps with programmable addresses.
+ It can contain any map needing another address than default one.
+ Possible maps names are :
+ADV7604 : main, avlink, cec, infoframe, esdp, dpp, afe, rep,
+ edid, hdmi, test, cp, vdp
+ADV7611 : main, cec, infoframe, afe, rep, edid, hdmi, cp
Optional Endpoint Properties:
@@ -50,7 +60,10 @@ Example:
hdmi_receiver@4c {
compatible = adi,adv7611;
- reg = 0x4c;
+ /* edid page will be accessible @ 0x66 on i2c bus */
+ /* other maps keep their default addresses */
+ reg = 0x4c 0x66;
+ reg-names = main, edid;
reset-gpios = ioexp 0 GPIO_ACTIVE_LOW;
hpd-gpios = ioexp 2 GPIO_ACTIVE_HIGH;
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index d4fa213..56037dd 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -326,6 +326,22 @@ static const struct adv7604_video_standards
adv7604_prim_mode_hdmi_gr[] = {
{ },
};
+static const char const *adv7604_secondary_names[] = {
+ main, /* ADV7604_PAGE_IO */
+ avlink, /* ADV7604_PAGE_AVLINK */
+ cec, /* ADV7604_PAGE_CEC */
+ infoframe, /* ADV7604_PAGE_INFOFRAME */
+ esdp, /* ADV7604_PAGE_ESDP */
+ dpp, /* ADV7604_PAGE_DPP */
+ afe, /* ADV7604_PAGE_AFE */
+ rep, /* ADV7604_PAGE_REP */
+ edid, /* ADV7604_PAGE_EDID */
+ hdmi, /* ADV7604_PAGE_HDMI */
+ test, /* ADV7604_PAGE_TEST */
+ cp, /* ADV7604_PAGE_CP */
+ vdp /* ADV7604_PAGE_VDP */
+};
+
/* --- */
static inline struct adv7604_state *to_state(struct v4l2_subdev *sd)
@@ -2528,13 +2544,31 @@ static void adv7604_unregister_clients(struct
adv7604_state *state)
}
static struct i2c_client *adv7604_dummy_client(struct v4l2_subdev *sd,
- u8 addr, u8 io_reg)
+ unsigned int i)
{
struct i2c_client *client = v4l2_get_subdevdata(sd);
+ struct adv7604_platform_data *pdata = client-dev.platform_data;
+ unsigned int io_reg = 0xf2 + i;
+ unsigned int default_addr = io_read(sd, io_reg) 1;
+ struct i2c_client *new_client;
+
+ if (IS_ENABLED(CONFIG_OF)) {
+ /* Try to find it in DT */
+ new_client = i2c_new_secondary_device(client,
+ adv7604_secondary_names[i], default_addr);
+ } else if (pdata) {
+ if (pdata-i2c_addresses[i])
+ new_client = i2c_new_dummy(client-adapter,
+ pdata-i2c_addresses[i]);
+ else
+ new_client = i2c_new_dummy(client-adapter,
+ default_addr);
+ }
- if (addr)
- io_write(sd, io_reg, addr 1);
- return i2c_new_dummy(client-adapter, io_read(sd, io_reg) 1);
+ if (new_client)
+ io_write(sd, io_reg, new_client-addr 1);
+
+ return new_client;
}
static const struct adv7604_reg_seq adv7604_recommended_settings_afe[] = {
@@ -2677,6 +2711,7 @@
Re: [PATCH v2 2/2] adv7604: Use DT parsing in dummy creation
On 08/29/2014 05:15 PM, Jean-Michel Hautbois wrote:
This patch uses DT in order to parse addresses for dummy devices of adv7604.
The ADV7604 has thirteen 256-byte maps that can be accessed via the main
I²C ports. Each map has it own I²C address and acts
as a standard slave device on the I²C bus.
If nothing is defined, it uses default addresses.
The main prupose is using two adv76xx on the same i2c bus.
Ideally this patch is split up in two patches. One patch adding support for
i2c_new_secondary_device() and one patch adding support for DT for the adv7604.
[...]
+static const char const *adv7604_secondary_names[] = {
+ main, /* ADV7604_PAGE_IO */
How about [ADV7604_PAGE_IO] = main, instead of having the comment, this
makes things more explicit.
+ avlink, /* ADV7604_PAGE_AVLINK */
+ cec, /* ADV7604_PAGE_CEC */
+ infoframe, /* ADV7604_PAGE_INFOFRAME */
+ esdp, /* ADV7604_PAGE_ESDP */
+ dpp, /* ADV7604_PAGE_DPP */
+ afe, /* ADV7604_PAGE_AFE */
+ rep, /* ADV7604_PAGE_REP */
+ edid, /* ADV7604_PAGE_EDID */
+ hdmi, /* ADV7604_PAGE_HDMI */
+ test, /* ADV7604_PAGE_TEST */
+ cp, /* ADV7604_PAGE_CP */
+ vdp /* ADV7604_PAGE_VDP */
+};
+
/* --- */
static inline struct adv7604_state *to_state(struct v4l2_subdev *sd)
@@ -2528,13 +2544,31 @@ static void adv7604_unregister_clients(struct
adv7604_state *state)
}
static struct i2c_client *adv7604_dummy_client(struct v4l2_subdev *sd,
- u8 addr, u8 io_reg)
+ unsigned int i)
{
struct i2c_client *client = v4l2_get_subdevdata(sd);
+ struct adv7604_platform_data *pdata = client-dev.platform_data;
+ unsigned int io_reg = 0xf2 + i;
+ unsigned int default_addr = io_read(sd, io_reg) 1;
+ struct i2c_client *new_client;
+
+ if (IS_ENABLED(CONFIG_OF)) {
No CONFIG_OF. i2c_new_secondary_device() is supposed to be the generic
method of instantiating the secondary i2c_client, regardless of how the
address is specified. For this driver we still need to keep the old method
of instantiation via platform data for legacy reasons for now. So what this
should look like is:
if (pdata pdata-i2c_addresses[i])
new_client = i2c_new_dummy(client-adapter,
pdata-i2c_addresses[i]);
else
new_client = i2c_new_secondary_device(client,
adv7604_secondary_names[i], default_addr);
+ /* Try to find it in DT */
+ new_client = i2c_new_secondary_device(client,
+ adv7604_secondary_names[i], default_addr);
+ } else if (pdata) {
+ if (pdata-i2c_addresses[i])
+ new_client = i2c_new_dummy(client-adapter,
+ pdata-i2c_addresses[i]);
+ else
+ new_client = i2c_new_dummy(client-adapter,
+ default_addr);
+ }
[...]
--
To unsubscribe from this list: send the line unsubscribe linux-i2c in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
