From patchwork Mon Sep 17 18:00:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1469251 Return-Path: X-Original-To: patchwork-linux-omap@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 471B2DF2D8 for ; Mon, 17 Sep 2012 18:05:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757027Ab2IQSFB (ORCPT ); Mon, 17 Sep 2012 14:05:01 -0400 Received: from na3sys009aog127.obsmtp.com ([74.125.149.107]:49611 "EHLO na3sys009aog127.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757024Ab2IQSFA (ORCPT ); Mon, 17 Sep 2012 14:05:00 -0400 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]) (using TLSv1) by na3sys009aob127.postini.com ([74.125.148.12]) with SMTP ID DSNKUFdmSvUuWNU3kRYi8u06jKelZkoQ2uSw@postini.com; Mon, 17 Sep 2012 11:04:59 PDT Received: by lagy9 with SMTP id y9so4373416lag.19 for ; Mon, 17 Sep 2012 11:04:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:reply-to:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=QnPDQBq6oWzb3cz6UslIbSVPtTeL7h8ZjDFMCRx1AYY=; b=gYGb7Y0PNEQyzl4O9+6xPn6uoQthbP5FNIDa9IGuwE/VVUGrL+pdhVfC4cOkr6NlaQ NL8uxn6gpFMmNYeZmejg7zmhvkOVAwXQ455aV2xZUB6ul7CljendCDIl1Cv0NMgFx97J taTGCPzc5v7+18U8YW4CrtX2qTEm6ZbxvQ3LsgvHwt3iUiR/Lf1k08zalKmJOKhljpJ8 RbYm/q/OXRgK5RpmS93DP1c6hTDL0oTj/VbI7ltbOoulnXrLRB9y1H/KWQN3lIFqHD9p ESILQvW7sESZow8Mz5T/V6Bj9/6Yr+4nzYBpv4Ib4b6Ua9pdHOIZHkwCDTAcr824JOob kJfg== Received: by 10.112.31.231 with SMTP id d7mr3973242lbi.60.1347905097531; Mon, 17 Sep 2012 11:04:57 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id y4sm2791330lbg.5.2012.09.17.11.04.55 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Sep 2012 11:04:56 -0700 (PDT) Date: Mon, 17 Sep 2012 21:00:17 +0300 From: Felipe Balbi To: Tony Lindgren Cc: Fengguang Wu , kernel-janitors@vger.kernel.org, linux-omap@vger.kernel.org Subject: Re: [omap:tmp-merge 31/47] drivers/mfd/twl-core.c:49:22: fatal error: plat/cpu.h: No such file or directory Message-ID: <20120917180014.GA15518@arwen.pp.htv.fi> Reply-To: balbi@ti.com References: <20120917003526.GB12394@localhost> <20120917165643.GL4521@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120917165643.GL4521@atomide.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQnaSCNT2wlKt/Bzrtc0DFWmc/lXBBXzUPqyPGJ0QDzR/RmJ9HPa14dWcFHagODm67ib0mEl Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Hi, On Mon, Sep 17, 2012 at 09:56:43AM -0700, Tony Lindgren wrote: > * Fengguang Wu [120916 17:41]: > > Hi Tony, > > > > FYI, kernel build failed on > > > > tree: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git tmp-merge > > head: a742996f4643b4e9612fe081d146035964cfbd87 > > commit: 7d7e1eba7e92c2f9c76db80adc24836e7a114bfb [31/47] ARM: OMAP2+: Prepare for irqs.h removal > > config: x86_64-randconfig-s331 (attached as .config) > > > > All related error/warning messages: > > > > drivers/mfd/twl-core.c:49:22: fatal error: plat/cpu.h: No such file or directory > > compilation terminated. > > > > vim +49 drivers/mfd/twl-core.c > > 44 #include > > 45 > > 46 #include > > 47 #include > > 48 > > > 49 #include > > 50 > > 51 #include "twl-core.h" > > 52 > > 53 /* > > 54 * The TWL4030 "Triton 2" is one of a family of a multi-function "Power > > OK thanks for letting me know. That include needs to be ifdeffed until > we remove all cpu_is_omap usage from drivers. I'll take a look and will > also check if other drivers may have the same issue. the only use of cpu_is_* in that driver is related to the osc_ck clock name. Isn't this enough ? From: Felipe Balbi Subject: mfd: twl-core: drop cpu_is_* usage NYET-Signed-off-by: Felipe Balbi diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c index cacabb0..b2e6080 100644 --- a/arch/arm/mach-omap2/clock2430_data.c +++ b/arch/arm/mach-omap2/clock2430_data.c @@ -1855,7 +1855,7 @@ static struct omap_clk omap2430_clks[] = { /* external root sources */ CLK(NULL, "func_32k_ck", &func_32k_ck, CK_243X), CLK(NULL, "secure_32k_ck", &secure_32k_ck, CK_243X), - CLK(NULL, "osc_ck", &osc_ck, CK_243X), + CLK(NULL, "osc_sys_ck", &osc_ck, CK_243X), CLK(NULL, "sys_ck", &sys_ck, CK_243X), CLK(NULL, "alt_ck", &alt_ck, CK_243X), CLK(NULL, "mcbsp_clks", &mcbsp_clks, CK_243X), diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index 1c32afe..e4fff17 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -1132,11 +1132,7 @@ static void clocks_init(struct device *dev, u32 rate; u8 ctrl = HFCLK_FREQ_26_MHZ; -#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) - if (cpu_is_omap2430()) - osc = clk_get(dev, "osc_ck"); - else - osc = clk_get(dev, "osc_sys_ck"); + osc = clk_get(dev, "osc_sys_ck"); if (IS_ERR(osc)) { printk(KERN_WARNING "Skipping twl internal clock init and " @@ -1147,18 +1143,6 @@ static void clocks_init(struct device *dev, rate = clk_get_rate(osc); clk_put(osc); -#else - /* REVISIT for non-OMAP systems, pass the clock rate from - * board init code, using platform_data. - */ - osc = ERR_PTR(-EIO); - - printk(KERN_WARNING "Skipping twl internal clock init and " - "using bootloader value (unknown osc rate)\n"); - - return; -#endif - switch (rate) { case 19200000: ctrl = HFCLK_FREQ_19p2_MHZ;