linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: b-cousson@ti.com (Benoit Cousson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/7] OMAP3: beagleboard: Remove DT support from regular board
Date: Thu, 1 Sep 2011 19:25:12 +0200	[thread overview]
Message-ID: <1314897912-18178-8-git-send-email-b-cousson@ti.com> (raw)
In-Reply-To: <1314897912-18178-1-git-send-email-b-cousson@ti.com>

In order to avoid conflict with the new board-omap3-dt.c file,
remove the .dt_compat entry from the beagle regular board
file.

Any DT work for OMAP3 will have to be done on the generic DT
board file to avoid breaking the legacy board support until
DT migration is done.

Based on orginal patch fropm Manju:
http://www.spinics.net/lists/linux-omap/msg55832.html

Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: G, Manjunath Kondaiah <manjugk@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/board-omap3beagle.c |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index a7923ca..2c358a2 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -19,7 +19,6 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/of_platform.h>
 #include <linux/leds.h>
 #include <linux/gpio.h>
 #include <linux/input.h>
@@ -388,9 +387,7 @@ static int __init omap3_beagle_i2c_init(void)
 	/* Bus 3 is attached to the DVI port where devices like the pico DLP
 	 * projector don't work reliably with 400kHz */
 	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;
 }
 
@@ -528,10 +525,6 @@ static void __init beagle_opp_init(void)
 
 static void __init omap3_beagle_init(void)
 {
-#ifdef CONFIG_OF
-	of_platform_prepare(NULL, NULL);
-#endif /* CONFIG_OF */
-
 	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
 	omap3_beagle_init_rev();
 	omap3_beagle_i2c_init();
@@ -563,11 +556,6 @@ static void __init omap3_beagle_init(void)
 	beagle_opp_init();
 }
 
-static const char *omap3_beagle_dt_match[] __initdata = {
-	"ti,omap3-beagle",
-	NULL
-};
-
 MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
 	/* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */
 	.boot_params	= 0x80000100,
@@ -577,5 +565,4 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
 	.init_irq	= omap3_beagle_init_irq,
 	.init_machine	= omap3_beagle_init,
 	.timer		= &omap3_secure_timer,
-	.dt_compat	= omap3_beagle_dt_match,
 MACHINE_END
-- 
1.7.0.4

  parent reply	other threads:[~2011-09-01 17:25 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-01 17:25 [PATCH 0/7] OMAP3: Add basic DT support + i2c + twl Benoit Cousson
2011-09-01 17:25 ` [PATCH 1/7] arm/dts: Add initial device-tree support for OMAP3 SoC Benoit Cousson
2011-09-01 17:25 ` [PATCH 2/7] arm/dts: OMAP3: Add mpu and iva nodes Benoit Cousson
2011-09-01 18:17   ` Arnd Bergmann
2011-09-05 15:05     ` Cousson, Benoit
2011-09-05 17:23       ` Arnd Bergmann
2011-09-05 17:46         ` Mitch Bradley
2011-09-06  7:15           ` Cousson, Benoit
2011-09-01 17:25 ` [PATCH 3/7] arm/dts: OMAP3: Add i2c controllers nodes Benoit Cousson
2011-09-01 17:25 ` [PATCH 4/7] arm/dts: omap3-beagle: Include the generic omap3.dtsi Benoit Cousson
2011-09-01 17:25 ` [PATCH 5/7] arm/dts: omap3-beagle: Add twl4030 and EEPROM i2c devices Benoit Cousson
2011-09-01 17:25 ` [PATCH 6/7] OMAP3: board-dt: Add generic board file for DT support Benoit Cousson
2011-09-02  8:09   ` Tony Lindgren
2011-09-02  8:46     ` Cousson, Benoit
2011-09-02  9:08       ` Russell King - ARM Linux
2011-09-02  9:13         ` Cousson, Benoit
2011-09-02  9:21           ` Russell King - ARM Linux
2011-09-02  9:34             ` Cousson, Benoit
2011-09-02 10:43       ` Tony Lindgren
2011-09-02 11:43         ` Cousson, Benoit
2011-09-02 11:57           ` Tony Lindgren
2011-09-02 12:20             ` Cousson, Benoit
2011-09-02 12:32               ` Tony Lindgren
2011-09-05 12:09   ` G, Manjunath Kondaiah
2011-09-01 17:25 ` Benoit Cousson [this message]
2011-09-02  8:12   ` [PATCH 7/7] OMAP3: beagleboard: Remove DT support from regular board Tony Lindgren
2011-09-02  8:59     ` Cousson, Benoit
2011-09-02 10:48       ` Tony Lindgren
2011-09-02 12:35         ` Cousson, Benoit
2011-09-02 13:08           ` Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1314897912-18178-8-git-send-email-b-cousson@ti.com \
    --to=b-cousson@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).