summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ARM] 5146/1: pxa2xx: convert all boards to call pxa2xx_transceiver_mode helperDmitry Baryshkov2008-07-128-13/+13
| | | | | Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge branch 'eseries' into pxaRussell King2008-07-1212-5/+617
|\ | | | | | | | | | | Conflicts: arch/arm/mach-pxa/Makefile
| * Support for LCD on e740 e750 e400 and e800 e-series PDAsIan Molton2008-07-106-0/+454
| | | | | | | | Signed-off-by: Ian Molton <spyro@f2s.com>
| * E-series UDC supportIan Molton2008-07-102-1/+58
| | | | | | | | Signed-off-by: IAn Molton <spyro@f2s.com>
| * PXA UDC - allow use of inverted GPIO for pullupIan Molton2008-07-102-2/+5
| | | | | | | | Signed-off-by: Ian Molton <spyro@f2s.com>
| * Add e350 supportIan Molton2008-07-102-0/+21
| | | | | | | | Signed-off-by: Ian Molton <spyro@f2s.com>
| * Fix broken e-series buildIan Molton2008-07-101-1/+1
| | | | | | | | Signed-off-by: Ian Molton <spyro@f2s.com>
| * E-series GPIO / IRQ definitions.Ian Molton2008-07-102-0/+77
| |
* | Merge branch 'pxa-tosa' into pxaRussell King2008-07-1222-97/+1539
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/tosa.c arch/arm/mach-pxa/spitz.c
| * | [ARM] 5152/1: Add myself to tosa maintainers listDmitry Baryshkov2008-07-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the beginning of this year I'm providing fixes and updates for the Sharp SL-6000 (tosa). Add myself as one of the maintainers of the machine. Cc: Dirk Opfer <dirk@opfer-online.de> Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5151/1: Tosa: remove double inclusion of linux/delay.hDmitry Baryshkov2008-07-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The patch applies to the linux-next tree. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Acked-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5150/1: Tosa: support built-in bluetooth power-upDmitry Baryshkov2008-07-076-5/+201
| | | | | | | | | | | | | | | | | | | | | | | | The driver is pretty much generic and will be later shared with a few other devices, like hx4700 ipaq. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5129/1: tosa: tmio-nand dataDmitry Baryshkov2008-07-071-0/+38
| | | | | | | | | | | | | | | Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5128/1: tc6393xb: tmio-nand supportDmitry Baryshkov2008-07-074-0/+83
| | | | | | | | | | | | | | | Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5127/1: Core MFD supportDmitry Baryshkov2008-07-074-0/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch provides a common subdevice registration system for MFD type chips, using platfrom device. Signed-off-by: Ian Molton <spyro@f2s.com> Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5099/1: Tosa: support AC-in detection.Dmitry Baryshkov2008-07-071-0/+66
| | | | | | | | | | | | | | | | | | | | | Add support for ac-in via pda_power device. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5098/1: fix sound/soc/pxa/tosa.c to new gpio apiDmitry Baryshkov2008-07-072-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | The sound/soc/pxa/tosa.c contains dependencies on parts that never ever hit mainline. Replace them with current support for tc6393xb. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5097/1: Tosa: support TC6393XB deviceDmitry Baryshkov2008-07-073-14/+158
| | | | | | | | | | | | | | | | | | | | | | | | Add definitions for Toshiba TC6393XB companion chip and register the tc6393xb device. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5096/2: Support Toshiba TC6393XB Mobile I/O Controller.Dmitry Baryshkov2008-07-074-0/+592
| | | | | | | | | | | | | | | | | | | | | | | | Add support for Toshiba TC6393XB companion chip. Currently only GPIO and part of IRQ features of the device are supported. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5083/2: Tosa: fix IrDA transciver powerup.Dmitry Baryshkov2008-07-072-12/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | On tosa the tranciver LED isn't powered down if the GPIO47 (STUART_TX) isn't configured as low-level. Power it down if IrDA is off to save a bit of power. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5089/1: tosa: cleanup includesDmitry Baryshkov2008-07-071-8/+0
| | | | | | | | | | | | | | | Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5081/1: tosa: fix SD GPIOsDmitry Baryshkov2008-07-071-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | This changes SD-related GPIO names to be more informative, and allocates two more SD-related GPIOs. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5064/1: pxa: explicitly specify tosa keyboard GPIOs' low power states ↵eric miao2008-07-072-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | to DRIVE_LOW Signed-off-by: Eric Miao <eric.miao@marvell.com> Acked-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5048/2: Clean up tosa and spitz resettingDmitry Baryshkov2008-07-072-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | Use new reset_gpio to reset tosa and spitz PDAs. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5069/1: pxa: include pxa2xx-regs.h in reset.c for RSCRPhilipp Zabel2008-07-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The RCSR definition was moved into pxa2xx-regs.h. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [ARM] 5047/2: Support resetting by asserting GPIO pinDmitry Baryshkov2008-07-074-17/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for resetting via assertion of GPIO pin. This e.g. is used on Sharp Zaurus SL-6000. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | |
| \ \
*-. \ \ Merge branches 'pxa-ian' and 'pxa-xm270' into pxaRussell King2008-07-1214-412/+767
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MAINTAINERS
| | * | | [ARM] 5107/1: Add maintainer entries for the CompuLab CM-X270/EM-X270 machinesMike Rapoport2008-07-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add maintainer entries for the CompuLab CM-X270/EM-X270 machines Signed-off-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] 5106/1: CM-X270: remove unneeded cm-x270.hMike Rapoport2008-07-091-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The include/asm-arm/arch-pxa/cm-x270.h is not used anymore. Remove it. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] 5105/1: CM-X270: update NAND flash driver to use gpio_libMike Rapoport2008-07-091-32/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CM-X270 NAND flash driver to use gpio_lib. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] 5104/1: CM-X270: PCMCIA updatesMike Rapoport2008-07-091-66/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert to use gpio_lib interface. Remove support for second PCMCIA slot to avoid run-time conflicts with MMC/SD because of shared GPIO Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] 5103/2: CM-X270: update core platform supportMike Rapoport2008-07-093-139/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert CM-X270 pin configuration to use MFP tables. Make device initialization dependent on respective driver CONFIG_ value (like in zylonite). Cleanup includes Signed-off-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] 5101/2: EM-X270 updatesMike Rapoport2008-07-091-80/+293
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert EM-X270 pin configuration to use MFP tables and gpio library Make device initialization dependent on respective driver CONFIG_ value (like in zylonite) Add keypad and gpio_key devices Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | Clocklib: Fix SA1111 clock name mess.Ian Molton2008-07-104-34/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses the ability of PXA's clocklib to alias clock to resolve the problem caused by sharing the SA1111 IO controller between PXA and SA1100 architectures, which have differing GPIO numbering. Signed-off-by: Ian Molton <spyro@f2s.com>
| * | | Clocklib: Provide for GPIO 12 clock on PXAIan Molton2008-07-102-0/+33
| | | | | | | | | | | | | | | | Signed-off-by: Ian Molton <spyro@f2s.com>
| * | | Fix serial broken-ness on PXA250Ian Molton2008-07-102-2/+14
| |/ / | | | | | | | | | | | | | | | | | | PXA255 and 26x are the only PXA CPUs with HWUART. This patch prevents bogus initialisation on other models. Signed-off-by: Ian Molton <spyro@f2s.com>
| | |
| \ \
*-. \ \ Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxaRussell King2008-07-101698-18138/+31387
|\ \ \ \
| | * | | [ARM] 5155/1: PalmTX battery monitorMarek Vašut2008-07-104-0/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds battery monitoring driver for PalmTX. It can read voltage from the battery and temperature. It also monitors charging/discharging status. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] 5154/1: PalmTX PCMCIAMarek Vašut2008-07-104-1/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds PCMCIA support for PalmTX handheld computer. There is one chip hard-soldered to slot0, another slot is not in use and not accessible. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] 5153/1: Add support for PalmTX handheld computerMarek Vašut2008-07-105-0/+469
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PalmTX is PXA27x based device with wifi, bluetooth, touchscreen, sdio slot, irda, keypad, nand flash, pxa framebuffer, serial and usb gadget interface. Supported by this patch is pxafb, touchscreen, irda, keypad and sdio slot. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | Merge branch 'machtypes' into pxa-palmRussell King2008-07-091686-18099/+30433
| | |\ \ \ | | | |/ / | | |/| |
| | | * | [ARM] mach-types updateRussell King2008-07-071-17/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mach-types. Remove invalid or incorrect entries. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | Linux 2.6.26-rc8v2.6.26-rc8Linus Torvalds2008-06-241-1/+1
| | | | |
| | | * | Merge branch 'release' of ↵Linus Torvalds2008-06-243-5/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Eliminate NULL test after alloc_bootmem in iosapic_alloc_rte() [IA64] Handle count==0 in sn2_ptc_proc_write() [IA64] Fix boot failure on ia64/sn2
| | | | * | [IA64] Eliminate NULL test after alloc_bootmem in iosapic_alloc_rte()Julia Lawall2008-06-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As noted by Akinobu Mita alloc_bootmem and related functions never return NULL and always return a zeroed region of memory. Thus a NULL test or memset after calls to these functions is unnecessary. Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Tony Luck <tony.luck@intel.com>
| | | | * | [IA64] Handle count==0 in sn2_ptc_proc_write()Cliff Wickman2008-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix applied in e0c6d97c65e0784aade7e97b9411f245a6c543e7 "security hole in sn2_ptc_proc_write" didn't take into account the case where count==0 (which results in a buffer underrun when adding the trailing '\0'). Thanks to Andi Kleen for pointing this out. Signed-off-by: Cliff Wickman <cpw@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
| | | | * | [IA64] Fix boot failure on ia64/sn2Jes Sorensen2008-06-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call check_sal_cache_flush() after platform_setup() as check_sal_cache_flush() now relies on being able to call platform vector code. Problem was introduced by: 3463a93def55c309f3c0d0a8aaf216be3be42d64 "Update check_sal_cache_flush to use platform_send_ipi()" Signed-off-by: Jes Sorensen <jes@sgi.com> Tested-by: Alex Chiang: <achiang@hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
| | | * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixesLinus Torvalds2008-06-242-15/+10
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: [GFS2] fix gfs2 block allocation (cleaned up) [GFS2] BUG: unable to handle kernel paging request at ffff81002690e000
| | | | * | | [GFS2] fix gfs2 block allocation (cleaned up)Benjamin Marzinski2008-06-241-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes bz 450641. This patch changes the computation for zero_metapath_length(), which it renames to metapath_branch_start(). When you are extending the metadata tree, The indirect blocks that point to the new data block must either diverge from the existing tree either at the inode, or at the first indirect block. They can diverge at the first indirect block because the inode has room for 483 pointers while the indirect blocks have room for 509 pointers, so when the tree is grown, there is some free space in the first indirect block. What metapath_branch_start() now computes is the height where the first indirect block for the new data block is located. It can either be 1 (if the indirect block diverges from the inode) or 2 (if it diverges from the first indirect block). Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| | | | * | | [GFS2] BUG: unable to handle kernel paging request at ffff81002690e000Bob Peterson2008-06-241-1/+1
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes bugzilla bug bz448866: gfs2: BUG: unable to handle kernel paging request at ffff81002690e000. Signed-off-by: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
OpenPOWER on IntegriCloud