From patchwork Tue Sep 9 17:15:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 37147 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 77FFF20491 for ; Tue, 9 Sep 2014 17:16:49 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id ft15sf28752016pdb.3 for ; Tue, 09 Sep 2014 10:16:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe:content-type; bh=tkJgLlQHAK35RCPQU8/Om/jzWOblcmyLSDvwDLORLm8=; b=U8m8orEEqfDmlcz9OX4uOJXwPYWEE1eXY15VXurjFHPovKOFy/AJEYa6VgIVw78Pf+ mQmSkkPoJ6F8nsx95SP8TPOMF7oPFgNnPnGBF1WyQ3jQvq/XKRsAud6w1liBYi5xKC/p kKeWv0a2EyL8/kXVSIEV6WDEtxTs5OyQ3NSeBIehQfIynreKpHg5z8ep2Zqpb6YghpNp eT3Rg1/3lt7Ys+6SyWrDlWMm6QyIx+BZVgKY6rvPn8JUofxMBI+xfipXrccE9GPSFdYB 1tx69DFr2D48Qdg1rkga2EUgMXzWSO6nEPz6JU/6CQBNYTztvhHx8ZcfNsPq/fOahqzC d4gQ== X-Gm-Message-State: ALoCoQkby2a0/cdVSn+/IcG0XB2qQcQBzs7XDTzjqLoSzlFpX4CHU6bXzm3/mQAQZtxs7sKnRIwo X-Received: by 10.66.249.231 with SMTP id yx7mr3990014pac.24.1410283008576; Tue, 09 Sep 2014 10:16:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.28.196 with SMTP id 62ls1268558qgz.12.gmail; Tue, 09 Sep 2014 10:16:48 -0700 (PDT) X-Received: by 10.52.170.69 with SMTP id ak5mr2714307vdc.63.1410283008423; Tue, 09 Sep 2014 10:16:48 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id h9si5422541vcr.11.2014.09.09.10.16.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 10:16:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id hy4so2680830vcb.37 for ; Tue, 09 Sep 2014 10:16:48 -0700 (PDT) X-Received: by 10.220.77.65 with SMTP id f1mr3230222vck.48.1410283008340; Tue, 09 Sep 2014 10:16:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp316980vcb; Tue, 9 Sep 2014 10:16:47 -0700 (PDT) X-Received: by 10.68.162.3 with SMTP id xw3mr16596092pbb.142.1410283007414; Tue, 09 Sep 2014 10:16:47 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gz10si24392527pbc.45.2014.09.09.10.16.46 for ; Tue, 09 Sep 2014 10:16:47 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757408AbaIIRQp (ORCPT + 27 others); Tue, 9 Sep 2014 13:16:45 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:40167 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754347AbaIIRQn (ORCPT ); Tue, 9 Sep 2014 13:16:43 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s89HFZal028379; Tue, 9 Sep 2014 12:15:35 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s89HFZBP011059; Tue, 9 Sep 2014 12:15:35 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Tue, 9 Sep 2014 12:15:34 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s89HFY88007310; Tue, 9 Sep 2014 12:15:34 -0500 From: Nishanth Menon To: Tony Lindgren CC: , , , Nishanth Menon Subject: [PATCH] ARM: OMAP5+: Reuse OMAP4 PM code for OMAP5 and DRA7 Date: Tue, 9 Sep 2014 12:15:33 -0500 Message-ID: <1410282933-30131-1-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: nm@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , OMAP4, OMAP5 and DRA7 share a lot of common logic and data structures. These have been enabled in the previous patches, however, this also means that OMAP5 or DRA7 only builds also need to build OMAP4 logic. Update to reuse OMAP4 logic. This fixes the 'undefined reference to 'omap4_pm_init_early'' in OMAP5 or DRA7 only builds. Fixes: 6af16a1dac5465c ("ARM: DRA7: Add hook in SoC initcalls to enable pm initialization") Fixes: 628ed4717000789 ("ARM: OMAP5: Add hook in SoC initcalls to enable pm initialization") Reported-by: Tony Lindgren Signed-off-by: Nishanth Menon --- This fixes the regression with randconfig that Tony reported with omap-for-v3.18/soc branch. Tested with CONFIG_ARCH_OMAP2, CONFIG_ARCH_OMAP3, CONFIG_ARCH_OMAP4, CONFIG_SOC_OMAP5, CONFIG_SOC_AM33XX, CONFIG_SOC_AM43XX, CONFIG_SOC_DRA7XX only builds. arch/arm/mach-omap2/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 69bbcba..d9dd99c 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -87,9 +87,10 @@ ifeq ($(CONFIG_PM),y) obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o -obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o omap-mpuss-lowpower.o -obj-$(CONFIG_SOC_OMAP5) += omap-mpuss-lowpower.o -obj-$(CONFIG_SOC_DRA7XX) += omap-mpuss-lowpower.o +omap-4-5-pm-common = pm44xx.o omap-mpuss-lowpower.o +obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-pm-common) +obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-pm-common) +obj-$(CONFIG_SOC_DRA7XX) += $(omap-4-5-pm-common) obj-$(CONFIG_PM_DEBUG) += pm-debug.o obj-$(CONFIG_POWER_AVS_OMAP) += sr_device.o @@ -102,7 +103,10 @@ endif ifeq ($(CONFIG_CPU_IDLE),y) obj-$(CONFIG_ARCH_OMAP3) += cpuidle34xx.o -obj-$(CONFIG_ARCH_OMAP4) += cpuidle44xx.o +omap-4-5-idle-common = cpuidle44xx.o +obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-idle-common) +obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-idle-common) +obj-$(CONFIG_SOC_DRA7XX) += $(omap-4-5-idle-common) endif # PRCM