From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755036AbdBGSQt (ORCPT ); Tue, 7 Feb 2017 13:16:49 -0500 Received: from mail-pg0-f54.google.com ([74.125.83.54]:35743 "EHLO mail-pg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754947AbdBGSQq (ORCPT ); Tue, 7 Feb 2017 13:16:46 -0500 From: Kevin Hilman To: Bartosz Golaszewski Cc: Sekhar Nori , Patrick Titiano , Michael Turquette , Rob Herring , Mark Rutland , Russell King , Alexandre Bailon , David Lechner , Laurent Pinchart , Mauro Carvalho Chehab , Lad Prabhakar , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Subject: Re: [PATCH 09/10] media: vpif: use a configurable i2c_adapter_id for vpif display Organization: BayLibre References: <1486485683-11427-1-git-send-email-bgolaszewski@baylibre.com> <1486485683-11427-10-git-send-email-bgolaszewski@baylibre.com> Date: Tue, 07 Feb 2017 10:16:44 -0800 In-Reply-To: <1486485683-11427-10-git-send-email-bgolaszewski@baylibre.com> (Bartosz Golaszewski's message of "Tue, 7 Feb 2017 17:41:22 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (darwin) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Bartosz Golaszewski writes: > The vpif display driver uses a static i2c adapter ID of 1 but on the > da850-evm board in DT boot mode the i2c adapter ID is actually 0. > > Make the adapter ID configurable like it already is for vpif capture. > > Signed-off-by: Bartosz Golaszewski Acked-by: Kevin Hilman > --- > arch/arm/mach-davinci/board-da850-evm.c | 1 + > drivers/media/platform/davinci/vpif_display.c | 2 +- > include/media/davinci/vpif_types.h | 1 + > 3 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c > index e5d4ded..fe0bfa7 100644 > --- a/arch/arm/mach-davinci/board-da850-evm.c > +++ b/arch/arm/mach-davinci/board-da850-evm.c > @@ -1290,6 +1290,7 @@ static struct vpif_display_config da850_vpif_display_config = { > .output_count = ARRAY_SIZE(da850_ch0_outputs), > }, > .card_name = "DA850/OMAP-L138 Video Display", > + .i2c_adapter_id = 1, > }; > > static __init void da850_vpif_init(void) > diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c > index 50c3073..7e5cf99 100644 > --- a/drivers/media/platform/davinci/vpif_display.c > +++ b/drivers/media/platform/davinci/vpif_display.c > @@ -1287,7 +1287,7 @@ static __init int vpif_probe(struct platform_device *pdev) > } > > if (!vpif_obj.config->asd_sizes) { > - i2c_adap = i2c_get_adapter(1); > + i2c_adap = i2c_get_adapter(vpif_obj.config->i2c_adapter_id); > for (i = 0; i < subdev_count; i++) { > vpif_obj.sd[i] = > v4l2_i2c_new_subdev_board(&vpif_obj.v4l2_dev, > diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h > index 4282a7d..0c72b46 100644 > --- a/include/media/davinci/vpif_types.h > +++ b/include/media/davinci/vpif_types.h > @@ -57,6 +57,7 @@ struct vpif_display_config { > int (*set_clock)(int, int); > struct vpif_subdev_info *subdevinfo; > int subdev_count; > + int i2c_adapter_id; > struct vpif_display_chan_config chan_config[VPIF_DISPLAY_MAX_CHANNELS]; > const char *card_name; > struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */