aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/common
AgeCommit message (Collapse)AuthorFilesLines
2011-01-13ARM: LoCoMo: irq_data conversion.Lennert Buytenhek1-12/+12
Signed-off-by: Lennert Buytenhek <[email protected]>
2011-01-13ARM: ITE 8152: irq_data conversion.Lennert Buytenhek1-5/+9
Signed-off-by: Lennert Buytenhek <[email protected]> Acked-by: Mike Rapoport <[email protected]>
2011-01-13ARM: gic: irq_data conversion.Lennert Buytenhek1-33/+33
Signed-off-by: Lennert Buytenhek <[email protected]> Acked-by: Abhijeet Dharmapurikar <[email protected]>
2011-01-06Merge branch 'misc' into develRussell King3-191/+8
Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c
2011-01-06Merge branch 'smp' into miscRussell King1-4/+24
Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c
2011-01-06ARM: DMA: add support for DMA debuggingRussell King1-8/+8
Add ARM support for the DMA debug infrastructure, which allows the DMA API usage to be debugged. Signed-off-by: Russell King <[email protected]>
2011-01-05Merge branch 'clksrc' into develRussell King1-3/+1
Conflicts: arch/arm/mach-vexpress/v2m.c arch/arm/plat-omap/counter_32k.c arch/arm/plat-versatile/Makefile
2011-01-05Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and ↵Russell King3-21/+203
'versatile' into devel
2010-12-28ARM: fix IXP4xx build failureImre Kaloz1-0/+1
arm: export dma_set_coherent_mask While a regression was fixed with commit 710224fa2750cf (arm: fix "arm: fix pci_set_consistent_dma_mask for dmabounce devices"), a new one was introduced as dma_set_coherent_mask wasn't exported for modules. This patch takes care for this issue. Signed-off-by: Imre Kaloz <[email protected]> Signed-off-by: Krzysztof Hałasa <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-12-22Merge branch 'master' into for-nextJiri Kosina1-18/+46
Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.
2010-12-14ARM: GIC: move enablement of PPI interrupts to gic.cRussell King1-0/+10
Avoid adding nasty genirq-specific code to local timers to enable PPI interrupts. Instead, provide a gic function to do this. Signed-off-by: Russell King <[email protected]>
2010-12-14ARM: GIC: move gic_data[] initialization into gic_init()Russell King1-24/+24
This avoids writing unnecessarily to gic_data[] from other CPUs, making this a mostly read-only variable. Reviewed-by: Catalin Marinas <[email protected]> Tested-by: Abhijeet Dharmapurikar <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-12-14ARM: GIC: consolidate gic_cpu_base_addr to common GIC codeRussell King1-0/+5
Every architecture using the GIC has a gic_cpu_base_addr pointer for GIC 0 for their entry assembly code to use to decode the cause of the current interrupt. Move this into the common GIC code. Reviewed-by: Catalin Marinas <[email protected]> Tested-by: Abhijeet Dharmapurikar <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-12-14ARM: GIC: Remove MMIO address from gic_cpu_init, rename to gic_secondary_initRussell King1-1/+6
We don't need to re-pass the base address for the CPU interfaces to the GIC for secondary CPUs, as it will never be different from the boot CPU - and even if it was, we'd overwrite the boot CPU's base address. Get rid of this argument, and rename to gic_secondary_init(). Reviewed-by: Catalin Marinas <[email protected]> Tested-by: Abhijeet Dharmapurikar <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-12-14ARM: GIC: provide a single initialization function for boot CPURussell King1-2/+9
Provide gic_init() which initializes the GIC distributor and current CPU's GIC interface for the boot (or single) CPU. Reviewed-by: Catalin Marinas <[email protected]> Tested-by: Abhijeet Dharmapurikar <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-12-06ARM: 6524/1: GIC irq desciptor bug fixChao Xie1-1/+7
gic_set_cpu will directly use irq_desc[]. If CONFIG_SPARSE_IRQ is enabled, there is no irq_desc[]. So we need use irq_to_desc(irq) to get the descriptor for irq. Signed-off-by: Chao Xie <[email protected]> Acked-by: Kyungmin Park <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-11-30ARM: 6496/1: GIC: Do not try to register more then NR_IRQS interruptsPawel Moll1-15/+17
This change limits number of GIC-originating interrupts to the platform maximum (defined by NR_IRQS) while still initialising all distributor registers. Signed-off-by: Pawel Moll <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-11-26ARM: 6483/1: arm & sh: factorised duplicated clkdev.cJean-Christop PLAGNIOL-VILLARD3-184/+0
factorise some generic infrastructure to assist looking up struct clks for the ARM & SH architecture. as the code is identical at 99% put the arch specific code for allocation as example in asm/clkdev.h Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Acked-by: Paul Mundt <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-11-12ARM: GIC: don't disable software generated interruptsRussell King1-4/+24
Software generated interrupts (SGI) are used for IPIs by the kernel. While previous revisions of the GIC hardware were specified not to implement enable bits for SGIs, more recent hardware is now permitted to implement these bits in a per-CPU banked register. The priority registers for the PPI and SGIs are also per-CPU banked registers, so ensure that these are also appropriately initialized. Reported-by: Scott Valentine <[email protected]> Acked-by: Abhijeet Dharmapurikar <[email protected]> Acked-by: Catalin Marinas <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-11-04ARM: 6432/1: move timer-sp.c from versatile to commonRob Herring2-0/+155
From: Rob Herring <[email protected]> The timer-sp h/w used on versatile platforms can also be used for other platforms, so move it to a common location. Signed-off-by: Rob Herring <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-11-01tree-wide: fix comment/printk typosUwe Kleine-König2-2/+2
"gadget", "through", "command", "maintain", "maintain", "controller", "address", "between", "initiali[zs]e", "instead", "function", "select", "already", "equal", "access", "management", "hierarchy", "registration", "interest", "relative", "memory", "offset", "already", Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2010-10-24Merge branch 'for-next' of ↵Linus Torvalds3-16/+16
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) Update broken web addresses in arch directory. Update broken web addresses in the kernel. Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget Revert "Fix typo: configuation => configuration" partially ida: document IDA_BITMAP_LONGS calculation ext2: fix a typo on comment in ext2/inode.c drivers/scsi: Remove unnecessary casts of private_data drivers/s390: Remove unnecessary casts of private_data net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data drivers/infiniband: Remove unnecessary casts of private_data drivers/gpu/drm: Remove unnecessary casts of private_data kernel/pm_qos_params.c: Remove unnecessary casts of private_data fs/ecryptfs: Remove unnecessary casts of private_data fs/seq_file.c: Remove unnecessary casts of private_data arm: uengine.c: remove C99 comments arm: scoop.c: remove C99 comments Fix typo configue => configure in comments Fix typo: configuation => configuration Fix typo interrest[ing|ed] => interest[ing|ed] Fix various typos of valid in comments ... Fix up trivial conflicts in: drivers/char/ipmi/ipmi_si_intf.c drivers/usb/gadget/rndis.c net/irda/irnet/irnet_ppp.c
2010-10-19Merge branch 'devel-stable' into develRussell King1-14/+0
2010-10-18Update broken web addresses in arch directory.Justin P. Mattock1-1/+1
The patch below updates broken web addresses in the arch directory. Signed-off-by: Justin P. Mattock <[email protected]> Signed-off-by: Maciej W. Rozycki <[email protected]> Cc: Finn Thain <[email protected]> Cc: Randy Dunlap <[email protected]> Reviewed-by: Finn Thain <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2010-10-11ARM: 6367/1: PL330: Accept different revisionJassi Brar1-4/+3
The driver can handle different revisions of the core which vary only minorly. Signed-off-by: Jassi Brar <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-10-08Merge branch 'for-russell' of ↵Russell King1-14/+0
git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable
2010-10-06GIC: Dont disable INT in ack callbackAbhijeet Dharmapurikar1-14/+0
Masking in the ack callback fails to work with handle_percpu_irq and handle_edge_irq. The interrupt stays disabled after the first invocation since percpu and edge irq do not unmask an interrupt after handling it. For handle_level_irq masking in the ack is redundant because ack is always called after mask in the mask_ack function. Masking in the ack function is required only when __do_IRQ was used instead of flow handlers, but using __do_IRQ has been deprecated. Remove the masking of interrupt from the ack callback. Signed-off-by: Abhijeet Dharmapurikar <[email protected]> Signed-off-by: Jeff Ohlstein <[email protected]> Signed-off-by: Daniel Walker <[email protected]>
2010-10-04ARM: 6349/1: sa1111: move __sa1111_probe() to .devinit.textUwe Kleine-König1-1/+1
__sa1111_probe is only called by sa1111_probe that lives in .devinit.text. So it's save to move the former to .devinit.text, too. Acked-by: Kristoffer Ericson <[email protected]> Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-09-23arm: uengine.c: remove C99 commentsH Hartley Sweeten1-9/+9
Comments should be /* */ not //. Signed-off-by: H Hartley Sweeten <[email protected]> Cc: Jiri Kosina <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2010-09-23arm: scoop.c: remove C99 commentsH Hartley Sweeten1-6/+6
Comments should be /* */ not //. Signed-off-by: H Hartley Sweeten <[email protected]> Cc: Jiri Kosina <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2010-09-22arm: fix "arm: fix pci_set_consistent_dma_mask for dmabounce devices"FUJITA Tomonori1-0/+8
This fixes the regression caused by the commit 6fee48cd330c68 ("dma-mapping: arm: use generic pci_set_dma_mask and pci_set_consistent_dma_mask"). ARM needs to clip the dma coherent mask for dmabounce devices. This restores the old trick. Note that strictly speaking, the DMA API doesn't allow architectures to do such but I'm not sure it's worth adding the new API to set the dma mask that allows architectures to clip it. Reported-by: Krzysztof Halasa <[email protected]> Signed-off-by: FUJITA Tomonori <[email protected]> Acked-by: Russell King <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-09-08Revert "[ARM] pxa: remove now unnecessary dma_needs_bounce()"Russell King1-0/+8
This reverts commit 4fa5518, which causes a compilation regression for IXP4xx platforms. Reported-by: Richard Cochran <[email protected]> Acked-by: Eric Miao <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-08-06Merge branch 'devel' of ↵Russell King1-8/+0
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable Conflicts: arch/arm/mach-pxa/palmt5.c arch/arm/mach-pxa/palmtreo.c
2010-08-05[ARM] pxa: remove now unnecessary dma_needs_bounce()Eric Miao1-8/+0
With a correct dev->dma_mask before calling dmabounce_register_dev(), dma_needs_bounce() is not necessary. The sa1111, though, is a bit complicated. Until it's fully understood and fixed, dma_needs_bounce() for sa1111 is kept if CONFIG_SA1111 is enabled with no side effect (with the condition of machine_is_*) Thanks for Mike Rapoport to fix one error in the original version of the patch and get this tested. Acked-by: Mike Rapoport <[email protected]> Signed-off-by: Eric Miao <[email protected]>
2010-08-03Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2-4/+47
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (291 commits) ARM: AMBA: Add pclk support to AMBA bus infrastructure ARM: 6278/2: fix regression in RealView after the introduction of pclk ARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128 ARM: 6276/1: mach-shmobile: remove duplicate NR_IRQS_LEGACY ARM: 6246/1: mmci: support larger MMCIDATALENGTH register ARM: 6245/1: mmci: enable hardware flow control on Ux500 variants ARM: 6244/1: mmci: add variant data and default MCICLOCK support ARM: 6243/1: mmci: pass power_mode to the translate_vdd callback ARM: 6274/1: add global control registers definition header file for nuc900 mx2_camera: fix type of dma buffer virtual address pointer mx2_camera: Add soc_camera support for i.MX25/i.MX27 arm/imx/gpio: add spinlock protection ARM: Add support for the LPC32XX arch ARM: LPC32XX: Arch config menu supoport and makefiles ARM: LPC32XX: Phytec 3250 platform support ARM: LPC32XX: Misc support functions ARM: LPC32XX: Serial support code ARM: LPC32XX: System suspend support ARM: LPC32XX: GPIO, timer, and IRQ drivers ARM: LPC32XX: Clock driver ...
2010-07-31Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', ↵Russell King2-4/+47
'pl', 'spear' and 'versatile' into devel
2010-07-30SA1111: Eliminate use after freeJulia Lawall1-3/+2
__sa1111_remove always frees its argument, so the subsequent reference to sachip->saved_state represents a use after free. __sa1111_remove does not appear to use the saved_state field, so the patch simply frees it first. A simplified version of the semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression E,E2; @@ __sa1111_remove(E) ... ( E = E2 | * E ) // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-07-16ARM: Remove 'node' argument form arch_adjust_zones()Russell King1-4/+1
Since we no longer support discontigmem, node is always zero, so remove this argument. Signed-off-by: Russell King <[email protected]>
2010-06-16ARM: 6150/1: gic: implement set_typeRabin Vincent1-0/+46
Implement set_type() to allow configuration of the trigger type. Cc: Abhijeet Dharmapurikar <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Rabin Vincent <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-27ARM: 6146/1: sa1111: Prevent deadlock in resume pathMarek Vašut1-2/+7
This patch reorganises the sa1111_resume() function in a manner the spinlock happens after calling the sa1111_wake(). This fixes two bugs: 1) This function called sa1111_wake() which tried to claim the same spinlock the sa1111_resume() already claimed. This would result in certain deadlock. Original idea for this part: Russell King <[email protected]> 2) The function didn't unlock the spinlock in case the chip didn't report correct ID. Original idea for this part: Julia Lawall <[email protected]> Signed-off-by: Marek Vasut <[email protected]> Cc: <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-17Merge branch 'devel-stable' into develRussell King3-6/+6
Conflicts: arch/arm/Kconfig arch/arm/include/asm/system.h arch/arm/mm/Kconfig
2010-05-17Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', ↵Russell King8-383/+2127
'omap', 'pxa', 'spear' and 'versatile' into devel Conflicts: arch/arm/Makefile arch/arm/common/Makefile arch/arm/mm/Kconfig
2010-05-15ARM: 6132/1: PL330: Add common core driverJassi Brar3-0/+1970
PL330 is a configurable DMA controller PrimeCell device. The register map of the device is well defined. The configuration of a particular implementation can be read from the six configuration registers CR0-4,Dn. This patch implements a driver for the specification:- http://infocenter.arm.com/help/topic/com.arm.doc.ddi0424a/DDI0424A_dmac_pl330_r0p0_trm.pdf The exported interface should be sufficient to implement a driver for any DMA API. Signed-off-by: Jassi Brar <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-05-02ARM: ICST: kill duplicate icst codeRussell King4-115/+11
The only difference between ICST307 and ICST525 are the two arrays for calculating the S parameter; the code is now identical. Merge the two files and kill the duplicated code. Signed-off-by: Russell King <[email protected]>
2010-05-02ARM: ICST: indirect s2div and idx2s arrays via icst_paramsRussell King2-14/+22
Signed-off-by: Russell King <[email protected]>
2010-05-02ARM: ICST: move minimum VCO frequency to icst_paramsRussell King2-2/+2
Signed-off-by: Russell King <[email protected]>
2010-05-02ARM: ICST: use Hz instead of kHzRussell King2-8/+8
This makes the ICST support fit more nicely with the clk API, eliminating the need to *1000 and /1000 in places. Signed-off-by: Russell King <[email protected]>
2010-05-02ARM: ICST: provide definitions for max/min VCO frequenciesRussell King2-2/+2
Signed-off-by: Russell King <[email protected]>
2010-05-02ARM: ICST: icst.*_ps_to_vco() functions are unused, remove themRussell King2-129/+0
These functions were originally implemented for the CLCD driver before we had clk API support. Since the CLCD driver does not use these anymore, we can remove them. Signed-off-by: Russell King <[email protected]>
2010-05-02ARM: ICST: merge common ICST VCO structuresRussell King2-14/+14
The structures for the ICST307 and ICST525 VCO devices are identical, so merge them together. Signed-off-by: Russell King <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.