From patchwork Tue May 8 07:14:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 157560 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B7C91B6FAB for ; Tue, 8 May 2012 17:16:34 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SRecz-0003lF-6H; Tue, 08 May 2012 07:14:33 +0000 Received: from arroyo.ext.ti.com ([192.94.94.40]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SRecr-0003ke-OP for linux-arm-kernel@lists.infradead.org; Tue, 08 May 2012 07:14:26 +0000 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id q487EMSP026932; Tue, 8 May 2012 02:14:23 -0500 Received: from DBDE71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id q487EMfU004072; Tue, 8 May 2012 12:44:22 +0530 (IST) Received: from dbdp31.itg.ti.com (172.24.170.98) by DBDE71.ent.ti.com (172.24.170.149) with Microsoft SMTP Server id 14.1.323.3; Tue, 8 May 2012 12:44:21 +0530 Received: from ula0393909.apr.dhcp.ti.com (udyx0166328-172024136157.apr.dhcp.ti.com [172.24.136.157]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id q487EKkc023736; Tue, 8 May 2012 12:44:20 +0530 (IST) From: Santosh Shilimkar To: Subject: [GIT PULL] ARM: OMAP2+: Misc cleanup Date: Tue, 8 May 2012 12:44:19 +0530 Message-ID: <1336461259-28596-1-git-send-email-santosh.shilimkar@ti.com> X-Mailer: git-send-email 1.7.5.4 MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -6.9 (------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [192.94.94.40 listed in list.dnswl.org] -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-omap@vger.kernel.org, Santosh Shilimkar , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Tony, Please pull the following preparatory cleanup series to add OMAP5 minimal support. Boot tested on OMAP2430 SDP, OMAP3430 SDP and OMAP4430 SDP platforms. I have dropped {[PATCH 7/7] ARM: OMAP4+: Add prm and cm base init function} from this set since Paul is taking that one in his queue. P.S: While merging this series with linux-omap master, I saw one trivial Makefile conflict. The following changes since commit 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a: Linux 3.4-rc5 (2012-04-29 15:19:10 -0700) are available in the git repository at: git://gitorious.org/omap-sw-develoment/linux-omap-dev.git for_3.5/omap_misc_cleanup R Sricharan (1): ARM: OMAP2+: dma: Define dma capabilities register bitfields and use them. Santosh Shilimkar (6): ARM: OMAP4: Don't compile cm2xxx_3xxx.c for OMAP4 only builds. ARM: OMAP2+: Clean up wrapping multiple objects in Makefile ARM: OMAP4: Remove un-used WakeupGen register defines. ARM: OMAP: dma: Make use of cpu_class_is_omap2() to avoid future patching. ARM: All OMAP2PLUS machines use omap2 directory so just add one entry ARM: OMAP4: Reduce the static IO mapping arch/arm/Makefile | 4 +- arch/arm/mach-omap2/Makefile | 163 ++++++++++----------- arch/arm/mach-omap2/dma.c | 11 +- arch/arm/mach-omap2/include/mach/omap-wakeupgen.h | 8 - arch/arm/mach-omap2/io.c | 30 ---- arch/arm/mach-omap2/iomap.h | 28 ---- arch/arm/plat-omap/dma.c | 4 +- arch/arm/plat-omap/include/plat/dma.h | 5 + 8 files changed, 93 insertions(+), 160 deletions(-) Regards Santosh