Commit Graph

300259 Commits

Author SHA1 Message Date
Arnd Bergmann
48b9bf0953 Merge branch 'marvell_cleanup_for_v3.5' of git://git.infradead.org/users/jcooper/linux into next/cleanup
* 'marvell_cleanup_for_v3.5' of git://git.infradead.org/users/jcooper/linux:
  Dove: Fix Section mismatch warnings
  ARM: orion5x: ts78xx debugging changes
  ARM: orion5x: remove PM dependency from ts78xx
  ARM: orion5x: ts78xx fix NAND resource off by one
  ARM: orion5x: ts78xx whitespace cleanups
  Orion5x: Fix Section mismatch warnings
  Orion5x: Fix warning: struct pci_dev declared inside paramter list

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-15 16:54:15 +02:00
Andrew Lunn
ca2ac5cc95 Dove: Fix Section mismatch warnings
Add missing __init markups to GPIO and timer functions.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14 18:13:15 +02:00
Alexander Clouter
4d72cef17b ARM: orion5x: ts78xx debugging changes
Move to using a refined pr_fmt to avoid having to manually
prefix every message line with 'ts78xx'.

Changelog:
 v2: moved pr_fmt define ahead of includes as suggested by
	Hartley Sweeten to avoid use of leading undef
 v1: initial release

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14 18:13:05 +02:00
Alexander Clouter
4f8cf6106d ARM: orion5x: remove PM dependency from ts78xx
Move ts78xx_fpga from /sys/power to /sys/firmware so that
we can remove the PM dependency.

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14 18:13:03 +02:00
Alexander Clouter
167473a593 ARM: orion5x: ts78xx fix NAND resource off by one
Changelog:
 v2: use DEFINE_RES_MEM as suggesed by Hartley Sweeten
 v1: inital release

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14 18:13:02 +02:00
Alexander Clouter
9f234997da ARM: orion5x: ts78xx whitespace cleanups
Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14 18:13:00 +02:00
Andrew Lunn
d2621b82c2 Orion5x: Fix Section mismatch warnings
Wrongly placed __initdata, and missing __init caused these warnings.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14 18:12:37 +02:00
Andrew Lunn
6ed272f245 Orion5x: Fix warning: struct pci_dev declared inside paramter list
Orion5x board files which don't have PCI give warnings:

arch/arm/mach-orion5x/common.h:54:38: warning: 'struct pci_dev' declared
inside parameter list.

Add a forward declaration in the header file, which is the pattern
used for other PCI structures.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
2012-05-14 18:12:36 +02:00
Arnd Bergmann
985f03c2e9 Merge branch 'clps711x/cleanup' into next/cleanup
* clps711x/cleanup:
  ARM: clps711x: Combine header files into one for clps711x-targets

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-13 22:07:49 +02:00
Alexander Shiyan
94bd32792e ARM: clps711x: Combine header files into one for clps711x-targets
Current ARM7 Cirrus Logic product line contains only 3 cpu.
EP7312 - Fully functional.
EP7309 - Missing SDRAM interface.
EP7311 - Missing DAI.
It makes no sense to separate the header files to identify these differences,
it is only necessary to keep in mind the presence or lack of any features of
a specific CPU when writing code.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-13 21:53:03 +02:00
Olof Johansson
68f4c319d6 Merge branch 'next/cleanup-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
From Kukjin Kim:
"Mostly it is using common macro to define resources and clean up useless codes."

