From patchwork Tue Nov 27 00:03:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1807921 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 45D76DF2EF for ; Tue, 27 Nov 2012 00:03:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932936Ab2K0ADA (ORCPT ); Mon, 26 Nov 2012 19:03:00 -0500 Received: from perceval.ideasonboard.com ([95.142.166.194]:48913 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932968Ab2K0AC6 (ORCPT ); Mon, 26 Nov 2012 19:02:58 -0500 Received: from avalon.ideasonboard.com (unknown [91.178.20.73]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id BE44635B16; Tue, 27 Nov 2012 01:02:45 +0100 (CET) From: Laurent Pinchart To: linux-sh@vger.kernel.org Cc: Paul Mundt , Magnus Damm , Simon Horman , Linus Walleij , Kuninori Morimoto , Phil Edworthy , Nobuhiro Iwamatsu Subject: [PATCH v2 74/77] ARM: shmobile: armadillo: Populate platform devices from device tree Date: Tue, 27 Nov 2012 01:03:13 +0100 Message-Id: <1353974596-30033-75-git-send-email-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1353974596-30033-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> References: <1353974596-30033-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Call of_platform_populate() at machine initialization time to populate platform devices. Remove the explicit pinmux initialization as the PFC device will be instantiated from the device tree. Signed-off-by: Laurent Pinchart --- arch/arm/mach-shmobile/board-armadillo800eva.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index 3cc8b1c..ba81519 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -985,7 +986,8 @@ static void __init eva_init(void) regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers, ARRAY_SIZE(fixed3v3_power_consumers), 3300000); - r8a7740_pinmux_init(); + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + r8a7740_meram_workaround(); /* SCIFA1 */