From patchwork Sat Dec 29 04:38:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 208621 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 98FB02C00F3 for ; Sat, 29 Dec 2012 15:42:06 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TooC4-00009b-PU; Sat, 29 Dec 2012 04:38:44 +0000 Received: from mail-pa0-f46.google.com ([209.85.220.46]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TooC0-00009H-Qd for linux-arm-kernel@lists.infradead.org; Sat, 29 Dec 2012 04:38:41 +0000 Received: by mail-pa0-f46.google.com with SMTP id bh2so6316606pad.5 for ; Fri, 28 Dec 2012 20:38:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent:x-gm-message-state; bh=zhgUdaryJyvEoKI+xd3lW4euYXX8UBWG8L4qaIuTgks=; b=Uv/9wDwQ3fyzJ/5TDxXFP7NFZRvWK/xsLuFj1FkBevIUmLH7ZScWJcKGXCxIGH8J0f vS9kCj5INT89dV9QQdI2hcb/ndNe2GpiKwjzDd//K2ljTHjr0TLxDDjFfBbbyrYOgIqn Yx5veMCDWEZYgGuTe/Zj5ilxrv38rKt7oCwCLafsOauWu+WZN2kjvbuh5GVr9o3Ytjjc BYb0hWud4O0ys9F2+0Njxd2ZRKZ4HSm0+EkDUP9WLzOS+Ji4jk+9DguDkjiVwSKkMqZk iBs8y8CRTzF9c4drLqUsFQbxD1beg9+vYHjFc4VgEkAP7N3jS0kQ/JK1X4zgV0LtKooP Up9Q== X-Received: by 10.68.138.229 with SMTP id qt5mr108520552pbb.122.1356755918804; Fri, 28 Dec 2012 20:38:38 -0800 (PST) Received: from localhost (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPS id l5sm21513278paz.14.2012.12.28.20.38.37 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 28 Dec 2012 20:38:37 -0800 (PST) Date: Fri, 28 Dec 2012 20:38:45 -0800 From: Olof Johansson To: torvalds@linux-foundation.org Subject: [GIT PULL] ARM: arm-soc OMAP low-prio fixes Message-ID: <20121229043845.GB11208@quad.lixom.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQl0wix9uCAp421i9KyGq2Z52dtCLkJKjU3LzoHwXKdhUTmDbojtdTAg7k4Vi0oguXNe2eEy X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121228_233840_981995_9CD10FBC X-CRM114-Status: GOOD ( 16.04 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.46 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: olof@lixom.net, arm@kernel.org, linux-kernel@vger.kernel.org, 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 Hi Linus, I'll leave it up to you to decide if you want to pull this or not -- it can wait to 3.9 as well. This branch came in from Tony at the start of the merge window, and I wanted to give it a little time in -next (but it got more than expected due to travel). It's a mix of lowish priority fixes and a couple of cleanups to split setup between OMAP1/2+, needed for multiplatform restructuring. Said multiplatform restructuring is the main reason arm-soc saw so much churn this release -- i.MX and OMAP platforms were reshuffled quite a bit to make them ready for multiplatform. i.MX finished, OMAP is nearly there with just a few more patches needed (for 3.9). It should slow down again for next release. Thanks, -Olof The following changes since commit 2b8318881ddbcb67c5e8d2178b42284749442222: Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux (2012-12-15 13:03:48 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/omap-late-cleanups for you to fetch changes up to f64d204b5cf21b282445ba2fa357d970028c9f52: arch/arm/mach-omap2/dpll3xxx.c: drop if around WARN_ON (2012-12-17 10:50:41 -0800) ---------------------------------------------------------------- ARM: arm-soc: late cleanups for omap >From Tony Lindgren: Here are few more patches to finish the omap changes for multiplatform conversion that are not strictly fixes, but were too complex to do with the dependencies during the merge window. Those are to move of serial-omap.h to platform_data, and the removal of remaining cpu_is_omap macro usage outside mach-omap2. Then there are several trivial fixes for typos and few minimal omap2plus_defconfig updates. ---------------------------------------------------------------- AnilKumar Chimata (1): ARM: OMAP2+: omap2plus_defconfig: Add tps65217 support Javier Martinez Canillas (2): ARM: OMAP2+: enable devtmpfs and devtmpfs automount ARM: OMAP2+: omap2plus_defconfig: enable twl4030 SoC audio Jon Hunter (1): ARM: OMAP2+: PMU: Remove unused header Julia Lawall (1): arch/arm/mach-omap2/dpll3xxx.c: drop if around WARN_ON Peter Ujfalusi (1): ARM: OMAP2+: omap_twl: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER Srinivas Kandagatla (1): ARM/omap: use module_platform_driver macro Tony Lindgren (3): MAINTAINERS: Add an entry for omap related .dts files ARM: OMAP: Split fb.c to remove last remaining cpu_is_omap usage ARM: OMAP2+: Drop plat/cpu.h for omap2plus Wei Yongjun (1): ARM: OMAP4: remove duplicated include from omap_hwmod_44xx_data.c YOSHIFUJI Hideaki (1): OMAP2: Fix a typo - replace regist with register. MAINTAINERS | 9 ++++ arch/arm/configs/omap2plus_defconfig | 5 ++ arch/arm/mach-omap1/Makefile | 2 +- arch/arm/mach-omap1/fb.c | 80 ++++++++++++++++++++++++++++++ arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/control.h | 2 +- arch/arm/mach-omap2/dpll3xxx.c | 3 +- arch/arm/mach-omap2/drm.c | 1 - arch/arm/mach-omap2/dss-common.c | 3 +- arch/arm/{plat-omap => mach-omap2}/fb.c | 50 +------------------ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1 - arch/arm/mach-omap2/omap_twl.c | 8 +-- arch/arm/mach-omap2/pmu.c | 2 - arch/arm/mach-omap2/prm2xxx.c | 3 +- arch/arm/mach-omap2/prm3xxx.c | 3 +- arch/arm/plat-omap/Makefile | 2 +- arch/arm/plat-omap/dmtimer.c | 13 +---- arch/arm/plat-omap/include/plat/cpu.h | 4 -- drivers/media/platform/omap3isp/isp.c | 2 - drivers/power/avs/smartreflex.c | 2 - 20 files changed, 109 insertions(+), 88 deletions(-) create mode 100644 arch/arm/mach-omap1/fb.c rename arch/arm/{plat-omap => mach-omap2}/fb.c (76%)