Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755967Ab3EHCCA (ORCPT ); Tue, 7 May 2013 22:02:00 -0400 Received: from perceval.ideasonboard.com ([95.142.166.194]:55045 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752219Ab3EHCB6 (ORCPT ); Tue, 7 May 2013 22:01:58 -0400 From: Laurent Pinchart To: Prabhakar Lad Cc: Arnd Bergmann , Sascha Hauer , LMML , Mauro Carvalho Chehab , DLOS , Hans Verkuil , Guennadi Liakhovetski , LKML , Sakari Ailus , Sylwester Nawrocki , Grant Likely , Rob Herring , Rob Landley , devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org Subject: Re: [PATCH RFC v3] media: i2c: mt9p031: add OF support Date: Wed, 08 May 2013 04:02:12 +0200 Message-ID: <124364082.ILKsvVk9ro@avalon> User-Agent: KMail/4.10.2 (Linux/3.7.10-gentoo-r1; KDE/4.10.2; x86_64; ; ) In-Reply-To: References: <1367563919-2880-1-git-send-email-prabhakar.csengg@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2105 Lines: 60 Hi Prabhakar, On Tuesday 07 May 2013 15:10:36 Prabhakar Lad wrote: > On Mon, May 6, 2013 at 8:29 PM, Prabhakar Lad wrote: > > On Fri, May 3, 2013 at 8:04 PM, Arnd Bergmann wrote: > >> On Friday 03 May 2013, Prabhakar Lad wrote: > > [snip] > > > >>> +} > >> > >> Ok, good. > >> > >>> @@ -955,7 +998,17 @@ static int mt9p031_probe(struct i2c_client *client, > >>> > >>> mt9p031->pdata = pdata; > >>> mt9p031->output_control = MT9P031_OUTPUT_CONTROL_DEF; > >>> mt9p031->mode2 = MT9P031_READ_MODE_2_ROW_BLC; > >>> > >>> - mt9p031->model = did->driver_data; > >>> + > >>> + if (!client->dev.of_node) { > >>> + mt9p031->model = (enum mt9p031_model)did->driver_data; > >>> + } else { > >>> + const struct of_device_id *of_id; > >>> + > >>> + of_id = of_match_device(of_match_ptr(mt9p031_of_match), > >>> + &client->dev); > >>> + if (of_id) > >>> + mt9p031->model = (enum > >>> mt9p031_model)of_id->data; > >>> + } > >>> > >>> mt9p031->reset = -1; > >> > >> Is this actually required? I thought the i2c core just compared the > >> part of the "compatible" value after the first comma to the string, so > >> "mt9p031->model = (enum mt9p031_model)did->driver_data" should work > >> in both cases. > > > > I am OK with "mt9p031->model = (enum mt9p031_model)did->driver_data" > > but I see still few drivers doing this, I am not sure for what reason. > > If everyone is > > OK with it I can drop the above change. > > My bad, while booting with DT the i2c_device_id ie did in this case will be > NULL, so the above changes are required :-) I've just tested your patch, and did isn't NULL when booting my Beagleboard with DT (on v3.9-rc5). -- Regards, Laurent Pinchart -- 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/