| Submitter | Olof Johansson |
|---|---|
| Date | Dec. 13, 2012, 1:57 a.m. |
| Message ID | <20121213015736.GD28281@quad.lixom.net> |
| Download | mbox |
| Permalink | /patch/206191/ |
| State | New |
| Headers | show
Return-Path: <linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org> 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 791BA2C0086 for <incoming-imx@patchwork.ozlabs.org>; Fri, 14 Dec 2012 04:24:11 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TjCSe-00044h-FA; Thu, 13 Dec 2012 17:20:41 +0000 Received: from mail-da0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tiy3O-0002QY-KQ for linux-arm-kernel@lists.infradead.org; Thu, 13 Dec 2012 01:57:39 +0000 Received: by mail-da0-f49.google.com with SMTP id v40so464203dad.36 for <linux-arm-kernel@lists.infradead.org>; Wed, 12 Dec 2012 17:57:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=QqirwQgGIy28shWouVwDMjg5bnrGKS+Efy9gUxCHkOs=; b=YmJtI2tFwh2+YbDKvoa+JgoNUB4fKMOG3krKQCWQ+FvsHku6Uxd6nsHXhrdFfGC1ei 2Epq0SmQZnwO21LC3iaDXaQgebj6FKgFxsoC2Yy/0qUN2093A1AQ5MEqz/+Ac66FsepB mKr+M7DhaIxeVH4Z9sQG7UzXxUEFGv90XUCk2r0+GKFrhJnwipJrmOl1pnILJRA9aWya o2JVEZydB2rIHkA+Aa6/X1XPiluTPRaHsU97sQfGQ2iAZC4ENTaaYbvrwJKvaG6Hd+RY sGjmfTQDRc+kG9mpm6f7yGqHDpSdGqF2iVradBHgja8co7BJrQ5/85NNOywURuXd+v+T Q52Q== Received: by 10.66.77.39 with SMTP id p7mr1775168paw.8.1355363857800; Wed, 12 Dec 2012 17:57:37 -0800 (PST) Received: from localhost (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPS id k4sm257465paz.26.2012.12.12.17.57.36 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Dec 2012 17:57:37 -0800 (PST) Date: Wed, 12 Dec 2012 17:57:36 -0800 From: Olof Johansson <olof@lixom.net> To: torvalds@linux-foundation.org Subject: [GIT PULL 4/5] ARM: arm-soc: driver specific changes Message-ID: <20121213015736.GD28281@quad.lixom.net> References: <20121213015543.GA18953@quad.lixom.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121213015543.GA18953@quad.lixom.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQmx79BndZtr/oFB0SiadXzPDh5RsLWSWuB4MAER+KEStclm6zajn6eOBQtNITccPbsNRwNa X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121212_205738_918087_E92A642D X-CRM114-Status: GOOD ( 14.47 ) 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.210.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Mailman-Approved-At: Thu, 13 Dec 2012 12:18:34 -0500 Cc: 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: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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, A collection of mostly SoC-specific driver updates: - a handful of pincontrol and setup changes - new drivers for hwmon and reset controller for vexpress - timing support updates for OMAP (gpmc and other interfaces) - + a collection of smaller cleanups Conflicts seen with this merge: None ---------------------------------------------------------------- The following changes since commit 93dd6e875a23bb2b41b527d869dbbd0d9595760d: Merge branch 'next/pm-merge' into HEAD are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/drivers for you to fetch changes up to 4aa7cf79b1f760b5751d1686329351c2e060791b: Merge branch 'next/gpio-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers ---------------------------------------------------------------- Afzal Mohammed (6): ARM: OMAP2+: nand: remove redundant rounding ARM: OMAP2+: gpmc: handle additional timings ARM: OMAP2+: gpmc: generic timing calculation ARM: OMAP2+: onenand: generic timing calculation ARM: OMAP2+: smc91x: generic timing calculation ARM: OMAP2+: tusb6010: generic timing calculation Arnd Bergmann (6): Merge branch 'vexpress-drivers' of git://git.linaro.org/people/pawelmoll/linux into next/drivers Merge tag 'ux500-pins-for-arm-soc' of http://git.kernel.org/.../linusw/linux-stericsson into next/drivers Merge branch 'omap/headers4' into next/drivers Merge tag 'omap-for-v3.8/gpmc-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/drivers Merge branch 'omap/dt' into next/drivers Merge tag 'omap-for-v3.8/timer-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/drivers Eunki Kim (2): ARM: SAMSUNG: Insert bitmap_gpio_int member in samsung_gpio_chip gpio: samsung: Fix input mode setting function for GPIO int Jean-Nicolas Graux (1): ARM: ux500: add STM pin configuration Jingoo Han (1): gpio: samsung: use pr_* instead of printk Jorgen Jonsson (1): ARM: ux500: fixup magnetometer pins Linus Walleij (2): ARM: ux500: delete duplicate macro ARM: ux500: fix pin warning Olof Johansson (1): Merge branch 'next/gpio-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/drivers Patrice Chotard (6): ARM: ux500: 8500: register LCD VSI pinctrl table ARM: ux500: 8500: add IDLE pin configuration for SPI ARM: ux500: 8500: update SKE keypad pinctrl table ARM: ux500: 8500: define SDI sleep states ARM: ux500: cosmetic fixups for uart0 ARM: ux500: 8500: add pinctrl support for uart1 and uart2 Pawel Moll (2): hwmon: Versatile Express hwmon driver ARM: vexpress: Reset driver Tony Lindgren (1): Merge tag 'gpmc-generic-timing' of git://gitorious.org/x0148406-public/linux-kernel into omap-for-v3.8/gpmc Documentation/bus-devices/ti-gpmc.txt | 122 ++++++ .../devicetree/bindings/hwmon/vexpress.txt | 23 + Documentation/hwmon/vexpress | 34 ++ arch/arm/mach-omap2/gpmc-nand.c | 26 +- arch/arm/mach-omap2/gpmc-onenand.c | 143 ++----- arch/arm/mach-omap2/gpmc-smc91x.c | 43 +- arch/arm/mach-omap2/gpmc.c | 373 ++++++++++++++++ arch/arm/mach-omap2/gpmc.h | 113 ++++- arch/arm/mach-omap2/usb-tusb6010.c | 181 ++------ arch/arm/mach-ux500/board-mop500-pins.c | 425 ++++++++++++++++--- arch/arm/mach-vexpress/reset.c | 141 ++++++ arch/arm/plat-samsung/include/plat/gpio-core.h | 2 + arch/arm/plat-samsung/s5p-irq-gpioint.c | 8 +- drivers/gpio/gpio-samsung.c | 25 +- drivers/hwmon/Kconfig | 8 + drivers/hwmon/Makefile | 1 + drivers/hwmon/vexpress.c | 229 ++++++++++ 17 files changed, 1525 insertions(+), 372 deletions(-) create mode 100644 Documentation/bus-devices/ti-gpmc.txt create mode 100644 Documentation/devicetree/bindings/hwmon/vexpress.txt create mode 100644 Documentation/hwmon/vexpress create mode 100644 arch/arm/mach-vexpress/reset.c create mode 100644 drivers/hwmon/vexpress.c