From patchwork Mon Dec 17 18:02:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 206951 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 EB5AF2C0093 for ; Tue, 18 Dec 2012 05:05:22 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tkf0z-0001Cr-Vz; Mon, 17 Dec 2012 18:02:10 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tkf0v-0001Bt-JB for linux-arm-kernel@lists.infradead.org; Mon, 17 Dec 2012 18:02:06 +0000 Received: from c-50-131-214-131.hsd1.ca.comcast.net ([50.131.214.131] helo=localhost.localdomain) by mho-01-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1Tkf0t-00004U-8B; Mon, 17 Dec 2012 18:02:03 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) 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: U2FsdGVkX1+wXnmHbNH0HIktNngHeLnf Date: Mon, 17 Dec 2012 10:02:01 -0800 From: Tony Lindgren To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL] omap fixes and cleanups for v3.8 merge window Message-ID: <20121217180200.GU4989@atomide.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121217_130205_864066_C4BBAC2A X-CRM114-Status: GOOD ( 17.29 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines 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 Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Arnd & Olof, Here are some fixes, including a omap2plus_defconfig build fix caused by the merge conflict with fb branch as the merge notes were missed probably because the pull got resolved automatically. I had to fix the subject line for one patch and added some acks, so the patches have recent timestamps. The patches themselves have not changed since yesterday. See also the tag notes below for the other changes included. Regards, Tony 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/fixes-for-merge-window-v3-signed for you to fetch changes up to 3e194c88f8b71700822828749187e65853ed8166: ARM: OMAP: Fix drivers to depend on omap for internal devices (2012-12-17 09:20:47 -0800) ---------------------------------------------------------------- These patches fixes a build error caused by a merge conflict with the fb code, few timer warnings, and longer term regressions for tfp410 and omap h4 ethernet. Also included is a GPIO mode fix for the legacy mux code. I've also included 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 (3): ARM: OMAP2+: common: remove use of vram ARM: OMAP2+: enable devtmpfs and devtmpfs automount ARM: OMAP2+: omap2plus_defconfig: enable twl4030 SoC audio Jon Hunter (7): ARM: OMAP2+: Fix realtime_counter_init warning in timer.c ARM: AM335x: Fix warning in timer.c ARM: OMAP2420: Fix ethernet support for OMAP2420 H4 ARM: OMAP: Remove debug-devices.c ARM: dts: OMAP2420: Correct H4 board memory size ARM: dts: Add build target for omap4-panda-a4 ARM: OMAP2+: PMU: Remove unused header Julia Lawall (1): arch/arm/mach-omap2/dpll3xxx.c: drop if around WARN_ON Oleg Matcovschi (1): OMAP2+: mux: Fixed gpio mux mode analysis Peter Ujfalusi (1): ARM: OMAP2+: omap_twl: Change TWL4030_MODULE_PM_RECEIVER to TWL_MODULE_PM_RECEIVER Roger Quadros (1): mfd: omap-usb-host: get rid of cpu_is_omap..() macros Srinivas Kandagatla (1): ARM/omap: use module_platform_driver macro Tomi Valkeinen (1): OMAP: board-files: fix i2c_bus for tfp410 Tony Lindgren (7): Merge branch 'fixes-timer-build' of git://github.com/jonhunter/linux into omap-for-v3.8/fixes-for-merge-window ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2 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 ARM: OMAP: Fix drivers to depend on omap for internal devices Vaibhav Hiremath (1): ARM: OMAP2+: Fix sparse warnings in timer.c 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/boot/dts/Makefile | 1 + arch/arm/boot/dts/omap2420-h4.dts | 2 +- arch/arm/configs/omap2plus_defconfig | 5 ++ arch/arm/mach-omap1/Makefile | 2 +- arch/arm/mach-omap1/fb.c | 80 +++++++++++++++++++ arch/arm/mach-omap2/Kconfig | 3 +- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/board-3430sdp.c | 1 + arch/arm/mach-omap2/board-am3517evm.c | 1 + arch/arm/mach-omap2/board-cm-t35.c | 1 + arch/arm/mach-omap2/board-devkit8000.c | 1 + arch/arm/mach-omap2/board-h4.c | 83 +++++-------------- arch/arm/mach-omap2/board-omap3evm.c | 1 + arch/arm/mach-omap2/board-omap3stalker.c | 1 + arch/arm/mach-omap2/common.c | 3 - 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/mux.c | 10 +-- arch/arm/mach-omap2/mux.h | 20 +++-- arch/arm/mach-omap2/mux34xx.c | 2 +- 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/mach-omap2/serial.c | 3 +- arch/arm/mach-omap2/timer.c | 6 +- arch/arm/mach-omap2/usb-host.c | 4 + arch/arm/plat-omap/Makefile | 3 +- arch/arm/plat-omap/debug-devices.c | 92 ---------------------- arch/arm/plat-omap/dmtimer.c | 13 +-- arch/arm/plat-omap/include/plat/cpu.h | 4 - arch/arm/plat-omap/include/plat/debug-devices.h | 2 - drivers/bus/Kconfig | 1 + drivers/input/keyboard/Kconfig | 1 + drivers/media/platform/omap3isp/isp.c | 2 - drivers/mfd/omap-usb-host.c | 3 +- drivers/power/avs/smartreflex.c | 2 - drivers/tty/serial/omap-serial.c | 3 +- drivers/usb/phy/Kconfig | 1 + drivers/video/omap2/Kconfig | 4 + drivers/w1/masters/Kconfig | 1 + .../linux/platform_data/serial-omap.h | 0 include/linux/platform_data/usb-omap.h | 3 + include/video/omap-panel-tfp410.h | 2 +- 49 files changed, 181 insertions(+), 273 deletions(-) create mode 100644 arch/arm/mach-omap1/fb.c rename arch/arm/{plat-omap => mach-omap2}/fb.c (76%) delete mode 100644 arch/arm/plat-omap/debug-devices.c delete mode 100644 arch/arm/plat-omap/include/plat/debug-devices.h rename arch/arm/plat-omap/include/plat/omap-serial.h => include/linux/platform_data/serial-omap.h (100%)