* 'next/cleanup-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (34 commits)
  ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c
  ARM: S3C24XX: Use common macro to define resources on mach-osiris.c
  ARM: EXYNOS: Adapt to cpuidle core time keeping and irq enable
  ARM: S5PV210: Use common macro to define resources on mach-smdkv210.c
  ARM: S5PV210: Use common macro to define resources on dev-audio.c
  ARM: S5PC100: Use common macro to define resources on dev-audio.c
  ARM: S5P64X0: Use common macro to define resources on dev-audio.c
  ARM: S3C64XX: Use common macro to define resources on mach-smdk6410.c
  ARM: S3C64XX: Use common macro to define resources on mach-real6410.c
  ARM: S3C64XX: Use common macro to define resources on mach-mini6410.c
  ARM: S3C64XX: Use common macro to define resources on mach-crag6410.c
  ARM: S3C64XX: Use common macro to define resources on mach-anw6410.c
  ARM: S3C64XX: Use common macro to define resources on dev-uart.c
  ARM: S3C64XX: Use common macro to define resources on dev-audio.c
  ARM: S3C24XX: Use common macro to define resources on simtec-nor.c
  ARM: S3C24XX: Use common macro to define resources on mach-vr1000.c
  ARM: S3C24XX: Use common macro to define resources on mach-tct_hammer.c
  ARM: S3C24XX: Use common macro to define resources on mach-rx1950.c
  ARM: S3C24XX: Use common macro to define resources on mach-otom.c
  ARM: S3C24XX: Use common macro to define resources on mach-nexcoder.c
  ...
2012-05-12 22:17:15 -07:00
Kukjin Kim
2870f53524 Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung 2012-05-13 06:48:21 +09:00
Tushar Behera
5fdbdd1d4b ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-13 06:47:18 +09:00
Tushar Behera
5ff2714ae0 ARM: S3C24XX: Use common macro to define resources on mach-osiris.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-13 06:47:07 +09:00
Amit Daniel Kachhap
06c77b3ce1 ARM: EXYNOS: Adapt to cpuidle core time keeping and irq enable
This patch enables core cpuidle timekeeping and irq enabling and
remove those redundant parts from the exynos cpuidle drivers

Signed-off-by: Amit Daniel <amit.kachhap@linaro.org>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Robert Lee <rob.lee@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:29:21 +09:00
Tushar Behera
b6e059417d ARM: S5PV210: Use common macro to define resources on mach-smdkv210.c
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:31 +09:00
Tushar Behera
58ff20af41 ARM: S5PV210: Use common macro to define resources on dev-audio.c
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:30 +09:00
Tushar Behera
9823000558 ARM: S5PC100: Use common macro to define resources on dev-audio.c
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:30 +09:00
Tushar Behera
5e9cf65664 ARM: S5P64X0: Use common macro to define resources on dev-audio.c
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:30 +09:00
Tushar Behera
c858fd5faf ARM: S3C64XX: Use common macro to define resources on mach-smdk6410.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:30 +09:00
Tushar Behera
ae03a33aef ARM: S3C64XX: Use common macro to define resources on mach-real6410.c
Cc: Darius Augulis <augulis.darius@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:29 +09:00
Tushar Behera
bc4521d394 ARM: S3C64XX: Use common macro to define resources on mach-mini6410.c
Cc: Darius Augulis <augulis.darius@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:26 +09:00
Tushar Behera
8ebf148a68 ARM: S3C64XX: Use common macro to define resources on mach-crag6410.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:26 +09:00
Tushar Behera
178e712601 ARM: S3C64XX: Use common macro to define resources on mach-anw6410.c
Cc: Kwangwoo Lee <kwangwoo.lee@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:26 +09:00
Tushar Behera
99c7165c2f ARM: S3C64XX: Use common macro to define resources on dev-uart.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:26 +09:00
Tushar Behera
c6d884c206 ARM: S3C64XX: Use common macro to define resources on dev-audio.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:25 +09:00
Tushar Behera
3d52cad455 ARM: S3C24XX: Use common macro to define resources on simtec-nor.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:25 +09:00
Tushar Behera
940e46ae23 ARM: S3C24XX: Use common macro to define resources on mach-vr1000.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:25 +09:00
Tushar Behera
f8dadf5dbe ARM: S3C24XX: Use common macro to define resources on mach-tct_hammer.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:25 +09:00
Tushar Behera
5f3b90dcc0 ARM: S3C24XX: Use common macro to define resources on mach-rx1950.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:25 +09:00
Tushar Behera
e21be38afa ARM: S3C24XX: Use common macro to define resources on mach-otom.c
Cc: Guillaume GOURAT <guillaume.gourat@nexvision.tv>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:24 +09:00
Tushar Behera
9615b7318e ARM: S3C24XX: Use common macro to define resources on mach-nexcoder.c
Cc: Guillaume GOURAT <guillaume.gourat@nexvision.tv>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:24 +09:00
Tushar Behera
7498b72870 ARM: S3C24XX: Use common macro to define resources on mach-mini2440.c
Cc: Michel Pollet <buserror@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:24 +09:00
Tushar Behera
635a472675 ARM: S3C24XX: Use common macro to define resources on mach-h1940.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:24 +09:00
Tushar Behera
1c2bf1d326 ARM: S3C24XX: Use common macro to define resources on mach-gta02.c
Cc: Nelson Castillo <arhuaco@freaks-unidos.net>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:23 +09:00
Tushar Behera
52df44d172 ARM: S3C24XX: Use common macro to define resources on mach-bast.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:21 +09:00
Tushar Behera
d990e3986d ARM: S3C24XX: Use common macro to define resources on mach-at2440evb.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:21 +09:00
Tushar Behera
d1c14938b7 ARM: S3C24XX: Use common macro to define resources on mach-anubis.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:21 +09:00
Tushar Behera
7d4aa909c8 ARM: S3C24XX: Use common macro to define resources on mach-amlm5900.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:20 +09:00
Tushar Behera
16b742f59c ARM: S3C24XX: Use common macro to define resources on bast-ide.c
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:20 +09:00
Tushar Behera
f7f145e7db ARM: EXYNOS: Use common macro to define resources on mach-smdkv310.c
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:20 +09:00
Tushar Behera
f9b08c6d37 ARM: EXYNOS: Use common macro to define resources on mach-armlex4210.c
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:20 +09:00
Tushar Behera
d1e819e57b ARM: EXYNOS: Use common macro to define resources on dev-audio.c
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:20 +09:00
Tushar Behera
7f9851fea7 ARM: EXYNOS: Use common macro to define resources on dev-ahci.c
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:19 +09:00
Tushar Behera
24eec601bd ARM: SAMSUNG: Use common macro to define resources on devs.c
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12 16:12:19 +09:00
Olof Johansson
243e095446 Merge branch 'msm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup
* 'msm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: msm: fix compilation flags for MSM_SCM (part 2)
  arch/arm/mach-msm: linux/gpio.h included twice
  ARM: msm: Drop useless teq from DEBUG_LL support
