summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)AuthorFilesLines
2013-10-18ARM: imx: imx6sl iomuxc syscon is compatible to imx6qShawn Guo1-1/+2
The imx6sl iomuxc syscon is compatible to imx6q, so let's add compatible string 'fsl,imx6q-iomuxc-gpr' for imx6sl iomuxc syscon node. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2013-10-18Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dtKevin Hilman4-1/+38
From Nicolas Ferre: First DT series for 3.13 - addition of sound for at91sam9n12 - a little fix for MMC vs. SPI on at91sam9g20ek * tag 'at91-dt' of git://github.com/at91linux/linux-at91: ARM: at91: remove pinctrl conflict between mmc and SPI for at91sam9g20ek ARM: at91: add sound support on at91sam9n12ek board ARM: at91: enable ssc on at91sam9n12ek board ARM: at91: enable wm8904 on at91sam9n12ek board ARM: at91: add ssc dma parameter for at91sam9n12 ARM: at91: add at91sam9n12 ssc clock in look up table Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-18Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into ↵Kevin Hilman28-311/+588
next/cleanup From Nicolas Ferre: First cleanup series for 3.13 - a little non-urgent fix - addition of DT files to MAINTAINERS - more important, the splitting of .dtsi files that allows to precisely choose the peripherals that are present for a particular SoC. It is useful for upcoming move to common cloks. * tag 'at91-cleanup' of git://github.com/at91linux/linux-at91: MAINTAINERS: Add patterns for DTS files for AT91 ARM: at91: remove init_machine() as default is suitable ARM: at91/dt: split sama5d3 peripheral definitions ARM: at91/dt: split sam9x5 peripheral definitions ARM: at91: cam60: fix incorrect placement of __initdata tag
2013-10-18Merge tag 'omap-for-v3.13/am43xx-hwmod-signed' of ↵Kevin Hilman18-2016/+3586
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc From Tony Lindgren: Changes needed for am43xx for the hwmod data. This will be the last new set of hwmod data for any SoC as future SoCs will use a driver and device tree based approach. But before that can be dealt with, we need to first sort out the pending driver/clk issues. Queued by Paul Walmsley <paul@pwsan.com>: Add hwmod and PRCM data for the TI AM43xx family of SoCs. Under normal circumstances, these patches would not be merged. The hwmod and PRCM data should be moved out either to DT data or to drivers/. Also, the current implementation trades off lines of diff by dynamically rewriting static data at runtime, which is a bad practice - it causes future maintenance headaches. However, after speaking with my upstream, it sounds like it's better to merge these patches in their current state, due to long term considerations. Basic test logs are here: http://www.pwsan.com/omap/testlogs/am43xx_support_v3.13/20131015213706/ Due to the lack of an AM43xx board and any available public documentation, it's impossible for me to review or test that platform in any meaningful way. But at least the tests above verify that the patches don't affect existing platforms - particularly AM33xx. * tag 'omap-for-v3.13/am43xx-hwmod-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2: hwmod: Add qspi data for am437x. ARM: OMAP2+: hwmod: Add USB hwmod data for AM437x. ARM: OMAP2+: AM43x PRCM init ARM: OMAP2+: AM43x: PRCM kbuild ARM: OMAP2+: hwmod: AM43x operations ARM: OMAP2+: hwmod: AM43x support ARM: OMAP2+: CM: AM43x clockdomain data ARM: OMAP2+: PM: AM43x powerdomain data ARM: OMAP2+: PRCM: AM43x definitions ARM: OMAP2+: hwmod: AM335x: remove static register offs ARM: OMAP2+: hwmod: AM335x: runtime register update ARM: OMAP2+: hwmod: AM335x/AM43x: move common data ARM: OMAP2+: CM: cm_inst offset s16->u16 Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-18ARM: at91: remove pinctrl conflict between mmc and SPI for at91sam9g20ekJean-Christophe PLAGNIOL-VILLARD1-1/+0
These MMC and SPI buses can't be configured at the same time because they share the same traces on the EK board. Reported-by: Mark Brown <broonie@kernel.org> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-10-18Merge tag 'samsung-fixes-v2' of ↵Kevin Hilman6-26/+40
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes-non-critical From Kukjin Kim: Fixes for v3.12 - correct typo 'samsung,pin-drv' - correct typo 'earlyprintk' - cpufreq regulator lookup for exynos4210-origen and trats - fix PL330 MDMA1 address for universal c210 board * tag 'samsung-fixes-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: fix PL330 MDMA1 address in DT for Universal C210 board ARM: dts: Work around lack of cpufreq regulator lookup for exynos4210-origen and trats boards ARM: dts: Fix typo earlyprintk in exynos5440-sd5v1 and ssdk5440 boards ARM: dts: Correct typo in use of samsung,pin-drv for exynos5250 Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-18Merge branch 'rockchip/boards' into next/boardsKevin Hilman7-97/+858
From Heiko Stübner: Support for the RK3188 SoC, basic RK3188 based Radxa Rock board and RK3066a based BQ Curie2 tablet. * rockchip/boards: ARM: rockchip: add support for rk3188 and Radxa Rock board ARM: rockchip: add dts for bqcurie2 tablet ARM: rockchip: enable arm-global-timer ARM: rockchip: move shared dt properties to common source file
2013-10-18Merge tag 'v3.13-rockchip-fixes' of ↵Kevin Hilman2-24/+1
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes-non-critical From Heiko Stübner: Romoval of obsolete (never used) dt properties and fix for the selection of the TWD. * tag 'v3.13-rockchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: rockchip: remove obsolete rockchip,config properties ARM: rockchip: fix wrong use of non-existent CONFIG_LOCAL_TIMERS
2013-10-18ARM: ux500: register all SSP and SPI blocksLinus Walleij1-1/+74
This adds the SSP and SPI blocks to the device tree and makes them active. Only this way can their clocks be properly gated off at boot. Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-18ARM: ux500: fix I2C4 clock bitLinus Walleij1-1/+1
The PCLK for I2C4 is controlled by bit 10 in the PCKEN registers while the KCLK is controlled by bit 9 on the KCKEN, it's one of these odd assymetric things. Correct the PCLK bit to 10. Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-18ARM: ux500: fix clock for GPIO blocks 6 and 7Linus Walleij1-2/+2
The clock assignment in the device tree for GPIO blocks 6 and 7 was incorrect, indicating this was managed by bit 1 on PRCC 2 while it was in fact bit 11 on PRCC 2. Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-18ARM: ux500: fix clock for GPIO block 8Linus Walleij1-1/+1
The clock assignment in the device tree for GPIO block 8 was incorrect, indicating this was managed by bit 1 on PRCC 6 while it was in fact bit 1 on PRCC 5. Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-18ARM: dts: imx6sl-evk: enable the SPI NORHuang Shijie1-0/+16
enable the spi nor for imx6sl-evk boards. Signed-off-by: Huang Shijie <b32955@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2013-10-18ARM: dts: imx6sl: add a pinctrl for ECSPI1Huang Shijie1-0/+10
add a pinctrl for ECSPI1. This pinctrl can be used in the imx6sl-evk board. Signed-off-by: Huang Shijie <b32955@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2013-10-18ARM: imx27: add missing #pwm-cells propertySteffen Trumtrar1-0/+1
The pwm-node is missing its #pwm-cells property. The pwm-framework will complain about this. Add the missing property. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2013-10-18KVM: ARM: Transparent huge page (THP) supportChristoffer Dall1-2/+56
Support transparent huge pages in KVM/ARM and KVM/ARM64. The transparent_hugepage_adjust is not very pretty, but this is also how it's solved on x86 and seems to be simply an artifact on how THPs behave. This should eventually be shared across architectures if possible, but that can always be changed down the road. Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2013-10-18KVM: ARM: Support hugetlbfs backed huge pagesChristoffer Dall3-41/+147
Support huge pages in KVM/ARM and KVM/ARM64. The pud_huge checking on the unmap path may feel a bit silly as the pud_huge check is always defined to false, but the compiler should be smart about this. Note: This deals only with VMAs marked as huge which are allocated by users through hugetlbfs only. Transparent huge pages can only be detected by looking at the underlying pages (or the page tables themselves) and this patch so far simply maps these on a page-by-page level in the Stage-2 page tables. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2013-10-18Merge branch 'tegra/defconfig' into next/boardsKevin Hilman1-0/+5
From Stephen Warren: * tegra/defconfig: ARM: tegra: defconfig updates Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-18Merge branch 'tegra/dt' into next/dtKevin Hilman6-9/+210
From Stephen Warren: * tegra/dt: ARM: tegra: Use symbolic names for gr3d clocks ARM: tegra: Mark Tegra30 display controller compatible with Tegra20 ARM: tegra: add GPIO controller to tegra124.dtsi ARM: tegra: enable LP1 suspend mode for Venice2 ARM: tegra: enable Tegra RTC as default for Tegra124 ARM: tegra: add Venice2 board support ARM: tegra: Add initial device tree for Tegra124 ARM: tegra: add vcc supply for nct1008 to Cardhu ARM: tegra: add DT entry for nct1008 to Dalmore ARM: tegra: use dt-binding header for key code ARM: tegra: add palmas pincontrol to Dalmore device tree Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-18iio: at91: introduce touch screen support in iio adc driverJosh Wu1-0/+34
AT91 ADC hardware integrate touch screen support. So this patch add touch screen support for at91 adc iio driver. To enable touch screen support in adc, you need to add the dt parameters: 1. which type of touch are used? (4 or 5 wires), sample period time. 2. correct pressure detect threshold value. In the meantime, since touch screen will use a interal period trigger of adc, so it is conflict to other hardware triggers. Driver will disable the hardware trigger support if touch screen is enabled. This driver has been tested in AT91SAM9X5-EK and SAMA5D3x-EK. Signed-off-by: Josh Wu <josh.wu@atmel.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> CC: devicetree@vger.kernel.org Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2013-10-18Merge tag 'tegra-for-3.13-cleanup' of ↵Kevin Hilman18-569/+99
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/cleanup ARM: tegra: cleanup for 3.13 This branch mainly removes dead code and defines that were useful only when booting using board files. A few other misc cleanups are also included. This branch is based on previous pull request tegra-for-3.13-deps-for-arm-init-time-cleanup. * tag 'tegra-for-3.13-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: fix ARCH_TEGRA_114_SOC select sort order ARM: tegra: make tegra_init_fuse() __init ARM: tegra: remove much of iomap.h ARM: tegra: move resume vector define to irammap.h ARM: tegra: delete gpio-names.h ARM: tegra: delete stale header content ARM: tegra: remove common.c Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-18Merge tag 'highbank-for-3.13' of ↵Kevin Hilman9-145/+27
git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux into next/soc From Rob Herring: Highbank platform updates for 3.13 - convert Calxeda cpuidle driver to a platform driver and to use PSCI - convert highbank smp_ops and suspend to PSCI * tag 'highbank-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dts: calxeda: add ARM PSCI binding ARM: highbank: adapt to use ARM PSCI calls ARM: PSCI: remove unnecessary include of arm-gic.h cpuidle: calxeda: add support to use PSCI calls ARM: highbank: cpuidle: convert to platform driver cpuidle: calxeda: add cpu_pm_enter/exit calls
2013-10-18KVM: ARM: Update comments for kvm_handle_wfiChristoffer Dall2-6/+9
Update comments to reflect what is really going on and add the TWE bit to the comments in kvm_arm.h. Also renames the function to kvm_handle_wfx like is done on arm64 for consistency and uber-correctness. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2013-10-18ARM: KVM: Yield CPU when vcpu executes a WFEMarc Zyngier3-2/+9
On an (even slightly) oversubscribed system, spinlocks are quickly becoming a bottleneck, as some vcpus are spinning, waiting for a lock to be released, while the vcpu holding the lock may not be running at all. This creates contention, and the observed slowdown is 40x for hackbench. No, this isn't a typo. The solution is to trap blocking WFEs and tell KVM that we're now spinning. This ensures that other vpus will get a scheduling boost, allowing the lock to be released more quickly. Also, using CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT slightly improves the performance when the VM is severely overcommited. Quick test to estimate the performance: hackbench 1 process 1000 2xA15 host (baseline): 1.843s 2xA15 guest w/o patch: 2.083s 4xA15 guest w/o patch: 80.212s 8xA15 guest w/o patch: Could not be bothered to find out 2xA15 guest w/ patch: 2.102s 4xA15 guest w/ patch: 3.205s 8xA15 guest w/ patch: 6.887s So we go from a 40x degradation to 1.5x in the 2x overcommit case, which is vaguely more acceptable. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
2013-10-18Merge tag 'dt-3.13-3' of git://git.infradead.org/linux-mvebu into next/dtKevin Hilman2-8/+38
From Jason Cooper: mvebu dt changes for v3.13 (round 3) - dove - add audio devices - fix bad properties of si5351 clkout2 for CuBox * tag 'dt-3.13-3' of git://git.infradead.org/linux-mvebu: ARM: Dove: fix bad properties of the si5351 clkout2 used by Cubox audio ARM: Dove: Add the audio device to the Cubox DT ARM: Dove: Add the audio devices in DT
2013-10-18Merge tag 'soc-3.13-2' of git://git.infradead.org/linux-mvebu into next/socKevin Hilman6-18/+168
From Jason Cooper: mvebu soc changes for v3.13 (round 2) - kirkwood - remove mbus init, pcie clk init - retain MAC addr for DT ethernet (work around broken IP) - docs: clarify Armada SoCs * tag 'soc-3.13-2' of git://git.infradead.org/linux-mvebu: Documentation: arm/Marvell: clarify Armada SoCs that match 78xx0 pattern ARM: kirkwood: retain MAC address for DT ethernet ARM: kirkwood: Remove unneeded PCIe clock adding ARM: kirkwood: Remove unneeded MBus initialization ARM: kirkwood: Add standby support Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-18Merge tag 'msm-cleanup-for-3.13' of ↵Kevin Hilman10-605/+20
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup From David Brown: General cleanups for MSM for 3.13 Some small cleanups for MSM. Removes extraneous irq definitions that aren't used on DT targets, moves the single existing board file to board-dt.c in antipication of additional targets, and renames the existing DT files to have a common 'qcom' prefix. * tag 'msm-cleanup-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm: ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix ARM: msm: Create a common board-dt and config ARCH_MSM_DT ARM: msm: Remove irqs-*.h files for DT based targets Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-18Merge tag 'integrator-for-v3.13-2' of ↵Kevin Hilman12-618/+161
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc From Linus Walleij: Integrator patches for the v3.13 kernel cycle: - Fix up the LED support - Update the Integrator defconfig - Remove ATAG boot path - Move some stuff over to the device tree * tag 'integrator-for-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: integrator: core module registers from compatible strings ARM: integrator: use devm_ioremap() to remap CM cpufreq: probe the Integrator cpufreq driver from DT ARM: integrator: move CM base into device tree ARM: integrator: decommission the <mach/irqs.h> header ARM: integrator: delete non-devicetree boot path ARM: integrator: print the Linux IRQ in LL_DEBUG code ARM: integrator: get the LM interrupts from DT ARM: integrator: update defconfig ARM: integrator: get the CM control register by proxy Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-18Merge branch 'davinci/soc' into next/socKevin Hilman1-7/+2
From Sekhar Nori: * davinci/soc: ARM: davinci: convert to clockevents_config_and_register Signed-off-by: Kevin Hilman <khilman@linaro.org>
2013-10-18ARM: davinci: convert to clockevents_config_and_registerUwe Kleine-König1-7/+2
clockevents_config_and_register is superior compared to setting shift/mult and {min,max}_delta_ns by hand. Tested-by: Prabhakar Lad <prabhakar.csengg@gmail.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> [nsekhar@ti.com: fix an alignment related checkpatch warning] Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2013-10-17ARM: tegra: Use symbolic names for gr3d clocksThierry Reding1-1/+2
Commit 05849c9381354be4bd4a2a878b5ecb12d375a1a0 (ARM: tegra30: convert device tree files to use CLK defines) updated the Tegra30 device tree to use symbolic clock names but forgot to update this node. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2013-10-17Merge tag 'for-v3.13/am43xx-support' of ↵Tony Lindgren18-2016/+3586
git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.13/hwmod Add hwmod and PRCM data for the TI AM43xx family of SoCs. Under normal circumstances, these patches would not be merged. The hwmod and PRCM data should be moved out either to DT data or to drivers/. Also, the current implementation trades off lines of diff by dynamically rewriting static data at runtime, which is a bad practice - it causes future maintenance headaches. However, after speaking with my upstream, it sounds like it's better to merge these patches in their current state, due to long term considerations. Basic test logs are here: http://www.pwsan.com/omap/testlogs/am43xx_support_v3.13/20131015213706/ Due to the lack of an AM43xx board and any available public documentation, it's impossible for me to review or test that platform in any meaningful way. But at least the tests above verify that the patches don't affect existing platforms - particularly AM33xx.
2013-10-17ARM: tegra: Mark Tegra30 display controller compatible with Tegra20Thierry Reding1-1/+1
The display controller found on Tegra30 SoCs is backwards-compatible with the one on Tegra20 SoCs. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
2013-10-17Powerpc KVM work is based on a commit after rc4.Gleb Natapov53-116/+367
Merging master into next to satisfy the dependencies. Conflicts: arch/arm/kvm/reset.c
2013-10-17kvm: Add struct kvm arg to memslot APIsAneesh Kumar K.V1-2/+3
We will use that in the later patch to find the kvm ops handler Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Alexander Graf <agraf@suse.de>
2013-10-17ARM: AT91: DT: pm: Select ram controller standby based on DTJean-Christophe PLAGNIOL-VILLARD7-15/+17
Move non-dt selection to ioremap_registers init which is only called not non-dt board. So we can support sam9n12/sam9x5/sama5d3 too. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-10-17ARM: AT91: pm: Factorize standby functionJean-Christophe PLAGNIOL-VILLARD6-36/+29
Detect presence of second bank. So we do not need to have on function per SoC Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
2013-10-17ARM: at91: cpuidle: Move driver to drivers/cpuidleDaniel Lezcano2-70/+0
As the cpuidle driver code has no more the dependency with the pm code, the 'standby' callback being passed as a parameter to the device's platform data, we can move the cpuidle driver in the drivers/cpuidle directory. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Conflicts: drivers/cpuidle/Kconfig.arm drivers/cpuidle/Makefile
2013-10-17ARM: at91: cpuidle: Convert to platform driverDaniel Lezcano9-22/+56
Using the platform driver model is a good way to separate the cpuidle specific code from the low level pm code. It allows to remove the dependency between these two components. The platform_device is located in the pm code and a 'set' function has been added to set the standby function from the AT91_SOC_START initialization function. Each SoC with a cpuidle driver will set the standby function in the platform_data field at init time. Then pm code will register the cpuidle platform device. The cpuidle driver will register the platform_driver and use the device's platform_data as a standby callback in the idle path. The at91_pm_enter function contains a { if then else } based on cpu_is_xx similar to what was in cpuidle. This is considered dangerous when adding a new SoC. Like the cpuidle driver, a standby ops is defined and assigned when the SoC init function specifies what is its standby function and reused in the at91_pm_enter's 'case' block. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-10-17ARM: Samsung: Remove the MIPI PHY setup codeSylwester Nawrocki5-75/+0
Generic PHY drivers are used to handle the MIPI CSIS and MIPI DSIM DPHYs so we can remove now unused code at arch/arm/plat-samsung. In case there is any board file for S5PV210 platforms using MIPI CSIS/DSIM (not any upstream currently) it should use the generic PHY API to bind the PHYs to respective PHY consumer drivers and a platform device for the PHY provider should be defined. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Felipe Balbi <balbi@ti.com> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-10-16ARM: at91: remove init_machine() as default is suitableNicolas Ferre2-14/+0
Since 883a106b0866ca8d75b5520bdb3ca1cf8e3730ba (ARM: default machine descriptor for multiplatform) we can remove the SoC-specific callback init_machine() to use the default code. This cleans up the code and reduces the number of lines. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2013-10-16ARM: at91/dt: split sama5d3 peripheral definitionsBoris BREZILLON17-208/+429
This patch splits the sama5d3 SoCs definition: - a common base for all sama5d3 SoCs (sama5d3.dtsi) - several optional peripheral definitions which will be included by sama5d3 specific SoCs (sama5d3_'periph name'.dtsi) - sama5d3 specific SoC definitions (sama5d3x.dtsi) This provides a better representation of the real hardware (drop unneed dt nodes) and avoids peripheral id conflict (which is not the case for current sama5d3 SoCs, but could be if other SoCs of this family are released). Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> [nicolas.ferre@atmel.com: add more "sama5d3?" compatibility strings] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-10-16ARM: at91/dt: split sam9x5 peripheral definitionsBoris BREZILLON8-88/+158
This patch splits the sam9x5 peripheral definitions into: - a common base for all sam9x5 SoCs (at91sam9x5.dtsi) - several optional peripheral definitions which will be included by specific sam9x5 SoCs (at91sam9x5_'periph name'.dtsi) This provides a better representation of the real hardware (drop unneeded dt nodes) and avoids future peripheral id conflict (lcdc and isi both use peripheral id 25). Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2013-10-16Merge tag 'kvm-arm-for-3.13-1' of ↵Gleb Natapov12-130/+221
git://git.linaro.org/people/cdall/linux-kvm-arm into next Updates for KVM/ARM including cpu=host and Cortex-A7 support
2013-10-16ARM: integrator: core module registers from compatible stringsLinus Walleij4-5/+17
This augments the core machine code for the Integrator platforms to get their references to the core module device nodes by using compatible strings instead of predefined node names and rename the CP syscon node to be simply "syscon". Reported-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-16ARM: integrator: use devm_ioremap() to remap CMLinus Walleij1-1/+1
In the PCIv3 driver, use devm_ioremap() instead of just ioremap() when remapping the system controller in the PCIv3 driver, so the mapping will be automatically released on probe failure. Reported-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-16ARM: integrator: move CM base into device treeLinus Walleij6-49/+92
This moves the core module (CM) control base into the device tree. It is a simple memory range of 0x200 bytes. Move the cm header down into the machine directory and unexport the cm_control() symbol as no modules are using it. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-16ARM: integrator: decommission the <mach/irqs.h> headerLinus Walleij5-85/+0
This header is no longer needed when we boot from the device tree. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-16ARM: integrator: delete non-devicetree boot pathLinus Walleij5-463/+25
The Device Tree boot path now supports everything the ATAG boot can provide, and the two are equivalent. This deletes the ATAG boot path from the Integrator/AP and Integrator/CP platforms to move them on to the future. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2013-10-16ARM: integrator: print the Linux IRQ in LL_DEBUG codeLinus Walleij1-2/+2
The static HW irqs have no meaning in the interrupt handler and does not correlate to the /proc/interrupts IRQ numbers anymore, print the Linux IRQ number instead. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>