From patchwork Mon Mar 8 18:52:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 84132 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 o28Iqqx5025566 for ; Mon, 8 Mar 2010 18:52:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755193Ab0CHSww (ORCPT ); Mon, 8 Mar 2010 13:52:52 -0500 Received: from mail-pz0-f200.google.com ([209.85.222.200]:47916 "EHLO mail-pz0-f200.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755086Ab0CHSwv (ORCPT ); Mon, 8 Mar 2010 13:52:51 -0500 Received: by pzk38 with SMTP id 38so1204942pzk.33 for ; Mon, 08 Mar 2010 10:52:51 -0800 (PST) Received: by 10.143.153.28 with SMTP id f28mr3518950wfo.129.1268074371317; Mon, 08 Mar 2010 10:52:51 -0800 (PST) Received: from localhost (deeprootsystems.com [216.254.16.51]) by mx.google.com with ESMTPS id 20sm4807221iwn.5.2010.03.08.10.52.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 08 Mar 2010 10:52:50 -0800 (PST) From: Kevin Hilman To: linux-omap@vger.kernel.org Subject: [PATCH/RFT v3] OMAP4: fix temporary hacks that break multi-omap PM Date: Mon, 8 Mar 2010 10:52:48 -0800 Message-Id: <1268074368-27026-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:52:53 +0000 (UTC) diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 402e8f0..595446f 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 */ if (cpu_is_omap242x()) omap2420_hwmod_init(); else if (cpu_is_omap243x()) @@ -319,7 +318,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(); @@ -333,11 +331,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(); }