summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gpio' of ↵Linus Torvalds2011-10-27226-3129/+962
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm * 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits) ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h> ARM: 7104/1: plat-pxa: break out GPIO driver specifics ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h> ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h ARM: 7083/1: rewrite U300 GPIO to use gpiolib ARM: 7074/1: gpio: davinci: eliminate unused variable warnings ARM: 7063/1: Orion: gpio: add missing include of linux/types.h ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio ARM: 7057/1: mach-pnx4008: rename GPIO header ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h> ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem ARM: 7043/1: mach-ixp2000: rename GPIO header ... Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually
| * ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>Mika Westerberg2011-10-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change bd5f12a2476 (ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics) accidentally removed the ep93xx <mach/gpio.h> instead of making it an empty file. This causes compilation to fail: In file included from include/linux/gpio.h:18:0, from drivers/gpio/gpiolib.c:10: linux/arch/arm/include/asm/gpio.h:5:23: fatal error: mach/gpio.h: No such file or directory compilation terminated. make[2]: *** [drivers/gpio/gpiolib.o] Error 1 Fix this by adding the file back. Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ryan Mallon <rmallon@gmail.com> Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7104/1: plat-pxa: break out GPIO driver specificsLinus Walleij2011-10-0123-180/+225
| | | | | | | | | | | | | | | | | | | | | | The <mach/gpio.h> file is included from upper directories and deal with generic GPIO and gpiolib stuff. Break out the platform and driver specific defines and functions into its own header file. Cc: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystemLinus Walleij2011-10-012-337/+0
| | | | | | | | | | | | | | | | | | As per example from the other ARM boards, push the PXA GPIO driver down to the GPIO subsystem so it can be consolidated. Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7042/3: mach-ep93xx: break out GPIO driver specificsLinus Walleij2011-10-015-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | The <mach/gpio.h> file is included from upper directories and deal with generic GPIO and gpiolib stuff. Break out the platform and driver specific defines and functions into its own header file. Cc: Ryan Mallon <rmallon@gmail.com> Acked-by: Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>Stephen Warren2011-09-277-39/+48
| | | | | | | | | | | | | | | | | | This will eventually allow <mach/gpio.h> to be deleted. This mirrors LinusW's recent equivalent work on various other ARM platforms. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Olof Johansson <olof@lixom.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.hStephen Warren2011-09-262-6/+5
| | | | | | | | | | | | | | | | This centralizes all GPIO naming in one header. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Olof Johansson <olof@lixom.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7083/1: rewrite U300 GPIO to use gpiolibLinus Walleij2011-09-086-184/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This rewrites the U300 GPIO so as to use gpiolib and struct gpio_chip instead of just generic GPIO, hiding all the platform specifics and passing in GPIO chip variant as platform data at runtime instead of the compiletime kludges. As a result <mach/gpio.h> is now empty for U300 and using just defaults. Cc: Grant Likely <grant.likely@secretlab.ca> Cc: Debian kernel maintainers <debian-kernel@lists.debian.org> Cc: Arnaud Patard <arnaud.patard@rtp-net.org> Reported-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7063/1: Orion: gpio: add missing include of linux/types.hAxel Lin2011-08-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing include of linux/types.h to fix below build error. CC arch/arm/mach-mv78xx0/mpp.o In file included from arch/arm/mach-mv78xx0/include/mach/gpio.h:9, from /home/axel/repos/git/linux-2.6/arch/arm/include/asm/gpio.h:5, from include/linux/gpio.h:18, from arch/arm/mach-mv78xx0/mpp.c:10: arch/arm/plat-orion/include/plat/gpio.h:28: error: expected declaration specifiers or '...' before 'u32' make[1]: *** [arch/arm/mach-mv78xx0/mpp.o] Error 1 make: *** [arch/arm/mach-mv78xx0] Error 2 Signed-off-by: Axel Lin <axel.lin@gmail.com> Reviewed-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix buildStephen Warren2011-08-241-1/+1
| | | | | | | | | | | | | | | | Tegra's <mach/gpio.h> uses type bool; we need to include <linux/types.h> to get the definition. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpioStephen Warren2011-08-241-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By not definining a custom gpio_to_irq, the default gpiolib version is used, allowing platform consolidation. irq_to_gpio is deprecated and in the process of being removed. Make that happen now for ARM Tegra. This also partially fixes the Tegra build; it was broken because gpio.h referred to EINVAL, which wasn't always defined when <mach/gpio.h> was included. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7057/1: mach-pnx4008: rename GPIO headerLinus Walleij2011-08-233-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PNX4008 header file is using the generic gpio and gpiolib namespace in <mach/gpio.h> yet the GPIO interface is not generic at all so rename it to <mach/gpio-pnx4008.h> This fixes a build failure in current -next: the includes were changed from <mach/gpio.h> to <linux/gpio.h> but since this platform isn't using generic gpio <linux/gpio.h> did not include <mach/gpio.h> and things broke apart. Acked-by: Vitaly Wool <vitalywool@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>Linus Walleij2011-08-233-21/+0
| | | | | | | | | | | | | | | | | | After recent consolidations the Nomadik <plat/gpio.h> is entirely superfluous, so get rid of it. Reported-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7050/1: mach-sa1100: delete irq_to_gpio() functionLinus Walleij2011-08-221-2/+0
| | | | | | | | | | | | | | | | This function is not used in the assabet build, and on the whole the call is hard to consolidate so get rid of it from this machine. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystemLinus Walleij2011-08-222-65/+1
| | | | | | | | | | | | | | | | As per example from the other ARM boards, push the SA100 GPIO driver down to the GPIO subsystem so it can be consolidated. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7045/1: mach-lpc32xx: break out GPIO driver specificsLinus Walleij2011-08-223-52/+51
| | | | | | | | | | | | | | | | | | | | | | | | The <mach/gpio.h> file is included from upper directories and deal with generic GPIO and gpiolib stuff. Break out the platform and driver specific defines and functions into its own header file. Cc: Wolfram Sang <w.sang@pengutronix.de> Cc: Barry Song <bs14@csr.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystemLinus Walleij2011-08-222-447/+1
| | | | | | | | | | | | | | | | | | | | As per example from the other ARM boards, push the LPC32XX GPIO driver down to the GPIO subsystem so it can be consolidated. Cc: Wolfram Sang <w.sang@pengutronix.de> Cc: Barry Song <bs14@csr.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7043/1: mach-ixp2000: rename GPIO headerLinus Walleij2011-08-223-2/+5
| | | | | | | | | | | | | | | | | | | | The ixp2000 abuses the <mach/gpio.h> namespace by not implementing any generic GPIO nor gpiolib functions in it - just custom GPIO. Rename the header to <mach/gpio-ixp2000.h> for clarity. Cc: Lennert Buytenhek <kernel@wantstofly.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7041/1: gpio-ep93xx: hookup the to_irq callback in the driverLinus Walleij2011-08-221-8/+1
| | | | | | | | | | | | | | | | | | Remove the ep93xx machine specific dependencies for gpio_to_irq() by hooking up the callback in the driver and using __gpio_to_irq. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7040/1: mach-davinci: break out GPIO driver specificsLinus Walleij2011-08-229-79/+100
| | | | | | | | | | | | | | | | | | | | | | | | The <mach/gpio.h> file is included from upper directories and deal with generic GPIO and gpiolib stuff. Break out the platform and driver specific defines and functions into its own header file. Cc: Sekhar Nori <nsekhar@ti.com> Cc: Kevin Hilman <khilman@ti.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7039/1: mach-davinci: move DaVinci TNET GPIO driver to GPIO subsystemLinus Walleij2011-08-222-206/+0
| | | | | | | | | | | | | | | | | | | | As per example from the other ARM boards, push the DaVinci TNET GPIO driver down to the GPIO subsystem so it can be consolidated. Cc: Sekhar Nori <nsekhar@ti.com> Cc: Kevin Hilman <khilman@ti.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7038/1: mach-davinci: move GPIO driver to GPIO subsystemLinus Walleij2011-08-222-459/+1
| | | | | | | | | | | | | | | | | | | | As per example from the other ARM boards, push the DaVinci GPIO driver down to the GPIO subsystem so it can be consolidated. Cc: Sekhar Nori <nsekhar@ti.com> Cc: Kevin Hilman <khilman@ti.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7037/1: mach-ks8695: fix GPIO LEDsLinus Walleij2011-08-222-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Enabling the LEDs on the ks8695 doesn't even compile, fix it with a proper include and also replace a <mach/gpio.h> with the proper <linux/gpio.h>. Cc: zeal <zealcook@gmail.com> Cc: Ben Dooks <ben-linux@fluff.org> Acked-by: Daniel Silverstone <dsilvers@simtec.co.uk> Acked-by: Simtec Linux Team <linux@simtec.co.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7036/1: mach-ks8695: break out GPIO driver specificsLinus Walleij2011-08-225-27/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The <mach/gpio.h> file is included from upper directories and deal with generic GPIO and gpiolib stuff. Break out the platform and driver specific defines and functions into its own header file. Cc: zeal <zealcook@gmail.com> Cc: Ben Dooks <ben-linux@fluff.org> Acked-by: Daniel Silverstone <dsilvers@simtec.co.uk> Acked-by: Simtec Linux Team <linux@simtec.co.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7035/1: mach-ks8695: move GPIO driver to GPIO subsystemLinus Walleij2011-08-222-319/+1
| | | | | | | | | | | | | | | | | | | | | | | | As per example from the other ARM boards, push the KS8695 GPIO driver down to the GPIO subsystem so it can be consolidated. Cc: zeal <zealcook@gmail.com> Cc: Ben Dooks <ben-linux@fluff.org> Acked-by: Daniel Silverstone <dsilvers@simtec.co.uk> Acked-by: Simtec Linux Team <linux@simtec.co.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7034/1: mach-u300: delete irq_to_gpio() functionLinus Walleij2011-08-221-9/+0
| | | | | | | | | | | | | | | | This function is not used in the U300 build, and on the whole the call is hard to consolidate so get rid of it from this machine. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7033/1: mach-u300: break out GPIO driver specificsLinus Walleij2011-08-223-246/+258
| | | | | | | | | | | | | | | | | | | | The <mach/gpio.h> file is included from upper directories and deal with generic GPIO and gpiolib stuff. Break out the platform and driver specific defines and functions into its own header file. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 7032/1: plat-nomadik: break out GPIO driver specificsLinus Walleij2011-08-2212-77/+95
| | | | | | | | | | | | | | | | | | | | | | | | The <[plat|mach]/gpio.h> file is included from upper directories and deal with generic GPIO and gpiolib stuff. Break out the platform and driver specific defines and functions into its own header file. Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> Cc: Alessandro Rubini <rubini@unipv.it> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: gpio: make trivial GPIOLIB implementation the defaultRussell King2011-08-1231-85/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than marking the mach/gpio.h header files which want to use the trivial GPIOLIB implementation, mark those which do not want to use it instead. This means that by default, you get the trivial implementation and only have to do something extra if you need to. This should encourage the use of the trivial default implementation. As an additional bonus, several gpio.h header files become empty. Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Tested-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: gpio: consolidate gpio_to_irqRussell King2011-08-1224-42/+13
| | | | | | | | | | | | | | | | | | | | Many of the gpio_to_irq implementations use the gpiolib version of this function. Provide the standard gpiolib gpio_to_irq() for everyone, but allow platforms to override it if they wish. Add the neccessary overrides for those platforms which do not use the standard definition. Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: gpio: consolidate trivial gpiolib implementationsRussell King2011-08-1225-150/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate 24 trivial gpiolib implementions out of mach/gpio.h into asm/gpio.h. This is basically the include of asm-generic/gpio.h and the definition of gpio_get_value, gpio_set_value, and gpio_cansleep as described in Documentation/gpio.txt Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Tested-by: David Brown <davidb@codeaurora.org> Acked-by: David Brown <davidb@codeaurora.org> Tested-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Tested-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.hRussell King2011-08-08138-222/+137
| | | | | | | | | | | | | | | | Convert arch/arm includes of mach/gpio.h and asm/gpio.h to linux/gpio.h before we start consolidating the individual platform implementations of the gpio header files. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: gpio: at91: remove redundant include of mach/gpio.hRussell King2011-08-081-1/+0
| | | | | | | | | | | | asm/gpio.h already directly includes mach/gpio.h. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'for-linus' of ↵Linus Torvalds2011-10-2618-164/+85
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: Blackfin: irq: remove IRQF_DISABLED Blackfin: boards: clean up i2c_board_info Blackfin: drop unused Kconfig symbol Blackfin: bf537-stamp: register ASoC EVAL-ADAU1373 board driver Blackfin: bf537-stamp: Register adav801 codec and ASoC machine driver Blackfin: bf537-stamp: register adau1701 codec and asoc machine driver Blackfin: merge asm/mutex.h into kbuild too Blackfin: bf537-stamp: fix ad73311 codec config macro Blackfin: bf537-stamp: fix ad1836 name Blackfin: kgdb_test: rework code to avoid -O0 usage Blackfin: fix sparse warnings in copy_to/from_user Blackfin: bf548-ezkit: update defconfig Blackfin: SMP: fix scheduling deadlock Blackfin: H8606: fixup bogus ioresource init Blackfin: SMP: convert to common asm-generic/atomic.h
| * | Blackfin: irq: remove IRQF_DISABLEDYong Zhang2011-10-268-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | This flag is a NOOP and can be removed now. Signed-off-by: Yong Zhang <yong.zhang0@gmail.com> Acked-by: Bob Liu <lliubbo@kernel.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: boards: clean up i2c_board_infoMichael Hennerich2011-10-251-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove i2c_board_info for driver that doesn't exist anymore. Delete irq_flags for drivers that don't use them anymore. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: drop unused Kconfig symbolPaul Bolle2011-10-251-4/+0
| | | | | | | | | | | | | | | Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: bf537-stamp: register ASoC EVAL-ADAU1373 board driverLars-Peter Clausen2011-10-251-0/+12
| | | | | | | | | | | | | | | | | | Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: bf537-stamp: Register adav801 codec and ASoC machine driverLars-Peter Clausen2011-10-251-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is already an entry in the spi device table for the codec, but the modalias was wrong. Also the config symbol name for the codec is wrong, so this is fixed as well. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: bf537-stamp: register adau1701 codec and asoc machine driverLars-Peter Clausen2011-10-251-0/+17
| | | | | | | | | | | | | | | | | | Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: merge asm/mutex.h into kbuild tooMike Frysinger2011-10-252-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This header was being rewritten while the asm-generic kbuild support was in flight, so it missed out on the update. Punt the stub and use the kbuild now that everything has settled. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: bf537-stamp: fix ad73311 codec config macroScott Jiang2011-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | SND_BF5XX_SOC is for machine drivers while SND_SOC is for codec drivers. Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: bf537-stamp: fix ad1836 nameScott Jiang2011-10-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The ASoC codec name is "ad1836" and not "ad183x" as the change to rename things ultimately did not get merged. Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: kgdb_test: rework code to avoid -O0 usageSonic Zhang2011-10-252-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __kfree_rcu() in rcupdate.h bugs when parameter offset is not a constant at compile time. Since we build the kgdb_test module with -O0 and it includes this header file, we hit the bug. So drop the -O0 and mark the one func we need for the test as noinline (so we can set a breakpoint on it and have it be hit). Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: fix sparse warnings in copy_to/from_userMikhail Gruzdev2011-10-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix argument types for copy_to_user. Fix following sparse warnings: arch/blackfin/include/asm/uaccess.h:198:14: warning: incorrect type in argument 2 (different address spaces) arch/blackfin/include/asm/uaccess.h:198:14: expected void const *s arch/blackfin/include/asm/uaccess.h:198:14: got void const [noderef] <asn:1>*from arch/blackfin/include/asm/uaccess.h:208:14: warning: incorrect type in argument 2 (different address spaces) arch/blackfin/include/asm/uaccess.h:208:14: expected void const *s arch/blackfin/include/asm/uaccess.h:208:14: got void const [noderef] <asn:1>*from Signed-off-by: Mikhail Gruzdev <michail.gruzdev@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: bf548-ezkit: update defconfigSonic Zhang2011-10-251-10/+3
| | | | | | | | | | | | | | | Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: SMP: fix scheduling deadlockSteven Miao2011-10-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Make sure our smp_send_reschedule() implementation matches the scheduler_ipi() callback so that it can kick the idle cpu. Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: H8606: fixup bogus ioresource initThomas Gleixner2011-10-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IRQF_SHARED is not part of the IORESOURCE_IRQ bits. It's expressed by IORESOURCE_IRQ_SHAREABLE. IORESOURCE_IRQ_HIGHEDGE and IRQF_TRIGGER_HIGH are contradicting values, an interrupt can hardly be configured for both level and edge at the same time. This was introduced in commit 45138439(Blackfin arch: flash memory map and dm9000 resources updating) of course without any hint in the changelog what the heck this is supposed to do. Acked-by: Javier Herrero <jherrero@hvsistemas.es> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * | Blackfin: SMP: convert to common asm-generic/atomic.hMike Frysinger2011-10-251-94/+10
| | | | | | | | | | | | | | | | | | | | | Now that common code supports SMP systems, switch our SMP atomic logic over to it to avoid code duplication. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | | Merge branch 'x86-cleanups-for-linus' of ↵Linus Torvalds2011-10-262-2/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86-64, unistd: Remove bogus __IGNORE_getcpu x86, mm, trivial: Remove unnecessary get_order() in free_thread_info() x86, cleanup: Remove unneeded version.h include from arch/x86/
OpenPOWER on IntegriCloud