From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ui1Me-0005Zy-Si for barebox@lists.infradead.org; Thu, 30 May 2013 11:49:56 +0000 From: Sascha Hauer Date: Thu, 30 May 2013 13:49:22 +0200 Message-Id: <1369914567-15650-4-git-send-email-s.hauer@pengutronix.de> In-Reply-To: <1369914567-15650-1-git-send-email-s.hauer@pengutronix.de> References: <1369914567-15650-1-git-send-email-s.hauer@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 3/8] ARM: i.MX6: skip devices register when devicetree is present To: barebox@lists.infradead.org When we have a devicetree, do not register the platform devices. Signed-off-by: Sascha Hauer --- arch/arm/mach-imx/imx6.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c index 7a7ce15..5c20aa1 100644 --- a/arch/arm/mach-imx/imx6.c +++ b/arch/arm/mach-imx/imx6.c @@ -57,6 +57,9 @@ static int imx6_init(void) { imx6_boot_save_loc((void *)MX6_SRC_BASE_ADDR); + if (of_get_root_node()) + return 0; + add_generic_device("imx-iomuxv3", 0, NULL, MX6_IOMUXC_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); add_generic_device("imx6-ccm", 0, NULL, MX6_CCM_BASE_ADDR, 0x4000, IORESOURCE_MEM, NULL); add_generic_device("imx31-gpt", 0, NULL, MX6_GPT_BASE_ADDR, 0x1000, IORESOURCE_MEM, NULL); -- 1.8.2.rc2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox