summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp/gplugd.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* ARM: mmp: add missing irqs.hHaojian Zhuang2012-08-021-0/+1
| | | | | | | | | | | arch/arm/mach-mmp/gplugd.c:195:13: error: ‘MMP_NR_IRQS’ undeclared here (not in a function) make[1]: *** [arch/arm/mach-mmp/gplugd.o] Error 1 Include <mach/irqs.h> to fix this issue. Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Olof Johansson <olof@lixom.net>
* ARM: mmp: remove NR_IRQSRob Herring2012-01-261-1/+1
| | | | | | | Remove NR_IRQS and add a per machine .nr_irqs setting. Clean-up namespace replacing usage of IRQ_BOARD_START with MMP_NR_IRQS. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
* Merge branch 'samsung/driver' into next/driversArnd Bergmann2012-01-091-0/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * ARM: restart: mmp: use new restart hookRussell King2012-01-051-0/+1
| | | | | | | | | | | | | | Hook the Shark restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'mxs/saif' into next/driversArnd Bergmann2011-12-061-1/+1
|\| | | | | | | | | Conflicts: drivers/net/ethernet/cadence/Kconfig
| * ARM: pxa168/gplugd: add the correct SSP deviceEric Miao2011-11-171-1/+1
| | | | | | | | | | | | | | There is no SSP0, but SSP1 is used on gplugd as an I2S port. Acked-by: Tanmay Upadhyay <tanmay.upadhyay@einfochips.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | ARM: pxa: change gpio to platform deviceHaojian Zhuang2011-11-151-0/+1
|/ | | | | | Remove most gpio macros and change gpio driver to platform driver. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
* Merge branch 'depends/rmk/gpio' into next/fixesArnd Bergmann2011-10-311-1/+1
|\ | | | | | | | | | | | | This sorts out merge conflicts with the arm/gpio branch that already got merged into mainline Linux. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * ARM: 7104/1: plat-pxa: break out GPIO driver specificsLinus Walleij2011-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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: mmp: rename SHEEVAD to GPLUGDEric Miao2011-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | GuruPlugD was initially named to be SHEEVAD, and it's causing naming confusion in the mach-types database. Make it consistent by renaming to GPLUGD. Reported-and-Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Tanmay Upadhyay <tanmay.upadhyay@einfochips.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | ARM: pxa168/gplugd: free correct GPIOTanmay Upadhyay2011-08-111-2/+2
| | | | | | | | | | Signed-off-by: Tanmay Upadhyay <tanmay.upadhyay@einfochips.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | ARM: pxa168/gplugd: get rid of mfp-gplugd.hTanmay Upadhyay2011-08-111-5/+13
|/ | | | | | | | Move definitions from mfp-gplugd.h to mfp-pxa168.h as they aren't gplugD specific. Signed-off-by: Tanmay Upadhyay <tanmay.upadhyay@einfochips.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM: pxa168: Add board support for gplugDTanmay Upadhyay2011-07-121-0/+189
Tested UART console, Ethernet & I2C interfaces Signed-off-by: Tanmay Upadhyay <tanmay.upadhyay@einfochips.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>