From patchwork Mon Dec 17 19:10:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 206972 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 923C02C0086 for ; Tue, 18 Dec 2012 06:14:07 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tkg5i-0007xW-K5; Mon, 17 Dec 2012 19:11:06 +0000 Received: from mho-04-ewr.mailhop.org ([204.13.248.74] helo=mho-02-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tkg5V-0007uQ-I6 for linux-arm-kernel@lists.infradead.org; Mon, 17 Dec 2012 19:10:54 +0000 Received: from c-50-131-214-131.hsd1.ca.comcast.net ([50.131.214.131] helo=localhost.localdomain) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1Tkg5T-0002Q5-VP; Mon, 17 Dec 2012 19:10:52 +0000 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 50.131.214.131 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18PrX4B+NRjdyCFmt7EBDzk Content-Disposition: inline MIME-Version: 1.0 X-Mailer: MIME::Lite 3.028 (F2.82; T1.35; A2.09; B3.13; Q3.13) Date: Mon, 17 Dec 2012 11:10:47 -0800 From: Tony Lindgren To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL 2/2] omap cleanup for v3.8 merge window In-Reply-To: X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121217_141053_725807_855BCA99 X-CRM114-Status: GOOD ( 10.91 ) X-Spam-Score: -1.4 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.74 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.5 MISSING_MID Missing Message-Id: header Cc: linux-omap@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 Message-ID: Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org 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/tmlind/linux-omap tags/omap-for-v3.8/cleanup-for-merge-window-signed 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) ---------------------------------------------------------------- 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%)