b7e9c223be
Merge branch 'master' into for-next
...
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
2011-07-11 14:15:55 +02:00
158f1e9518
gpio: include linux/gpio.h where needed
...
Some files use GPIOF_ macros but don't include the header file
for them. These macros are being moved to <linux/gpio.h>, so add
includes for <linux/gpio.h> where needed.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com >
Signed-off-by: Grant Likely <grant.likely@secretlab.ca >
2011-06-16 08:40:44 -06:00
28f65c11f2
treewide: Convert uses of struct resource to resource_size(ptr)
...
Several fixes as well where the +1 was missing.
Done via coccinelle scripts like:
@@
struct resource *ptr;
@@
- ptr->end - ptr->start + 1
+ resource_size(ptr)
and some grep and typing.
Mostly uncompiled, no cross-compilers.
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: Jiri Kosina <jkosina@suse.cz >
2011-06-10 14:55:36 +02:00
e9fb13bfec
pcmcia: Make declaration and uses of struct pcmcia_device_id const
...
Const allows tables to be moved into text sections.
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2011-05-06 07:46:15 +02:00
37fac4b6e6
pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data
...
sa11x0_pcmcia_hw_init is only used by sa11x0_drv_pcmcia_probe which
lives in .devinit.text so it can go to .devinit.data.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2011-05-06 07:46:11 +02:00
e9c549998d
Revert wrong fixes for common misspellings
...
These changes were incorrectly fixed by codespell. They were now
manually corrected.
Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi >
2011-04-26 23:31:11 -07:00
7db6a7fa09
ARM: pxa: convert incorrect IRQ_TO_IRQ() to irq_to_gpio()
...
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 <nickbane1@gmail.com >
Signed-off-by: Eric Miao <eric.y.miao@gmail.com >
2011-04-13 09:30:40 +08:00
735443fede
pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform
...
pxa2xx_trizeps4 tries to register pxa2xx-pcmcia device not checking whether
machine is really trizeps4, thus messing multi-machine kernels. Fix it up.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com >
Signed-off-by: Eric Miao <eric.y.miao@gmail.com >
2011-04-12 23:07:42 +08:00
af21cbb1ef
pcmcia: limit pxa2xx_balloon3 subdriver to balloon3 platform
...
pxa2xx_balloon3 tries to register pxa2xx-pcmcia device not checking whether
machine is really balloon3, thus messing multi-machine kernels. Fix it up.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com >
Signed-off-by: Eric Miao <eric.y.miao@gmail.com >
2011-04-12 23:07:42 +08:00
25985edced
Fix common misspellings
...
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi >
2011-03-31 11:26:23 -03:00
85eb1513c1
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
...
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (65 commits)
ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support
ARM: 6838/1: etm: fix section mismatch warning
ARM: 6837/1: remove unused pci_fixup_prpmc1100
ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn == PC
Fix the broken build for Marvell Dove platform.
ARM: 6835/1: perf: ensure overflows aren't missed due to IRQ latency
ARM: 6834/1: perf: reset counters on all CPUs during initialisation
ARM: 6833/1: perf: add required isbs() to ARMv7 backend
ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues
ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile
arm: mach-mx3: pcm043: add write-protect and card-detect for SD1
eukrea_mbimxsd51: add SD Card detect
eukrea_mbimxsd25-baseboard: add SD card detect
mx3/eukrea_mbimxsd-baseboard: add SD card detect support
mx3/eukrea_mbimxsd-baseboard: fix gpio request
ARM: mxs/mx28evk: add mmc device
ARM: mxs/mx23evk: add mmc device
ARM: mxs: dynamically allocate mmc device
ARM: mx51_efika: update platform data for new mfd changes
mx2/iomux: Set direction for CSPI2 pins
...
2011-03-30 07:50:45 -07:00
dced35aeb0
drivers: Final irq namespace conversion
...
Scripted with coccinelle.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de >
2011-03-29 14:48:19 +02:00
938c0ace3f
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
...
Conflicts:
arch/arm/mach-pxa/tosa.c
2011-03-26 10:03:03 +00:00
4c5811bf46
Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
...
* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6: (21 commits)
tty: serial: altera_jtaguart: Add device tree support
tty: serial: altera_uart: Add devicetree support
dt: eliminate of_platform_driver shim code
dt: Eliminate of_platform_{,un}register_driver
dt/serial: Eliminate users of of_platform_{,un}register_driver
dt/usb: Eliminate users of of_platform_{,un}register_driver
dt/video: Eliminate users of of_platform_{,un}register_driver
dt/net: Eliminate users of of_platform_{,un}register_driver
dt/sound: Eliminate users of of_platform_{,un}register_driver
dt/spi: Eliminate users of of_platform_{,un}register_driver
dt: uartlite: merge platform and of_platform driver bindings
dt: xilinx_hwicap: merge platform and of_platform driver bindings
ipmi: convert OF driver to platform driver
leds/leds-gpio: merge platform_driver with of_platform_driver
dt/sparc: Eliminate users of of_platform_{,un}register_driver
dt/powerpc: Eliminate users of of_platform_{,un}register_driver
dt/powerpc: move of_bus_type infrastructure to ibmebus
drivercore/dt: add a match table pointer to struct device
dt: Typo fix.
altera_ps2: Add devicetree support
...
2011-03-16 17:28:10 -07:00
9ed3fbf1cb
ARM: pxa: Update copyright notices for Palm devices
...
Signed-off-by: Marek Vasut <marek.vasut@gmail.com >
2011-03-16 16:32:46 +08:00
e27af7edda
ARM: pxa: Use gpio arrays in vpac270_pcmcia driver
...
Use gpio_request_array() / gpio_free_array(), this makes the code
cleaner and less error prone.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com >
2011-03-16 16:32:46 +08:00
235a175c40
ARM: pxa: Use gpio arrays in palmtx_pcmcia driver
...
Use gpio_request_array() / gpio_free_array(), this makes the code
cleaner and less error prone.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com >
2011-03-16 16:32:46 +08:00
ba38830794
ARM: pxa: Use gpio arrays in palmtc_pcmcia driver
...
Use gpio_request_array() / gpio_free_array(), this makes the code
cleaner and less error prone.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com >
2011-03-16 16:32:46 +08:00
2070417dff
ARM: pxa: Use gpio arrays in palmld_pcmcia driver
...
Use gpio_request_array() / gpio_free_array(), this makes the code
cleaner and less error prone.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com >
2011-03-16 16:32:46 +08:00
e593106ca4
ARM: pxa: Use gpio arrays in colibri_pcmcia driver
...
Use gpio_request_array() / gpio_free_array(), this makes the code cleaner and
less error prone.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com >
2011-03-16 16:32:45 +08:00
34d4ade77b
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
...
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
davinci: cpufreq: fix section mismatch warning
DaVinci: fix compilation warnings in <mach/clkdev.h>
davinci: tnetv107x: fix register indexing for GPIOs numbers > 31
davinci: da8xx/omap-l1x: add platform device for davinci-pcm-audio
ARM: pxa/tosa: register wm9712 codec device
ARM: pxa: enable pxa-pcm-audio on pxa210/pxa25x platform
ARM: pxa/colibri: don't register pxa2xx-pcmcia nodes on non-colibri platforms
ARM: pxa/tosa: drop setting LED trigger name, as it's unsupported now
ARM: 6762/1: Update number of VIC for S5P6442 and S5PC100
ARM: 6761/1: Update number of VIC for S5PV210
ARM: 6768/1: hw_breakpoint: ensure debug logic is powered up on v7 cores
ARM: 6767/1: ptrace: fix register indexing in GETHBPREGS request
ARM: 6765/1: remove obsolete comment from asm/mach/arch.h
ARM: 6757/1: fix tlb.h induced linux/swap.h build failure
2011-03-07 20:45:42 -08:00
1c48a5c93d
dt: Eliminate of_platform_{,un}register_driver
...
Final step to eliminate of_platform_bus_type. They're all just
platform drivers now.
v2: fix type in pasemi_nand.c (thanks to Stephen Rothwell)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca >
2011-02-28 13:22:46 -07:00
8d9bd9002d
ARM: pxa/colibri: don't register pxa2xx-pcmcia nodes on non-colibri platforms
...
PXA supports multi-machine kernels since long ago. However a kernel
compiled with support for colibri and any other PXA machine and with
PCMCIA enabled will barf at runtime about duplicate registration of
pxa2xx-pcmcia device. Fix that.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com >
Signed-off-by: Eric Miao <eric.y.miao@gmail.com >
2011-02-27 21:38:23 +08:00
33619f0d3f
pcmcia: re-enable Zoomed Video support
...
Allow drivers to enable Zoomed Video support. Currently, this is only
used by out-of-tree drivers (L64020 DVB driver in particular).
CC: <stable@kernel.org > [for 2.6.37]
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2011-02-20 12:47:34 +01:00
5b703683b6
pcmcia vs. MECR on pxa25x/sa1111
...
After 2.6.34 changes, __pxa2xx_drv_pcmcia_probe() was replaced by
sa1111_pcmcia_add(). That unfortunately means that configure_sockets()
is not called, leading to MECR not being set properly, leading to
strange crashes.
Tested on pxa255+sa1111, I do not have lubbock board nearby. Perhaps
cleaner solution exists?
Signed-off-by: Pavel Machek <pma@sysgo.com >
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net >
2011-02-19 12:22:35 +01:00
Jiri Kosina
Randy Dunlap
Joe Perches
Uwe Kleine-König
Lucas De Marchi
Eric Miao
Dmitry Eremin-Solenikov
Linus Torvalds
Thomas Gleixner
Russell King
Marek Vasut
Grant Likely
Dominik Brodowski
Pavel Machek