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 potential naming confliction since multiple architecture will be built
in a single kernel.Signed-off-by: Haojian Zhuang
Acked-by: Grant Likely
01 Nov, 2011
2 commits
-
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann
-
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
22 Aug, 2011
1 commit
-
Signed-off-by: Nicolas Pitre
Acked-by: Arnd Bergmann
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
12 Jul, 2011
1 commit
-
Signed-off-by: Eric Miao
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
30 Mar, 2011
1 commit
-
* '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
...
29 Mar, 2011
2 commits
-
Use irq_set_chip_and_handler() instead. Converted with coccinelle.
Signed-off-by: Thomas Gleixner
-
Convert to the new function names. Automated with coccinelle.
Signed-off-by: Thomas Gleixner
16 Mar, 2011
1 commit
-
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
14 Jan, 2011
1 commit
-
Signed-off-by: Lennert Buytenhek
16 Dec, 2010
2 commits
-
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
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
08 Oct, 2010
1 commit
-
Signed-off-by: Haojian Zhuang
Acked-by: Antonio Ospite
Signed-off-by: Eric Miao
02 Mar, 2010
2 commits
-
Missing AC97 pin configurations are added where pxa_set_ac97_info() are
called for all pxa25x/pxa27x platforms. Where no exact configuration is
provided, use the default as in sound/arm/pxa2xx-ac97-lib.cCc: Dmitry Eremin-Solenikov
Signed-off-by: Eric Miao -
Signed-off-by: Eric Miao
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
09 Mar, 2009
2 commits
-
This makes gpio.c fully independent of pxa-regs.h (except for the
virtual address of the registers).Signed-off-by: Mike Rapoport
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
09 Oct, 2008
1 commit
-
desc_handle_irq() was declared as obsolete since long ago.
Replace it with generic_handle_irq()Signed-off-by: Dmitry Baryshkov
Signed-off-by: Russell King
08 Oct, 2008
1 commit
-
Direct access to USB host controller registers is considered to be not
portable, and is usually a bad sign for poorly abstracted interface.
Introduce .flags and .power_on_delay to "struct pxaohci_platform_data"
so that most platforms don't bother to write their own .init/.exit()
sequences.Signed-off-by: Eric Miao
Signed-off-by: Russell King
27 Sep, 2008
2 commits
-
Signed-off-by: Eric Miao
Signed-off-by: Russell King -
Signed-off-by: Eric Miao
Signed-off-by: Russell King
07 Aug, 2008
2 commits
-
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King
-
Remove includes of asm/hardware.h in addition to asm/arch/hardware.h.
Then, since asm/hardware.h only exists to include asm/arch/hardware.h,
update everything to directly include asm/arch/hardware.h and remove
asm/hardware.h.Signed-off-by: Russell King
27 Jul, 2008
1 commit
-
IRQT_* and __IRQT_* were obsoleted long ago by patch [3692/1].
Remove them completely. Sed script for the reference:s/__IRQT_RISEDGE/IRQ_TYPE_EDGE_RISING/g
s/__IRQT_FALEDGE/IRQ_TYPE_EDGE_FALLING/g
s/__IRQT_LOWLVL/IRQ_TYPE_LEVEL_LOW/g
s/__IRQT_HIGHLVL/IRQ_TYPE_LEVEL_HIGH/g
s/IRQT_RISING/IRQ_TYPE_EDGE_RISING/g
s/IRQT_FALLING/IRQ_TYPE_EDGE_FALLING/g
s/IRQT_BOTHEDGE/IRQ_TYPE_EDGE_BOTH/g
s/IRQT_LOW/IRQ_TYPE_LEVEL_LOW/g
s/IRQT_HIGH/IRQ_TYPE_LEVEL_HIGH/g
s/IRQT_PROBE/IRQ_TYPE_PROBE/g
s/IRQT_NOEDGE/IRQ_TYPE_NONE/gSigned-off-by: Dmitry Baryshkov
Signed-off-by: Russell King
10 Jul, 2008
2 commits
-
As well as moving all the device declarations to a single one in devices.c
this causes all platforms to register the I/O and interrupt resources for
the AC97 controller.Cc: eric miao
Cc: Mike Rapoport
Cc: Lennert Buytenhek
Cc: Jürgen Schindele
Cc: Juergen Beisert
Signed-off-by: Mark Brown
Signed-off-by: Russell King
03 Jul, 2008
1 commit
-
Acked-by: Lennert Buytenhek
Signed-off-by: Russell King
02 Jun, 2008
1 commit
-
Don't register the LPD270 cpld_irq system device when we're not running
on a LPD270 machine - "cpld_irq" is also registered (separately) by
Lubbock and Mainstone.Signed-off-by: Russell King
19 Apr, 2008
1 commit
-
two reasons:
1. GPIO namings and their mode definitions are conceptually not part
of the PXA register definitions2. this is actually a temporary move in the transition of PXA2xx to
use MFP-alike APIs (as what PXA3xx is now doing), so that legacy
code will still work and new code can be added in step by stepSigned-off-by: eric miao
Signed-off-by: Russell King
26 Jan, 2008
1 commit
-
PXA3 has a different memory controller from PXA2 platforms. Avoid
clashing definitions by moving the PXA2 definitions to pxa2xx-regs.hSigned-off-by: Russell King
25 Jan, 2008
1 commit
-
All kobjects require a dynamically allocated name now. We no longer
need to keep track if the name is statically assigned, we can just
unconditionally free() all kobject names on cleanup.Signed-off-by: Kay Sievers
Signed-off-by: Greg Kroah-Hartman
12 Jul, 2007
2 commits
-
Signed-off-by: Russell King
-
/* should be ok this time, I aligned this patch to your arm:pxa2.mbox */
1. move pxa25x specific IRQ initialization code to pxa25x_init_irq()
and pxa27x code to pxa27x_init_irq(), remove pxa_init_irq()2. replace all pxa_init_irq() with their PXA25x or PXA27x specific
functionsSigned-off-by: eric miao
Signed-off-by: Russell King