2012-05-11 22:31:02 -07:00
Olof Johansson
eb9eef616b Merge branch 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
* 'fixes-for-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: OTG integration: fix compiler warning
  ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 builds
2012-05-11 22:21:51 -07:00
Stephen Boyd
26e87b1383 ARM: msm: fix compilation flags for MSM_SCM (part 2)
eca55f4 (ARM: msm: fix compilation flags for MSM_SCM, 2011-11-08)
added the correct assembler directive for the first smc instance
but missed the second instance in scm_get_version(). Add it so we
can compile this file with newer binutils.

Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
2012-05-11 11:08:37 -07:00
Danny Kukawka
847ac9bf61 arch/arm/mach-msm: linux/gpio.h included twice
arch/arm/mach-msm/board-msm7x30.c and arch/arm/mach-msm/board-qsd8x50.c
included 'linux/gpio.h' twice, remove the duplicates.

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: David Brown <davidb@codeaurora.org>
2012-05-11 11:08:36 -07:00
Stephen Boyd
c97d9320c6 ARM: msm: Drop useless teq from DEBUG_LL support
This teq was first introduced in bcc0f6a ([ARM] msm: clean up
iomap and devices, 2008-09-10). It seems that DEBUG_LL support on
MSM at the time had to remove the virtual mapping for the uart
base. Thus when the MMU was enabled the addruart macro returned 0
and the senduart macro would test for 0 and do nothing. It was a
simple way to turn off DEBUG_LL when the MMU was enabled.

The virtual mapping was added back in 6339f66 (msm: make
debugging UART (for DEBUG_LL) configurable, 2009-11-02) but the
patch forgot to remove the teq here. So as it stands the teq has
been useless for two years and DEBUG_LL works fine without it.

Cc: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
2012-05-11 11:08:34 -07:00