From patchwork Thu Oct 13 22:27:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 119650 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 F0EC5B6F65 for ; Fri, 14 Oct 2011 09:28:10 +1100 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RETkv-0003ra-9Y; Thu, 13 Oct 2011 22:28:01 +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 1RETkv-0003dQ-1e; Thu, 13 Oct 2011 22:28:01 +0000 Received: from mail-gy0-f177.google.com ([209.85.160.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RETkr-0003d7-9F for linux-arm-kernel@lists.infradead.org; Thu, 13 Oct 2011 22:27:58 +0000 Received: by gyd10 with SMTP id 10so628808gyd.36 for ; Thu, 13 Oct 2011 15:27:55 -0700 (PDT) MIME-Version: 1.0 Received: by 10.236.176.105 with SMTP id a69mr7819208yhm.95.1318544874859; Thu, 13 Oct 2011 15:27:54 -0700 (PDT) Received: by 10.147.136.13 with HTTP; Thu, 13 Oct 2011 15:27:54 -0700 (PDT) X-Originating-IP: [2620:0:1000:1b02:1aa9:5ff:fe24:37a9] In-Reply-To: <201110131716.18358.arnd@arndb.de> References: <201110131716.18358.arnd@arndb.de> Date: Thu, 13 Oct 2011 15:27:54 -0700 Message-ID: Subject: Re: [GIT PULL] Please pull tegra cleanups for 3.2 From: Olof Johansson To: Arnd Bergmann X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20111013_182757_405708_74F56E71 X-CRM114-Status: GOOD ( 17.62 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.177 listed in list.dnswl.org] Cc: linux-tegra@vger.kernel.org, Russell King - ARM Linux , Stephen Warren , linux-arm-kernel@lists.infradead.org, Colin Cross 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 Hi, On Thu, Oct 13, 2011 at 8:16 AM, Arnd Bergmann wrote: > On Thursday 13 October 2011, Olof Johansson wrote: >> Hi Arnd, >> >> Please pull the below branch of cleanups for the 3.2 merge window. >> They have been included in linux-next for a couple of days already. > > I saw Russell had a comment on the macro name should be addressed. > I've put your series plus an additional commit to fix this up > into the tegra/cleanup branch. When you ack this patch, I'll include > this branch into next/cleanup and the for-next branch. Based on discussion on IRC, I pulled in the edit into the original commit instead and rebased the branch. I also added the devices.c fix that I posted yesterday, so here is a new pull request. Thanks! -Olof The following changes since commit 976d167615b64e14bc1491ca51d424e2ba9a5e84: Linux 3.1-rc9 (2011-10-04 18:11:50 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.2/cleanup Olof Johansson (15): ARM: tegra: annotate IO_*_VIRT pointers ARM: tegra: timer: don't cast __iomem pointers ARM: tegra: tegra2_clocks: don't cast __iomem pointers ARM: tegra: tegra2_clocks: 0 -> NULL changes ARM: tegra: pcie: don't cast __iomem pointers ARM: tegra: pcie: include board.h ARM: tegra: pcie: 0 -> NULL changes ARM: tegra: tegra_init_cache should be static ARM: tegra: tegra_rtc_read_ms should be static ARM: tegra: tegra_powergate_is_powered should be static ARM: tegra: tegra2_clocks: don't export some tables ARM: tegra: dma: staticify some tables and functions ARM: tegra: cpu-tegra: sparse type fix ARM: tegra: cpu-tegra: unexport two functions ARM: tegra: devices.c should include devices.h arch/arm/mach-tegra/common.c | 2 +- arch/arm/mach-tegra/cpu-tegra.c | 6 ++-- arch/arm/mach-tegra/devices.c | 2 + arch/arm/mach-tegra/dma.c | 14 +++++--- arch/arm/mach-tegra/include/mach/io.h | 18 ++++++--- arch/arm/mach-tegra/include/mach/powergate.h | 1 - arch/arm/mach-tegra/io.c | 8 ++-- arch/arm/mach-tegra/pcie.c | 8 +++-- arch/arm/mach-tegra/powergate.c | 5 +-- arch/arm/mach-tegra/tegra2_clocks.c | 50 +++++++++++++------------- arch/arm/mach-tegra/timer.c | 6 ++-- 11 files changed, 66 insertions(+), 54 deletions(-)