aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAge
* Merge branch 'for-linus' of ↵Linus Torvalds2014-08-08
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull input updates from Dmitry Torokhov: - big update to Wacom driver by Benjamin Tissoires, converting it to HID infrastructure and unifying USB and Bluetooth models - large update to ALPS driver by Hans de Goede, which adds support for newer touchpad models as well as cleans up and restructures the code - more changes to Atmel MXT driver, including device tree support - new driver for iPaq x3xxx touchscreen - driver for serial Wacom tablets - driver for Microchip's CAP1106 - assorted cleanups and improvements to existing drover and input core * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (93 commits) Input: wacom - update the ABI doc according to latest changes Input: wacom - only register once the MODULE_* macros Input: HID - remove hid-wacom Bluetooth driver Input: wacom - add copyright note and bump version to 2.0 Input: wacom - remove passing id for wacom_set_report Input: wacom - check for bluetooth protocol while setting OLEDs Input: wacom - handle Intuos 4 BT in wacom.ko Input: wacom - handle Graphire BT tablets in wacom.ko Input: wacom - prepare the driver to include BT devices Input: hyperv-keyboard - register as a wakeup source Input: imx_keypad - remove ifdef round PM methods Input: jornada720_ts - get rid of space indentation and use tab Input: jornada720_ts - switch to using managed resources Input: alps - Rushmore and v7 resolution support Input: mcs5000_ts - remove ifdef around power management methods Input: mcs5000_ts - protect PM functions with CONFIG_PM_SLEEP Input: ads7846 - release resources on failure for clean exit Input: wacom - add support for 0x12C ISDv4 sensor Input: atmel_mxt_ts - use deep sleep mode when stopped ARM: dts: am437x-gp-evm: Update binding for touchscreen size ...
| * ARM: dts: am437x-gp-evm: Update binding for touchscreen sizeRoger Quadros2014-07-28
| | | | | | | | | | | | | | | | Update the bindings for touchscreen size. Signed-off-by: Roger Quadros <rogerq@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| * ARM: dts: am43x-epos-evm: Update binding for touchscreen sizeRoger Quadros2014-07-28
| | | | | | | | | | | | | | | | Update the bindings for touchscreen size. Signed-off-by: Roger Quadros <rogerq@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
* | Merge branch 'akpm' (second patchbomb from Andrew Morton)Linus Torvalds2014-08-08
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge more incoming from Andrew Morton: "Two new syscalls: memfd_create in "shm: add memfd_create() syscall" kexec_file_load in "kexec: implementation of new syscall kexec_file_load" And: - Most (all?) of the rest of MM - Lots of the usual misc bits - fs/autofs4 - drivers/rtc - fs/nilfs - procfs - fork.c, exec.c - more in lib/ - rapidio - Janitorial work in filesystems: fs/ufs, fs/reiserfs, fs/adfs, fs/cramfs, fs/romfs, fs/qnx6. - initrd/initramfs work - "file sealing" and the memfd_create() syscall, in tmpfs - add pci_zalloc_consistent, use it in lots of places - MAINTAINERS maintenance - kexec feature work" * emailed patches from Andrew Morton <akpm@linux-foundation.org: (193 commits) MAINTAINERS: update nomadik patterns MAINTAINERS: update usb/gadget patterns MAINTAINERS: update DMA BUFFER SHARING patterns kexec: verify the signature of signed PE bzImage kexec: support kexec/kdump on EFI systems kexec: support for kexec on panic using new system call kexec-bzImage64: support for loading bzImage using 64bit entry kexec: load and relocate purgatory at kernel load time purgatory: core purgatory functionality purgatory/sha256: provide implementation of sha256 in purgaotory context kexec: implementation of new syscall kexec_file_load kexec: new syscall kexec_file_load() declaration kexec: make kexec_segment user buffer pointer a union resource: provide new functions to walk through resources kexec: use common function for kimage_normal_alloc() and kimage_crash_alloc() kexec: move segment verification code in a separate function kexec: rename unusebale_pages to unusable_pages kernel: build bin2c based on config option CONFIG_BUILD_BIN2C bin2c: move bin2c in scripts/basic shm: wait for pins to be released when sealing ...
| * | kexec: load and relocate purgatory at kernel load timeVivek Goyal2014-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load purgatory code in RAM and relocate it based on the location. Relocation code has been inspired by module relocation code and purgatory relocation code in kexec-tools. Also compute the checksums of loaded kexec segments and store them in purgatory. Arch independent code provides this functionality so that arch dependent bootloaders can make use of it. Helper functions are provided to get/set symbol values in purgatory which are used by bootloaders later to set things like stack and entry point of second kernel etc. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Cc: Borislav Petkov <bp@suse.de> Cc: Michael Kerrisk <mtk.manpages@gmail.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Eric Biederman <ebiederm@xmission.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Matthew Garrett <mjg59@srcf.ucam.org> Cc: Greg Kroah-Hartman <greg@kroah.com> Cc: Dave Young <dyoung@redhat.com> Cc: WANG Chao <chaowang@redhat.com> Cc: Baoquan He <bhe@redhat.com> Cc: Andy Lutomirski <luto@amacapital.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| * | arch/arm/mach-w90x900/cpu.c: replace obsolete strict_strtoDaniel Walter2014-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace obsolete strict_strto with kstrto calls Signed-off-by: Daniel Walter <dwalter@google.com> Cc: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| * | arch/arm/mach-s3c24xx/mach-jive.c: replace strict_strto* with kstrto*Daniel Walter2014-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace obsolete strict_strto call with kstrto Signed-off-by: Daniel Walter <dwalter@google.com> Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| * | arch/arm/mach-pxa: replace strict_strto call with kstrtoDaniel Walter2014-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace obsolete call to strict_strto with kstrto Signed-off-by: Daniel Walter <dwalter@google.com> Cc: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| * | arch/arm/mach-omap2: replace strict_strto* with kstrto*Daniel Walter2014-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace obsolete strict_strto call with kstrto calls. Simplify copy_from_user/strict_strto by using kstrto_from_user Signed-off-by: Daniel Walter <dwalter@google.com> Cc: Tony Lindgren <tony@atomide.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| * | lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual KconfigLaura Abbott2014-08-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than have architectures #define ARCH_HAS_SG_CHAIN in an architecture specific scatterlist.h, make it a proper Kconfig option and use that instead. At same time, remove the header files are are now mostly useless and just include asm-generic/scatterlist.h. [sfr@canb.auug.org.au: powerpc files now need asm/dma.h] Signed-off-by: Laura Abbott <lauraa@codeaurora.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> [x86] Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> [powerpc] Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: "James E.J. Bottomley" <JBottomley@parallels.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | Merge tag 'defconfig-for-3.17' of ↵Linus Torvalds2014-08-08
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC defconfig updates from Olof Johansson: "We broke this out in a separate branch since some defconfigs now are shared between maintainers, and having them merged in through separate topics (drivers/soc/etc) is a recipe for conflicts. Most of this is removal of two defconfigs: - Kirkwood, now folded into mvebu/multi_v5 - Renesas genmai, removed platform - major defconfig refresh for exynos - various updates on the other multi-defconfigs and others (tegra, socfpga, shmobile): * tag 'defconfig-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits) ARM: multi_v7_defconfig: Enable TI PIPE3 PHY driver ARM: config: enable ARCH_HIX5HD2 ARM: multi_v7_defconfig: Enable MiPHY365x - ST's Generic (SATA & PCIe) PHY ARM: multi_v7_defconfig: Enable ST's (S)ATA driver ARM: multi_v7_defconfig: add ST Keyscan driver ARM: update multi_v7_defconfig for STI ARM: multi_v7_defconfig: Configure in ST's Thermal Controller ARM: exynos_defconfig: Update exynos_defconfig ARM: shmobile: defconfig: Remove MACH_GENMAI ARM: mvebu: update mvebu_v7_defconfig with cpufreq support ARM: mvebu: defconfig: enable cpuidle support in mvebu_v7_defconfig ARM: shmobile: genmai: remove defconfig ARM: socfpga: Update socfpga_defconfig ARM: Kirkwood: Remove kirkwood_defconfig ARM: mvebu: enable Armada 375 network driver in mvebu_v7_defconfig ARM: shmobile: Enable R-Car Gen 2 PCIe in shmobile_defconfig ARM: mvebu: add devtmpfs to mvebu_v5_defconfig ARM: mvebu: add appended DTB support in mvebu_v5_defconfig ARM: multi_v7: enable igb, stmpe, lm95245, pwm leds ARM: multi_v7_defconfig: Enable ST's I2C driver ...
| * | | ARM: multi_v7_defconfig: Enable TI PIPE3 PHY driverRoger Quadros2014-08-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver is needed by SATA, PCIe and USB modules on TI SoCs. Signed-off-by: Roger Quadros <rogerq@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Olof Johansson <olof@lixom.net>
| * | | ARM: config: enable ARCH_HIX5HD2Haojian Zhuang2014-07-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since both ARCH_HI3xxx and ARCH_HIX5HD2 are based on Cortex A9 & they're using similiar kernel features, make them share the hi3xxx_config. And add it into multi_v7_defconfig too. Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> Acked-by: Wei Xu <xuwei5@hisilicon.com> [olof: also turn on ARCH_HISI in multi_v7] Signed-off-by: Olof Johansson <olof@lixom.net>
| * | | Merge tag 'sti-defconfig-for-v3.17-1' of ↵Olof Johansson2014-07-22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.stlinux.com/devel/kernel/linux-sti into next/defconfig Merge "ARM: STi: defconfig changes for v3.17" from Maxime Coquelin: STi defconfig updates for v3.17 - Enable ST's Thermal controller driver - Enable ST's Keyscan driver - Enable ST's MiPHY365 Phy driver for STiH416 SATA & PCIe - Enable ST's AHCI driver. * tag 'sti-defconfig-for-v3.17-1' of git://git.stlinux.com/devel/kernel/linux-sti: ARM: multi_v7_defconfig: Enable MiPHY365x - ST's Generic (SATA & PCIe) PHY ARM: multi_v7_defconfig: Enable ST's (S)ATA driver ARM: multi_v7_defconfig: add ST Keyscan driver ARM: update multi_v7_defconfig for STI ARM: multi_v7_defconfig: Configure in ST's Thermal Controller + Linux 3.16-rc6 Signed-off-by: Olof Johansson <olof@lixom.net>
| | * | | ARM: multi_v7_defconfig: Enable MiPHY365x - ST's Generic (SATA & PCIe) PHYLee Jones2014-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
| | * | | ARM: multi_v7_defconfig: Enable ST's (S)ATA driverLee Jones2014-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
| | * | | ARM: multi_v7_defconfig: add ST Keyscan driverGabriel FERNANDEZ2014-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds KEYBOARD_ST_KEYSCAN config Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
| | * | | ARM: update multi_v7_defconfig for STIPeter Griffin2014-07-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables SDHCI STI platform driver. Signed-off-by: Peter Griffin <peter.griffin@linaro.org> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
| | * | | ARM: multi_v7_defconfig: Configure in ST's Thermal ControllerLee Jones2014-07-21
| | | |/ | | |/| | | | | | | | | | | | | | | | | Signed-off-by: Ajit Pal Singh <ajitpal.singh@st.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
| * | | ARM: exynos_defconfig: Update exynos_defconfigSachin Kamat2014-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed outdated configs. Enabled most of the configs used on latest Exynos based platforms. This will provide a reference for users trying to verify and test various features on Exynos based platforms and also help in detecting breakages by widening the build coverage. Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com> [arun.kk@samsung.com: on Snow, Pit, Pi chromebooks] Tested-by: Arun Kumar K <arun.kk@samsung.com> Tested-by: Doug Anderson <dianders@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Olof Johansson <olof@lixom.net>
| * | | Merge tag 'mvebu-defconfig-3.17-2' of git://git.infradead.org/linux-mvebu ↵Olof Johansson2014-07-19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into next/defconfig Merge "ARM: mvebu: defconfig changes for v3.17 (round 2)" from Jason Cooper: "Here's all the defconfig changes we have for mvebu this time around. The big one is the removal of kirkwood_defconfig, corresponding to the mach-kirkwood/ removal in mvebu/soc." - mvebu * Add appended_dtb support * Add devtmpfs support * Add 375 network driver * Add cpuidle support * Add cpufreq support - kirkwood * Remove kirkwood_defconfig * tag 'mvebu-defconfig-3.17-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: update mvebu_v7_defconfig with cpufreq support ARM: mvebu: defconfig: enable cpuidle support in mvebu_v7_defconfig ARM: Kirkwood: Remove kirkwood_defconfig ARM: mvebu: enable Armada 375 network driver in mvebu_v7_defconfig ARM: mvebu: add devtmpfs to mvebu_v5_defconfig ARM: mvebu: add appended DTB support in mvebu_v5_defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
| | * | | ARM: mvebu: update mvebu_v7_defconfig with cpufreq supportThomas Petazzoni2014-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the Armada XP supports dynamic CPU frequency scaling, it makes sense to enable the cpufreq subsystem in mvebu_v7_defconfig, as well as the cpufreq-generic driver used on Armada XP. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Link: https://lkml.kernel.org/r/1404920715-19834-7-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| | * | | ARM: mvebu: defconfig: enable cpuidle support in mvebu_v7_defconfigGregory CLEMENT2014-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Marvell EBU SoCs such as Armada 370, Armada XP or Armada 38x now support cpuidle, so this commit enables the appropriate Kconfig options in mvebu_v7_defconfig. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Link: https://lkml.kernel.org/r/1404913221-17343-18-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| | * | | ARM: Kirkwood: Remove kirkwood_defconfigAndrew Lunn2014-07-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is no longer needed now that kirkwood lives inside mach-mvebu. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1405028192-9623-3-git-send-email-andrew@lunn.ch Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| | * | | ARM: mvebu: enable Armada 375 network driver in mvebu_v7_defconfigMarcin Wojtas2014-07-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the Armada 375 network driver has been pushed, let's enable it in mvebu_v7_defconfig. Signed-off-by: Marcin Wojtas <mw@semihalf.com> Link: https://lkml.kernel.org/r/1405021936-28658-5-git-send-email-ezequiel.garcia@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| | * | | ARM: mvebu: add devtmpfs to mvebu_v5_defconfigThomas Petazzoni2014-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The devtmpfs filesystem is now widely used and generally needed to boot Linux systems. 42 ARM defconfigs have it enabled, so it makes sense to have it enabled as well in mvebu_v5_defconfig. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1404375830-22169-2-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| | * | | ARM: mvebu: add appended DTB support in mvebu_v5_defconfigThomas Petazzoni2014-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mvebu_v5_defconfig is currently used for Kirkwood platforms, and in the future hopefully used for Orion5x platforms. Those platforms use fairly old bootloaders that don't have Device Tree support, so it makes sense to enable appended DTB support by default, as well as the backward compatibility with ATAGS passed by the bootloader for those platforms. It helps having a defconfig that works fine out of the box for most Kirkwood platforms. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1404375830-22169-1-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| * | | | Merge tag 'tegra-for-3.17-defconfig' of ↵Olof Johansson2014-07-19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/defconfig Merge "ARM: tegra: defconfig updates for 3.17" from Theirry Reding: This set of patches update the tegra_defconfig by first regenerating on top of v3.16-rc1 to prune all non-existent symbols or symbols which are now selected by default. * tag 'tegra-for-3.17-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: enable igb, stmpe, i2c chardev, lm95245, pwm leds ARM: tegra: rebuild tegra_defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
| | * | | | ARM: tegra: enable igb, stmpe, i2c chardev, lm95245, pwm ledsMarcel Ziswiler2014-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NVIDIA Tegra 3 based Apalis T30 module contains an Intel i210 or i211 gigabit Ethernet controller, an STMPE811 ADC/touch controller, I2C buses and PWM LEDs generically accessible from user space and an LM95245 temperature sensor chip. The later four can also be found on the Colibri T30 module. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com> [swarren, dropped chunk contained in previous commit that rebuilt the defconfig file] Signed-off-by: Stephen Warren <swarren@nvidia.com>
| | * | | | ARM: tegra: rebuild tegra_defconfigStephen Warren2014-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run "make tegra_defconfig; make savedefconf" on v3.16-rc1. This allows other people to do the same thing to adjust the defconfig file without their patch bringing in a bunch of irrelevant diffs. All of the removed options either have been removed from Kconfig, or are now default y. Signed-off-by: Stephen Warren <swarren@nvidia.com>
| * | | | | Merge tag 'renesas-defconfig4-for-v3.17' of ↵Olof Johansson2014-07-19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig Merge "Fourth Round of Renesas ARM Based SoC Defconfig Updates for v3.17" from Simon Horman: The genmai board code is going away so remove: - The genmai defconfig - MACH_GENMAI from shmobile defconfig * tag 'renesas-defconfig4-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: defconfig: Remove MACH_GENMAI ARM: shmobile: genmai: remove defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
| | * | | | | ARM: shmobile: defconfig: Remove MACH_GENMAILaurent Pinchart2014-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CONFIG_MACH_GENMAI is scheduled for removal so remove it from shmobile_defconfig. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> [horms+renesas@verge.net.au: revised changelog for updated commit order] Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| | * | | | | ARM: shmobile: genmai: remove defconfigSimon Horman2014-07-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The genmai board code is scheduled for removal and once that occurs the defconfig will be of no use. Remove it. Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| * | | | | | ARM: socfpga: Update socfpga_defconfigVince Bridgers2014-07-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_PM=y CONFIG_SUSPEND=y CONFIG_MMC_UNSAFE_RESUME=y CONFIG_DWMAC_SOCFPGA=y CONFIG_USB=y CONFIG_USB_DWC2=y CONFIG_USB_DWC2_HOST=y CONFIG_USB_DWC2_PLATFORM=y CONFIG_FHANDLE=y CONFIG_I2C=y CONFIG_I2C_DESIGNWARE_CORE=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_CHARDEV=y CONFIG_CAN=y CONFIG_CAN_RAW=y CONFIG_CAN_BCM=y CONFIG_CAN_GW=y CONFIG_CAN_DEV=y CONFIG_CAN_CALC_BITTIMING=y CONFIG_CAN_C_CAN=y CONFIG_CAN_C_CAN_PLATFORM=y CONFIG_WATCHDOG=y CONFIG_DW_WATCHDOG=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_DWAPB=y CONFIG_PPS=y CONFIG_NETWORK_PHY_TIMESTAMPING=y CONFIG_PTP_1588_CLOCK=y CONFIG_VLAN_8021Q=y CONFIG_VLAN_8021Q_GVRP=y CONFIG_GARP=y CONFIG_IPV6=y CONFIG_HOTPLUG=y Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com> Signed-off-by: Alan Tull <atull@altera.com> Signed-off-by: Thor Thayer <tthayer@altera.com> Signed-off-by: Dinh Nguyen <dinguyen@altear.com> Signed-off-by: Olof Johansson <olof@lixom.net>
| * | | | | | Merge tag 'renesas-defconfig3-for-v3.17' of ↵Olof Johansson2014-07-13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig Merge "Third Round of Renesas ARM Based SoC Defconfig Updates for v3.17" from Simon Horman: - Enable R-Car Gen 2 PCIe in shmobile_defconfig * tag 'renesas-defconfig3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Enable R-Car Gen 2 PCIe in shmobile_defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
| | * | | | | ARM: shmobile: Enable R-Car Gen 2 PCIe in shmobile_defconfigSimon Horman2014-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The R-Car Gen 2 PCIe driver provides PCIe host support for Renesas R-Car Gen2 platforms. To increase hardware support enable the driver in the shmobile_defconfig multiplatform configuration. Cc: Phil Edworthy <phil.edworthy@renesas.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| * | | | | | Merge tag 'renesas-defconfig2-for-v3.17' of ↵Olof Johansson2014-07-12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig Merge "Second Round of Renesas ARM Based SoC Defconfig Updates for v3.17" from Simon Horman: * Enable genmai board in multiplatform defconfig * tag 'renesas-defconfig2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Enable genmai board in multiplatform defconfig Signed-off-by: Olof Johansson <olof@lixom.net>
| | * | | | | ARM: shmobile: Enable genmai board in multiplatform defconfigSimon Horman2014-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| * | | | | | Merge tag 'mvebu-defconfig-3.17' of git://git.infradead.org/linux-mvebu into ↵Olof Johansson2014-07-08
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | next/defconfig Merge "mvebu defconfig changes for v3.17" from Jason Cooper: - mvebu (v5) * add LaCie 2Big and 5Big Network v2 - multi (v5) * add LaCie 2Big and 5Big Network v2 * tag 'mvebu-defconfig-3.17' of git://git.infradead.org/linux-mvebu: ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2 ARM: mvebu: Add LaCie 2Big and 5Big Network v2 Signed-off-by: Olof Johansson <olof@lixom.net>
| | * | | | | ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2Andrew Lunn2014-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable building LaCie 2Big and 5Big Network v2 in the multi v5 kernel. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1401132591-26305-5-git-send-email-andrew@lunn.ch Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| | * | | | | ARM: mvebu: Add LaCie 2Big and 5Big Network v2Andrew Lunn2014-06-20
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable building LaCie 2Big and 5Big Network v2 in the mvebu v5 kernel. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Link: https://lkml.kernel.org/r/1401132591-26305-4-git-send-email-andrew@lunn.ch Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| * | | | | Merge tag 'renesas-defconfig-for-v3.17' of ↵Olof Johansson2014-07-06
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig Merge "Renesas ARM Based SoC Defconfig Updates for v3.17" from Simon Horman: * Enable Marzen board and r8a7779 SoC, CPUFREQ and PM_RUNTIME in shmobile (multiplatform) defconfig * Enable LED support in armadillo800eva defconfig * tag 'renesas-defconfig-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Enable CPUFREQ configuration ARM: shmobile: Enable PM_RUNTIME in defconfig ARM: shmobile: marzen: Add to shmobile defconfig ARM: shmobile: armadillo800eva defconfig: Enable REGULATOR_GPIO and LEDS_GPIO
| | * | | | ARM: shmobile: Enable CPUFREQ configurationGaku Inami2014-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes of configuration is multiplatform build only for r8a7790/r8a7791. Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| | * | | | ARM: shmobile: Enable PM_RUNTIME in defconfigSimon Horman2014-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| | * | | | ARM: shmobile: marzen: Add to shmobile defconfigSimon Horman2014-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add marzen to shmobile defconfig now that it supports multiplatform Also enable SH_HSPI which is used by marzen. Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| | * | | | ARM: shmobile: armadillo800eva defconfig: Enable REGULATOR_GPIO and LEDS_GPIOGeert Uytterhoeven2014-06-16
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable missing options for devices in platform data and/or DT: - REGULATOR_GPIO - LEDS_GPIO (and its dependencies) Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| * | | | ARM: multi_v7: enable igb, stmpe, lm95245, pwm ledsMarcel Ziswiler2014-07-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NVIDIA Tegra 3 based Apalis T30 module contains an Intel i210 resp. i211 gigabit Ethernet controller, an STMPE811 ADC/touch controller, PWM LEDs generically accessible from user space and an LM95245 temperature sensor chip. The later three can also be found on the Colibri T30 module. While at it move the NEON entry down to its proper place to have it all nicely ordered again. Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com> Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
| * | | | ARM: multi_v7_defconfig: Enable ST's I2C driverLee Jones2014-07-06
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
* | | | | Merge tag 'drivers-for-3.17' of ↵Linus Torvalds2014-08-08
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC driver changes from Olof Johansson: "A handful of driver-related changes. We've had a bunch of them going in through other branches as well, so it's only a part of what we really have this release. Larger pieces are: - Removal of a now unused PWM driver for atmel [ This includes AVR32 changes that have been appropriately acked ] - Performance counter support for the arm CCN interconnect - OMAP mailbox driver cleanups and consolidation - PCI and SATA PHY drivers for SPEAr 13xx platforms - Redefinition (with backwards compatibility!) of PCI DT bindings for Tegra to better model regulators/power" Note: this merge also fixes up the semantic conflict with the new calling convention for devm_phy_create(), see commit f0ed817638b5 ("phy: core: Let node ptr of PHY point to PHY and not of PHY provider") that came in through Greg's USB tree. Semantic merge patch by Stephen Rothwell <sfr@canb.auug.org.au> through the next tree. * tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits) bus: arm-ccn: Fix error handling at event allocation mailbox/omap: add a parent structure for every IP instance mailbox/omap: remove the private mailbox structure mailbox/omap: consolidate OMAP mailbox driver mailbox/omap: simplify the fifo assignment by using macros mailbox/omap: remove omap_mbox_type_t from mailbox ops mailbox/omap: remove OMAP1 mailbox driver mailbox/omap: use devm_* interfaces bus: ARM CCN: add PERF_EVENTS dependency bus: ARM CCN PMU driver PCI: spear: Remove spear13xx_pcie_remove() PCI: spear: Fix Section mismatch compilation warning for probe() ARM: tegra: Remove legacy PCIe power supply properties PCI: tegra: Remove deprecated power supply properties PCI: tegra: Implement accurate power supply scheme ARM: SPEAr13xx: Update defconfigs ARM: SPEAr13xx: Add pcie and miphy DT nodes ARM: SPEAr13xx: Add bindings and dt node for misc block ARM: SPEAr13xx: Fix static mapping table phy: Add drivers for PCIe and SATA phy on SPEAr13xx ...
| * \ \ \ \ Merge tag 'omap-for-v3.17/mailbox-cleanup' of ↵Arnd Bergmann2014-07-29
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers Merge "late omap mailbox clean-up, driver parts" from Tony Lindgren: Driver specific omap mailbox cleanup. Mostly to remove broken legacy code for omap1 and move things towards device tree. These patches were posted a while back, but I did not realize I was supposed to merge the driver related parts too. So apologies for a late pull request on these changes. * tag 'omap-for-v3.17/mailbox-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: mailbox/omap: add a parent structure for every IP instance mailbox/omap: remove the private mailbox structure mailbox/omap: consolidate OMAP mailbox driver mailbox/omap: simplify the fifo assignment by using macros mailbox/omap: remove omap_mbox_type_t from mailbox ops mailbox/omap: remove OMAP1 mailbox driver mailbox/omap: use devm_* interfaces Signed-off-by: Arnd Bergmann <arnd@arndb.de>