| Message ID | 1343075561-17446-9-git-send-email-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show
Return-Path: <patch+caf_=linaro-patchwork=canonical.com@linaro.org> X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9100B2402A for <patchwork@peony.canonical.com>; Mon, 23 Jul 2012 20:32:50 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 61237A1804F for <linaro-patchwork@canonical.com>; Mon, 23 Jul 2012 20:32:50 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id z12so6272261ghb.11 for <linaro-patchwork@canonical.com>; Mon, 23 Jul 2012 13:32:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=fWlLkuqmxNCWQzfdEo+0maSS+fV/Tbz6KWk9vSr1VpA=; b=bEY5pNjPAU6FESI+qc6i6gH5HvMfYGoy4axuTLkG+s1A0bzKIdBgRybLuSrNzU92a9 CTrlkiIJXTcOrRIJik69b/rjkiuVVzv6UGswpJRptrZEOMI5vF+BABLzp0egfiRCOGMk VE08ftVWF9sYJmcut4gkZvEfRmBaPFLSo0zFXsAYEA9r+zVGWh4RBvXoEL2xLgHRBUDa IbFbSkPJUKdOpk7+PPhB2pwEs7u04UefFaCfCfzqKky90RqvzD+6MhEXJSbPjalLnNYs UE+GXO6g85Ih9ON7Dh1Z68hEMmNQPMhZ8mgqEjjE4LcbYGjbYlgvxYLB2p/csOLAUglQ lKZw== Received: by 10.43.69.12 with SMTP id ya12mr9636395icb.50.1343075569503; Mon, 23 Jul 2012 13:32:49 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.153.7 with SMTP id i7csp61681ibw; Mon, 23 Jul 2012 13:32:48 -0700 (PDT) Received: by 10.216.221.74 with SMTP id q52mr8657448wep.181.1343075567679; Mon, 23 Jul 2012 13:32:47 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.8]) by mx.google.com with ESMTP id v6si705553wiw.7.2012.07.23.13.32.46; Mon, 23 Jul 2012 13:32:47 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.8; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.lan (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0MOiGM-1SxEnQ2L7W-0063ko; Mon, 23 Jul 2012 22:32:46 +0200 From: Arnd Bergmann <arnd@arndb.de> To: Linus Torvalds <torvalds@linux-foundation.org> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm@kernel.org Subject: [GIT PULL 08/15] arm-soc: cleanups, part 2 Date: Mon, 23 Jul 2012 22:32:34 +0200 Message-Id: <1343075561-17446-9-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1343075561-17446-1-git-send-email-arnd@arndb.de> References: <1343075561-17446-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:V4WFgQQGTCnVAESkJAJ0n5RvL6V4kSBhuPu5kYk+594 2TmXsi76xTp+xeiamyFvO3dmWi2Usym3xE1tAcYlV0dYJhDlxp 7qGvHTHWCL/YaBBuyK0tZXwu/rsN8qX2IA6n9klpXVoerv6/+B 0SyPYW2hiEAGyWTjcLFHhBkySNDy8Q0cBLa9gbsf5VeoRbT226 5yvNkvr/MdmLHZ6e8RmrirC/DQKhNzS+szt+QB8omIbDacOIcD ci6sFlst97dWSfJrVxDuARMagtV17XBOGZJKLwP5tEIkNjy0zd KK26wRAPN9miwwU2J5VTfMZvt5fV16FxKtLoaWuXXm9kaMaygu t5aazb8oUkZUkqZK4742a/yfT8Yq18mUWpGoYBXL2 X-Gm-Message-State: ALoCoQmNIDSOCpZfhj7gMiBlmwAYDwhVIUY65dpmp55torf97zACEgDQvkVEgiJ41j7D/esTE3gf |
The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git next/cleanup2 for you to fetch changes up to db3c47a3af96e8109b1bb114c32f0854259d5970: Merge tag 'omap-cleanup-part2-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2 (2012-07-10 16:58:19 +0200) ---------------------------------------------------------------- arm-soc: cleanups, part 2 These omap cleanups have dependencies on earlier omap branches that in turn depend on other cleanups, so they could not go into the same branch. ---------------------------------------------------------------- Arnd Bergmann (2): Merge tag 'omap-cleanup-part2-for-v3.6' of git://git.kernel.org/.../tmlind/linux-omap into next/cleanup2 Merge branch 'next/cleanup2' into for-next Jon Hunter (2): ARM: OMAP4: clockdomain/CM code: Update supported transition modes ARM: OMAP2+: powerdomain code: Fix Wake-up power domain power status Kishon Vijay Abraham I (1): ARM: OMAP2+: hwmod code: add support to set dmadisable in hwmod framework Paul Walmsley (1): Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_3.6' into omap_devel_f_3.6 R Sricharan (1): ARM: OMAP2+: PRM/CM: Move the stubbed prm and cm functions to prcm.c file and make them __weak Sakari Ailus (1): ARM: OMAP3: control: add definition for CONTROL_CAMERA_PHY_CTRL Santosh Shilimkar (1): ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds Tarun Kanti DebBarma (3): ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API ARM: OMAP: dmtimer: use devm_ API and do some cleanup in probe() ARM: OMAP2+: dmtimer: cleanup fclk usage Tony Lindgren (3): Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel-am33xx-for-v3.6' into devel-am33xx-part2 Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into cleanup-part2 ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API Vaibhav Hiremath (7): ARM: OMAP2+: hwmod: Add new sysc_type3 into omap_hwmod required for am33xx ARM: OMAP3/4: omap_hwmod: Add rstst_offs field to struct omap_hwmod_omap4_prcm ARM: OMAP2+: All OMAP2PLUS uses omap-device.o target so add one entry ARM: OMAP2+: Move omap3 dpll ops to dpll3xxx.c ARM: OMAP2+: am33xx: Make am33xx as a separate class ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals Vikram Pandita (1): ARM: OMAP3+: dpll: optimize noncore dpll locking logic arch/arm/mach-omap2/Kconfig | 12 +++- arch/arm/mach-omap2/Makefile | 8 ++- arch/arm/mach-omap2/clock.c | 18 ------ arch/arm/mach-omap2/clock3xxx_data.c | 2 +- arch/arm/mach-omap2/clock44xx_data.c | 22 ++++---- arch/arm/mach-omap2/clockdomain44xx.c | 10 +++- arch/arm/mach-omap2/cminst44xx.c | 14 ----- arch/arm/mach-omap2/cminst44xx.h | 25 --------- arch/arm/mach-omap2/common.c | 10 +--- arch/arm/mach-omap2/common.h | 5 ++ arch/arm/mach-omap2/control.h | 1 + arch/arm/mach-omap2/dpll3xxx.c | 26 ++++++++- arch/arm/mach-omap2/id.c | 4 +- arch/arm/mach-omap2/omap_hwmod.c | 76 ++++++++++++++++++++++++-- arch/arm/mach-omap2/omap_hwmod_common_data.c | 10 ++++ arch/arm/mach-omap2/powerdomain.c | 6 +- arch/arm/mach-omap2/prcm.c | 23 ++++++++ arch/arm/mach-omap2/prm2xxx_3xxx.h | 65 ---------------------- arch/arm/mach-omap2/prm_common.c | 62 +++++++++++++++++++++ arch/arm/mach-omap2/timer.c | 3 +- arch/arm/plat-omap/Makefile | 4 +- arch/arm/plat-omap/dmtimer.c | 53 ++++++------------ arch/arm/plat-omap/include/plat/cpu.h | 17 +++--- arch/arm/plat-omap/include/plat/omap_hwmod.h | 19 +++++++ arch/arm/plat-omap/include/plat/sdrc.h | 2 +- arch/arm/plat-omap/sram.c | 6 +- 26 files changed, 296 insertions(+), 207 deletions(-)