summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-03-21ARM: hisi: select HAVE_ARM_SCU only for SMPArnd Bergmann1-1/+1
The SCU code does not build unless we are compiling an SMP kernel. This does the same as every other platform with an SCU. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
2014-03-21ARM: efm32: allow uncompress debug outputArnd Bergmann1-1/+1
efm32 has no mach/uncompress.h, but we can trivially use the fallback to the ll_debug code by just allowing this option in Kconfig. Found during randconfig testing. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Uwe Kleine-König <kernel@pengutronix.de>
2014-03-17ARM: prima2: build reset code standaloneArnd Bergmann3-13/+13
The prima2 platform code currently depends on the rstc implementation and that in turn depends on the reset controller framework. This removes the platform dependency by letting the driver access arm_pm_restart directly to turn the driver into a standalone entity, and also removes the dependency on the reset controller framework by using "if (IS_ENABLED(CONFIG_RESET_CONTROLLER))". This will cause all code that is used for the reset controller to be dropped by the compiler if the framework is disabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into ↵Arnd Bergmann16-16/+1981
next/cleanup Merge "First batch of AT91 cleanup for 3.15" from Nicolas Ferre: - some updates on the defconfig front - two SoCs converted to Device Tree: sam9261 and sam9rl (with use of CCF!) - a little PWM clock update that goes on top of this * tag 'at91-cleanup' of git://github.com/at91linux/linux-at91: ARM: at91: add PWM clock ARM: at91: move sam9261 SoC to common clk ARM: at91: prepare common clk transition for sam9261 SoC ARM: at91: updated the at91_dt_defconfig with support for the ADS7846 ARM: at91: dt: sam9261: Device Tree support for the at91sam9261ek ARM: at91: dt: defconfig: Added the sam9261 to the list of DT-enabled SOCs ARM: at91: dt: Add at91sam9261 dt SoC support ARM: at91: switch sam9rl to common clock framework ARM: at91/dt: define main clk frequency of at91sam9rlek ARM: at91/dt: define at91sam9rl clocks ARM: at91: prepare common clk transition for sam9rl SoCs ARM: at91: prepare sam9 dt boards transition to common clk ARM: at91: dt: sam9rl: Device Tree for the at91sam9rlek ARM: at91/defconfig: Add the sam9rl to the list of DT-enabled SOCs ARM: at91: Add at91sam9rl DT SoC support ARM: at91: prepare at91sam9rl DT transition ARM: at91/defconfig: refresh at91sam9260_9g20_defconfig ARM: at91/defconfig: remove useless configuration in at91sam9260_9g20_defconfig ARM: at91/defconfig: refresh at91sam9rl_defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-12ARM: at91: add PWM clockBo Shen5-0/+5
Add PWM clock for AT91 series SoC which include PWM controller. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91: move sam9261 SoC to common clkJean-Jacques Hiblot1-1/+0
This patch removes the selection of AT91_USE_OLD_CLK when selecting sam9261 SoCs support. This will automatically enable COMMON_CLK_AT91 option and add support for at91 common clk implementation. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91: prepare common clk transition for sam9261 SoCJean-Jacques Hiblot1-2/+6
This patch encloses sam9261 old clk registration in "#if defined(CONFIG_OLD_CLK_AT91) #endif" sections. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91: updated the at91_dt_defconfig with support for the ADS7846Jean-Jacques Hiblot1-0/+1
This provides touchscreen support to the at91sam9261ek Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91: dt: sam9261: Device Tree support for the at91sam9261ekJean-Jacques Hiblot2-0/+213
This patch implements a DTS to boot a at91sam9261ek with a dt-enabled kernel (at91_dt_defconfig). supported features are: * dbgu * lcdc * usb host * usb gadget, * spi dataflash * nand flash * touchscreen * leds * user buttons In the TODO list: * dm9000 (ethernet) * audio * mmc Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91: dt: defconfig: Added the sam9261 to the list of DT-enabled SOCsJean-Jacques Hiblot1-0/+1
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91: dt: Add at91sam9261 dt SoC supportJean-Jacques Hiblot2-0/+752
This patch adds support for the Device Tree on a sam9261-based platform Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91: switch sam9rl to common clock frameworkAlexandre Belloni1-1/+0
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris BREZILLON <b.brezillon.dev@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91/dt: define main clk frequency of at91sam9rlekAlexandre Belloni1-0/+6
Define the main clock frequency for the new main clock node in at91sam9rlek.dts Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris BREZILLON <b.brezillon.dev@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91/dt: define at91sam9rl clocksAlexandre Belloni1-1/+226
Define at91sam9rl clocks in at91sam9rl dtsi file. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris BREZILLON <b.brezillon.dev@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91: prepare common clk transition for sam9rl SoCsAlexandre Belloni1-1/+5
This patch encloses sam9rl old clk registration in #if defined(CONFIG_OLD_CLK_AT91)/#endif sections. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris BREZILLON <b.brezillon.dev@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91: prepare sam9 dt boards transition to common clkBoris BREZILLON1-1/+10
This patch prepare the transition to common clk for sam9 dt boards by replacing the timer init callback. Clocks registration cannot be done in early init callback (as formerly done by the old clk implementation) because it requires dynamic allocation which is not ready yet during early init. In the other hand, at91 clocks must be registered before at91sam926x_pit_init is called because PIT (Periodic Interval Timer) driver request the master clk (mck). A new function (at91sam9_dt_timer_init) is created to fullfil these needs. This function registers all at91 clks using the dt definition before calling the PIT init function. The device tree clock registration is enabled only if common clk is selected. Else the old clk registration is been done during at91_dt_initialize call. Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91: dt: sam9rl: Device Tree for the at91sam9rlekAlexandre Belloni2-0/+153
Add a device tree for the at91sam9rl-ek. For now it supports: - MMC - dbgu - usart1 - watchdog - nand - leds - buttons Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris BREZILLON <b.brezillon.dev@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91/defconfig: Add the sam9rl to the list of DT-enabled SOCsAlexandre Belloni1-0/+1
at91sam9rl now has a device tree, add it to the at91_dt_defconfig. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris BREZILLON <b.brezillon.dev@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91: Add at91sam9rl DT SoC supportAlexandre Belloni1-0/+577
This adds preliminary DT support for the at91sam9rl. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris BREZILLON <b.brezillon.dev@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91: prepare at91sam9rl DT transitionAlexandre Belloni1-0/+17
Add the new names, coming from DT, for the clock lookups. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Boris BREZILLON <b.brezillon.dev@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12Merge tag 'bcm2835-for-3.15-soc' of ↵Olof Johansson9-16/+20
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/cleanup Merge "ARM: bcm2835: consolidate into mach-bcm/" from Stephen Warren: This pull request consists of a single patch which moves files from arch/arm/mach-bcm2835 into mach-bcm, thus consolidating them with support for other Broadcom chips. * tag 'bcm2835-for-3.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi: ARM: bcm2835: Move to mach-bcm directory Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-12Merge tag 'armsoc/for-3.15/cleanup' of git://github.com/broadcom/mach-bcm ↵Olof Johansson3-89/+65
into next/cleanup Merge "ARM: mach-bcm: cleanups for 3.15" from Matt Porter: - make bcm281xx symbol naming consistent with SoC name - remove unneeded and reorder bcm281xx header files - consolidate bcm281xx reboot and l2 cache code * tag 'armsoc/for-3.15/cleanup' of git://github.com/broadcom/mach-bcm: ARM: bcm281xx: Rename board_init() function ARM: bcm281xx: Re-order hearder files ARM: bcm281xx: Consolidate reboot code ARM: bcm281xx: Move kona_l2_cache_init() so it can be shared ARM: bcm281xx: symbol cleanup Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-10ARM: at91/defconfig: refresh at91sam9260_9g20_defconfigAlexandre Belloni1-0/+2
Select CONFIG_EMBEDDED as it it useful for that board. Also select CONFIG_MTD_UBI to really enable UBIfs (CONFIG_FS_UBIFS depends on it). Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-10ARM: at91/defconfig: remove useless configuration in at91sam9260_9g20_defconfigAlexandre Belloni1-7/+0
A few configuration symbols are deprecated and disappeared a few versions ago, remove them. CONFIG_FPE_NWFPE depends on OABI_COMPAT which was not selected. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-10ARM: at91/defconfig: refresh at91sam9rl_defconfigAlexandre Belloni1-3/+7
The defconfig for the at91sam9rl is quite old, refresh it: - now uses EABI instead of OABI - add devtmpfs support - add UBI/UBIfs support - remove a few config symbols that disappeared Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-09Merge tag 'sirf-soc-for-3.15' of ↵Olof Johansson10-50/+120
git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/cleanup ARM: sirf: machine update for 3.15 from Barry Song: Most of the below are some minor fixes for coding style. "ARM: prima2: move to generic reset controller driver framework" has been ready near 3.14 merge window, but it was late to merge in 3.14, so move this one to 3.15. * tag 'sirf-soc-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux: ARM: prima2: move to generic reset controller driver framework ARM: prima2: staticize sirfsoc_init_late function ARM: prima2: rtciobrg: fix the typo about license ARM: prima2: common: fix checkpatch issues ARM: prima2: platsmp: fix checkpatch issues ARM: prima2: l2x0: fix checkpatch issues Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09Merge tag 'irq-mmp' of ↵Olof Johansson1-1/+1
https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into next/cleanup Merge a mach header include removal from Haojian Zhuang. * tag 'irq-mmp' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux: irqchip: mmp: avoid use head file in a specific arch Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09Merge tag 'samsung-cleanup' of ↵Olof Johansson90-255/+90
http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup Samsung cleanup for v3.15 from Kukjin Kim: - Use generic uncompress.h for exynos and remove exynos <mach/uncompress.h> accordingly (other uncompress.h files will be removed) - move <plat/rtc-core.h> into s3c24xx <mach/rtc-core.h> - remove unused header files - cleanup exynos related non-DT stuffs - use inclusion <linux/serial_s3c.h> instead of <plat/regs-serial.h> - remove unneeded Kconfig entries: S3C24XX_GPIO_EXTRA64 and S3C24XX_GPIO_EXTRA128 - remove unneeded function s3c24xx_init_cpu() - remove obsolete s3c24xx <mach/tick.h> * tag 'samsung-cleanup' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Remove uncompress.h ARM: debug: Use generic uncompress.h for exynos ARM: S3C24XX: Move rtc-core.h from plat to mach ARM: EXYNOS: Remove unused header file from pm_domains.c ARM: SAMSUNG: Remove Exynos specific code from devs, s5p-pm-irq and pm-gpio.c ARM: SAMSUNG: Delete unused plat/regs-serial.h header file ARM: SAMSUNG: Replace inclusion of plat/regs-serial.h header file ARM: SAMSUNG: Remove platform dependency from samsung.S ARM: S3C24XX: get rid of unneeded selects ARM: SAMSUNG: remove unneeded s3c24xx_init_cpu() ARM: SAMSUNG: remove obsolete tick.h Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09Merge tag 'samsung-drivers' of ↵Olof Johansson2-4/+1
http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup Samsung drivers update for v3.15 from Kukjin Kim: - remove inclusion <asm/mach/time.h> from exynos_mct.c - remove inclusion <asm/mach/irq.h> from exynos-combiner.c and use calling handle_bad_irq() instead of do_bad_IRQ() * tag 'samsung-drivers' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: irqchip: exynos-combiner: call handle_bad_irq directly clocksource: exynos_mct: remove unwanted header file inclusion Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-06ARM: bcm281xx: Rename board_init() functionMarkus Mayer1-2/+2
Rename board_init() to bcm281xx_init(), so the name reflects the board specific nature of this function. Signed-off-by: Markus Mayer <markus.mayer@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org>
2014-03-06ARM: bcm281xx: Re-order hearder filesMarkus Mayer1-2/+2
Re-order header files alphabetically. Signed-off-by: Markus Mayer <markus.mayer@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org>
2014-03-06ARM: bcm281xx: Consolidate reboot codeMarkus Mayer3-66/+34
Consolidate reboot code and remove unnecessary functions. Signed-off-by: Markus Mayer <markus.mayer@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org>
2014-03-06ARM: bcm281xx: Move kona_l2_cache_init() so it can be sharedMarkus Mayer3-27/+32
In preparation for future SoCs, move kona_l2_cache_init() from board specific board_bcm281xx.c to shared kona.c, so multiple SoC families can make use of it. Also change the return type to "void", since we never look at the return code anyway. Signed-off-by: Markus Mayer <markus.mayer@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org>
2014-03-06ARM: bcm281xx: symbol cleanupAlex Elder1-3/+6
This patch renames a few symbols that needlessly used "11351" rather than "281xx" in their names. Support for the bcm11351 board is being removed from the kernel, and the family of boards is more properly referred to as "bcm281xx". Signed-off-by: Alex Elder <elder@linaro.org> Reviewed-by: Markus Mayer <markus.mayer@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org>
2014-03-05ARM: prima2: move to generic reset controller driver frameworkBarry Song6-37/+108
this moves to generic IP module reset framework, and make other drivers use common device_reset() API. Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com> Signed-off-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Bin Shi <Bin.Shi@csr.com> Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
2014-03-05ARM: prima2: staticize sirfsoc_init_late functionBarry Song1-1/+1
sirfsoc_init_late() is a local function not an extern interface to anyone. Signed-off-by: Barry Song <Baohua.Song@csr.com>
2014-03-05ARM: prima2: rtciobrg: fix the typo about licenseBarry Song1-1/+1
we are marking GPL v2 in head comments, but MODULE_LICENSE is declaring GPL. Signed-off-by: Barry Song <Baohua.Song@csr.com>
2014-03-05ARM: prima2: common: fix checkpatch issuesBarry Song1-3/+3
fix the below checkpatch issues: ERROR: Use of const init definition must use __initconst 30: FILE: common.c:30: +static const char *atlas6_dt_match[] __initdata = { ERROR: Use of const init definition must use __initconst 45: FILE: common.c:45: +static const char *prima2_dt_match[] __initdata = { ERROR: Use of const init definition must use __initconst 61: FILE: common.c:61: +static const char *marco_dt_match[] __initdata = { Signed-off-by: Barry Song <Baohua.Song@csr.com>
2014-03-05ARM: prima2: platsmp: fix checkpatch issuesBarry Song1-3/+3
fix the below checkpatch issues: ERROR: code indent should use tabs where possible 141: FILE: platsmp.c:141: + .smp_prepare_cpus = sirfsoc_smp_prepare_cpus,$ WARNING: please, no spaces at the start of a line 141: FILE: platsmp.c:141: + .smp_prepare_cpus = sirfsoc_smp_prepare_cpus,$ ERROR: code indent should use tabs where possible 142: FILE: platsmp.c:142: + .smp_secondary_init = sirfsoc_secondary_init,$ WARNING: please, no spaces at the start of a line 142: FILE: platsmp.c:142: + .smp_secondary_init = sirfsoc_secondary_init,$ ERROR: code indent should use tabs where possible 143: FILE: platsmp.c:143: + .smp_boot_secondary = sirfsoc_boot_secondary,$ WARNING: please, no spaces at the start of a line 143: FILE: platsmp.c:143: + .smp_boot_secondary = sirfsoc_boot_secondary,$ Signed-off-by: Barry Song <Baohua.Song@csr.com>
2014-03-05ARM: prima2: l2x0: fix checkpatch issuesBarry Song1-5/+4
Fix the below checkpatch issues: ERROR: open brace '{' following struct go on the same line 15: FILE: l2x0.c:15: +struct l2x0_aux +{ ERROR: Use of __initconst requires a separate use of const 20: FILE: l2x0.c:20: +static struct l2x0_aux prima2_l2x0_aux __initconst = { ERROR: Use of __initconst requires a separate use of const 25: FILE: l2x0.c:25: +static struct l2x0_aux marco_l2x0_aux __initconst = { ERROR: Use of __initconst requires a separate use of const 31: FILE: l2x0.c:31: +static struct of_device_id sirf_l2x0_ids[] __initconst = { Signed-off-by: Barry Song <Baohua.Song@csr.com>
2014-03-04irqchip: mmp: avoid use head file in a specific archNeil Zhang1-1/+1
For example, arm64 doesn't have mach/irq.h. Signed-off-by: Neil Zhang <zhangwm@marvell.com> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
2014-02-28ARM: clps711x: Update defconfigAlexander Shiyan1-2/+1
This updates the CLPS711X defconfig to the thing saved by savedefconfig. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-02-28ARM: clps711x: Remove EP72XX_ROM_BOOT optionAlexander Shiyan2-31/+0
CLPS711X CPUs have 128 bytes of on-chip Boot ROM with an instruction sequence that configure UART1 to receive up to 2 Kbytes of serial data which is then placed in the on-chip SRAM. Once the download is complete, the program counter jumps to SRAM to begin executed the downloaded data. The purpose of this mode is to allow the downloaded code to facilitate programming of FLASH or other ROM device. Selection of the internal Boot ROM is accomplished at power-on-reset time. No reason to keep this special (develop only) mode in the kernel. This patch removes EP72XX_ROM_BOOT kernel symbol. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-02-28Merge tag 'kconfig-cleanup-for-3.15' of ↵Arnd Bergmann33-228/+12
git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux into next/cleanup Merge "kconfig clean-up and mach-virt removal for 3.15" from Rob Herring - Remove common kconfig options required by multi-platform builds out of individual platforms as they are redundant. - Make SMP, CACHE_L2X0 and GPIO config options user visible on multi-platform builds as most platforms enable these options and all platforms can run with them enabled. - Make multi-platform v6 default to more optimal v6k rather than v6 - Remove the last bit of mach-virt and convert it to just a kconfig option. * tag 'kconfig-cleanup-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: ARM: virt: select ARM_AMBA ARM: virt: make mach-virt just a kconfig option ARM: vt8500: enable V6K instead of plain V6 ARM: cns3xxx: enable V6K instead of plain V6 ARM: bcm2835: enable V6K instead of plain V6 ARM: Select V6K instead of V6 by default for multi-platform ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform ARM: select HAVE_SMP for V7 multi-platform ARM: centralize common multi-platform kconfig options Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-02-25Merge tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux into ↵Arnd Bergmann3-10/+0
next/cleanup Merge "efm32 cleanups for next" from Uwe Kleine-König Just three simple cleanups for efm32 removing two now unused files and a superflous select by ARCH_EFM32. As these cleanups have dependencies on both v3.14-rc1 and my timex.h cleanup (which is based on v3.13-rc1) this pull request also included a merge of my cleanup tag which is already in armsoc/next/cleanup. * tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux: ARM: efm32: drop unused file <mach/timex.h> ARM: efm32: drop selecting CLKSRC_MMIO ARM: efm32: drop unused file entry-macro.S Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-02-25ARM: bcm2835: Move to mach-bcm directoryMarkus Mayer9-20/+20
Move the bcm2835 board file into the mach-bcm directory. This allows us to get rid of the mach-bcm2835 directory with the associated Kconfig and Makefile. Signed-off-by: Markus Mayer <markus.mayer@linaro.org> [swarren, adjust defconfig so ARCH_BCM2835 still gets enabled] Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
2014-02-24ARM: efm32: drop unused file <mach/timex.h>Uwe Kleine-König1-3/+0
This file is unused since commit 79f08d9ed217 (ARM: drop <mach/timex.h> for !ARCH_MULTIPLATFORM, too) . Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2014-02-24Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linuxUwe Kleine-König74-732/+153
This cleanup series gets rid of <mach/timex.h> for platforms not using ARCH_MULTIPLATFORM. (For multi-platform code it's already unused since 387798b (ARM: initial multiplatform support).) To make this work some code out of arch/arm needed to be adapted. The respective changes got acks by their maintainers to be taken via armsoc (with Andrew Morton substituting for Alessandro Zummo as rtc maintainer). Compared to the previous pull request there was another patch added that fixes a (non-critical) regression on ixp4xx. Olof Johansson asked to not squash this fix into the original commit to save him from the need to reverify the series. Conflicts: arch/arm/mach-at91/at91sam9260.c arch/arm/mach-at91/at91sam9261.c arch/arm/mach-at91/at91sam9263.c arch/arm/mach-at91/at91sam9rl.c arch/arm/mach-mmp/time.c arch/arm/mach-sa1100/time.c
2014-02-24ARM: efm32: drop selecting CLKSRC_MMIOUwe Kleine-König1-3/+0
CLKSRC_MMIO is needed on efm32 because the clocksource driver (CLKSRC_EFM32) uses clocksource_mmio_init() and clocksource_mmio_readl_up(). Since commit 09ca27579ee5 (clocksource: time-efm32: Select CLKSRC_MMIO) CLKSRC_EFM32 does the necessary select itself and ARCH_EFM32 doesn't need to select it explicitly any more. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2014-02-24ARM: efm32: drop unused file entry-macro.SUwe Kleine-König1-4/+0
This file is unused since commit e6d159cdf9f7 (ARM: 7890/1: v7-M: drop using mach/entry-macro.S) which went into v3.14-rc1. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.0) at 2024-11-23 08:09:38 +0300