summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-05-13Merge branch 'clps711x/cleanup' into next/cleanupArnd Bergmann
* clps711x/cleanup: ARM: clps711x: Combine header files into one for clps711x-targets Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-13ARM: clps711x: Combine header files into one for clps711x-targetsAlexander Shiyan
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-12Merge branch 'next/cleanup-samsung' of ↵Olof Johansson
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-13Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsungKukjin Kim
2012-05-13ARM: S3C24XX: Use common macro to define resources on mach-qt2410.cTushar Behera
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-13ARM: S3C24XX: Use common macro to define resources on mach-osiris.cTushar Behera
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-12ARM: EXYNOS: Adapt to cpuidle core time keeping and irq enableAmit Daniel Kachhap
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-12ARM: S5PV210: Use common macro to define resources on mach-smdkv210.cTushar Behera
Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12ARM: S5PV210: Use common macro to define resources on dev-audio.cTushar Behera
Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12ARM: S5PC100: Use common macro to define resources on dev-audio.cTushar Behera
Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12ARM: S5P64X0: Use common macro to define resources on dev-audio.cTushar Behera
Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12ARM: S3C64XX: Use common macro to define resources on mach-smdk6410.cTushar Behera
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-12ARM: S3C64XX: Use common macro to define resources on mach-real6410.cTushar Behera
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-12ARM: S3C64XX: Use common macro to define resources on mach-mini6410.cTushar Behera
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-12ARM: S3C64XX: Use common macro to define resources on mach-crag6410.cTushar Behera
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-12ARM: S3C64XX: Use common macro to define resources on mach-anw6410.cTushar Behera
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-12ARM: S3C64XX: Use common macro to define resources on dev-uart.cTushar Behera
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-12ARM: S3C64XX: Use common macro to define resources on dev-audio.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on simtec-nor.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on mach-vr1000.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on mach-tct_hammer.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on mach-rx1950.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on mach-otom.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on mach-nexcoder.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on mach-mini2440.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on mach-h1940.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on mach-gta02.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on mach-bast.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on mach-at2440evb.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on mach-anubis.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on mach-amlm5900.cTushar Behera
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-12ARM: S3C24XX: Use common macro to define resources on bast-ide.cTushar Behera
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-12ARM: EXYNOS: Use common macro to define resources on mach-smdkv310.cTushar Behera
Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12ARM: EXYNOS: Use common macro to define resources on mach-armlex4210.cTushar Behera
Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12ARM: EXYNOS: Use common macro to define resources on dev-audio.cTushar Behera
Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12ARM: EXYNOS: Use common macro to define resources on dev-ahci.cTushar Behera
Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-12ARM: SAMSUNG: Use common macro to define resources on devs.cTushar Behera
Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2012-05-11Merge branch 'msm-core' of ↵Olof Johansson
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-11Merge branch 'fixes-for-cleanup' of ↵Olof Johansson
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-11ARM: msm: fix compilation flags for MSM_SCM (part 2)Stephen Boyd
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-11arch/arm/mach-msm: linux/gpio.h included twiceDanny Kukawka
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-11ARM: msm: Drop useless teq from DEBUG_LL supportStephen Boyd
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-11ARM: OMAP: OTG integration: fix compiler warningPaul Walmsley
Tony reported the following compile warning after commit eeb3711b89d68e147e05e7b43a49ecc5009dc157 ("ARM: OMAP2+: clean up some cppcheck warnings"): arch/arm/plat-omap/usb.c: In function 'omap_otg_init': arch/arm/plat-omap/usb.c:40: warning: unused variable 'status' This happens if CONFIG_ARCH_OMAP_OTG is set but CONFIG_USB_GADGET_OMAP, CONFIG_USB_OHCI_HCD, CONFIG_USB_OHCI_HCD_MODULE, and CONFIG_USB_OTG are all unset. Fix by localizing the status variable to the blocks that use it. Compile-tested only, with omap2plus_defconfig and omap2plus_defconfig with CONFIG_USB_OHCI_HCD and CONFIG_USB_OTG enabled. Signed-off-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-11ARM: OMAP1: USB: fix ocpi_enable compile problem on non-1610 buildsPaul Walmsley
Janusz Krzysztofik reported the following build break on OMAP1 builds that don't include CONFIG_ARCH_OMAP16XX: LD .tmp_vmlinux1 arch/arm/mach-omap1/built-in.o: In function `omap1_usb_init': lcd_dma.c:(.init.text+0x1420): undefined reference to `ocpi_enable' make: *** [.tmp_vmlinux1] Error 1 This was caused by commit d3645d39ad0ed9f09535065676ea0ba114f93cdf ("ARM: OMAP1: OHCI: use platform_data fn ptr to enable OCPI bus"). Fix by declaring an empty ocpi_enable() on non-16XX builds, which should work until the OCPI code is moved out to drivers/. Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com> Signed-off-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2012-05-11Merge branch 'clps711x/cleanup' into next/cleanupArnd Bergmann
A single patch from Alexander Shiyan <shc_work@mail.ru>: * clps711x/cleanup: ARM: clps711x: Using a single definition for the PHYS and VIRT registers offset Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-11ARM: clps711x: Using a single definition for the PHYS and VIRT registers offsetAlexander Shiyan
Using a single definition for the physical and virtual address register for all variants boards clps711x. This patch also includes the use of a single function clps_read/write in some units. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-10Merge tag 'omap-cleanup-dss-for-v3.5' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup Clean up for omap DSS board init in preparation for adding DT support. By Tomi Valkeinen via Tomi Valkeinen (1) and Tony Lindgren (1) * tag 'omap-cleanup-dss-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: OMAPDSS: DSI: implement generic DSI pin config OMAPDSS: Taal: move reset gpio handling to taal driver OMAPDSS: TFP410: rename dvi files to tfp410 OMAPDSS: TFP410: rename dvi -> tfp410 OMAP: board-files: remove custom PD GPIO handling for DVI output OMAPDSS: panel-dvi: add PD gpio handling Resolved context conflicts in arch/arm/mach-omap2/board-omap4panda.c. Signed-off-by: Olof Johansson <olof@lixom.net>
2012-05-10Merge tag 'ep93xx-cleanup-for-3.5' of ↵Olof Johansson
git://github.com/RyanMallon/linux-ep93xx into next/cleanup By H Hartley Sweeten (2) and Ryan Mallon (1) via Ryan Mallon * tag 'ep93xx-cleanup-for-3.5' of git://github.com/RyanMallon/linux-ep93xx: arm: ep93xx: use gpio_led_register_device Fix build breakage in ep93xx-core arm: ep93xx: use DEFINE_RES_* macros
2012-05-09Merge branch 'for-3.5/cleanup' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup By Arnd Bergmann (1) and Danny Kukawka (1) via Stephen Warren * 'for-3.5/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: do not hide dma declarations ARM: tegra: fix multiple asm/hardware/gic.h inclusion Signed-off-by: Olof Johansson <olof@lixom.net>
2012-05-09Merge branch 'for-l-o-3.5' of git://gitorious.org/linux-omap-dss2/linux into ↵Tony Lindgren
cleanup-dss
generated by cgit (git 2.34.1) at 2025-09-10 04:00:53 +0000