summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa95x.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next/fixes-non-critical' into next/driversArnd Bergmann2012-03-201-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-lpc32xx/clock.c arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c The conflicts with pxa are non-obvious, we have multiple branches adding and removing the same clock settings. According to Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct fix here. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * ARM: pxa: remove duplicated registeration on pxa-gpioHaojian Zhuang2012-03-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Both reboot (via reboot(RB_AUTOBOOT)) and suspend freeze on hx4700. Registration of pxa_gpio_syscore_ops is moved into pxa-gpio driver, but it still exists in arch-pxa directory. It resulsts failure on reboot and suspend. Now remove the registration code in arch-pxa. Reported-by: Paul Parsons <lost.distance@yahoo.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
* | ARM: pxa: add rtc dummy clockHaojian Zhuang2012-02-281-0/+1
|/ | | | | | | | sa1100-rtc driver could be shared among sa1100/pxa/mmp series silicon. Since clk is used in mmp series silicon, add dummy clock support in pxa also. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
* Revert "ARM: pxa: add dummy clock for sa1100-rtc"Russell King2012-01-191-1/+0
| | | | | | | This reverts commit 7557c175f60d8d40baf16b22caf79beadef8f081. This revert is necessary to revert the broken "RTC: sa1100: support sa1100, pxa and mmp soc families" change.
* Merge branch 'drivers/rtc-sa1100' into next/driversArnd Bergmann2011-12-281-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | * drivers/rtc-sa1100: ARM: sa1100: clean up of the clock support ARM: pxa: add dummy clock for sa1100-rtc RTC: sa1100: support sa1100, pxa and mmp soc families RTC: sa1100: remove redundant code of setting alarm RTC: sa1100: Clean out ost register Conflicts: arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c
| * ARM: pxa: add dummy clock for sa1100-rtcJett.Zhou2011-12-281-0/+1
| | | | | | | | | | | | | | | | | | | | Now sa1100-rtc can support sa1100/pxa/mmp soc series, then we need add dummy clock for sa1100-rtc. Signed-off-by: Jett.Zhou <jtzhou@marvell.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* | ARM: pxa: add clk support in gpio driverHaojian Zhuang2011-11-151-0/+2
| | | | | | | | | | | | | | | | Support clk in gpio driver. There's no gpio clock in PXA25x and PXA27x. So use dummy clk instead. And move the gpio edge initialization into gpio driver for arch-mmp. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
* | ARM: pxa: change gpio to platform deviceHaojian Zhuang2011-11-151-2/+1
|/ | | | | | Remove most gpio macros and change gpio driver to platform driver. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
* ARM: 7104/1: plat-pxa: break out GPIO driver specificsLinus Walleij2011-10-011-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: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.hRussell King2011-08-081-2/+1
| | | | | | | | 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: pxa: avoid accessing interrupt registers directlyEric Miao2011-07-121-1/+0
| | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* ARM / PXA: Use struct syscore_ops for "core" power managementRafael J. Wysocki2011-04-241-16/+4
| | | | | | | | | | | | | Replace sysdev classes and struct sys_device objects used for "core" power management by the PXA platform code with struct syscore_ops objects that are simpler. This reduces the code size and the kernel memory footprint. It also is necessary for removing sysdevs entirely from the kernel in the future. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
* ARM: pxa2xx: reorganize I2C filesSebastian Andrzej Siewior2011-03-211-1/+1
| | | | | | | | | | | | | | | | | This patch moves the platform data definition from arch/arm/plat-pxa/include/plat/i2c.h to include/linux/i2c/pxa-i2c.h so it can be accessed from x86 the same way as on ARM. This change should make no functional change to the PXA code. The move is verified by building the following defconfigs: cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig raumfeld_defconfig magician_defconfig mmp2_defconfig pxa168_defconfig pxa910_defconfig Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: pxa: support pxa95xHaojian Zhuang2010-12-181-0/+308
The core of PXA955 is PJ4. Add new PJ4 support. And add new macro CONFIG_PXA95x. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
OpenPOWER on IntegriCloud