From patchwork Fri Dec 21 16:28:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Greer X-Patchwork-Id: 1903731 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 3BA5C3FE37 for ; Fri, 21 Dec 2012 16:28:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751609Ab2LUQ2j (ORCPT ); Fri, 21 Dec 2012 11:28:39 -0500 Received: from mail20.dotsterhost.com ([66.11.232.73]:38857 "EHLO mail20.dotsterhost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751293Ab2LUQ2f (ORCPT ); Fri, 21 Dec 2012 11:28:35 -0500 Received: (qmail 18339 invoked from network); 21 Dec 2012 16:28:32 -0000 Received: from unknown (HELO blue.animalcreek.com) (mgreer@animalcreek.com@[68.3.93.7]) by 66.11.232.73 with SMTP; 21 Dec 2012 16:28:32 -0000 Received: from blue.animalcreek.com (localhost [127.0.0.1]) by blue.animalcreek.com (Postfix) with ESMTP id 7E58865A6D; Fri, 21 Dec 2012 09:28:31 -0700 (MST) From: "Mark A. Greer" To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: paul@pwsan.com, "Mark A. Greer" Subject: [PATCH 05/15] ARM: OMAP2+: Only manually add hwmod data when DT not used. Date: Fri, 21 Dec 2012 09:28:05 -0700 Message-Id: <1356107295-11121-6-git-send-email-mgreer@animalcreek.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1356107295-11121-1-git-send-email-mgreer@animalcreek.com> References: <1356107295-11121-1-git-send-email-mgreer@animalcreek.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: "Mark A. Greer" The omap_init_sham() routine in devices.c only needs to be called when there is no device tree present. CC: Paul Walmsley Signed-off-by: Mark A. Greer --- arch/arm/mach-omap2/devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 598ab1e..c8f878a 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -672,10 +672,10 @@ static int __init omap2_init_devices(void) omap_init_dmic(); omap_init_mcpdm(); omap_init_mcspi(); + omap_init_sham(); } omap_init_sti(); omap_init_rng(); - omap_init_sham(); omap_init_aes(); omap_init_vout(); omap_init_ocp2scp();