From patchwork Mon Mar 8 18:32:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 84128 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 o28IX094019378 for ; Mon, 8 Mar 2010 18:33:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753940Ab0CHSc6 (ORCPT ); Mon, 8 Mar 2010 13:32:58 -0500 Received: from mail-qy0-f198.google.com ([209.85.221.198]:36341 "EHLO mail-qy0-f198.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751969Ab0CHSc6 (ORCPT ); Mon, 8 Mar 2010 13:32:58 -0500 Received: by qyk36 with SMTP id 36so4519320qyk.19 for ; Mon, 08 Mar 2010 10:32:57 -0800 (PST) Received: by 10.224.34.145 with SMTP id l17mr34014qad.215.1268073153431; Mon, 08 Mar 2010 10:32:33 -0800 (PST) Received: from localhost (deeprootsystems.com [216.254.16.51]) by mx.google.com with ESMTPS id 20sm4813774iwn.9.2010.03.08.10.32.32 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 08 Mar 2010 10:32:32 -0800 (PST) From: Kevin Hilman To: linux-omap@vger.kernel.org Subject: [PATCH/RFT v2] OMAP4: fix temporary hacks that break multi-omap PM Date: Mon, 8 Mar 2010 10:32:31 -0800 Message-Id: <1268073151-12332-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:33:00 +0000 (UTC) diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 81312b4..daefe79 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -309,7 +309,6 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, { pwrdm_init(powerdomains_omap); clkdm_init(clockdomains_omap, clkdm_autodeps); -#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once the clkdev is ready */ #ifdef CONFIG_ARCH_OMAP2420 if (cpu_is_omap242x()) omap2420_hwmod_init(); @@ -325,7 +324,6 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, omap2_mux_init(); /* The OPP tables have to be registered before a clk init */ omap_pm_if_early_init(mpu_opps, dsp_opps, l3_opps); -#endif if (cpu_is_omap2420()) omap2420_clk_init(); @@ -339,11 +337,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(); }