lkml.org 
[lkml]   [2018]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] media: adv7604: Add support for i2c_new_secondary_device
    Date
    From: Jean-Michel Hautbois <jean-michel.hautbois@vodalys.com>

    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.

    Allow a device tree node to override the default addresses so that
    address conflicts with other devices on the same bus may be resolved at
    the board description level.

    Signed-off-by: Jean-Michel Hautbois <jean-michel.hautbois@vodalys.com>
    [Kieran: Re-adapted for mainline]
    Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
    ---
    Based upon the original posting :
    https://lkml.org/lkml/2014/10/22/469
    ---
    .../devicetree/bindings/media/i2c/adv7604.txt | 18 ++++++-
    drivers/media/i2c/adv7604.c | 60 ++++++++++++++--------
    2 files changed, 55 insertions(+), 23 deletions(-)

    diff --git a/Documentation/devicetree/bindings/media/i2c/adv7604.txt b/Documentation/devicetree/bindings/media/i2c/adv7604.txt
    index 9cbd92eb5d05..b64e313dcc66 100644
    --- a/Documentation/devicetree/bindings/media/i2c/adv7604.txt
    +++ b/Documentation/devicetree/bindings/media/i2c/adv7604.txt
    @@ -13,7 +13,11 @@ Required Properties:
    - "adi,adv7611" for the ADV7611
    - "adi,adv7612" for the ADV7612

    - - reg: I2C slave address
    + - reg: I2C slave addresses
    + The ADV76xx has up to 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. The main address is mandatory, others are
    + optional and revert to defaults if not specified.

    - hpd-gpios: References to the GPIOs that control the HDMI hot-plug
    detection pins, one per HDMI input. The active flag indicates the GPIO
    @@ -35,6 +39,11 @@ Optional Properties:

    - reset-gpios: Reference to the GPIO connected to the device's reset pin.
    - default-input: Select which input is selected after reset.
    + - reg-names : Names of maps with programmable addresses.
    + It can contain any map needing a non-default address.
    + Possible maps names are :
    + "main", "avlink", "cec", "infoframe", "esdp", "dpp", "afe",
    + "rep", "edid", "hdmi", "test", "cp", "vdp"

    Optional Endpoint Properties:

    @@ -52,7 +61,12 @@ Example:

    hdmi_receiver@4c {
    compatible = "adi,adv7611";
    - reg = <0x4c>;
    + /*
    + * The edid page will be accessible @ 0x66 on the i2c bus. All
    + * other maps will retain 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 1544920ec52d..c346b9a8fb57 100644
    --- a/drivers/media/i2c/adv7604.c
    +++ b/drivers/media/i2c/adv7604.c
    @@ -2734,6 +2734,27 @@ static const struct v4l2_ctrl_config adv76xx_ctrl_free_run_color = {

    /* ----------------------------------------------------------------------- */

    +struct adv76xx_register {
    + const char *name;
    + u8 default_addr;
    +};
    +
    +static const struct adv76xx_register adv76xx_secondary_names[] = {
    + [ADV76XX_PAGE_IO] = { "main", 0x4c },
    + [ADV7604_PAGE_AVLINK] = { "avlink", 0x42 },
    + [ADV76XX_PAGE_CEC] = { "cec", 0x40 },
    + [ADV76XX_PAGE_INFOFRAME] = { "infoframe", 0x3e },
    + [ADV7604_PAGE_ESDP] = { "esdp", 0x38 },
    + [ADV7604_PAGE_DPP] = { "dpp", 0x3c },
    + [ADV76XX_PAGE_AFE] = { "afe", 0x26 },
    + [ADV76XX_PAGE_REP] = { "rep", 0x32 },
    + [ADV76XX_PAGE_EDID] = { "edid", 0x36 },
    + [ADV76XX_PAGE_HDMI] = { "hdmi", 0x34 },
    + [ADV76XX_PAGE_TEST] = { "test", 0x30 },
    + [ADV76XX_PAGE_CP] = { "cp", 0x22 },
    + [ADV7604_PAGE_VDP] = { "vdp", 0x24 },
    +};
    +
    static int adv76xx_core_init(struct v4l2_subdev *sd)
    {
    struct adv76xx_state *state = to_state(sd);
    @@ -2834,13 +2855,26 @@ static void adv76xx_unregister_clients(struct adv76xx_state *state)
    }

    static struct i2c_client *adv76xx_dummy_client(struct v4l2_subdev *sd,
    - u8 addr, u8 io_reg)
    + unsigned int i)
    {
    struct i2c_client *client = v4l2_get_subdevdata(sd);
    + struct adv76xx_state *state = to_state(sd);
    + struct adv76xx_platform_data *pdata = &state->pdata;
    + unsigned int io_reg = 0xf2 + i;
    + 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,
    + adv76xx_secondary_names[i].name,
    + adv76xx_secondary_names[i].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 adv76xx_reg_seq adv7604_recommended_settings_afe[] = {
    @@ -3115,20 +3149,6 @@ static int adv76xx_parse_dt(struct adv76xx_state *state)
    /* Disable the interrupt for now as no DT-based board uses it. */
    state->pdata.int1_config = ADV76XX_INT1_CONFIG_DISABLED;

    - /* Use the default I2C addresses. */
    - state->pdata.i2c_addresses[ADV7604_PAGE_AVLINK] = 0x42;
    - state->pdata.i2c_addresses[ADV76XX_PAGE_CEC] = 0x40;
    - state->pdata.i2c_addresses[ADV76XX_PAGE_INFOFRAME] = 0x3e;
    - state->pdata.i2c_addresses[ADV7604_PAGE_ESDP] = 0x38;
    - state->pdata.i2c_addresses[ADV7604_PAGE_DPP] = 0x3c;
    - state->pdata.i2c_addresses[ADV76XX_PAGE_AFE] = 0x26;
    - state->pdata.i2c_addresses[ADV76XX_PAGE_REP] = 0x32;
    - state->pdata.i2c_addresses[ADV76XX_PAGE_EDID] = 0x36;
    - state->pdata.i2c_addresses[ADV76XX_PAGE_HDMI] = 0x34;
    - state->pdata.i2c_addresses[ADV76XX_PAGE_TEST] = 0x30;
    - state->pdata.i2c_addresses[ADV76XX_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;
    @@ -3478,9 +3498,7 @@ static int adv76xx_probe(struct i2c_client *client,
    if (!(BIT(i) & state->info->page_mask))
    continue;

    - state->i2c_clients[i] =
    - adv76xx_dummy_client(sd, state->pdata.i2c_addresses[i],
    - 0xf2 + i);
    + state->i2c_clients[i] = adv76xx_dummy_client(sd, i);
    if (!state->i2c_clients[i]) {
    err = -ENOMEM;
    v4l2_err(sd, "failed to create i2c client %u\n", i);
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-01-22 13:53    [W:3.831 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site