summaryrefslogtreecommitdiffstats
path: root/arch/arm
AgeCommit message (Collapse)Author
2014-02-28ARM: tegra: Hook up SDMMC3 power-supply on Venice2Thierry Reding
The SDMMC3 interface is supplied with 1.8V by the PMICs LDO6. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2014-02-28ARM: tegra: Overhaul Venice2 regulatorsThierry Reding
Some of the regulators and the relationships to other regulators are wrong. This commit attempts to rectify this by making them more similar to what the schematics contain. This starts by adding a +VDD_MUX supply that represents the 12V input and derives the main +3.3V_SYS and +5V_SYS supplies from that. The majority of the other regulators derive from one of those three. While at it, rename the regulators to match the names in the schematics to make them easier to match up. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2014-02-28ARM: clps711x: Update defconfigAlexander Shiyan
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 Shiyan
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-28ARM: clps711x: autcpu12: Fix incorrect NAND CLE GPIOAlexander Shiyan
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-02-28ARM: clps711x: Migrate CLPS711X subarch to the new irqchip driverAlexander Shiyan
This patch remove old code and migrate Cirrus Logic CLPS711X subarch to the new irqchip driver. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-02-28ARM: clps711x: Add CLPS711X irqchip driverAlexander Shiyan
This adds the irqchip driver for Cirrus Logic CLPS711X series SoCs. 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 Bergmann
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-28Merge tag 'qcom-dt-for-3.15' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/dt Merge "Qualcomm ARM Based Device Tree Updates for v3.15" from Kumar Gala * Added device tree nodes to enable SMP on msm8660, msm8960, and msm8974 * Added Random Number Generator DT nodes for msm8974 and msm8960 SoCs * tag 'qcom-dt-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom: ARM: dts: qcom-msm8960-cdp: Add RNG device tree node ARM: dts: qcom: Add RNG device tree node ARM: dts: qcom: Add nodes necessary for SMP boot Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-02-28Merge branch 'qcom/cleanup' into next/dtArnd Bergmann
This is a dependency for the qcom/dt branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-02-28Merge tag 'omap-for-v3.14/fixes-rc4' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Omap fixes from Tony Lindgren: Fixes for omaps mostly to fix the 3430 display regression, and random crashes if booting n900 with device tree and thumb mode. Also few other regressions and fixes. * tag 'omap-for-v3.14/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP3: Fix pinctrl interrupts for core2 ARM: OMAP: Kill warning in CPUIDLE code with !CONFIG_SMP ARM: OMAP2+: Add support for thumb mode on DT booted N900 ARM: OMAP2+: clock: fix clkoutx2 with CLK_SET_RATE_PARENT ARM: OMAP4: hwmod: Fix SOFTRESET logic for OMAP4 ARM: DRA7: hwmod data: correct the sysc data for spinlock ARM: OMAP5: PRM: Fix reboot handling Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-02-28ARM: ux500: skip GIC CPU and dist address checksLinus Walleij
The Ux500 is initializing its IRQs from the device tree and does not need to figure out any static base addresses anymore, this is just dead code so delete it. Cc: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-02-28ARM: sun6i: dt: Fix mod0 compatibleMaxime Ripard
The module 0 clock compatibles were changed between the time the patch was sent and it was merged. Update the compatibles. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-02-28arm: dma-mapping: remove order parameter from arm_iommu_create_mapping()Marek Szyprowski
The 'order' parameter for IOMMU-aware dma-mapping implementation was introduced mainly as a hack to reduce size of the bitmap used for tracking IO virtual address space. Since now it is possible to dynamically resize the bitmap, this hack is not needed and can be removed without any impact on the client devices. This way the parameters for arm_iommu_create_mapping() becomes much easier to understand. 'size' parameter now means the maximum supported IO address space size. The code will allocate (resize) bitmap in chunks, ensuring that a single chunk is not larger than a single memory page to avoid unreliable allocations of size larger than PAGE_SIZE in atomic context. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
2014-02-28arm: dma-mapping: Add support to extend DMA IOMMU mappingsAndreas Herrmann
Instead of using just one bitmap to keep track of IO virtual addresses (handed out for IOMMU use) introduce an array of bitmaps. This allows us to extend existing mappings when running out of iova space in the initial mapping etc. If there is not enough space in the mapping to service an IO virtual address allocation request, __alloc_iova() tries to extend the mapping -- by allocating another bitmap -- and makes another allocation attempt using the freshly allocated bitmap. This allows arm iommu drivers to start with a decent initial size when an dma_iommu_mapping is created and still to avoid running out of IO virtual addresses for the mapping. Signed-off-by: Andreas Herrmann <andreas.herrmann@calxeda.com> [mszyprow: removed extensions parameter to arm_iommu_create_mapping() function, which will be modified in the next patch anyway, also some debug messages about extending bitmap] Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
2014-02-28OMAPDSS: Remove unused get_context_loss_count supportTomi Valkeinen
The omapdss driver no longer uses get_context_loss_count call, so we can remove it. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Reviewed-by: Archit Taneja <archit@ti.com>
2014-02-28ARM: ux500: delete pointless DT config optionLinus Walleij
Supporting device tree on the Ux500 is not optional anymore, so delete the config option and compile this in at all times. Cc: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-02-27ARM: OMAP3: Fix pinctrl interrupts for core2Tony Lindgren
After splitting padconf core into two parts to avoid exposing unaccessable registers, the new padconf core2 domain was left without a wake-up interrupt. Fix the issue by passing the shared wake-up interrupt in platform data like we do for padconf core and wkup domains already. Fixes: 3d49538364 (ARM: dts: Split omap3 pinmux core device) Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-02-27arm/arm64: KVM: detect CPU reset on CPU_PM_EXITMarc Zyngier
Commit 1fcf7ce0c602 (arm: kvm: implement CPU PM notifier) added support for CPU power-management, using a cpu_notifier to re-init KVM on a CPU that entered CPU idle. The code assumed that a CPU entering idle would actually be powered off, loosing its state entierely, and would then need to be reinitialized. It turns out that this is not always the case, and some HW performs CPU PM without actually killing the core. In this case, we try to reinitialize KVM while it is still live. It ends up badly, as reported by Andre Przywara (using a Calxeda Midway): [ 3.663897] Kernel panic - not syncing: unexpected prefetch abort in Hyp mode at: 0x685760 [ 3.663897] unexpected data abort in Hyp mode at: 0xc067d150 [ 3.663897] unexpected HVC/SVC trap in Hyp mode at: 0xc0901dd0 The trick here is to detect if we've been through a full re-init or not by looking at HVBAR (VBAR_EL2 on arm64). This involves implementing the backend for __hyp_get_vectors in the main KVM HYP code (rather small), and checking the return value against the default one when the CPU notifier is called on CPU_PM_EXIT. Reported-by: Andre Przywara <osp@andrep.de> Tested-by: Andre Przywara <osp@andrep.de> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Rob Herring <rob.herring@linaro.org> Acked-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2014-02-27ARM: dts: vf610: i2c: Add eDMA supportYuan Yao
Add i2c dts node properties for eDMA support, them depend on the eDMA driver. Signed-off-by: Yuan Yao <yao.yuan@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2014-02-26dts: socfpga: Add support for SD/MMC on the SOCFPGA platformDinh Nguyen
Introduce "altr,socfpga-dw-mshc" to enable Altera's SOCFPGA platform specific implementation of the dw_mmc driver. Also add the "syscon" binding to the "altr,sys-mgr" node. The clock driver can use the syscon driver to toggle the register for the SD/MMC clock phase shift settings. Finally, fix an indentation error for the sysmgr node. Signed-off-by: Dinh Nguyen <dinguyen@altera.com> Acked-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Tested-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Chris Ball <chris@printf.net>
2014-02-26ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfigKumar Gala
Enable support for the MSM8x60, MSM8960, and MSM8974 SoCs, clocks and serial console as part of the standard multi_v7_defconfig. Signed-off-by: Kumar Gala <galak@codeaurora.org> [khilman: removed non-qcom changes] Signed-off-by: Kevin Hilman <khilman@linaro.org>
2014-02-26ARM: dts: keystone: add support for k2 Edison SoC and EVMMurali Karicheri
Keystone2 Edison (K2E) is a Quad Cortex A15 based SoC with 1 DSP. It has standard peripherals such as i2c, spi, uart, timer, pcie, etc similar to k2hk, but without wireless hardwares. This patch add support for k2 Edison SoC and EVM. This re-uses the common keystone.dtsi to include common bindings across the various k2 devices. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-02-26ARM: dts: keystone: add support for K2 Lamarr SoC and EVMMurali Karicheri
Keystone2 Lamarr (K2L) is a dual Cortex A15 core based SoC with 4 DSPs. It has standard peripherals such as i2c, spi, uart, timer, pcie etc., similar to k2hk, but different set of wireless hardware. This patch add support for k2 Lamarr SoC and EVM. This re-uses the common keystone.dtsi to include common bindings across the various k2 devices. Cc: Olof Johansson <olof@lixom.net> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Rob Herring <robh+dt@kernel.org> Cc: Kumar Gala <galak@codeaurora.org> Cc: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-02-26ARM: dts: keystone: preparatory patch to support K2L and K2E SOCsMurali Karicheri
Current keystone.dtsi includes SoC specific definitions for K2HK SoCs. In order to support two addition keystone devices, k2 Edison and K2 Lamarr and corresponding EVMs, This patch restructure the dts files for the following:- - All clock nodes that are only available in k2hk SoC are moved from keystone-clocks.dtsi to a new k2hk-clocks.dtsi include file - The CPU nodes are now part of the soc specific k2hk.dtsi. - Change the compatibility string to ti,k2hk-evm and change the model name accordingly - Finally include k2hk-clocks.dtsi in k2hk.dtsi and that in k2hk-evm.dts Cc: Olof Johansson <olof@lixom.net> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Rob Herring <robh+dt@kernel.org> Cc: Kumar Gala <galak@codeaurora.org> Cc: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-02-26ARM: integrator: register sched_clock directlyLinus Walleij
The detour through plat-versatile/sched-clock.c is hard to migrate to multiplatform set-up and it's very little code being duplicated so let's just inline the sched_clock registration and cut one more dependency to plat-versatile. This also makes this sched_clock implementation compulsory. Cc: Will Deacon <will.deacon@arm.com> Cc: Jonathan Austin <jonathan.austin@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-02-26ARM: integrator: localize the hardware.h headerLinus Walleij
As we move toward multiplatform support for the Integrator family we need to localize all <mach/*> headers. This moves the hardware.h header down to the machine folder. There are no users outside the machine in the kernel. Cc: Will Deacon <will.deacon@arm.com> Cc: Jonathan Austin <jonathan.austin@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-02-26ARM: integrator: merge platform.h to hardware.hLinus Walleij
There is no need to have the two separate headers <mach/platform.h> and <mach/hardware.h>, especially since we are now going to make them local files. There is not one single driver outside the mach-integrator folder referencing any of the files. Cc: Will Deacon <will.deacon@arm.com> Cc: Jonathan Austin <jonathan.austin@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-02-26ARM: integrator: localize the impd1.h headerLinus Walleij
As we move toward multiplatform support for the Integrator family we need to localize all <mach/*> headers. This moves the impd1.h header down to the machine folder, copying the the three defines only used by the clock driver down into the clock driver. Cc: Will Deacon <will.deacon@arm.com> Cc: Jonathan Austin <jonathan.austin@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Mike Turquette <mturquette@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-02-26ARM: integrator: localize the lm.h headerLinus Walleij
As we move toward multiplatform support for the Integrator family we need to localize all <mach/*> headers. This moves the lm.h header down to the machine folder as it is not used outside it anyway. Cc: Will Deacon <will.deacon@arm.com> Cc: Jonathan Austin <jonathan.austin@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-02-26ARM: u300: switch SSP/SPI clock name to "SSPCLK"Linus Walleij
As noted in recent discussions the name of the core clock for the PL022 derived SPI blocks is erroneously named in the U300 device tree. The kernel doesn't currently use the name, but may do so soon so let use rename all these clocks in accordance with the name given in the PL022 TRM (ARM DDI 0194G). Reviewed-by: Mark Brown <broonie@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-02-26ARM: ux500: switch SSP/SPI clock name to "SSPCLK"Linus Walleij
As noted in recent discussions the name of the core clock for the PL022 derived SPI blocks is erroneously named in the Ux500 device trees. The kernel doesn't currently use the name, but may do so soon so let use rename all these clocks in accordance with the name given in the PL022 TRM (ARM DDI 0194G). Reviewed-by: Mark Brown <broonie@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2014-02-26ARM: shmobile: Add SDHI devices for Koelsch DTSMagnus Damm
Add DT support for SDHI0, SDHI1 and SDHI2 on Koelsch. The board specific handling of CD and WP pins are using GPIOs. SDHI0 and SDHI1 are hooked up to regular SD connectors while SDHI2 is using micro-SD which is lacking WP signal. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-02-26ARM: shmobile: Add SDHI devices to r8a7791 DTSIMagnus Damm
Add SDHI0, SDHI1 and SDHI2 to the r8a7791 DTSI. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-02-26ARM: shmobile: Move SYSC base variable to inside ifdefsMagnus Damm
Move the rcar_sysc_base variable to inside #ifdefs to avoid triggering build warnings in case PM or SMP is not selected. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
2014-02-26ARM: dts: use macros in clock bindings for exynos5440Andrzej Hajda
The patch replaces magic numbers with macros defined in DT header in exynos5440 clock bindings. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Tomasz Figa <t.figa@samsung.com> Acked-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-02-26ARM: dts: use macros in clock bindings for exynos5420Andrzej Hajda
The patch replaces magic numbers with macros defined in DT header in exynos5420 clock bindings. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Tomasz Figa <t.figa@samsung.com> Acked-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-02-26ARM: dts: use macros in clock bindings for exynos5250Andrzej Hajda
The patch replaces magic numbers with macros defined in DT header in exynos5250 clock bindings. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Tomasz Figa <t.figa@samsung.com> Acked-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-02-26ARM: dts: use macros in clock bindings for exynos4Andrzej Hajda
The patch replaces magic numbers with macros defined in DT header in exynos4 clock bindings. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Tomasz Figa <t.figa@samsung.com> Acked-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-02-25ARM: dts: keystone: update for supporting K2L/K2E EVMsMurali Karicheri
This patch add compatibility strings for k2hk, k2l and k2e EVMs Cc: Olof Johansson <olof@lixom.net> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Rob Herring <robh+dt@kernel.org> Cc: Kumar Gala <galak@codeaurora.org> Cc: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-02-25ARM: dts: keystone: fix domain id for clkdebugsstrcMurali Karicheri
fix domain-id for debugsstrc to 1 Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-02-25ARM: kirkwood: Add HP T5325 thin clientAndrew Lunn
Convert the kirkwood t5325-setup.c to mostly device tree for mach-mvebu. Part of the audio setup needs to remain in C for the moment until suitable bindings are designed and implemented. So add board code, triggered by the compatibility string. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-02-25ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfigAndrew Lunn
The HP T5325 has a PCI based VGA controller. Add the frame buffer driver, and frame buffer support to the defconfig's. Additionally add the soc audio framework and the necessary codec. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-02-25ARM: tegra: Export I/O rail functionsThierry Reding
The I/O rail functions can be used by drivers that are buildable as modules. Exporting the functions makes sure that they're available. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2014-02-25ARM: kirkwood: select dtbs based on SoCJason Cooper
To prevent problems later with mvebu_v5_defconfig builds, we restrict the scope of the changes this series makes. Selecting ARCH_KIRKWOOD and MACH_KIRKWOOD is necessary during the migration from mach-kirkwood to mach-mvebu. Until the last four legacy kirkwood board files have a DT equivalent, we need to support building DT from both mach-kirkwood and mach-mvebu. Reported-by: Kevin Hilman <khilman@linaro.org> Acked-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-02-25Merge tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux into ↵Arnd Bergmann
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: tegra: Combine VBUS enable pins into one nodeThierry Reding
Both USB_VBUS_EN0 and USB_VBUS_EN1 are configured the same way, so they can be combined into a single node. While at it, don't configure them as pull-up since they already have external pull-ups. Also U-Boot doesn't configure them as pull-up either. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2014-02-25ARM: tegra: Use "disabled" for status propertyThierry Reding
To disable a device tree node, the status property should be set to "disabled", not "disable". Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2014-02-25ARM: tegra: remove tegra EMC scaling driverStephen Warren
Nothing calls into the Tegra EMC (External Memory Controller) scaling driver any more, so it's dead code. Remove it. Cc: Joseph Lo <josephl@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2014-02-25Merge tag 'mvebu-soc-3xx-3.15' of git://git.infradead.org/linux-mvebu into ↵Arnd Bergmann
next/soc Merge "mvebu new SoCs for v3.15" from Jason Cooper: - mvebu - initial support for Armada 375, 380, and 385 Depends: - tags/mvebu-soc-3.15 (resolves delete/rename hidden conflict) * tag 'mvebu-soc-3xx-3.15' of git://git.infradead.org/linux-mvebu: Documentation: arm: update Marvell documentation about Armada 375/38x ARM: mvebu: add initial support for the Armada 380/385 SOCs ARM: mvebu: add workaround for data abort issue on Armada 375 ARM: mvebu: add initial support for the Armada 375 SOCs ARM: mvebu: add Armada 375 support to the system-controller driver ARM: mvebu: make CPU_PJ4B selection a per-SoC choice ARM: mvebu: rename DT machine structure for Armada 370/XP ARM: mvebu: rename armada-370-xp.c to board-v7.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>