aboutsummaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAge
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-12-08
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (272 commits) Fix soc_common PCMCIA configuration ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request ARM: 5826/1: SA1100: h3100/h3600: always build htc-egpio driver ARM: 5825/1: SA1100: h3600: update defconfig ARM: 5824/1: SA1100: reuse h3600 PCMCIA driver on h3100 ARM: 5823/1: SA1100: h3100/h3600: add support for gpio-keys ARM: 5822/1: SA1100: h3100/h3600: clean up #includes ARM: 5821/1: SA1100: h3100/h3600: revise copyright boilerplates ARM: 5820/1: SA1100: h3100/h3600: split h3600.c ARM: 5819/1: SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.h ARM: 5818/1: SA1100: h3100/h3600: drop old GPIO definitions ARM: 5817/1: SA1100: h3100/h3600: configure all unused gpios as inputs ARM: 5816/1: SA1100: h3600: remove IRQ_GPIO_* definitions ARM: 5815/1: SA1100: h3100/h3600: remove now unused assign_h3600_egpio handlers ARM: 5814/1: SA1100: h3100/h3600: convert all users of assign_h3600_egpio to gpiolib ARM: 5813/1: SA1100: h3100/h3600: add htc-egpio driver ARM: 5812/1: SA1100: h3100/h3600: separate machine-specific LCD helpers ARM: 5811/2: pcmcia: convert sa1100_h3600 driver to gpiolib ARM: 5799/1: SA1100: h3600: stop setting direction for LCD pins ARM: 5798/1: SA1100: h3600: remove unused cruft from h3600.h ...
| * Merge branch 'sa1100' into develRussell King2009-12-06
| |\
| | * Merge branch 'for-lak' of git://git.linuxtogo.org/home/thesing/collie into ↵Russell King2009-12-06
| | |\ | | | | | | | | | | | | sa1100
| | | * collie: support pda_power driverThomas Kunze2009-11-27
| | | | | | | | | | | | | | | | This add the pda-power platform device to collie.
| | | * collie: convert to gpiolib for ucb1x00Thomas Kunze2009-11-27
| | | | | | | | | | | | | | | | | | | | Only the parts used for collie_battery are converted. The rest will be cleaned up later.
| | | * add gpiolib support to ucb1x00Thomas Kunze2009-11-27
| | | | | | | | | | | | | | | | | | | | The old access methods to the gpios will be removed when all users has been converted. (mainly ucb1x00-ts)
| | | * SA1100: make gpio_to_irq and reverse a macroThomas Kunze2009-11-27
| | | | | | | | | | | | | | | | | | | | The function can't be used for static initialisations so convert them to macros.
| | | * collie: prepare for gpiolib useThomas Kunze2009-11-27
| | | | | | | | | | | | | | | | | | | | prefix gpio definitions for direct register access with '_' so we can use the other names for gpio_request & co
| | | * collie: fix scoop convesion to new apiThomas Kunze2009-11-27
| | | |
| | * | ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_requestDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5826/1: SA1100: h3100/h3600: always build htc-egpio driverDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many features of h3100/h3600 (LCD, PCMCIA, Flash write, etc.) depend on correct functioning of GPIO expander handled by htc-egpio driver, so force its building in Kconfig. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5825/1: SA1100: h3600: update defconfigDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update defconfig to current kernel, enable support for iPAQ H3100 and following drivers: gpio-keys, htc-egpio, ide_cs. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5823/1: SA1100: h3100/h3600: add support for gpio-keysDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for "Power" and "Action" (joystick center) buttons - the only buttons on iPaq h3100/h3600 connected to GPIOs (other buttons are controlled by microcontroller) Also remove setting PWER for wakeup on Power button press - gpio-keys driver will handle it. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5822/1: SA1100: h3100/h3600: clean up #includesDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a code reorganization and following split, there's some #includes now unused. Clean them up and sort remaining alphabetticaly where possible. Compile tested. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5821/1: SA1100: h3100/h3600: revise copyright boilerplatesDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct boilerplates after files split. Also shorten them a bit - use standart GPL wording (as per http://lkml.org/lkml/2007/5/1/220) and drop changelog, which only entry about h3800 support and abstracted EGPIOs is just confusing now, as both of these features are gone. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5820/1: SA1100: h3100/h3600: split h3600.cDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split common h3600.c into three separate files: h3100.c, h3600.c and h3xxx.c (the latter contains common code for h3100/h3600) Copyright boilerplates and #includes are copied intact and will be cleaned up later. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5819/1: SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.hDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Combine both headers into one, rename to h3xxx.h and change all users accordingly. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5818/1: SA1100: h3100/h3600: drop old GPIO definitionsDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As all existing code was converted to gpiolib, drop no more used pre-gpiolib (bit-shifted) GPIO definintions. Supply new gpiolib-friendly definitions for GPIOs which don't have them yet. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5817/1: SA1100: h3100/h3600: configure all unused gpios as inputsDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After conversion to gpiolib there's still some GPIOs left, that get configured in *_mach_init() as outputs (using direct operations on GPCR/GPDR registers), but otherwise unused. These GPIOs are mainly sound related and should be configured by corresponding driver once it is written. Drop this initialisation and configure all GPIOs as input. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5816/1: SA1100: h3600: remove IRQ_GPIO_* definitionsDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As all the remaining users of these definitions (in pcmcia/sa1100_h3600 driver) were converted to gpio_to_irq(), they can be safely removed. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5815/1: SA1100: h3100/h3600: remove now unused assign_h3600_egpio handlersDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As all users of assign_h3600_egpio now converted to gpiolib, we can safely remove all assign_h3600_egpio handling code and definitions. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5814/1: SA1100: h3100/h3600: convert all users of assign_h3600_egpio to ↵Dmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gpiolib Use of gpio_request/gpio_free in some callbacks may look ugly, but corresponding drivers (sa1100_serial and sa1100_fb) don't provide (yet) init/exit hooks and registering these gpios in *_mach_init is also not possible, because htc-gpio driver starts a bit later... Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5813/1: SA1100: h3100/h3600: add htc-egpio driverDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will be used for future conversion of assign_h3600_egpio calls to gpiolib. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5812/1: SA1100: h3100/h3600: separate machine-specific LCD helpersDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | h3100 and h3600 have different sets of LCD-controlling gpios, which mapped to the same "abstracted" EGPIO. As we plan to get rid of those abstracted egpios completely, we need to separate these helper functions. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5799/1: SA1100: h3600: stop setting direction for LCD pinsDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sa1100_fb driver handles this Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5798/1: SA1100: h3600: remove unused cruft from h3600.hDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PM_SUSPEND, PM_RESUME and machine_is_h3xxx() are not used anywhere in kernel (checked with git grep), so it's safe to remove them. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5796/1: SA1100: h3600: remove IRDA bits from serial PM callbackDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IRDA is handled by separate sa1100-ir driver and has nothing to do with sa1100_serial Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5797/1: SA1100: h3100/h3600: remove dead links from Kconfig help textDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 5795/1: SA1100: h3100/h3600: mark *_mach_init functions as __initDmitry Artamonow2009-12-06
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: iPAQ: no need to set PWER_RTCRussell King2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | The rtc-sa1100 driver takes care of this. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: iPAQ: move serial port support functionsRussell King2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No point calling sa1100_register_uart_fns early - these aren't used until late in the boot sequence. Also convert to gpiolib support. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: iPAQ: convert H3100 IrDA to use generic gpio supportRussell King2009-12-06
| | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: iPAQ: provide a way to setup platform-controlled GPIOsRussell King2009-12-06
| | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: iPAQ: separate IrDA machine specificsRussell King2009-12-06
| | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: h3600: provide each iPAQ machine type with own init functionRussell King2009-12-06
| | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: sa11x0: convert set_xxx_data() to register_xxx()Russell King2009-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only register devices if we have platform data for those which require platform data. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | Merge branch 'devel-stable' into develRussell King2009-12-05
| |\ \ \
| | * \ \ Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2009-12-04
| | |\ \ \ | | | | | | | | | | | | | | | | | | devel-stable
| | | * | | mx31moboard: fix typoRobert Schwebel2009-12-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, linux-next breaks due to a typo introduced in commit 33c4d91928bea4444b067e620496befbeb87029c This patch fixes it. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> Cc: Valentin Longchamp <valentin.longchamp@epfl.ch> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | | i.MX27 audmux: Fix register offsetsSascha Hauer2009-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have two holes in the register space. The driver did not handle this. Fix it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | | mx27: mxt_td60: Add support to SD/MMCAlan Carvalho de Assis2009-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch configures iomux and i2c io expander in order to add support to SD/MMC cards on i-MXT TD60. Signed-off-by: Alan Carvalho de Assis <acassis@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | | mx35: add usb gadget support in mx35pdk.cHarro Haan2009-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Harro Haan <hrhaan@yahoo.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | | mx35: register usb_ahb clock in clock-imx35.cHarro Haan2009-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Harro Haan <hrhaan@yahoo.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | | Add KZM-ARM11-01 supportYoichi Yuasa2009-11-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | | mx27: Add basic support for Maxtrack i-MXT TD60Alan Carvalho de Assis2009-11-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alan Carvalho de Assis <acassis@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * | | IMX: don't disable the uart clock if DEBUG_LL uses itUwe Kleine-König2009-11-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the clock was left enabled only for DEBUG_LL_CONSOLE which requires an additional patch to exist at all. With this patch applied DEBUG_LL_CONSOLE depends on DEBUG_LL, so this doesn't break. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * | | | Merge branch 'devel' of ↵Russell King2009-12-04
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
| | | * | | | [ARM] pxa/hx4700: actually use platform_lcd driverDmitry Artamonow2009-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit e2c509c7e6 ([ARM] pxa/hx4700: use platform_lcd driver) missed to actually register platform device for LCD. It causes following GCC warning: arch/arm/mach-pxa/hx4700.c:553: warning: 'hx4700_lcd' defined but not used Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Acked-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| | | * | | | [ARM] pxa/pcm990: don't use pxa_camera init() callbackAntonio Ospite2009-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pxa_camera init() is ambiguous, it's better to configure PXA CIF pins statically in machine init function. Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| | | * | | | [ARM] pxa/em-x270: don't use pxa_camera init() callbackAntonio Ospite2009-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pxa_camera init() is ambiguous, it's better to statically configure the sensor. Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Acked-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-15 00:15:06 -0500