Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754076AbaJVPbN (ORCPT ); Wed, 22 Oct 2014 11:31:13 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:42641 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754027AbaJVPbI (ORCPT ); Wed, 22 Oct 2014 11:31:08 -0400 From: Jean-Michel Hautbois To: linux-media@vger.kernel.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, wsa@the-dreams.de, lars@metafoo.de, Jean-Michel Hautbois Subject: [PATCH 2/2] adv7604: Add support for i2c_new_secondary_device Date: Wed, 22 Oct 2014 17:30:48 +0200 Message-Id: <1413991848-28495-2-git-send-email-jean-michel.hautbois@vodalys.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1413991848-28495-1-git-send-email-jean-michel.hautbois@vodalys.com> References: <1413991848-28495-1-git-send-email-jean-michel.hautbois@vodalys.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 purpose is using two adv76xx on the same i2c bus. Signed-off-by: Jean-Michel Hautbois --- .../devicetree/bindings/media/i2c/adv7604.txt | 16 +++++- drivers/media/i2c/adv7604.c | 59 ++++++++++++++-------- 2 files changed, 53 insertions(+), 22 deletions(-) diff --git a/Documentation/devicetree/bindings/media/i2c/adv7604.txt b/Documentation/devicetree/bindings/media/i2c/adv7604.txt index 5c8b3e6..8486b5c 100644 --- a/Documentation/devicetree/bindings/media/i2c/adv7604.txt +++ b/Documentation/devicetree/bindings/media/i2c/adv7604.txt @@ -12,7 +12,10 @@ Required Properties: - "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 @@ -33,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: @@ -51,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 421035f..e4e30a2 100644 --- a/drivers/media/i2c/adv7604.c +++ b/drivers/media/i2c/adv7604.c @@ -326,6 +326,27 @@ static const struct adv7604_video_standards adv7604_prim_mode_hdmi_gr[] = { { }, }; +struct adv7604_register { + const char *name; + u8 default_addr; +}; + +static const struct adv7604_register adv7604_secondary_names[] = { + [ADV7604_PAGE_IO] = { "main", 0x4c }, + [ADV7604_PAGE_AVLINK] = { "avlink", 0x42 }, + [ADV7604_PAGE_CEC] = { "cec", 0x40 }, + [ADV7604_PAGE_INFOFRAME] = { "infoframe", 0x3e }, + [ADV7604_PAGE_ESDP] = { "esdp", 0x38 }, + [ADV7604_PAGE_DPP] = { "dpp", 0x3c }, + [ADV7604_PAGE_AFE] = { "afe", 0x26 }, + [ADV7604_PAGE_REP] = { "rep", 0x32 }, + [ADV7604_PAGE_EDID] = { "edid", 0x36 }, + [ADV7604_PAGE_HDMI] = { "hdmi", 0x34 }, + [ADV7604_PAGE_TEST] = { "test", 0x30 }, + [ADV7604_PAGE_CP] = { "cp", 0x22 }, + [ADV7604_PAGE_VDP] = { "vdp", 0x24 }, +}; + /* ----------------------------------------------------------------------- */ static inline struct adv7604_state *to_state(struct v4l2_subdev *sd) @@ -2528,13 +2549,26 @@ 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 (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].name, + adv7604_secondary_names[i].default_addr); + + if (new_client) + io_write(sd, io_reg, new_client->addr << 1); - if (addr) - io_write(sd, io_reg, addr << 1); - return i2c_new_dummy(client->adapter, io_read(sd, io_reg) >> 1); + return new_client; } static const struct adv7604_reg_seq adv7604_recommended_settings_afe[] = { @@ -2718,20 +2752,6 @@ static int adv7604_parse_dt(struct adv7604_state *state) /* Disable the interrupt for now as no DT-based board uses it. */ state->pdata.int1_config = ADV7604_INT1_CONFIG_DISABLED; - /* Use the default I2C addresses. */ - state->pdata.i2c_addresses[ADV7604_PAGE_AVLINK] = 0x42; - state->pdata.i2c_addresses[ADV7604_PAGE_CEC] = 0x40; - state->pdata.i2c_addresses[ADV7604_PAGE_INFOFRAME] = 0x3e; - state->pdata.i2c_addresses[ADV7604_PAGE_ESDP] = 0x38; - state->pdata.i2c_addresses[ADV7604_PAGE_DPP] = 0x3c; - state->pdata.i2c_addresses[ADV7604_PAGE_AFE] = 0x26; - state->pdata.i2c_addresses[ADV7604_PAGE_REP] = 0x32; - state->pdata.i2c_addresses[ADV7604_PAGE_EDID] = 0x36; - state->pdata.i2c_addresses[ADV7604_PAGE_HDMI] = 0x34; - state->pdata.i2c_addresses[ADV7604_PAGE_TEST] = 0x30; - state->pdata.i2c_addresses[ADV7604_PAGE_CP] = 0x22; - state->pdata.i2c_addresses[ADV7604_PAGE_VDP] = 0x24; - /* Hardcode the remaining platform data fields. */ state->pdata.disable_pwrdnb = 0; state->pdata.disable_cable_det_rst = 0; @@ -2892,8 +2912,7 @@ static int adv7604_probe(struct i2c_client *client, continue; state->i2c_clients[i] = - adv7604_dummy_client(sd, state->pdata.i2c_addresses[i], - 0xf2 + i); + adv7604_dummy_client(sd, i); if (state->i2c_clients[i] == NULL) { err = -ENOMEM; v4l2_err(sd, "failed to create i2c client %u\n", i); -- 2.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/