summaryrefslogtreecommitdiffstats
path: root/arch/arm
AgeCommit message (Collapse)Author
2014-03-11Merge tag 'omap-for-v3.15/dt-part2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Merge "omap device tree changes for v3.15, part 2" from Tony Lindgren: Part two of omap device tree changes enabling driver features in the dts files. * tag 'omap-for-v3.15/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am335x-evmsk: enable dual_emac mode ARM: dts: DRA7: Add device nodes for ABB ARM: dts: OMAP4: Add device nodes for ABB ARM: dts: OMAP36xx: Add device node for ABB ARM: dts: am43x-epos-evm: add SD card hotplug support ARM: dts: am335x-evm: add SD card hotplug support ARM: dts: am437x gp-evm: add sd card dt nodes ARM: dts: omap5: added dt properties to adapt to the new phy framwork ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK ARM: dts: Update echi-omap DT binding example usage ARM: dts: Get rid of incompatible ids for hci-omap USB host nodes ARM: OMAP2+: Remove legacy_init_ehci_clk() ARM: dts: Add support for OMAP4 Gumstix DuoVero/Parlor Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-11Merge tag 'bcm2835-for-3.15-dt' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/dt Merge "ARM: bcm2835: DT changes for 3.15" from Stephen Warren: A variety of features are added to the bcm2835 device trees: - ARM PMU, for perf_event - DMA controller - I2S controller A few cleanups are applied to the DTs too. * tag 'bcm2835-for-3.15-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi: ARM: bcm2835: fix clock DT node names ARM: bcm2835: node name unit address cleanup ARM: bcm2835: fix DT node sort order ARM: bcm2835: add I2S driver to device tree ARM: bcm2835: add dmaengine driver to device tree ARM: bcm2835: perf_event support for Raspberry-Pi Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-11Merge tag 'bcm2835-for-3.15-soc' of ↵Olof Johansson
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-11Merge tag 'armsoc/for-3.15/cleanup' of git://github.com/broadcom/mach-bcm ↵Olof Johansson
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-11Merge tag 'armsoc/for-3.15/dt' of git://github.com/broadcom/mach-bcm into ↵Olof Johansson
next/dt Merge "ARM: mach-bcm dt updates for 3.15" from Matt Porter: - add BCM4708 dt support - remove bcm11351-brt - bcm281xx common clock support * tag 'armsoc/for-3.15/dt' of git://github.com/broadcom/mach-bcm: ARM: dts: remove bcm11351-brt.dts ARM: dts: Leave sdio1 as disabled on bcm28155-ap ARM: dts: bcm281xx: define real clocks ARM: BCM5301X: add dts files for BCM4708 SoC Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-11Merge tag 'armsoc/for-3.15/soc-2' of git://github.com/broadcom/mach-bcm into ↵Olof Johansson
next/soc Merge "ARM: mach-bcm soc updates" from Matt Porter: - add BCM5301x support - remove GENERIC_TIME * tag 'armsoc/for-3.15/soc-2' of git://github.com/broadcom/mach-bcm: ARM: BCM5301X: workaround suppress fault ARM: BCM5301X: add early debugging support ARM: BCM5301X: initial support for the BCM5301X/BCM470X SoCs with ARM CPU ARM: mach-bcm: Remove GENERIC_TIME Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-11Merge tag 'keystone-soc' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/boards Keystone SOC updates for 3.15 - Enable Watchdog and GPIO config - Enable LED driver config - Enable NAND and EMIF driver config * tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: config: keystone: enable AEMIF/NAND support ARM: config: keystone: enable led support ARM: config: keystone: enable gpio support ARM: config: keystone: enable watchdog support
2014-03-11Merge tag 'keystone-dts' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt Keystone DTS updates for 3.15 from Santosh Shilimkar: - Add watchdog timer, timer64 and gpio device nodes - Add LED device nodes - Fixes for debugss, msmc clock nodes - Add support for Keystone Lamarr and Edision SOC/EVM support - Add NAND and AEMIF device nodes * tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: dts: keystone: add AEMIF/NAND device entry ARM: dts: keystone: add support for k2 Edison SoC and EVM ARM: dts: keystone: add support for K2 Lamarr SoC and EVM ARM: dts: keystone: preparatory patch to support K2L and K2E SOCs ARM: dts: keystone: update for supporting K2L/K2E EVMs ARM: dts: keystone: fix domain id for clkdebugsstrc ARM: dts: keystone: drop msmcsram clock node ARM: dts: k2hk-evm: rename clock node to clocks ARM: dts: k2hk-evm: add leds supports ARM: dts: keystone: add gpio device entry ARM: dts: keystone: add keystone timer entry ARM: dts: keystone: add watchdog entry Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-11ARM: at91: fix network interface ordering for sama5d36Boris BREZILLON
On the newly introduced sama5d36, Gigabit and 10/100 Ethernet network interfaces are probed in a different order than for the sama5d35. Moreover, users are accustomed to this order in bootloaders and backports for older kernel revisions. So this patch switches DT node order as it is done for the other dual-Ethernet sama5d3 SoC. Better interface numbering which does not depend on DT node order is being developed for stronger interface identification. Signed-off-by: Boris BREZILLON <b.brezillon.dev@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-11arm: add support for reserved memory defined by device treeMarek Szyprowski
Enable reserved memory initialization from device tree. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Grant Likely <grant.likely@linaro.org>
2014-03-11ARM: SAMSUNG: remove all custom uncompress.hHeiko Stuebner
All Samsung platforms now use the generic uncompress.h so all the custom ones can be removed. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-11ARM: SAMSUNG: use generic uncompress.hHeiko Stuebner
All Samsung platforms, not only Exynos, use the custom uncompress.h simply to setup the uart for the initial debug output. This can also be done using the generic uncompress.h. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-11sched: Remove unused mc_capable() and smt_capable()Bjorn Helgaas
Remove mc_capable() and smt_capable(). Neither is used. Both were added by 5c45bf279d37 ("sched: mc/smt power savings sched policy"). Uses of both were removed by 8e7fbcbc22c1 ("sched: Remove stale power aware scheduling remnants and dysfunctional knobs"). Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Link: http://lkml.kernel.org/r/20140304210737.16893.54289.stgit@bhelgaas-glaptop.roam.corp.google.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
2014-03-11ARM: STi: Add reset controller support to mach-sti KconfigStephen Gallimore
This patch selects reset controller support for ARCH_STI and selects the reset controllers for STiH415 and STiH416 SoCs. Signed-off-by: Stephen Gallimore <stephen.gallimore@st.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com> Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
2014-03-11Merge branch 'sched/urgent' into sched/coreIngo Molnar
Pick up fixes before queueing up new changes. Signed-off-by: Ingo Molnar <mingo@kernel.org>
2014-03-11ARM: STi: STIH416: Add IR support.Srinivas Kandagatla
This patch adds IRB support to STiH416 platforms. Tested on B2000 and B2020 development board Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11ARM: STi: STIH415: Add IR support.Srinivas Kandagatla
This patch adds IRB support to STiH415 platforms. Tested on B2000 and B2020 development boards. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11ARM: STi: STiH416: Add ethernet support.Srinivas Kandagatla
This patch adds support to STiH416 SOC, which has two ethernet snps,dwmac controllers version 3.710. With this patch B2000 and B2020 boards can boot with ethernet in MII and RGMII modes. Tested on both B2020 and B2000. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11ARM: STi: STiH415: Add ethernet support.Srinivas Kandagatla
This patch adds support to STiH415 SOC, which has two ethernet snps,dwmac controllers version 3.610. With this patch B2000 and B2020 boards can boot with ethernet in MII and RGMII modes. Tested on both B2020 and B2000. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11ARM: STi: STiH416: Add soft reset controller support.Srinivas Kandagatla
This patch adds soft reset controller support for STiH415 and adds new softreset lines required for other device tree nodes in the header file. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11ARM: STi: STiH416: Add reset controller support.Srinivas Kandagatla
This patch adds a reset controller node to the SOC device tree and also adds new header files with reset lines required for other device tree nodes. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11ARM: STi: STiH415: Add soft reset controller support.Srinivas Kandagatla
This patch adds soft reset controller support for STiH415 and adds new softreset lines required for other device tree nodes in the header file. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11ARM: STi: STiH415: Add reset controller support.Srinivas Kandagatla
This patch adds a reset controller node to the SOC device tree and also adds new header files with reset lines required for other device tree nodes. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11ARM: STi: STiH415: Add interrupt support for pin controllerSrinivas Kandagatla
This patch adds interrupt support for STiH415 pin controllers. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11ARM: STi: STiH416: Add interrupt support for pin controllerSrinivas Kandagatla
This patch adds interrupt support for STiH416 pin controllers. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11Merge tag 'v3.14-rc5' into patchworkMauro Carvalho Chehab
Linux 3.14-rc5 * tag 'v3.14-rc5': (1117 commits) Linux 3.14-rc5 drm/vmwgfx: avoid null pointer dereference at failure paths drm/vmwgfx: Make sure backing mobs are cleared when allocated. Update driver date. drm/vmwgfx: Remove some unused surface formats MAINTAINERS: add maintainer entry for Armada DRM driver arm64: Fix !CONFIG_SMP kernel build arm64: mm: Add double logical invert to pte accessors dm cache: fix truncation bug when mapping I/O to >2TB fast device perf tools: Fix strict alias issue for find_first_bit powerpc/powernv: Fix indirect XSCOM unmangling powerpc/powernv: Fix opal_xscom_{read,write} prototype powerpc/powernv: Refactor PHB diag-data dump powerpc/powernv: Dump PHB diag-data immediately powerpc: Increase stack redzone for 64-bit userspace to 512 bytes powerpc/ftrace: bugfix for test_24bit_addr powerpc/crashdump : Fix page frame number check in copy_oldmem_page powerpc/le: Ensure that the 'stop-self' RTAS token is handled correctly kvm, vmx: Really fix lazy FPU on nested guest perf tools: fix BFD detection on opensuse drm/radeon: enable speaker allocation setup on dce3.2 ...
2014-03-10ARM: at91/DT: add NAND + DMA propertyNicolas Ferre
Add the "atmel,nand-has-dma" property to NAND node for SoC that can use the DMA to perform NAND accesses. Use of this property was added in 1b7192658a08f70df0f290634fd7cd2ecb629fc9 (mtd: atmel_nand: add a new dt binding item for nand dma support). Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Boris BREZILLON <b.brezillon@overkiz.com>
2014-03-10ARM: at91/defconfig: refresh at91sam9260_9g20_defconfigAlexandre Belloni
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 Belloni
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 Belloni
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-10ARM: spear: clean up editing mistakePaul Bolle
Clean up an obvious editing mistake introduced by commit 4b6effb6ff38 ("ARM: spear: merge Kconfig files"). Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2014-03-09ARM: enable ARM_HAS_SG_CHAIN for multiplatformOlof Johansson
Enable ARM_HAS_SG_CHAIN for all multiplatform targets, it makes sense to enable on all "modern" platforms; downsides are limited for platforms that don't need it. Requested-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09dts: socfpga: Add sysmgr node so the gmac can use to referenceDinh Nguyen
commit[7e0b4cd dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.] references the sysmgr through its phandle. This patch adds the appropriate sysmgr node for the gmac to use. Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
2014-03-09dts: 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-03-09Merge tag 'fixes-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC fixes from from Olof Johansson: "A collection of fixes for ARM platforms. A little large due to us missing to do one last week, but there's nothing in particular here that is in itself large and scary. Mostly a handful of smaller fixes all over the place. The majority is made up of fixes for OMAP, but there are a few for others as well. In particular, there was a decision to rename a binding for the Broadcom pinctrl block that we need to go in before the final release since we then treat it as ABI" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: dts: omap3-gta04: Add ti,omap36xx to compatible property to avoid problems with booting ARM: tegra: add LED options back into tegra_defconfig ARM: dts: omap3-igep: fix boot fail due wrong compatible match ARM: OMAP3: Fix pinctrl interrupts for core2 pinctrl: Rename Broadcom Capri pinctrl binding pinctrl: refer to updated dt binding string. Update dtsi with new pinctrl compatible string 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 ARM: sunxi: dt: Change the touchscreen compatibles ARM: sun7i: dt: Fix interrupt trigger types
2014-03-09Merge tag 'imx-soc-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6 ↵Olof Johansson
into next/soc i.MX SoC changes for 3.15 from Shawn Guo: - Support suspend from ocram (DDR IO floating) for imx6 platforms - Add cpuidle support for imx6sl - Sparse warning fixes for imx6sl and vf610 clock code - Remove PWM platform code - Support ptp and rmii clock from pad - Support WEIM CS GPR configuration - Random cleanups and defconfig updates * tag 'imx-soc-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6: (373 commits) ARM: imx6: drop .text.head section annotation from headsmp.S ARM: imx6: build suspend-imx6.o with CONFIG_SOC_IMX6 ARM: imx6: rename pm-imx6q.c to pm-imx6.c ARM: imx6: introduce CONFIG_SOC_IMX6 for i.MX6 common stuff ARM: imx6: do not call imx6q_suspend_init() with !CONFIG_SUSPEND ARM: imx6: call suspend_set_ops() from suspend routine ARM: imx6: build headsmp.o only on CONFIG_SMP ARM: imx6: move v7_cpu_resume() into suspend-imx6.S ARM i.MX6q: Mark VPU and IPU AXI transfers as cacheable, increase IPU priority ARM: imx6q: Add GPR6 and GPR7 register definitions for iomuxc gpr bus: imx-weim: support CS GPR configuration ARM: mach-imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX2_WDT from SOC_IMX53 ARM: imx_v6_v7_defconfig: Select CONFIG_DEBUG_FS ARM: mach-imx: Select CONFIG_SRAM at ARCH_MXC level ARM: imx: add speed grading check for i.mx6 soc ARM: imx: avoid calling clk APIs in idle thread which may cause schedule ARM: imx6q: support ptp and rmii clock from pad ARM: imx6q: remove unneeded clk lookups ARM: imx_v6_v7_defconfig: Select CONFIG_MMC_UNSAFE_RESUME ARM: imx_v4_v5_defconfig: Select CONFIG_MMC_UNSAFE_RESUME ...
2014-03-09Merge tag 'imx-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 ↵Olof Johansson
into next/dt i.MX device tree changes for 3.15, take 2 from Shawn Guo: - Cleanup and device additions for imx27-phytec-phycard boards - eDMA and audio support for vf610-twr board - Minor updates and fixes for a couple of imx28 and imx5 boards * tag 'imx-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: dts: vf610: i2c: Add eDMA support ARM: dts: imx27-phytec-phycore-som: Add USBOTG node ARM: dts: imx27-phytec-phycore-rdk: Add USBH2 node ARM: dts: i.MX27: Add USB nodes ARM: dts: vf610-twr: Add ADC support ARM: dts: mxs: Fix the RTC compatible prop on M28EVK ARM: dts: vf610-twr: Add simple-card support. ARM: dts: vf610-twr: Enable SGTL5000 codec. ARM: dts: vf610-twr: Enable SAI ALSA SoC DAI device ARM: dts: vf610: Add edma mux Tx and Rx support for SAI node. ARM: dts: vf610: lpuart: Add eDMA support ARM: dts: vf610: Add eDMA node ARM: dts: imx27-phytec-phycore: Add diagnostic PMIC LEDs ARM: dts: imx27-phytec-phycard-s-som: Rename file to .dtsi ARM: dts: i.MX51 babbage: Support diagnostic LED ARM: dts: imx28-tx28: Remove 'enable-active-low' property ARM: dts: mx53: Remove 'enable-active-low' property ARM: dts: imx27-phytec-phycard-s-rdk: Add pinctrl definitions for SDHC2 ARM: dts: imx27-phytec-phycard-s-som: Add NFC node ARM: dts: imx27-phytec-phycard-s-som: Sort entries Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09Merge tag 'imx6-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 ↵Olof Johansson
into next/dt i.MX6 device tree changes for 3.15, take 2 from Shawn Guo: - Add USB, GPMI and SATA support for imx6q-phytec board - Update imx6sl-evk board support regarding PFUZE100, audio and LED etc. - Minor updates on a few imx6qdl boards * tag 'imx6-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: dts: imx6q-phytec: Added SATA Support ARM: dts: imx6q-phytec: Added GPMI-NAND Support ARM: dts: imx6q-phytec: Added USB_HOST Support ARM: dts: imx6q-phytec: Added USB_OTG Support ARM: dts: imx6sl-evk: Keep VGEN1 regulator always enabled ARM: dts: imx6qdl-sabreauto: Support debug LED ARM: dts: imx6q: add 852MHz setpoint for CPU freq ARM: dts: imx6qdl-wandboard: use GPIO_6 for FEC interrupt ARM: dts: imx6sl-evk: Add debug LED support ARM: dts: imx6qdl-sabreauto: Add PFUZE100 support ARM: dts: imx6sl-evk: Add audio support ARM: dts: imx6sl-evk: Add PFUZE100 support ARM: dts: imx6qdl-sabresd: correct gpio key's active state Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09Merge tag 'sirf-soc-for-3.15' of ↵Olof Johansson
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 'pxa' of ↵Olof Johansson
https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into next/boards * tag 'pxa' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux: ARM: pxa: add gpio keys information Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09Merge tag 'ux500-dt-v3.15-2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt A set of device tree-related cleanups for the ux500 platform from Linus Walleij: - Rename SSP/SPI clocks to the name found in the hardware reference manual. (Also includes a rename in the U300 device tree file.) - Delete dead non-DT code. - Drop now completely unused GPIO definition header file. - Delete all hardcoded IRQ number assignments. This hits MFD a bit so the patch has been ACKed by Lee Jones from the MFD side. * tag 'ux500-dt-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: mfd: dbx500/abx500: root out hardcoded IRQ assignments ARM: ux500: drop a chunk of GPIO definitions ARM: ux500: skip GIC CPU and dist address checks ARM: ux500: delete pointless DT config option ARM: u300: switch SSP/SPI clock name to "SSPCLK" ARM: ux500: switch SSP/SPI clock name to "SSPCLK" Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09Merge tag 'sunxi-dt-for-3.15' of https://github.com/mripard/linux into next/dtOlof Johansson
Allwinner DT patches for 3.15, take 1 from Maxime Ripard: - Add SPI controllers for all the SoCs - Add various missing aliases - Add USB clocks nodes - Addition of the GMAC support - Introduction of the pcDuino board - A few DT cleanup patches: change of compatibles, * tag 'sunxi-dt-for-3.15' of https://github.com/mripard/linux: (33 commits) ARM: sun6i: dt: Fix mod0 compatible ARM: dts: sun7i: Enable the SPI controllers of the A20-olinuxino-micro ARM: dt: sun7i: Add SPI muxing options ARM: dt: sun5i: Add A13 SPI controller nodes ARM: dt: sun5i: Add A10s SPI controller nodes ARM: dt: sun4i: Add A10 SPI controller nodes ARM: dt: sun7i: Add A20 SPI controller nodes ARM: sun4i: dt: Remove grouping + simple-bus compatible for regulators ARM: sunxi: dt: Convert to the new clock compatibles ARM: sun7i: add arch timer node ARM: sun7i: dt: Add bindings for USB clocks ARM: sun5i: dt: Add bindings for USB clocks ARM: sun4i: dt: Add bindings for USB clocks ARM: dts: sun7i: Add ethernet alias for GMAC ARM: dts: sun7i: a20-olinuxino-micro: Enable GMAC instead of EMAC ARM: dts: sun7i: cubieboard2: Enable GMAC instead of EMAC ARM: dts: sun7i: cubietruck: Enable the GMAC ARM: dts: sun7i: Add pin muxing options for the GMAC ARM: dts: sun7i: Add GMAC controller node to sun7i DTSI ARM: dts: sun7i: Add GMAC clock node to sun7i DTSI ... Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09Merge tag 'exynos-clk' of ↵Olof Johansson
http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt Samsung exynos clock related DT updates for v3.15 from Kukjim Kim: - use macros instead of hard coded numbers for clock bindings NOTE: this is based on v3.15-next/dt-samsung * tag 'exynos-clk' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: use macros in clock bindings for exynos5440 ARM: dts: use macros in clock bindings for exynos5420 ARM: dts: use macros in clock bindings for exynos5250 ARM: dts: use macros in clock bindings for exynos4
2014-03-09Merge tag 'samsung-dt' of ↵Olof Johansson
http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt Samsung DT updates for v3.15 from Kukjin Kim: For exynos4412 - update vdd_arm voltage range for odroidx board For exynos5250 - add PMU sysreg node and update watchdog node - re-organize RTC status - add max77686 pmic node for smdk5250 For exynos5420 - add PMU sysreg, i2s, adma and watchdog nodes - re-organize RTC status - add fixed voltage regulators and regulator nodes for smdk5420 - add PMIC, GPIO based wake up key and vmmc-supply support for arndale-octa board * tag 'samsung-dt' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Add vmmc-supply to MMC on arndale-octa board ARM: dts: Add wake up key to arndale-octa board ARM: dts: Add PMIC support to arndale-octa board ARM: dts: Add fixed voltage regulators to smdk5420 ARM: dts: Add I2S nodes to exynos5420 ARM: dts: Add ADMA node to exynos5420 ARM: dts: Re-organize RTC status for exynos5250 ARM: dts: Re-organize RTC status for exynos5420 ARM: dts: Add regulator entries to smdk5420 ARM: dts: add max77686 pmic node for smdk5250 ARM: dts: update vdd_arm voltage range for exynos4412 based boards ARM: dts: update watchdog device nodes for exynos5250 and exynos5420 ARM: dts: Add pmu sysreg node to exynos5250 and exynos5420 Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09Merge tag 'samsung-cleanup' of ↵Olof Johansson
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-08Merge tag 'omap-for-v3.15/crossbar-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers Merge OMAP crossbar support from Tony Lindgren: Add support for GIC crossbar that routes interrupts on newer omaps. Looks like people wanted these merged via the omap tree as it's the only user for the GIC crossbar. * tag 'omap-for-v3.15/crossbar-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: DRA: Enable Crossbar IP support for DRA7XX ARM: OMAP4+: Correct Wakeup-gen code to use physical irq number DRIVERS: IRQCHIP: CROSSBAR: Add support for Crossbar IP DRIVERS: IRQCHIP: IRQ-GIC: Add support for routable irqs Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-08Merge tag 'omap-for-v3.15/dt-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt OMAP device tree changes from Tony Lindgren: Device tree related changes for omaps with minor code changes also to platform data quirks that are still needed for some features. * tag 'omap-for-v3.15/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (60 commits) ARM: dts: omap4+: Add DMM bindings ARM: dts: am43x-gp-evm: Add matrix gpio keys. ARM: dts: am43xx: add support for parallel NAND flash ARM: dts: AM33xx: updated default ECC scheme in nand-ecc-opt ARM: dts: am335x-evm: NAND: update MTD partition table ARM: OMAP2+: gpmc: update gpmc_hwecc_bch_capable() for new platforms and ECC schemes ARM: dts: omap3-gta04: Add bma180 accelerometer ARM: dts: omap3-gta04: Enable mmc2 for wifi ARM: dts: omap3-gta04: Add basic sound support ARM: dts: omap3-gta04: Add twl4030 charger ARM: dts: omap3-gta04: Add touchscreen properties ARM: dts: omap3-gta04: Add support for magnetometer ARM: dts: am437x-gp-evm: Enable gpio. ARM: dts: am437x-gp-evm: Add pwm backlight support. ARM: dts: am437x-gp-evm: Add gp dts. ARM: dts: am43x-epos-evm: Add SPI data. ARM: dts: am43x-epos-evm: Add I2C2 data. pinctrl: am43xx: dt-bindings: add MUX_MODE8 ARM: dts: am43x-epos-evm: Add pwm backlight support. ARM: dts: am4372: Add pwm-cells property for ecap device. ...
2014-03-08Merge tag 'omap-for-v3.15/prcm-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Power, reset and clock related changes via Paul Walmsley <paul@pwsan.com>, via Tony Lindgren: Some low-level optimizations and fixes that don't belong in an -rc series for various OMAP-family chips, targeted for v3.15. Basic build, boot, and PM test logs are available here: http://www.pwsan.com/omap/testlogs/prcm-a-for-v3.15/20140228124518/ * tag 'omap-for-v3.15/prcm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP3+: DPLL: stop reparenting to same parent if already done ARM: OMAP2+: clock: fix rate prints ARM: AM43x: hwmod data: register spinlock OCP interface ARM: OMAP2+: clockdomain: Reintroduce SW_SLEEP Support ARM: OMAP2+: AM43xx: implement support for machine restart Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-08Merge tag 'omap-for-v3.15/soc-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc OMAP SoC changes from Tony Lindgren: Few SoC related improvments for omaps. * tag 'omap-for-v3.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: remove OMAP_PACKAGE_ZAC and OMAP_PACKAGE_ZAF ARM: OMAP2+: AM43x: Use gptimer as clocksource ARM: OMAP2+: AM43x: determine features ARM: OMAP2+: AM43x: Add ID for ES1.1 ARM: OMAP2+: AM43x: enable in default config Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-08Merge tag 'omap-for-v3.14/fixes-dt-rc4' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes From Tony Lindgren: Two omap3430 vs 3630 device tree regression fixes for issues booting 3430 based boards. * tag 'omap-for-v3.14/fixes-dt-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: omap3-gta04: Add ti,omap36xx to compatible property to avoid problems with booting ARM: dts: omap3-igep: fix boot fail due wrong compatible match Signed-off-by: Olof Johansson <olof@lixom.net>