iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43872fa788
linux/arch/arm/mach-pxa
History
Arnd Bergmann 43872fa788 Merge branch 'depends/rmk/gpio' into next/fixes 
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-10-31 22:44:18 +01:00
..
include/mach Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
am200epd.c ARM: pxa/am200epd: fix leak in am200_init_gpio_regs error path 2011-03-17 18:16:12 +08:00
am300epd.c ARM: pxa/am300epd: fix leak in am300_init_gpio_regs error path 2011-03-17 23:06:29 +08:00
balloon3.c ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
capc7117.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
clock-pxa2xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
clock-pxa3xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
clock.c ARM: pxa: add clk_set_rate() 2011-07-12 19:45:19 +08:00
clock.h ARM: pxa: add clk_set_rate() 2011-07-12 19:45:19 +08:00
cm-x2xx-pci.c ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
cm-x2xx-pci.h
cm-x2xx.c ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
cm-x255.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
cm-x270.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
cm-x300.c ARM: pxa/cm-x300: properly set bt_reset pin 2011-10-25 22:36:51 +08:00
colibri-evalboard.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
colibri-pxa3xx.c ARM: pxa: clean up set_pxa_fb_info 2011-03-16 16:32:47 +08:00
colibri-pxa270-income.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
colibri-pxa270.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
colibri-pxa300.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
colibri-pxa320.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
corgi_pm.c [ARM] pxa: removed mostly unused and confusing two sharpsl.h 2010-08-05 14:32:38 +08:00
corgi.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
cpufreq-pxa2xx.c ARM: pxa: Access SMEMC via virtual addresses 2010-12-16 14:31:16 +08:00
cpufreq-pxa3xx.c ARM: pxa: reduce the scope of get_clk_frequency_khz() 2010-10-09 17:07:30 +08:00
csb701.c [ARM] pxa/csb701: do not register devices on non-csb726 boads 2009-04-04 10:26:35 +08:00
csb726.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
devices.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00:00
devices.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-10-25 08:32:05 -07:00
em-x270.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
eseries.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
eseries.h
ezx.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
generic.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
generic.h ARM: pxa: move declarations from generic.h to <soc>.h 2011-07-12 19:50:32 +08:00
gumstix.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
h5000.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
himalaya.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
hx4700.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
icontrol.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
idp.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
irq.c Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
Kconfig ARM: pxa: sharpsl pm needs SPI 2011-10-08 21:03:06 +08:00
leds-idp.c [ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usage 2009-03-09 21:22:36 +08:00
leds-lubbock.c [ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usage 2009-03-09 21:22:36 +08:00
leds-mainstone.c [ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usage 2009-03-09 21:22:36 +08:00
leds.c
leds.h
littleton.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
lpd270.c Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
lubbock.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
magician.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
mainstone.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
Makefile ARM: pxa: pxa95x/saarb depends on pxa3xx code 2011-10-08 21:03:00 +08:00
Makefile.boot
mfp-pxa2xx.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
mfp-pxa3xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
mioa701_bootresume.S
mioa701.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
mp900.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
mxm8x10.c ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
palm27x.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00:00
palmld.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
palmt5.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
palmtc.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
palmte2.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
palmtreo.c ARM: pxa: allow selecting just one of TREO680/CENTRO 2011-10-08 21:02:59 +08:00
palmtx.c ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
palmz72.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
pcm027.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
pcm990-baseboard.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
pm.c ARM: pm: move cpu_init() call into core code 2011-06-24 08:48:43 +01:00
poodle.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
pxa2xx.c [ARM] pxa: add gpio_pwdown(_inverted) into pxaficp_ir.c 2009-09-10 18:49:39 +08:00
pxa3xx-ulpi.c ARM: pxa: export symbols from pxa3xx-ulpi 2011-10-08 21:02:58 +08:00
pxa3xx.c Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
pxa25x.c Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
pxa27x.c Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
pxa95x.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
pxa300.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
pxa320.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
pxa930.c ARM: pxa: support pxa95x 2010-12-18 21:02:14 +08:00
raumfeld.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
reset.c [ARM] pxa: allow gpio_reset drive high during normal work 2009-05-18 21:52:09 +08:00
saar.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
saarb.c Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
sharpsl_pm.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
sleep.S ARM: pm: pxa: move cpu_suspend into C code 2011-06-24 08:48:45 +01:00
smemc.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
spitz_pm.c gpio: include linux/gpio.h where needed 2011-06-16 08:40:44 -06:00
spitz.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
standby.S [ARM] pxa: separate definitions from pxa-regs.h and remove it finally 2009-03-09 21:22:40 +08:00
stargate2.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
tavorevb3.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
tavorevb.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
time.c clocksource: convert ARM 32-bit up counting clocksources 2011-05-23 18:04:51 +01:00
tosa-bt.c ARM: pxa/tosa: drop setting LED trigger name, as it's unsupported now 2011-02-27 21:38:18 +08:00
tosa.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
trizeps4.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
viper.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
vpac270.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
xcep.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
z2.c ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available 2011-10-08 21:02:44 +08:00
zeus.c ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
zylonite_pxa300.c ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
zylonite_pxa320.c [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot 2009-12-29 14:11:34 +08:00
zylonite.c ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00