From mboxrd@z Thu Jan 1 00:00:00 1970 From: "G, Manjunath Kondaiah" Subject: Re: [RFC PATCH 3/5] OMAP3: Beagle: Update beagle board file to use DT Date: Thu, 7 Jul 2011 22:34:08 +0530 Message-ID: <20110707170408.GB3124@manju-desktop> References: <1309426647-31587-1-git-send-email-manjugk@ti.com> <1309426647-31587-4-git-send-email-manjugk@ti.com> <20110706190022.GL4871@ponder.secretlab.ca> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20110706190022.GL4871@ponder.secretlab.ca> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Grant Likely Cc: devicetree-discuss@lists.ozlabs.org, linux-omap@vger.kernel.org, ben-linux@fluff.org, linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org On Wed, Jul 06, 2011 at 01:00:22PM -0600, Grant Likely wrote: > On Thu, Jun 30, 2011 at 03:07:25PM +0500, G, Manjunath Kondaiah wrote: > > > > The beagle board file is updated to use i2c nodes from device > > tree data structures. > > > > Signed-off-by: G, Manjunath Kondaiah > > --- > > arch/arm/mach-omap2/board-omap3beagle.c | 24 ++++++++++++++++++++---- > > 1 files changed, 20 insertions(+), 4 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c > > index 213c4cd..db494aa 100644 > > --- a/arch/arm/mach-omap2/board-omap3beagle.c > > +++ b/arch/arm/mach-omap2/board-omap3beagle.c > > @@ -20,6 +20,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -33,6 +34,7 @@ > > > > #include > > #include > > +#include > > > > #include > > #include > > @@ -421,8 +423,8 @@ static int __init omap3_beagle_i2c_init(void) > > omap3_pmic_init("twl4030", &beagle_twldata); > > /* Bus 3 is attached to the DVI port where devices like the pico DLP > > * projector don't work reliably with 400kHz */ > > +#if !defined(CONFIG_OF) > > omap_register_i2c_bus(3, 100, beagle_i2c_eeprom, ARRAY_SIZE(beagle_i2c_eeprom)); > > -#ifdef CONFIG_OF > > omap_register_i2c_bus(2, 100, NULL, 0); > > #endif /* CONFIG_OF */ > > return 0; > > @@ -565,11 +567,24 @@ static void __init beagle_opp_init(void) > > return; > > } > > > > +static struct of_device_id omap_dt_gic_match[] __initdata = { > > + { .compatible = "ti,omap-gic", }, > > + {} > > +}; > > + > > +static struct of_device_id omap_dt_match_table[] __initdata = { > > + { .compatible = "ti,omap3-beagle", }, > > + {} > > +}; > > + > > static void __init omap3_beagle_init(void) > > { > > -#ifdef CONFIG_OF > > - of_platform_prepare(NULL, NULL); > > -#endif /* CONFIG_OF */ > > + struct device_node *node; > > + > > + node = of_find_matching_node_by_address(NULL, omap_dt_gic_match, > > + OMAP34XX_IC_BASE); > > + if (node) > > + irq_domain_add_simple(node, 0); > > > > omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); > > omap3_beagle_init_rev(); > > @@ -597,6 +612,7 @@ static void __init omap3_beagle_init(void) > > > > beagle_display_init(); > > beagle_opp_init(); > > + of_platform_populate(NULL, omap_dt_match_table, NULL, NULL); > > This is probably a loosing approach. Until the DT stuff is stable on > omap, you should avoid doing anything that might break existing board > ports. Instead, I recommend creating an board-omap3-dt.c board file, > and pull in only the static beagle device registrations that you need > to get up and running, then you can pull them back out as the beagle > DT board support matures. yes. that is the plan. I have mentioned the same in PATCH 0/5 -Manjunath