From patchwork Thu May 9 20:54:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 242849 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2AD942C00F6 for ; Fri, 10 May 2013 06:54:47 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UaXrO-00063Z-Il; Thu, 09 May 2013 20:54:42 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UaXrM-0003cP-45; Thu, 09 May 2013 20:54:40 +0000 Received: from mail-pb0-x22c.google.com ([2607:f8b0:400e:c01::22c]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UaXrJ-0003bP-5I for linux-arm-kernel@lists.infradead.org; Thu, 09 May 2013 20:54:38 +0000 Received: by mail-pb0-f44.google.com with SMTP id wz17so2269918pbc.3 for ; Thu, 09 May 2013 13:54:14 -0700 (PDT) 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=mEwcXk+u6bT04dHhonnWZ1bCp1X/zuOQIui6oXdbLWM=; b=G8euTjFth4GvIIw2grR1t+JsXNtTOETWI3si4bEmdhnBZh66LHrMunIDdiiXlNQlpK H3Y+UnDSc+LVqSv4RqhWqeS+cJadEIcYRi/GlGbnha64xpRTfUY2/zd8+jx5Oc4Ih/Y1 dfMqzpI2/3ylZpMgLBfXxgML9bypLyX4buPbrR/6BLpjGDpTPCGjB8AkLYSYIQ7LqCap 5WpX1wn574ZZiuReVsN7twCk0pW9djnpIxOHtSopogftlEEUqxYSJS2/oVodP75AFL8x rTzf8kNgJXion2giJ3ws3PPaS4W2Pht7F/T5XcfYv2w0aIYSTqvUBMQnsCszw0jaA02q iA5Q== X-Received: by 10.68.234.100 with SMTP id ud4mr14380914pbc.9.1368132853852; Thu, 09 May 2013 13:54:13 -0700 (PDT) Received: from localhost ([2001:470:1f05:1640:38a5:b309:b330:5494]) by mx.google.com with ESMTPSA id qb1sm4219672pbb.33.2013.05.09.13.54.11 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 09 May 2013 13:54:12 -0700 (PDT) Date: Thu, 9 May 2013 13:54:13 -0700 From: Olof Johansson To: torvalds@linux-foundation.org Subject: [GIT PULL] ARM: arm-soc fixes and a few straggler patches for 3.10 Message-ID: <20130509205413.GA16897@quad.lixom.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQnu5y9V9YSl/j/3oVbyA8BnWtYyqzx2+pqGU4YJDnyUKFq1eZjFD5uR1SGm0oCHxGRu4RJL X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130509_165437_385473_98AE5A9C X-CRM114-Status: GOOD ( 16.31 ) 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 ---- ---------------------- -------------------------------------------------- -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.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" 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, The following changes since commit 8cbc95ee748741939222c3d38584a40c92bedcdd: Merge tag 'nfs-for-3.10-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (2013-05-09 10:24:54 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-linus for you to fetch changes up to c58c1a4c118ba2ed49f72de9b42ef13bc8ee71e5: ARM: exynos: dts: Fixed vbus-gpios (2013-05-09 13:25:23 -0700) ---------------------------------------------------------------- ARM: arm-soc fixes and straggler patches for 3.10 A collection of fixes for fall out from 3.10 merge window, some build fixes and warning cleanups and a small handful of patches that were small and contained and made sense to still include in 3.10 (some of these have also been in -next since the merge window opened). Largest continous series is for OMAP, but there's a handful for other platforms. For i.MX, one of the patches are framebuffer fixups due to fallout during the merge window, and the other removes some stale and broken code. ---------------------------------------------------------------- Aaro Koskinen (1): ARM: OMAP: RX-51: change probe order of touchscreen and panel SPI devices Arnd Bergmann (7): ARM: default machine descriptor for multiplatform ARM: tegra: Tegra114 needs CPU_FREQ_TABLE ARM: OMAP: build SMP code only for OMAP4/5 ARM: imx: build CPU suspend code only when needed ARM: SPEAr: conditionalize l2x0 support ARM: SIRF: select SMP_ON_UP only on SMP builds ARM: ux500: always select ABX500_CORE Christoph Fritz (1): omap: mux: add AM/DM37x gpios Doug Anderson (1): ARM: exynos: dts: Fixed vbus-gpios Fabio Baltieri (1): ARM: ux500: read the correct soc_id number Fabio Estevam (2): ARM: imx: Select GENERIC_ALLOCATOR video: mxsfb: Adapt to new videomode API Inderpal Singh (1): ARM: EXYNOS5: Fix kernel dump in AFTR idle mode Jason Cooper (1): ARM: dts: don't assume boards are using twl4030 for omap3 Javier Martinez Canillas (3): Documentation: dt: update TI GPMC ethernet binding properties ARM: OMAP2+: only search for GPMC DT child nodes on probe ARM: OMAP2+: only WARN if a GPMC child probe function fail Jon Hunter (2): Documentation: dt: update properties in TI GPMC NAND example ARM: dts: OMAP4: Fix ethernet IRQ for OMAP4 boards Kevin Hilman (1): ARM: OMAP2+: omap_device: use late_initcall_sync Lee Jones (1): ARM: ux500: Rid ignored return value of regulator_enable() compiler warning Nishanth Menon (2): ARM: dts: OMAP36xx: Fix CPU OPP voltages ARM: dts: OMAP4460: Fix CPU OPP voltages Olof Johansson (4): Merge branch 'late/fixes' into fixes ARM: exynos: dts: cros5250: add cyapa trackpad Merge tag 'omap-for-v3.10/fixes-for-merge-window-part2' of git://git.kernel.org/.../tmlind/linux-omap into fixes Merge tag 'omap-for-v3.10/dt-fixes-for-merge-window' of git://git.kernel.org/.../tmlind/linux-omap into fixes Peter Ujfalusi (1): ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module Philip Avinash (1): ARM: dts: AM33XX: Add GPMC node Roger Quadros (1): ARM: OMAP3: Beagle: Fix USB Host on beagle xM Ax/Bx Shawn Guo (1): ARM: imx: compile fix for hotplug.c Tony Lindgren (4): ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP Merge branch 'omap-gpmc-fixes-for-v3.10' of git://github.com/jonhunter/linux into fixes ARM: dts: Configure and fix the McSPI pins for 4430sdp ARM: OMAP2+: Remove bogus IS_ERR_OR_NULL checking from id.c Vaibhav Hiremath (1): ARM: OMAP2: AM33XX: id: Add support for new AM335x PG2.1 Si Wei Yongjun (1): ARM: OMAP1: DMA: fix error handling in omap1_system_dma_init() .../devicetree/bindings/mtd/gpmc-nand.txt | 28 ++++----- Documentation/devicetree/bindings/net/gpmc-eth.txt | 56 ++++++++--------- arch/arm/Kconfig | 1 - arch/arm/boot/dts/am33xx.dtsi | 12 ++++ arch/arm/boot/dts/cros5250-common.dtsi | 8 +++ arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 +- arch/arm/boot/dts/exynos5250-snow.dts | 2 +- arch/arm/boot/dts/omap3-beagle-xm.dts | 1 + arch/arm/boot/dts/omap3-evm.dts | 1 + arch/arm/boot/dts/omap3-overo.dtsi | 1 + arch/arm/boot/dts/omap3.dtsi | 1 - arch/arm/boot/dts/omap36xx.dtsi | 6 +- arch/arm/boot/dts/omap4-sdp.dts | 14 ++++- arch/arm/boot/dts/omap4-var-som.dts | 2 +- arch/arm/boot/dts/omap4460.dtsi | 6 +- arch/arm/configs/omap2plus_defconfig | 4 ++ arch/arm/kernel/devtree.c | 7 +++ arch/arm/kernel/setup.c | 13 +++- arch/arm/mach-exynos/include/mach/regs-pmu.h | 1 + arch/arm/mach-exynos/pmu.c | 5 +- arch/arm/mach-imx/Kconfig | 5 +- arch/arm/mach-imx/Makefile | 1 - arch/arm/mach-imx/common.h | 1 + arch/arm/mach-imx/headsmp.S | 2 +- arch/arm/mach-imx/hotplug.c | 2 + arch/arm/mach-imx/iram_alloc.c | 73 ---------------------- arch/arm/mach-omap1/dma.c | 8 +-- arch/arm/mach-omap2/Kconfig | 2 - arch/arm/mach-omap2/Makefile | 8 +-- arch/arm/mach-omap2/board-omap3beagle.c | 6 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 4 +- arch/arm/mach-omap2/gpmc.c | 38 ++++------- arch/arm/mach-omap2/id.c | 13 ++-- arch/arm/mach-omap2/mux34xx.h | 6 +- arch/arm/mach-omap2/omap_device.c | 2 +- arch/arm/mach-omap2/soc.h | 2 + arch/arm/mach-prima2/Kconfig | 2 +- arch/arm/mach-spear/spear13xx.c | 2 + arch/arm/mach-tegra/Kconfig | 1 + arch/arm/mach-ux500/Kconfig | 2 + arch/arm/mach-ux500/board-mop500.c | 4 +- arch/arm/mach-ux500/cpu-db8500.c | 2 +- drivers/video/Kconfig | 2 +- drivers/video/mxsfb.c | 8 +-- include/linux/platform_data/imx-iram.h | 41 ------------ 45 files changed, 173 insertions(+), 235 deletions(-) delete mode 100644 arch/arm/mach-imx/iram_alloc.c delete mode 100644 include/linux/platform_data/imx-iram.h