28 Dec, 2011
2 commits
-
* 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 registerConflicts:
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c -
Now sa1100-rtc can support sa1100/pxa/mmp soc series, then we need
add dummy clock for sa1100-rtc.Signed-off-by: Jett.Zhou
Acked-by: Jean-Christophe PLAGNIOL-VILLARD
Acked-by: Haojian Zhuang
Signed-off-by: Arnd Bergmann
15 Nov, 2011
2 commits
-
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
-
Remove most gpio macros and change gpio driver to platform driver.
Signed-off-by: Haojian Zhuang
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
-
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.Signed-off-by: Arnd Bergmann
08 Oct, 2011
1 commit
-
This tries to clear up the confusion between integers and iomem pointers
in the marvell pxa platform. MMIO addresses are supposed to be __iomem*
values, in order to let the Linux type checking work correctly. This
patch moves the cast to __iomem as far back as possible, to the place
where the MMIO virtual address windows are defined.Signed-off-by: Arnd Bergmann
Signed-off-by: Eric Miao
02 Oct, 2011
1 commit
-
The 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
Signed-off-by: Linus Walleij
Signed-off-by: Russell King
08 Aug, 2011
1 commit
-
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
24 Jun, 2011
2 commits
-
The first and second arguments shouldn't concern platform code, so
hide them from each platforms caller.Tested-by: Kevin Hilman
Acked-by: Jean Pihet
Signed-off-by: Russell King -
We don't need a veneer for cpu_suspend, it can be called directly from
C code now. Move it into the PXA CPU suspend functions, along with
the accumulator register saving/restoring.Signed-off-by: Russell King
25 Apr, 2011
1 commit
-
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
Acked-by: Greg Kroah-Hartman
13 Apr, 2011
1 commit
-
This fixes the failure to register the IRQ_RTCAlrm alarm as a wakeup
event. It is misinterpreted as a gpio irq not a PWER bitmask. Fixed
this by converting the incorrect IRQ_TO_IRQ() to a correct version of
irq_to_gpio().Reported-by: Nick Bane
Signed-off-by: Eric Miao
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
23 Feb, 2011
1 commit
-
Signed-off-by: Russell King
14 Jan, 2011
1 commit
-
Signed-off-by: Lennert Buytenhek
16 Dec, 2010
5 commits
-
Signed-off-by: Eric Miao
-
Introduce 'struct clk' for memory and remove
get_memclk_frequency_10khz().Signed-off-by: Eric Miao
-
Signed-off-by: Eric Miao
-
This is important because on PXA3xx, the physical mapping of SMEMC registers
differs from the one on PXA2xx. In order to get PCMCIA working on both PXA2xx
and PXA320, the PCMCIA driver was adjusted accordingly as well.Also, various places in the kernel had to be patched to use
__raw_read/__raw_write.Signed-off-by: Marek Vasut
Acked-by: Haojian Zhuang
Signed-off-by: Eric Miao -
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
17 Aug, 2010
1 commit
-
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.Conflicts:
arch/arm/mach-mx2/clock_imx27.c
arch/arm/mach-mx2/devices.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-zoom2.c
sound/soc/fsl/mpc5200_dma.c
sound/soc/fsl/mpc5200_dma.h
sound/soc/fsl/mpc8610_hpcd.c
sound/soc/pxa/spitz.c
12 Aug, 2010
1 commit
-
This patch extends the ASoC API to allow sound cards to have more than one
CODEC and more than one platform DMA controller. This is achieved by dividing
some current ASoC structures that contain both driver data and device data into
structures that only either contain device data or driver data. i.e.struct snd_soc_codec ---> struct snd_soc_codec (device data)
+-> struct snd_soc_codec_driver (driver data)struct snd_soc_platform ---> struct snd_soc_platform (device data)
+-> struct snd_soc_platform_driver (driver data)struct snd_soc_dai ---> struct snd_soc_dai (device data)
+-> struct snd_soc_dai_driver (driver data)struct snd_soc_device ---> deleted
This now allows ASoC to be more tightly aligned with the Linux driver model and
also means that every ASoC codec, platform and (platform) DAI is a kernel
device. ASoC component private data is now stored as device private data.The ASoC sound card struct snd_soc_card has also been updated to store lists
of it's components rather than a pointer to a codec and platform. The PCM
runtime struct soc_pcm_runtime now has pointers to all its components.This patch adds DAPM support for ASoC multi-component and removes struct
snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec
or runtime PCM level basis rather than using snd_soc_socdev.Other notable multi-component changes:-
* Stream operations now de-reference less structures.
* close_delayed work() now runs on a DAI basis rather than looping all DAIs
in a card.
* PM suspend()/resume() operations can now handle N CODECs and Platforms
per sound card.
* Added soc_bind_dai_link() to bind the component devices to the sound card.
* Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove
DAI link components.
* sysfs entries can now be registered per component per card.
* snd_soc_new_pcms() functionailty rolled into dai_link_probe().
* snd_soc_register_codec() now does all the codec list and mutex init.This patch changes the probe() and remove() of the CODEC drivers as follows:-
o Make CODEC driver a platform driver
o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core.
o Removed all static codec pointers (drivers now support > 1 codec dev)
o snd_soc_register_pcms() now done by core.
o snd_soc_register_dai() folded into snd_soc_register_codec().CS4270 portions:
Acked-by: Timur TabiSome TLV320aic23 and Cirrus platform fixes.
Signed-off-by: Ryan MallonTI CODEC and OMAP fixes
Signed-off-by: Peter Ujfalusi
Signed-off-by: Janusz Krzysztofik
Signed-off-by: Jarkko NikulaSamsung platform and misc fixes :-
Signed-off-by: Chanwoo Choi
Signed-off-by: Joonyoung Shim
Signed-off-by: Kyungmin Park
Reviewed-by: Jassi Brar
Signed-off-by: Seungwhan YounMPC8610 and PPC fixes.
Signed-off-by: Timur Tabii.MX fixes and some core fixes.
Signed-off-by: Sascha HauerJ4740 platform fixes:-
Signed-off-by: Lars-Peter ClausenCC: Tony Lindgren
CC: Nicolas Ferre
CC: Kevin Hilman
CC: Sascha Hauer
CC: Atsushi Nemoto
CC: Kuninori Morimoto
CC: Daniel Gloeckner
CC: Manuel Lauss
CC: Mike Frysinger
CC: Arnaud Patard
CC: Wan ZongShunAcked-by: Mark Brown
Signed-off-by: Liam Girdwood
07 Aug, 2010
1 commit
-
…-linux-2.6 into devel-stable
Conflicts:
arch/arm/mach-pxa/palmt5.c
arch/arm/mach-pxa/palmtreo.c
05 Aug, 2010
1 commit
-
Not tested and enabled on MMP at this moment, and since the IRQ
is different from mach-pxa, I'd prefer to move the PMU device
back into mach-pxa/. Will introduce the PMU device to MMP once
it's enabled and tested.Signed-off-by: Eric Miao
13 Jul, 2010
1 commit
-
Reported-by: Dylan Cristiani
Signed-off-by: Eric Miao
09 Mar, 2010
1 commit
-
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
02 Mar, 2010
1 commit
-
This is really pxa27x specific and should be kept in pxa27x.c. With this
newly introduced function, the original set_resetgpio_mode() is deprecated.Cc: Dmitry Eremin-Solenikov
Cc: Mark Brown
Signed-off-by: Eric Miao
13 Feb, 2010
1 commit
-
Most machine classes want some way to register a block of clk_lookup
structures, and most do it by implementing a clks_register() type
function which walks an array, or by open-coding a loop.Consolidate all this into clkdev_add_table().
Acked-by: H Hartley Sweeten
Reviewed-by: Kevin Hilman
Acked-by: Eric Miao
Signed-off-by: Russell King
01 Dec, 2009
1 commit
-
For some platforms, it is inappropriate to register all PXA UARTs.
In some cases, the UARTs may not be used, and in others we may want
to avoid registering the UARTs to allow other drivers (eg, FICP) to
make use of the UART.In addition, a while back there was a request to be able to pass
platform data to the UART driver.This patch enables all of this by providing functions platforms can
call to register each individual UART.Signed-off-by: Russell King
Acked-by: Mike Rapoport
Acked-by: Robert Jarzmik
Signed-off-by: Eric Miao
05 Jun, 2009
2 commits
-
PXA processors have several low-power modes. Currently kernel supports
only one of these modes for PM_SUSPEND_MEM.This patch adds ability to set desired suspend mode for PXA27x based
machines.Signed-off-by: Mike Rapoport
Reviewed-by: Russell King
Signed-off-by: Eric Miao -
Signed-off-by: Paul Shen
Signed-off-by: Eric Miao
09 Mar, 2009
3 commits
-
This is part of the work making gpio.c generic enough, the changes
include:1. move IRQ handling of GPIO 0 and 1 outside (and back into irq.c)
2. pxa_init_gpio() accepts a range for muxed GPIO IRQs, and an IRQ
number for the muxed GPIOs3. __gpio_is_occupied() and __gpio_is_inverted() are made inline,
and are moved into instead of generic gpio.cSigned-off-by: Eric Miao
-
Signed-off-by: Eric Miao
-
Considering the header mess ATM, it is not always possible to include
the correct header files within board code. Let's keep this simple:- for pxa25x based platforms
- for pxa27x based platforms
- for pxa300 based platforms
- for pxa320 based platforms
- for pxa930 based platformsNOTE:
1. one header one board file, they are not compatible (i.e. they have
conflicting definitions which won't compile if included together).2. Unless strictly necessary, the following header files are considered
to be SoC files use _only_, and is not recommended to be included in
board code:
Signed-off-by: Eric Miao
03 Dec, 2008
1 commit
-
…xa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/pxa25x.c
02 Dec, 2008
4 commits
-
Add IO memory and IRQ ressources for pxa based SoC to be
able to use the new rtc-pxa driver.Signed-off-by: Robert Jarzmik
Signed-off-by: Eric Miao -
Signed-off-by: Eric Miao
-
Let's put these devices into a central place even if they are now
processor specific, as they might be re-used in later processors.Signed-off-by: Eric Miao
-
The 'gpio_nr' can really be inferred by 'pxa_last_gpio', and since we
already have that variable, remove the unnecessary 'gpio_nr' now.Also, fix the incorrect GPIO number passed in pxa27x_init_irq().
Note: pxa_last_gpio should be initialized earlier, and this is true
since it's been assigned in machine_desc->init_irq().Signed-off-by: Eric Miao