summaryrefslogtreecommitdiffstats
path: root/arch/arm
AgeCommit message (Collapse)Author
2014-03-18ARM: Change more ARM kprobes symbol names to something more genericDavid A. Long
Change kprobe_emulate_none, kprobe_simulate_nop, and arm_kprobe_decode_init function names to something more appropriate for code being shared outside of the kprobes subsystem. Also, move the new arm_probes_decode_init declaration out of the kprobes.h include file and into the probes.h include file. Signed-off-by: David A. Long <dave.long@linaro.org> Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18ARM: Make the kprobes condition_check symbol names more genericDavid A. Long
In preparation for sharing the ARM kprobes instruction interpreting code with uprobes, make the symbols names less kprobes-specific. Signed-off-by: David A. Long <dave.long@linaro.org> Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18ARM: Remove use of struct kprobe from generic probes codeDavid A. Long
Change the generic ARM probes code to pass in the opcode and architecture-specific structure separately instead of using struct kprobe, so we do not pollute code being used only for uprobes or other non-kprobes instruction interpretation. Signed-off-by: David A. Long <dave.long@linaro.org> Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18ARM: use a function table for determining instruction interpreter actionDavid A. Long
Make the instruction interpreter call back to semantic action functions through a function pointer array provided by the invoker. The interpreter decodes the instructions into groups and uses the group number to index into the supplied array. kprobes and uprobes code will each supply their own array of functions. Signed-off-by: David A. Long <dave.long@linaro.org> Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18ARM: move generic thumb instruction parsing code to new files for use by ↵David A. Long
other feature Move the thumb version of the kprobes instruction parsing code into more generic files from where it can be used by uprobes and possibly other subsystems. The symbol names will be made more generic in a subsequent part of this patchset. Signed-off-by: David A. Long <dave.long@linaro.org> Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18ARM: Move generic arm instruction parsing code to new files for sharing ↵David A. Long
between features Move the arm version of the kprobes instruction parsing code into more generic files from where it can be used by uprobes and possibly other subsystems. The symbol names will be made more generic in a subsequent part of this patchset. Signed-off-by: David A. Long <dave.long@linaro.org> Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18ARM: move shared uprobe/kprobe definitions into new include fileDavid A. Long
Separate the kprobe-only definitions from the definitions needed by both kprobes and uprobes. Signed-off-by: David A. Long <dave.long@linaro.org> Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18ARM: Fix missing includes in kprobes sourcesDavid A. Long
Make sure includes in ARM kprobes sources are done explicitly. Do not rely on includes from other includes. Signed-off-by: David A. Long <dave.long@linaro.org> Acked-by: Jon Medhurst <tixy@linaro.org>
2014-03-18ARM: dts: Build all keystone dt blobsSantosh Shilimkar
Now we have additional two SOC/boards supported, so add make file rule so that all device tree blobs can be build for keystone with 'make dtbs'. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-03-18ARM: dts: keystone: Fix control register range for clktsipIvan Khoronzhuk
The control register range for clktsio interferes with clkaemifspi clock. And it causes issues for NAND/AEMIF. So fix it. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-03-18ARM: dts: keystone: Fix domain register range for clkfftc1Ivan Khoronzhuk
The domain register range for clkfftc1 has to be 0x0235004c instead of 0x023504c0. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
2014-03-18Merge branch 'cleanup/kconfig' into next/driversArnd Bergmann
This resolves a conflict between the new sti reset controller driver and the Kconfig cleanup. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-18Merge tag 'sti-reset-for-v3.15' of ↵Arnd Bergmann
git://git.stlinux.com/devel/kernel/linux-sti into next/drivers Merge "STi Reset controller support" from Srinivas Kandagatla: * tag 'sti-reset-for-v3.15' of git://git.stlinux.com/devel/kernel/linux-sti: ARM: STi: Add reset controller support to mach-sti Kconfig drivers: reset: stih416: add softreset controller drivers: reset: stih415: add softreset controller drivers: reset: Reset controller driver for STiH416 drivers: reset: Reset controller driver for STiH415 drivers: reset: STi SoC system configuration reset controller support Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-18Merge branch 'sti/dt' into next/driversArnd Bergmann
This is apparently a dependency for the STi reset controller driver. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-18Merge tag 'DT-for-v3.15-part-1-v2' of ↵Arnd Bergmann
git://git.stlinux.com/devel/kernel/linux-sti into next/dt Merge "STi DT changes part 1 v2" from Srinivas Kandagatla: Patches : 01-02 are DT patches, adding interrupt support to pin controller driver, Driver changes are already going via Linus W's pinctrl tree. Patches: 03 - 06 are DT patches for reset/softreset controller. Reset controller driver is Acked by Philipp Zabel. Patches: 07, 08 are DT patches, adding Ethernet controller support patches, actual driver changes are already in v3.14-rc4 via Dave Millers net tree. Patches: 09, 10 are DT patches for IR driver support, actual IR driver is already available since v3.12. Reason for the delay is due to dependency on reset controller driver/headers. * tag 'DT-for-v3.15-part-1-v2' of git://git.stlinux.com/devel/kernel/linux-sti: ARM: STi: STIH416: Add IR support. ARM: STi: STIH415: Add IR support. ARM: STi: STiH416: Add ethernet support. ARM: STi: STiH415: Add ethernet support. ARM: STi: STiH416: Add soft reset controller support. ARM: STi: STiH416: Add reset controller support. ARM: STi: STiH415: Add soft reset controller support. ARM: STi: STiH415: Add reset controller support. ARM: STi: STiH415: Add interrupt support for pin controller ARM: STi: STiH416: Add interrupt support for pin controller Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-18Merge tag 'samsung-fixes' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical Merge "Samsung non-critical fixes for v3.15" from Kukjin Kim: - fix typo CONFIG_CPU_S3C2443 in Kconfig - fix G3D regulator on because of entering low power mode for exynos5250-arndale - fix CONFIG_USB_EHCI_EXYNOS for exynos_defconfig - fix initcall of mach-crag6410-module.c * tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: S3C64XX: mach-crag6410-module.c is not modular ARM: exynos_defconfig: Update EHCI config entry ARM: dts: Keep G3D regulator always on for exynos5250-arndale ARM: S3C24XX: Fix typo CONFIG_CPUS_3C2443 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-18ARM: mmp: allow platform devices with modular USBArnd Bergmann
The USB host drivers need platform data to be defined on pxa168 and pxa910, but the conditionals used in the devices.c file only work if the drivers are built-in. This patch fixes the definition by changing the #ifdef to #if IS_ENABLED(), which works both for built-in and modular Kconfig symbols. I found one specific problem using 'randconfig' builds, but for consistency, this patch uses IS_ENABLED() for all Kconfig symbols in these three files. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
2014-03-18ARM: ixp4xx: Make dma_set_coherent_mask common, correct implementationSimon Kågström
Non-PCI devices can use the entire 32-bit range, PCI dittos are limited to the first 64MiB. Also actually setup coherent_dma_mask. The patch has been verified on a board with 128MiB memory, one ipx4xx_eth device and a e100 PCI device. Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-18xen/grant-table: Refactor gnttab_[un]map_refs to avoid m2p_overrideZoltan Kiss
The grant mapping API does m2p_override unnecessarily: only gntdev needs it, for blkback and future netback patches it just cause a lock contention, as those pages never go to userspace. Therefore this series does the following: - the bulk of the original function (everything after the mapping hypercall) is moved to arch-dependent set/clear_foreign_p2m_mapping - the "if (xen_feature(XENFEAT_auto_translated_physmap))" branch goes to ARM - therefore the ARM function could be much smaller, the m2p_override stubs could be also removed - on x86 the set_phys_to_machine calls were moved up to this new funcion from m2p_override functions - and m2p_override functions are only called when there is a kmap_ops param It also removes a stray space from arch/x86/include/asm/xen/page.h. Signed-off-by: Zoltan Kiss <zoltan.kiss@citrix.com> Suggested-by: Anthony Liguori <aliguori@amazon.com> Suggested-by: David Vrabel <david.vrabel@citrix.com> Suggested-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: David Vrabel <david.vrabel@citrix.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
2014-03-18ARM: dts: enable ahci sata and sata phy for exynos5250Yuvaraj Kumar C D
This patch adds dt entry for ahci sata controller and its corresponding phy controller.phy node has been added w.r.t new generic phy framework. Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd@samsung.com> Acked-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18ARM: dts: add dt node for sss module for exynos5250/5420Naveen Krishna Chatradhi
This patch adds the device tree node for SSS module found on Exynos5420 and Exynos5250 Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18ARM: dts: Remove leftover spi0 node for smdk5250Mark Brown
Now that the SPI controllers are disabled by default for Exynos5250 there is no need to explicitly disable them in individual board files. This hunk appears not to have been merged when doing the original conversion, add it now. Signed-off-by: Mark Brown <broonie@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18ARM: dts: Add ADC and themistor nodes for exynos4412-trats2Chanwoo Choi
This patch use ADC to get the temperature of SoC/battery by using NTC thermistor driver in hwmon. NTC thermistor driver covnvert ADC's raw data to temperature by using following variables: Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18ARM: dts: Move common dt data for interrupt combiner controller for exynos4x12Chanwoo Choi
This patch move common dt data of interrupt combiner controller to exynos4x12.dtsi. Each Exynos4x12 SoC has different number of interrput combiner as following: - Exynos4212 : interrput combiner 18(0 ~ 17) - Exynos4412 : interrput combiner 20(0 ~ 19) The exynos combiner driver initialize interrupt according to specific number of interrput combiner. - samsung,combiner-nr : The number of interrput combiners supported. Also, This patch arrange again the dt data according to register address in exynos4212/exynos4412.dtsi. Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18ARM: dts: Add GPS_ALIVE power domain for exynos4x12Chanwoo Choi
This patch add GPS_ALIVE power domain for Exynos4x12 SoC. GPS_ALIVE power domain include GPS_BLK for GPS IP. Exynos SoC used generic power-domain driver to control power domain. After completed kernel booting, Exynos power-domain driver disable un-used power domain to reduce power-consumption/leak. If GPS_ALIVE power domain isn't registered to Exynos power-domain driver, happen power-leakage because GPS_ALIVE_CONFIGURATION is default power on state. - 0x10023D00 : GPS_ALIVE_CONFIGURATION register address Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18ARM: dts: Add PMU dt data to support PMU for exynos4x12Chanwoo Choi
ARM CPU has its own performance profiling unit(PMU, Perforamnce Monitoring Unit). This patch add PMU dt data to support PMU which count cache hit and miss events. PMU interrput list of Exynos4212 - <2 2> : INTG2[2] - PMUIRQ[0] for CPU0 - <3 2> : INTG3[2] - PMUIRQ[1] for CPU1 PMU interrput list of Exynos4412 - <2 2> : INTG2[2], PMUIRQ[0] for CPU0 - <3 2> : INTG3[2], PMUIRQ[1] for CPU1 - <18 2> : INTG18[2], PMUIRQ[2] : CPU2 - <19 2> : INTG19[2], PMUIRQ[3] : CPU3 Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18ARM: dts: Add ADC's dt data to read raw data for exynos4x12Chanwoo Choi
This patch add ADC(Analog to Digital Converter)'s dt data to get raw data with IIO subsystem. Usually, ADC is used to check temperature, jack type and so on. Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-17Merge tag 'armsoc/for-3.15/soc-4' of git://github.com/broadcom/mach-bcm into ↵Arnd Bergmann
next/soc Merge "ARM: mach-bcm: soc updates for 3.15 - part 3" from Matt Porter - enable bcm590xx regulator driver in bcm_defconfig * tag 'armsoc/for-3.15/soc-4' of git://github.com/broadcom/mach-bcm: ARM: configs: bcm_defconfig: enable bcm590xx regulator support Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17ARM: add Marvell Dove and some drivers to multi_v7 defconfigSebastian Hesselbarth
With Marvell Dove now being part of the multi_v7 family, add some Dove specific drivers to multi_v7 defconfig. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17ARM: prima2: build reset code standaloneArnd Bergmann
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 3.14-rc7 into staging-nextGreg Kroah-Hartman
This resolves a merge issue with drivers/staging/cxt1e1/linux.c that was fixed in a report from Stephen Rothwell Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-17ARM: configs: bcm_defconfig: enable bcm590xx regulator supportMatt Porter
Enable BCM590xx MFD and regulator drivers to manage voltage regulators on BCM281xx platforms. Signed-off-by: Tim Kryger <tim.kryger@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org> Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
2014-03-17Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into ↵Arnd Bergmann
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-17CNS3xxx: Fix PCIe early iotable_init().Krzysztof Hałasa
This patch fixes the following BUG: > kernel BUG at mm/vmalloc.c:1132! > PC is at vm_area_add_early+0x20/0x84 > LR is at add_static_vm_early+0xc/0x60 > > The problem is cns3xxx_pcie_init() (device_initcall) calls the "early" > iotable_init(). Instead of merely calling the PCIe iotable_init() from machine_desc->map_io(), this patch adds the required mappings to the main CNS3xxx mapping table. This means we don't convert .pfn back to virtual addresses in pcie.c. The size of the address space consumed for PCIe control is reduced from 96 MiB (6 * 16 MiB) to about 32 MiB (this doesn't include MMIO address space required by PCI devices): - Size of the PCIe "host" mapping is reduced from 16 MiB to 4 KiB. It's a PCI configuration address space for the local (on-chip) PCIe bridge. - Size of the "CFG0" mapping is reduced from 16 MiB to 64 KiB. It's for Type 0 Configuration accesses, i.e., accesses to the single device (with possible "functions") on the other end of the PCIe link. We really only need a 4 KiB page at 0x8000 (see the offset calculation in cns3xxx_pci_cfg_base()). There is still a potential problem with PCI bus numbers > 0xF, are they supported? - The code in cns3xxx_pci_cfg_base() and cns3xxx_pcie_hw_init() should be clearer now. - The maximum address space allocated for PCI MMIO is now correctly shown in /proc/iomem as 176 MiB (per each of the two PCI "domains" - previously only 16 MiB were reserved). This patch has been tested on Gateworks Laguna board, masqueraded as CNS3420VB. Signed-off-by: Krzysztof Ha?asa <khalasa@piap.pl> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17CNS3xxx: Fix a WARN() related to IRQ allocation.Krzysztof Hałasa
WARNING: at drivers/irqchip/irq-gic.c:952 gic_init_bases+0xe4/0x2b8() Cannot allocate irq_descs @ IRQ16, assuming pre-allocated Backtrace: gic_init_bases from cns3xxx_init_irq+0x24/0x34 cns3xxx_init_irq from init_IRQ+0x24/0x2c init_IRQ from start_kernel+0x1a8/0x338 start_kernel from 0x2000806c The problem is that 64 CNS3xxx CPU interrupts, starting at 32, are allocated by the ARM platform-independent code (as requested by machine_desc->nr_irqs = 96), and then the GIC code tries to allocate them again. Tested on Gateworks Laguna board, masqueraded as CNS3420VB. Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'omap-for-v3.15/fixes-for-merge-window' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical Merge "omap fixes for v3.15 merge window" from Tony Lindgren: Fixes for omaps that would be good to get in before v3.15-rc1. * tag 'omap-for-v3.15/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP4: hwmod data: correct the idlemodes for spinlock ARM: dts: am33xx: correcting dt node unit address for usb ARM: dts: omap4/5: Use l3_ick for the gpmc node CLK: TI: OMAP4/5/DRA7: Remove gpmc_fck from dummy clocks ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM ARM: OMAP2+: INTC: Acknowledge stuck active interrupts Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'armsoc/for-3.15/dt-2' of git://github.com/broadcom/mach-bcm into ↵Arnd Bergmann
next/dt Merge "ARM: mach-bcm: dt updates for 3.15 - part 2" from Matt Porter: - BCM21664 SoC support - BCM59056 PMU support - BCM281xx reboot fix * tag 'armsoc/for-3.15/dt-2' of git://github.com/broadcom/mach-bcm: ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot ARM: dts: add bcm590xx pmu support and enable for bcm28155-ap ARM: dts: bcm21664: Add device tree files. ARM: DT: bcm21664: Device tree bindings Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'omap-for-v3.15/dt-overo-signed' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Updates to the .dts files to support more Gumstix boards. These are sent separately from the rest of the .dts changes as these depend on the fixes merged into v3.14-rc4, and needed a bit more time to get updated on the fixes. * tag 'omap-for-v3.15/dt-overo-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Add support for the Overo Summit ARM: dts: Add support for the Overo Chestnut43 ARM: dts: Add support for the Overo Alto35 ARM: dts: Add support for the Overo Gallop43 ARM: dts: Add support for the Overo Palo43 ARM: dts: overo: Add LIS33DE accelerometer ARM: dts: overo: Create a file for common Gumstix peripherals ARM: dts: overo: Push uart3 pinmux down to expansion board ARM: dts: omap3-tobi: Add AT24C01 EEPROM ARM: dts: omap3-tobi: Use include file omap-gpmc-smsc9221 ARM: dts: omap: Add common file for SMSC9221 ARM: dts: omap3-overo: Add HSUSB PHY ARM: dts: omap3-overo: Enable WiFi/BT combo ARM: dts: omap3-overo: Add missing pinctrl ARM: dts: omap3-tobi: Add missing pinctrl ARM: dts: overo: reorganize include files Signed-off-by: Arnd Bergmann <arnd@arndb.de> Conflicts: arch/arm/boot/dts/omap3-overo.dtsi
2014-03-17ARM: zynq: Add waituart implementationMichal Simek
Add missing waituart implementation. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2014-03-17ARM: zynq: Move of_clk_init from clock driverMichal Simek
Move of_clk_init() from clock driver to enable options not to use zynq clock driver. Use for example fixed clock setting. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2014-03-17Merge tag 'omap-for-v3.15/dt-part3' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Pull "omap device tree changes for v3.15, part 3" from Tony Lindgren: Device tree related changes to the omap iommu driver as that is finally getting updated. Also few trivial board related .dts updates to add more devices. * tag 'omap-for-v3.15/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530 ARM: dts: am335x-evmsk: enable DMA controller for USB ARM: dts: OMAP5: Add IOMMU nodes ARM: dts: OMAP4: Add IOMMU nodes ARM: dts: OMAP3: Add IVA IOMMU node ARM: dts: OMAP3: Update ISP IOMMU node ARM: OMAP2+: extend iommu pdata-quirks to OMAP5 ARM: OMAP5: hwmod data: add mmu data for ipu & dsp ARM: OMAP2+: use pdata quirks for iommu reset lines ARM: OMAP2+: change the ISP device archdata MMU name for DT ARM: OMAP3: fix iva mmu programming issues ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux into next/dtArnd Bergmann
Pull "Allwinner DT additions for 3.15, take 2" from Maxime Ripard: - Two new boards: INet 97F Rev 02 and A10-OLinuXino-LIME - Addition of the I2C for the A31 - Addition USB Host mode for the A10, A10s, A13 and A20 - Addition of SATA support for the A10 and A20 - Change of compatible for the watchdog * tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux: (23 commits) ARM: sunxi: dt: Update the watchdog compatibles ARM: sun6i: colombus: Enable the I2C controllers ARM: sun6i: Enable the I2C muxing options ARM: sun6i: Enable the I2C controllers ARM: sun4i: dt: Add support for the INet-97F_Rev_02 board ARM: sun4i: dt: Add support for the A10-OLinuXino-LIME board ARM: sun7i: dt: Add USB host nodes to a20-olinuxino-micro dts ARM: sun7i: dt: Add USB host nodes to cubieboard2 dts ARM: sun7i: dt: Add USB host nodes to cubietruck dts ARM: sun5i: dt: Add USB host nodes to a13-olinuxino-micro ARM: sun5i: dt: Add USB host nodes to a10s-olinuxino-micro ARM: sun5i: dt: Add USB host nodes to A13-Olinuxino ARM: sun4i: dt: Add USB host nodes to pcduino.dts ARM: sun4i: dt: Add USB host nodes to mini-xplus dts ARM: sun4i: dt: Add USB host nodes to hackberry dts ARM: sun4i: dt: Add USB host nodes to cubieboard dts ARM: sun4i: dt: Add USB host nodes to Mele A1000 dts ARM: sun7i: dt: Add USB host bindings ARM: sun5i: dt: Add USB host bindings ARM: sun4i: dt: Add USB host bindings ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dtArnd Bergmann
Merge "First batch of AT91 DT material for 3.15" from Nicolas Ferre: - activate DMA for NAND flash controller - some binding documentation update for usba and ADC (iio) drivers - removal of some deprecated ADC (iio) properties * tag 'at91-dt' of git://github.com/at91linux/linux-at91: ARM: at91/dt: at91-cosino: remove useless adc properties ARM: at91/dt: sama5d3: remove useless adc properties ARM: at91/dt: at91sam9x5: remove useless adc properties ARM: at91/dt: at91sam9g45: remove useless adc properties ARM: at91/dt: at91sam9260: remove useless adc properties ARM: at91/dt: at91-ariag25: remove useless adc properties Documentation: dt: iio: move arm/atmel-adc.txt to iio/adc/at91_adc.txt Documentation: dt: iio: improve atmel-adc documentation ARM: at91: sama5d3: get rid of atmel_tsadcc driver ARM: at91/DT: atmel_usba correct atmel,vbus-gpio meaning ARM: at91/DT: add NAND + DMA property Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'davinci-for-v3.15/soc' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc Merge "DaVinci SoC updates for v3.15" from Sekhar Nori: This pull request removes da8xx_omapl_defconfig enabling all ARMv5 davinci devices to be built using davinci_all_defconfig * tag 'davinci-for-v3.15/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: remove da8xx_omapl_defconfig ARM: davinci: da8xx: fix multiple watchdog device registration ARM: davinci: add da8xx specific configs to davinci_all_defconfig ARM: davinci: enable da8xx build concurrently with older devices Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17ARM: davinci: remove tnetv107x supportArnd Bergmann
The tnetv107x support does not compile, and seems to have been broken for a while with nobody caring to fix it. So far everyone I asked said it's probably dead and completely unused and will never again be needed in a future kernel release, so let's delete it. If someone finds a use for this code later and is able to get it to work again, we can always revert the removal. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Sekhar Nori <nsekhar@ti.com> Acked-by: Kevin Hilman <khilman@linaro.org>
2014-03-17Merge tag 'armsoc/for-3.15/soc-3' of git://github.com/broadcom/mach-bcm into ↵Arnd Bergmann
next/soc Merge "ARM: mach-bcm: soc updates for 3.15 - part 2" from Matt Porter: - Add bcm21664 support - Use Kona Debug UART only on ARCH_BCM_MOBILE * tag 'armsoc/for-3.15/soc-3' of git://github.com/broadcom/mach-bcm: ARM: restrict BCM_KONA_UART to ARCH_BCM_MOBILE ARM: bcm21664: Add board support. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge branch 'bcm/cleanup' into next/socArnd Bergmann
This is a dependency for the bcm21664 support. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux into ↵Arnd Bergmann
next/soc Merge "Allwinner core additions for 3.15" from Maxime Ripard: Just a minor commit to adjust the restart code to take into account the new compatibles * tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux: ARM: sunxi: Add the new watchog compatibles to the reboot code Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'sunxi-defconfig-for-3.15' of https://github.com/mripard/linux ↵Arnd Bergmann
into next/boards Merge "Allwinner defconfig additions for 3.15" from Maxime Ripard: Enables SPI and SID drivers in sunxi defconfig * tag 'sunxi-defconfig-for-3.15' of https://github.com/mripard/linux: ARM: sunxi: Enable A31 SPI and SID in the defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17ARM: fix duplicate symbols in multi_v5_defconfigArnd Bergmann
A couple of lines in multi_v5_defconfig appear twice, causing a harmless Kconfig warning. This removes one of the two copies. Signed-off-by: Arnd Bergmann <arnd@arndb.de>