10 Jan, 2012
1 commit
-
Conflicts:
arch/arm/mach-mxs/include/mach/common.hPull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.Signed-off-by: Arnd Bergmann
05 Jan, 2012
1 commit
-
Hook these platforms restart code into the new restart hook rather
than using arch_reset().Acked-by: Richard Purdie
Signed-off-by: Russell King
14 Nov, 2011
1 commit
-
Avoid to define gpio_to_irq() and irq_to_gpio() for potential name
confliction since multiple architecture will be built together.Signed-off-by: Haojian Zhuang
01 Nov, 2011
1 commit
-
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann
14 Oct, 2011
1 commit
-
Signed-off-by: Nicolas Pitre
08 Oct, 2011
1 commit
-
Cc: Vasily Khoruzhick
Acked-by: Arnd Bergmann
Signed-off-by: Eric Miao
22 Aug, 2011
1 commit
-
Signed-off-by: Nicolas Pitre
Acked-by: Arnd Bergmann
12 Jul, 2011
2 commits
-
Signed-off-by: Vasily Khoruzhick
Signed-off-by: Eric Miao -
Signed-off-by: Eric Miao
26 Mar, 2011
1 commit
-
…-linux-2.6 into devel-stable
Conflicts:
arch/arm/mach-pxa/tosa.c
21 Mar, 2011
1 commit
-
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_defconfigSigned-off-by: Sebastian Andrzej Siewior
Signed-off-by: Dirk Brandewie
Signed-off-by: Ben Dooks
16 Mar, 2011
7 commits
-
Otherwise userspace might be confused.
Signed-off-by: Vasily Khoruzhick
Acked-by: Marek Vasut -
So user can see if there's any mmc activity and if device's
charging.Signed-off-by: Vasily Khoruzhick
Acked-by: Marek Vasut -
It eats too much power, and anyway it's not usefull
during boot process. Userspace can enable it later.Signed-off-by: Vasily Khoruzhick
Acked-by: Marek Vasut -
GPIO15 seems to be not related to WiFi, so don't touch it.
Signed-off-by: Vasily Khoruzhick
Acked-by: Marek Vasut -
Fix coefficients to get actual voltage, and make
voltage_max/voltage_min looks like values for LiIon battery.Signed-off-by: Vasily Khoruzhick
Acked-by: Marek Vasut -
It's very easy to press some keypad key when Z2 is closed,
so to prevent unexpected wakeups, use only 'Power' key to wake
Z2 from sleep.Signed-off-by: Vasily Khoruzhick
Acked-by: Marek Vasut -
set_pxa_fb_info() has been a long-standing wart in the naming scheme
of the pxa_set_xxx_info() functions. This renames the function, and
combines set_pxa_fb_parent() with set_pxa_fb_info().Signed-off-by: Russell King
Acked-by: Igor Grinberg
Signed-off-by: Eric Miao
08 Jan, 2011
1 commit
-
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
spi/omap: Fix DMA API usage in OMAP MCSPI driver
spi/imx: correct the test on platform_get_irq() return value
spi/topcliff: Typo fix threhold to threshold
spi/dw_spi Typo change diable to disable.
spi/fsl_espi: change the read behaviour of the SPIRF
spi/mpc52xx-psc-spi: move probe/remove to proper sections
spi/dw_spi: add DMA support
spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
spi/dw_spi: Fix too short timeout in spi polling loop
spi/pl022: convert running variable
spi/pl022: convert busy flag to a bool
spi/pl022: pass the returned sglen to the DMA engine
spi/pl022: map the buffers on the DMA engine
spi/topcliff_pch: Fix data transfer issue
spi/imx: remove autodetection
spi/pxa2xx: pass of_node to spi device and set a parent device
spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
spi/pxa2xx: Add chipselect support for Sodaville
spi/pxa2xx: Consider CE4100's FIFO depth
spi/pxa2xx: Add CE4100 support
...
16 Dec, 2010
1 commit
-
This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish
between PXA25x/PXA27x and PXA3xx memory mapping.Also, fixup for platforms broken after introducing pxa{25x,27x}_map_io()
and pxa3xx_map_io() is included.Signed-off-by: Marek Vasut
Signed-off-by: Eric Miao
01 Dec, 2010
1 commit
-
The PXA-SPI driver relies on some files / defines which are arm specific
and are within the ARM tree. The CE4100 SoC which is x86 has also the
SPI core.
This patch moves the ssp and spi files from arm/mach-pxa and plat-pxa to
include/linux where the CE4100 can access them.This move got 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_defconfigSigned-off-by: Sebastian Andrzej Siewior
Signed-off-by: Dirk Brandewie
20 Oct, 2010
1 commit
-
Since we're now using addruart to establish the debug mapping, we can
remove the io_pg_offst and phys_io members of struct machine_desc.The various declarations were removed using the following script:
grep -rl MACHINE_START arch/arm | xargs \
sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }'[ Initial patch was from Jeremy Kerr, example script from Russell King ]
Signed-off-by: Nicolas Pitre
Acked-by: Eric Miao
09 Oct, 2010
1 commit
-
mach-mmp utilizes pxa27x_keypad code so we need to move header to
platform pxa directory.Signed-off-by: Mark F. Brown
Signed-off-by: Eric Miao
05 Aug, 2010
2 commits
-
Signed-off-by: Marek Vasut
-
Register TPS65021 regulator in Zipit Z2.
Signed-off-by: Marek Vasut
Signed-off-by: Eric Miao
18 Jun, 2010
2 commits
-
This patch registers the WM8750 codec on a proper place on the ZipitZ2
machine after the WM8750 driver was converted to new API.Signed-off-by: Marek Vasut
Signed-off-by: Eric Miao -
This patch adds support for the AER915 battery chip into Zipit Z2
platform file.Signed-off-by: Marek Vasut
Signed-off-by: Eric Miao
13 Jun, 2010
1 commit
-
This patch fixes flash layout to it's final version. Also, I fixed the
authorship information of this file as it's been totally reworked since Ken
released his last version.Signed-off-by: Marek Vasut
Signed-off-by: Eric Miao
11 May, 2010
2 commits
-
delay_detect in HZ is confusing, convert it to be millisecond based. And
thus remove those unnecessary call to msecs_to_jiffies() at runtime for
this field. Other constants are converted assuming HZ == 100, which are
basically true for those platforms.The assignment in csb726.c was incorrect, and is fixed in this patch as
a result.Signed-off-by: Eric Miao
Acked-by: Robert Jarzmik
Acked-by: Marc Zyngier
Acked-by: Marek Vasut
Acked-by: Mike Rapoport
Acked-by: Daniel Mack -
This patch adds support for the Zipit Z2. The parts missing from this
patch are the battery support, SPI driver for the LCD and support for
the Silicon Serial ID chip.Signed-off-by: Marek Vasut
Signed-off-by: Eric Miao