From patchwork Thu Sep 22 16:33:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 115967 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 C95D5B6F83 for ; Fri, 23 Sep 2011 02:33:54 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1R6mDb-0008Ez-JJ; Thu, 22 Sep 2011 16:33:48 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1R6mDb-0003sQ-6D; Thu, 22 Sep 2011 16:33:47 +0000 Received: from na3sys009aog114.obsmtp.com ([74.125.149.211]) by canuck.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1R6mDX-0003rv-UI for linux-arm-kernel@lists.infradead.org; Thu, 22 Sep 2011 16:33:45 +0000 Received: from mail-yw0-f47.google.com ([209.85.213.47]) (using TLSv1) by na3sys009aob114.postini.com ([74.125.148.12]) with SMTP ID DSNKTntjZXOSFjxv1tcfcQTMVyg5SNIJj0mt@postini.com; Thu, 22 Sep 2011 09:33:43 PDT Received: by mail-yw0-f47.google.com with SMTP id 7so3214147ywf.6 for ; Thu, 22 Sep 2011 09:33:41 -0700 (PDT) Received: by 10.101.19.2 with SMTP id w2mr2202951ani.153.1316709221225; Thu, 22 Sep 2011 09:33:41 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id z1sm32100406anb.18.2011.09.22.09.33.38 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Sep 2011 09:33:39 -0700 (PDT) From: Kevin Hilman To: Tony Lindgren Subject: Re: [GIT PULL] OMAP: omap_device cleanup for v3.2 Organization: Texas Instruments, Inc. References: <87mxe5tlzv.fsf@ti.com> <87y5xps6kv.fsf@ti.com> <20110921182051.GH2937@atomide.com> Date: Thu, 22 Sep 2011 09:33:37 -0700 In-Reply-To: <20110921182051.GH2937@atomide.com> (Tony Lindgren's message of "Wed, 21 Sep 2011 11:20:51 -0700") Message-ID: <878vpgv8ny.fsf@ti.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110922_123344_222013_50AC0A8D X-CRM114-Status: GOOD ( 15.82 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.211 listed in list.dnswl.org] Cc: linux-omap , Russell King , linux-arm-kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 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 Lindgren writes: > * Kevin Hilman [110915 16:23]: >> Kevin Hilman writes: >> >> > Please pull this omap_device cleanup series for v3.2. This sets the >> > groundwork for Benoit's DT infrastructure work. >> >> Turns out this series has a dependency on a patch[1] in Russell's >> for-next branch. >> >> Russell, any chance of picking this patch into your devel-stable so we >> have a fixed point to merge with? > > Or maybe Kevin can add it to his series instead? OK, Russell and I agreed (offline) that I would just take this patch, and he will drop from his for-next branch. I've cherry-picked it into the my branch, and here's the updated pull request. Should have no external dependencies now, and I compile tested for OMAP1 and OMAP2+ on top of the arm-soc/next/cleanup branch. Kevin The following changes since commit b6fd41e29dea9c6753b1843a77e50433e6123bcb: Linux 3.1-rc6 (2011-09-12 14:02:02 -0700) are available in the git repository at: git://gitorious.org/khilman/linux-omap-pm.git for_3.2/omap_device Grazvydas Ignotas (1): OMAP: omap_device: make latency autoadjust messages debug Jarkko Nikula (1): omap: mcbsp: Remove omap device API Kevin Hilman (7): OMAP: omap_device: replace debug/warning/error prints with dev_* macros OMAP: omap_device: remove internal functions from omap_device.h OMAP: omap_device: when building return platform_device instead of omap_device OMAP: omap_device: device register functions now take platform_device pointer OMAP: omap_device: _disable_idle_on_suspend() takes platform_device pointer OMAP: omap_device: decouple platform_device from omap_device ARM: 7082/1: platform_device: pdev_archdata: add omap_device pointer arch/arm/include/asm/device.h | 5 + arch/arm/mach-omap2/devices.c | 44 +++--- arch/arm/mach-omap2/display.c | 6 +- arch/arm/mach-omap2/dma.c | 16 +- arch/arm/mach-omap2/gpio.c | 10 +- arch/arm/mach-omap2/hsmmc.c | 8 +- arch/arm/mach-omap2/hwspinlock.c | 8 +- arch/arm/mach-omap2/mcbsp.c | 8 +- arch/arm/mach-omap2/opp.c | 2 +- arch/arm/mach-omap2/pm.c | 8 +- arch/arm/mach-omap2/serial.c | 14 +- arch/arm/mach-omap2/sr_device.c | 6 +- arch/arm/plat-omap/i2c.c | 8 +- arch/arm/plat-omap/include/plat/omap_device.h | 30 ++-- arch/arm/plat-omap/mcbsp.c | 27 ---- arch/arm/plat-omap/omap_device.c | 185 +++++++++++++------------ 16 files changed, 185 insertions(+), 200 deletions(-)