From patchwork Mon Mar 8 18:26:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 84127 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o28IQqn3017714 for ; Mon, 8 Mar 2010 18:26:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754320Ab0CHS0v (ORCPT ); Mon, 8 Mar 2010 13:26:51 -0500 Received: from qw-out-2122.google.com ([74.125.92.24]:61794 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753458Ab0CHS0v (ORCPT ); Mon, 8 Mar 2010 13:26:51 -0500 Received: by qw-out-2122.google.com with SMTP id 5so1185317qwd.37 for ; Mon, 08 Mar 2010 10:26:50 -0800 (PST) Received: by 10.224.44.11 with SMTP id y11mr46858qae.40.1268072804328; Mon, 08 Mar 2010 10:26:44 -0800 (PST) Received: from localhost (deeprootsystems.com [216.254.16.51]) by mx.google.com with ESMTPS id 22sm4799752iwn.8.2010.03.08.10.26.42 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 08 Mar 2010 10:26:42 -0800 (PST) From: Kevin Hilman To: linux-omap@vger.kernel.org Subject: [PATCH/RFT] OMAP4: fix temporary hacks that break multi-omap PM Date: Mon, 8 Mar 2010 10:26:40 -0800 Message-Id: <1268072800-11696-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.7.0.2 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 08 Mar 2010 18:26:52 +0000 (UTC) diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 81312b4..5d06b2a 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -339,11 +339,10 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, pr_err("Could not init clock framework - unknown CPU\n"); omap_serial_early_init(); -#ifndef CONFIG_ARCH_OMAP4 omap_hwmod_late_init(); omap_pm_if_init(); omap2_sdrc_init(sdrc_cs0, sdrc_cs1); _omap2_init_reprogram_sdrc(); -#endif + gpmc_init(); }