summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-29bond: Check length of IFLA_BOND_ARP_IP_TARGET attributesThomas Graf
Fixes: 7f28fa10 ("bonding: add arp_ip_target netlink support") Reported-by: John Fastabend <john.fastabend@gmail.com> Cc: Scott Feldman <sfeldma@cumulusnetworks.com> Signed-off-by: Thomas Graf <tgraf@suug.ch> Acked-by: John Fastabend <john.r.fastabend@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2014-11-29Merge branch 'irq-urgent-for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull irq fixes from Thomas Gleixner: "Three fixlets from the ARM SoC camp: - correct irqdomain initialization for atmel-aic - correct error handling for device tree parsing in bcm controllers" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip: brcmstb-l2: Fix error handling of irq_of_parse_and_map irqchip: bcm7120-l2: Fix error handling of irq_of_parse_and_map irqchip: atmel-aic: Fix irqdomain initialization
2014-11-29Merge tag 'scsi-fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi Pull SCSI fixes from James Bottomley: "This is a set of ten fixes: 8 for UFS including four static checker warnings, a potential null deref in the voltage regulator code, a race on module unload, a ref counting fix on the well known LUNs which made it impossible to remove the ufs module and fix to correct the information in pwr_info. In addition to UFS, there's a blacklist for the Intel Multi-Flex array which chokes on report supported operation codes and a fix to an oops in bnx2fc caused by shared skbs" [ For us non-SCSI people: "UFS" here is "Universal Flash Storage" not the filesystem. - Linus ] * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: ufs: fix NULL dereference when no regulators are defined ufs: ensure clk gating work is finished before module unloading scsi: ufs: fix static checker warning in ufshcd_parse_clock_info scsi: ufs: fix static checker warning in __ufshcd_setup_clocks scsi: ufs: fix static checker warning in ufshcd_populate_vreg scsi: ufs: fix static checker errors in ufshcd_system_suspend ufs: fix power info after link start-up ufs: fix reference counting of W-LUs scsi: add Intel Multi-Flex to scsi scan blacklist bnx2fc: do not add shared skbs to the fcoe_rx_list
2014-11-28Merge tag 'staging-3.18-rc7' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging/IIO driver fixes from Greg KH: "Here are some staging and IIO driver fixes for 3.18-rc7 that resolve a number of reported issues, and a new device id for a staging wireless driver. All of these have been in linux-next" * tag 'staging-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: r8188eu: Add new device ID for DLink GO-USB-N150 staging: r8188eu: Fix scheduling while atomic error introduced in commit fadbe0cd iio: accel: bmc150: set low default thresholds iio: accel: bmc150: Fix iio_event_spec direction iio: accel: bmc150: Send x, y and z motion separately iio: accel: bmc150: Error handling when mode set fails iio: gyro: bmg160: Fix iio_event_spec direction iio: gyro: bmg160: Send x, y and z motion separately iio: gyro: bmg160: Don't let interrupt mode to be open drain iio: gyro: bmg160: Error handling when mode set fails iio: adc: men_z188_adc: Add terminating entry for men_z188_ids iio: accel: kxcjk-1013: Fix kxcjk10013_set_range iio: Fix IIO_EVENT_CODE_EXTRACT_DIR bit mask
2014-11-28Merge tag 'tty-3.18-rc7' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty Pull tty/serial fix from Greg KH: "Here is a single revert for the of-serial driver that resolves a reported issue. This revert has been in linux-next for a while" * tag 'tty-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: Revert "serial: of-serial: add PM suspend/resume support"
2014-11-28Merge tag 'usb-3.18-rc7' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb Pull USB fixes from Greg KH: "Here are some USB driver fixes and new device ids for 3.18-rc7. Full details are in the shortlog, and all of these have been in the linux-next tree for a while" * tag 'usb-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: usb-quirks: Add reset-resume quirk for MS Wireless Laser Mouse 6000 usb: xhci: rework root port wake bits if controller isn't allowed to wakeup USB: xhci: Reset a halted endpoint immediately when we encounter a stall. Revert "xhci: clear root port wake on bits if controller isn't wake-up capable" USB: xhci: don't start a halted endpoint before its new dequeue is set USB: uas: Add no-uas quirk for Hitachi usb-3 enclosures 4971:1012 USB: ssu100: fix overrun-error reporting USB: keyspan: fix overrun-error reporting USB: keyspan: fix tty line-status reporting usb: serial: ftdi_sio: add PIDs for Matrix Orbital products usb: dwc3: ep0: fix for dead code USB: serial: cp210x: add IDs for CEL MeshConnect USB Stick
2014-11-28bus: brcmstb_gisb: Add register offset tables for older chipsKevin Cernekee
This will select the appropriate register layout based on the DT "compatible" string. Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2014-11-28bus: brcmstb_gisb: Look up register offsets in a tableKevin Cernekee
There are at least 4 incompatible variations of this hardware block, so let's use the ARB_* constants as a table index instead of hardcoding specific register offsets. Also, allow for the possibility of adding old devices that are missing some of the registers. Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2014-11-28bus: brcmstb_gisb: Introduce wrapper functions for MMIO accessesKevin Cernekee
These will be used to abstract out chip-to-chip differences. Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2014-11-28bus: brcmstb_gisb: Make the driver buildable on MIPSKevin Cernekee
BCM7xxx ARM and MIPS platforms share a similar hardware block for reporting GISB errors, so they both benefit from the use of this driver. Conditionally compile the ARM-specific bus error handler so that the GISB error IRQ handler works on other architectures. Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2014-11-28Merge tag 'omap-for-v3.19/gpmc-move-v2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/omap-gpmc Pull "move omap gpmc to drivers finally" from Tony Lindgren: We can finally move the GPMC code to live in drivers/memory for further clean up work. Note that we still have dependencies to the legacy booting for omap3 board-*.c files for setting up the board specific memory timings. For that we need the timing related things still exposed in include/linux/omap-gpmc.h. This will all become private data to the GPMC driver once the legacy booting support can be dropped. * tag 'omap-for-v3.19/gpmc-move-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: memory: gpmc: Move omap gpmc code to live under drivers ARM: OMAP2+: Move GPMC initcall to devices.c ARM: OMAP2+: Prepare to move GPMC to drivers by platform data header Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge branch 'fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal Pull thermal fixes from Eduardo Valentin: "In this -rc still very minor changes: - Lee Jones fixes compilation warning in sti thermal driver - Marjus Elfring removes unnecessary checks in exynos thermal driver (as per coccinelle) - Now we always update cpufreq policies, and thus get (hopefully) always in sync with cpufreq, thanks to Yadwinder" * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal: thermal: Exynos: Deletion of unnecessary checks before two function calls thermal: sti: Ignore suspend/resume functions when !PM_SLEEP thermal: cpu_cooling: Update always cpufreq policy with thermal constraints
2014-11-28Merge tag 'sound-3.18-rc7' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound Pull sound fixes from Takashi Iwai: "No excitement, here are only minor fixes: an endian fix for the new DSD format we added in 3.18, a fix for HP mute LED, and a fix for Native Instrument quirk" * tag 'sound-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: pcm: Add big-endian DSD sample formats and fix XMOS DSD sample format ALSA: hda - One more HP machine needs to change mute led quirk ALSA: usb-audio: Use snd_usb_ctl_msg() for Native Instruments quirk
2014-11-28Merge tag 'tegra-for-3.19-soc' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/fixes-non-critical Pull "ARM: tegra: Core code changes for v3.19" from Thierry Reding: This contains a single fix for a bug that was introduced back in v3.13. * tag 'tegra-for-3.19-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: Re-add removed SoC id macro to tegra_resume() Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'tegra-for-3.19-defconfig' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/defconfig Pull "ARM: tegra: Default configuration changes for v3.19" from Thierry Reding: This is merely a regeneration of the default configuration to get rid of two symbols that are now enabled by default or removed. * tag 'tegra-for-3.19-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra: Regenerate default configuration Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'bcm5301x-dt-2014-11-27' of https://github.com/hauke/linux into ↵Arnd Bergmann
next/dt Pull "ARM: BCM5301X: Add some more devices to device tree" from Hauke Mehrtens: The most important part is adding the axi bus to the SoC dtsi file, this is the main bus on the SoC. These patches were all send to the arm list and I haven't got any negative responses. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * tag 'bcm5301x-dt-2014-11-27' of https://github.com/hauke/linux: ARM: BCM5301X: Add LEDs for Netgear R6250 V1 ARM: BCM5301X: Add Broadcom's bus-axi to the DTS file Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28arm64: ARM: Fix the Generic Timers interrupt active level descriptionLiviu Dudau
The Cortex-A5x TRM states in paragraph "9.2 Generic Timer functional description" that generic timers provide an active-LOW interrupt output. Fix the device trees to correctly describe this. While doing this update the CPU mask to match the number of described CPUs as well. Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'armsoc-for-rc7' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC fixes from Arnd Bergmann: "Not much interesting going on fixes-wise for us this week, as it should be for an -rc7. I'm not expecting Olof to work much over Thanksgiving weekend, so I decided to take over again and push these out to you. Just four simple fixes this week: - one missing of_node_put() on armv7 based mvebu - forcing the USB host into the right mode on Chromebook (exynos5-snow) - enabling two important drivers for exynos_defconfig - fixing a noncritical bug for tegra that would cause a regression with common code patches queued for 3.19" * tag 'armsoc-for-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: tegra: irq: fix buggy usage of irq_data irq field ARM: exynos_defconfig: Enable max77802 rtc and clock drivers ARM: dts: Explicitly set dr_mode on exynos5250-snow ARM: mvebu: add missing of_node_put() call in coherency.c
2014-11-28Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-armLinus Torvalds
Pull ARM fixes from Russell King: "Another round of relatively small ARM fixes. Thomas spotted that the strex backoff delay bit was a disable bit, so it needed to be clear for this to work. Vladimir spotted that using a restart block for the cache flush operation would return -EINTR, which userspace was not expecting. Dmitry spotted that the auxiliary control register accesses for Xscale were not correct" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8226/1: cacheflush: get rid of restarting block ARM: 8222/1: mvebu: enable strex backoff delay ARM: 8216/1: xscale: correct auxiliary register in suspend/resume
2014-11-28Merge tag 'mvebu-dt-3.19-2' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann
Pull "mvebu DT changes for v3.19 (round 2)" from Jason Cooper: - mvebu - Use simple-card audio on Armada 370 DB - Add DSA node for Armada 370 DB - Add SDHCI to Armada 38x - Armada 370/XP rework to support new Synology boards - Add Synology DS213j and DS414 - Various pinctrl and uart and alias fixes to help bootloaders * tag 'mvebu-dt-3.19-2' of git://git.infradead.org/linux-mvebu: arm: mvebu: normalize pinctrl entries for Armada SoCs arm: mvebu: fix wrongly named DS414 pinctrl entries arm: mvebu: add .dts file for Synology DS414 arm: mvebu: add .dts file for Synology DS213j arm: mvebu: define and use common Armada XP SPI pinctrl setting arm: mvebu: define and use common Armada XP UART2/3 pinctrl settings arm: mvebu: define and use common Armada 370 UART pinctrl settings arm: mvebu: define and use common Armada 370 SPI pinctrl settings arm: mvebu: move Armada 370/XP pinctrl node definition armada-370-xp.dtsi arm: mvebu: use recently introduced uart label for stdout-path arm: mvebu: add uartX labels for Armada SoC serial nodes arm: mvebu: fix vendor prefix typo in kirkwood-synology.dtsi ARM: mvebu: fix ordering in Armada 370 .dtsi ARM: mvebu: adjust ethernet aliases according to U-Boot requirements for A38x ARM: mvebu: remove clock-frequency from Armada 38x SDHCI Device Tree node ARM: mvebu: enable no-1-8-v flag for Armada 385 DB SDHCI interface mvebu: 370 RD: Add support for the switch ARM: mvebu: use simple-card DT binding for audio on Armada 370 DB ARM: mvebu: remove conflicting muxing on Armada 370 DB Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'mvebu-defconfig-3.19-2' of git://git.infradead.org/linux-mvebu ↵Arnd Bergmann
into next/defconfig Pull "mvebu defconfig changes for v3.19 (round 2)" from Jason Cooper: - mvebu - Add SDHCI, i2c, and MTD_BLOCK * tag 'mvebu-defconfig-3.19-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: add MTD_BLOCK to mvebu_v7_defconfig ARM: mvebu: enable i2c device in mvebu_v7_defconfig ARM: mvebu: re-enable SDHCI driver for Armada 38x SoC in v7 defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'mvebu-soc-3.19' of git://git.infradead.org/linux-mvebu into next/socArnd Bergmann
Pull "mvebu SoC changes for v3.19" from Jason Cooper: - Armada 38x - Implement CPU hotplug support - Armada 375 - Remove Z1 stepping support (limited dist. of SoC) * tag 'mvebu-soc-3.19' of git://git.infradead.org/linux-mvebu: ARM: mvebu: Implement the CPU hotplug support for the Armada 38x SoCs ARM: mvebu: Fix the secondary startup for Cortex A9 SoC ARM: mvebu: Move SCU power up in a function ARM: mvebu: Clean-up the Armada XP support ARM: mvebu: update comments in coherency.c ARM: mvebu: remove Armada 375 Z1 workaround for I/O coherency ARM: mvebu: remove unused register offset definition ARM: mvebu: disable I/O coherency on non-SMP situations on Armada 370/375/38x/XP ARM: mvebu: make the coherency_ll.S functions work with no coherency fabric ARM: mvebu: Remove thermal quirk for A375 Z1 revision ARM: mvebu: add missing of_node_put() call in coherency.c ARM: orion: Fix for certain sequence of request_irq can cause irq storm ARM: mvebu: armada xp: Generalize use of i2c quirk Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28perf session: Do not fail on processing out of order eventJiri Olsa
Linus reported perf report command being interrupted due to processing of 'out of order' event, with following error: Timestamp below last timeslice flush 0x5733a8 [0x28]: failed to process type: 3 I could reproduce the issue and in my case it was caused by one CPU (mmap) being behind during record and userspace mmap reader seeing the data after other CPUs data were already stored. This is expected under some circumstances because we need to limit the number of events that we queue for reordering when we receive a PERF_RECORD_FINISHED_ROUND or when we force flush due to memory pressure. Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Jiri Olsa <jolsa@kernel.org> Acked-by: Ingo Molnar <mingo@kernel.org> Cc: Andi Kleen <ak@linux.intel.com> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Matt Fleming <matt.fleming@intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1417016371-30249-1-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2014-11-28ARM: vexpress: Enable regulator framework when MMCI is in usePawel Moll
The MMCI driver, when used with a Device Tree described device, relies on the "vmmc" voltage regulator supply to set the OCR register voltage bits, using MMC core's mmc_regulator_get_supply() function. Without the regulator framework present there are no valid operating voltages reported and the device initialisation fails: mmci-pl18x 10005000.mmci: No vmmc regulator found mmci-pl18x 10005000.mmci: no support for card's volts mmc0: error -22 whilst initialising SD card Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28memory: gpmc: Move omap gpmc code to live under driversTony Lindgren
Just move to drivers as further clean-up can now happen there finally. Let's also add Roger and me to the MAINTAINERS so we get notified for any patches related to GPMC. Cc: Arnd Bergmann <arnd@arndb.de> Acked-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-28ARM: OMAP2+: Move GPMC initcall to devices.cTony Lindgren
This will us allow to just move gpmc.c to live under drivers in the next patch. Note that we now also remove the omap specific check for the initcall. That's OK as gpmc_probe() checks for the pdata and bails out for other platforms compiled in. Also the postcore_initcall() maybe possible to change to just regular module_init(), but let's do that in separate patch after the move to drivers is done. Cc: Arnd Bergmann <arnd@arndb.de> Acked-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-11-28Merge tag 'at91-cleanup4' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/cleanup Pull "Fourth batch of cleanup/SoC for 3.19" from Nicolas Ferre: - removal of legacy board support for the last SoC having board C files: at91rm9200 - removal or modification of some Kconfig options - switch to USE_OF for all the AT91 SoCs - removal of the old AT91-specific clocks and IRQ drivers * tag 'at91-cleanup4' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91: remove unused IRQ function declarations ARM: at91: remove legacy IRQ driver and related code ARM: at91: remove old at91-specific clock driver ARM: at91: remove clock data in at91sam9n12.c and at91sam9x5.c files ARM: at91: remove all !DT related configuration options ARM: at91/trivial: update Kconfig comment to mention SAMA5 ARM: at91: always USE_OF from now on ARM: at91/Kconfig: remove ARCH_AT91RM9200 option for drivers ARM: at91: switch configuration option to SOC_AT91RM9200 ARM: at91: remove at91rm9200 legacy board support ARM: at91: remove at91rm9200 legacy boards files Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'at91-cleanup3' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/cleanup Pull "Third batch of cleanup/SoC for 3.19" from Nicolas Ferre: - fixes following legacy board removal - removal of legacy board support for at91sam9263, at91sam9260/at91sam9g20 and at91sam9261/at91sam9g10 SoCs families. Please use DT now. - removal of some now useless Kconfig options * tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: ARM: at91/Kconfig: remove useless fbdev Kconfig options ARM: at91: remove at91sam9261/at91sam9g10 legacy board support ARM: at91/Kconfig: remove unused config options ARM: at91: remove at91sam9260/at91sam9g20 legacy board support ARM: at91: remove at91sam9260/at91sam9g20 legacy boards files ARM: at91: remove at91sam9263 legacy board support ARM: at91/at91sam9g45: remove useless header file Conflicts: arch/arm/mach-at91/at91sam9g45.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28MAINTAINERS: ARM Versatile Express platformPawel Moll
This patch adds a separate section for the ARM Versatile Express platform maintainers, listing all different bits and bobs used by it. Acked-by: Liviu Dudau <liviu.dudau@arm.com> Acked-by: Sudeep Holla <sudeep.holla@arm.com> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Pawel Moll <pawel.moll@arm.com> Acked-by: Michael Turquette <mturquette@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28arm64: amd-seattle: Adding device tree for AMD Seattle platformSuravee Suthikulpanit
Initial revision of device tree for AMD Seattle Development platform. Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> Signed-off-by: Thomas Lendacky <Thomas.Lendacky@amd.com> Signed-off-by: Joel Schopp <Joel.Schopp@amd.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28ARM: vexpress: Remove non-DT codePawel Moll
Now, with the CLCD DT support available, there is no more reason to keep the non-DT support for V2P-CA9. Removed, together with "some" supporting code. It was necessary to make PLAT_VERSATILE_SCHED_CLOCK optional and selected by the machines still interested in it. Acked-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28ARM: multi_v7_defconfig: add driver support for hix5hd2Zhangfei Gao
Tested on hix5hd2 platform with mmc, usb, network, reboot etc. Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'sirf-dts-for-3.19' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/dt Pull "change pinmux pingroup and add some lost node/prop" from Barry Song: 1. add resets properity for some nodes; 2. change pinctrl groups for audio 3. add PMU node * tag 'sirf-dts-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux: ARM: dts: atlas6: add resets property for SPI nodes ARM: dts: atlas6: add resets property for VPP nodes ARM: dts: prima2: add resets property for VPP nodes ARM: dts: prima2: add resets property for GPS nodes ARM: dts: prima2: add node for Performance Monitor Unit ARM: dts: atlas6: Add I2S external clock input pingroup ARM: dts: atlas6: add a separate pingroup for i2s mclk output ARM: dts: prima2: add I2S 2ch, 6ch, nodin, mclk groups Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28ARM: add lolevel debug support for asm9260Oleksij Rempel
Since there is no public documentation, this patch also provide register offsets for different UART units on this SoC. Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28ARM: add mach-asm9260Oleksij Rempel
it is low cost (?) SoC targeted for market in China and India which trying to compete with AT91SAM9G25. Here is some info: http://www.alphascale.com/index.asp?ics/615.html One of products: http://www.aliexpress.com/store/product/2014-hot-sales-FREE-SHIPPING-new-Purple-core-ARM9-development-board-ASM9260T-SDRAM-power-line/433637_1931495721.html In some cases this SoC looks similar to iMX23/iMX28. But currently it makes no sense to merge mach code of this devices. Especially because most differences are already collected mach-mxs folder. Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'sunxi-simplefb-for-3.19' of ↵Arnd Bergmann
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt Pull "Allwinner simple frambuffer support" from Maxime Ripard: This enables the simple framebuffer on all the supported Allwinner SoCs (but the A80). That allows to have at last a video display usable by using the framebuffer the firmware might have set up. * tag 'sunxi-simplefb-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (55 commits) ARM: dts: sunxi: Update simplefb nodes so that u-boot can find them ARM: dts: sunxi: Add de_be0 clk parent pll to simplefb node ARM: dts: sun7i: Add simplefb node ARM: dts: sun6i: Add simplefb node ARM: dts: sun5i: Add simplefb node ARM: dts: sun4i: Add simplefb node ARM: dts: sun6i: Add ethernet support to M9 board ARM: sun6i: DT: Add PLL6 multiple outputs ARM: dts: sun6i: Add support for the status led ARM: dts: sun6i: Add EHCI support for the M9 board ARM: dts: sunxi: Add regulator-boot-on property to ahci-5v regulator ARM: dts: sun7i: Cubietruck: add power supply regulator for USB OTG VBUS ARM: dts: sun7i: Cubietruck: override regulator pin ARM: sun7i: dtsi: add support for usbphy0 ARM: dtsi: sunxi: add common VBUS regulator ARM: dts: sunxi: Banana Pi: increase startup-delay for the GMAC PHY regulator ARM: sun5i: olinuxino: Relicense the device tree under GPLv2/X11 ARM: sun4i: cubieboard: Relicense the device tree under GPLv2/X11 ARM: sun7i: pcduino3: Relicense the device tree under GPLv2/X11 ARM: sun4i: pcduino: Relicense the device tree under GPLv2/X11 ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'imx-dt-3.19' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt Pull "The i.MX device tree changes for 3.19" from Shawn Guo: - Device additions for board vf610-colibri, pwm, backlight, I2C, RTC, ADC etc. - Update i.MX6 phyFLEX board to include PCIe, CAN and audio support - Improve SSI clocks description for i.MX5 platforms - Add ENET2 support for imx6sx-sdb board - Add device tree source for LS1021A SoC, board QDS and TWR - Enable cpufreq support for i.MX53 - Enable VPU device support for i.MX6QDL - Enable poweroff support for i.MX6 SoCs - Add support for TBS2910 Matrix ARM mini PC which is built on i.MX6Q - Create generic base device trees for Vybrid and add support for Colibri VF50 Note: the change set is built on top of imx-soc-3.19 to resolve the dependency that "ARM: dts: imx53: add cpufreq-dt support" uses the clock define IMX5_CLK_ARM that is added by "ARM: imx53: clk: add ARM clock". * tag 'imx-dt-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (51 commits) ARM: dts: imx6q-tbs2910: Enable snvs-poweroff ARM: dts: imx6: add pm_power_off support for i.mx6 chips ARM: dts: vf-colibri: add USB regulators ARM: dts: imx6: phyFLEX: Add CAN support ARM: dts: imx6: phyFLEX: Add PCIe ARM: dts: imx6: phyFLEX: Set correct interrupt for pmic ARM: dts: imx6: phyFLEX: Enable gpmi in module file ARM: dts: imx6: phyFLEX: set nodes in alphabetical order ARM: dts: vf-colibri-eval-v3.dts: Enable ST-M41T0M6 RTC ARM: dts: vf-colibri: Add I2C support ARM: dts: imx6qdl: Enable CODA960 VPU ARM: dts: imx6q-tbs2910: Remove unneeded 'fsl,mode' property ARM: dts: vf610: enable USB misc/phy nodes where necessary ARM: dts: vf610: use new GPIO support ARM: dts: pbab01: enable I2S audio on phyFLEX-i.MX6 boards ARM: dts: pbab01: move i2c pins and frequency configuration into pfla02 ARM: dts: vf500-colibri: add Colibri VF50 support ARM: dts: vf610: create generic base device trees ARM: dts: vf610: assign oscillator to clock module dt-bindings: arm: add Freescale LS1021A SoC device tree binding ... Signed-off-by; Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'imx-soc-3.19' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc Pull "The i.MX SoC update for 3.19" from Shawn Guo - Update i.MX6 suspend code to check DDR instead of CPU type, as the difference we need to handle is between LPDDR2 and DDR3, not SoCs. - Set anatop properly for LPDDR2 in DSM mode - Add support for new SoC LS1021A which integrates dual Cortex-A7 - Add ENET initialization for i.MX6SX platform - Add cpufreq support for i.MX53 platform - Add a SNVS based poweroff driver for i.MX6 platforms - Use ARM Global Timer as clocksource on VF610 Note: the change set is built on top of tag imx-fixes-3.18-2 to resolve a conflict on file arch/arm/mach-imx/clk-vf610.c. * tag 'imx-soc-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: power: reset: imx-snvs-poweroff: add power off driver for i.mx6 ARM: imx: temporarily remove CONFIG_SOC_FSL from LS1021A ARM: imx: clk-vf610: get input clocks from assigned clocks ARM: imx: Add Freescale LS1021A SMP support ARM: imx: Add initial support for Freescale LS1021A ARM: imx53: add cpufreq support ARM: imx53: clk: add ARM clock ARM: imx: add CPU clock type ARM: imx5: add step clock, used when reprogramming PLL1 ARM: imx: add enet init for i.mx6sx ARM: imx6sx: add imx6sx iomux-gpr field define ARM: vf610: Add ARM Global Timer clocksource option ARM: imx: add anatop settings for LPDDR2 when enter DSM mode ARM: imx: replace cpu type check with ddr type check ARM: imx: Fix the removal of CONFIG_SPI option ARM: imx: clk-vf610: define PLL's clock tree Signed-off-by; Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'imx-cleanup-3.19' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/cleanup Pull "The i.MX cleanup for 3.19" from Shawn Guo: - Clean up reset handler for DT machines, since reset has been handled in watchdog driver - Remove unneeded .map_io hook for a couple of i.MX6 machines - A few small i.MX6 device tree source cleanups - Some random iomuxc and pllv3 code cleanup * tag 'imx-cleanup-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx: Remove unneeded .map_io initialization ARM: dts: imx6qdl-sabresd: Fix the microphone route ARM: imx: refactor mxc_iomux_mode() ARM: imx: simplify clk_pllv3_prepare() ARM: imx6q: drop unnecessary semicolon ARM: imx: clean up machine mxc_arch_reset_init_dt reset init ARM: dts: imx6qdl-rex: Remove unneeded 'fsl,mode' property ARM: dts: imx6qdl-gw5x: Remove unneeded 'fsl,mode' property ARM: dts: imx6qdl-sabresd: Use IMX6QDL_CLK_CKO define Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'omap-for-v3.19/dt-part2-updated' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Pull "More dts changes for omaps to add support for new devices" from Tony Lindgren: - Add DCAN support am335x, am437x and dra7 - Add devices for sb-t3x computers - Add support for NovaTech OrionLXm - Add n900 battery and si4713 support * tag 'omap-for-v3.19/dt-part2-updated' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (26 commits) ARM: dts: am335x-evm: Add DCAN1 details ARM: dts: am33xx: Update DCAN nodes ARM: dts: am33xx: Add control module syscon node ARM: dts: am437x-gp: Add dcan support ARM: dts: am4372: Add DCAN nodes ARM: dts: am4372: Add control module syscon node ARM: dts: dra72-evm: Add CAN support ARM: dts: dra7-evm: Add CAN support ARM: dts: DRA7: Add DCAN nodes ARM: dts: dra7: Add syscon regmap for CORE CONTROL area ARM: dts: sbc-t3x30: add audio support ARM: dts: sbc-t3x: add TV out display alias ARM: dts: cm-t3x: add TV out support ARM: dts: cm-t3x: add I2C1 pinmux ARM: dts: AM43xx: add tscadc DT entries for am437x-evm and am43x-epos-evm ARM: dts: cm-t3x30: add keypad support ARM: dts: sb-t35: add EEPROM support ARM: dts: cm-t3x: add EEPROM support ARM: OMAP2+: remove cm-t3x touchscreen pdata quirk ARM: dts: cm-t3x: add ADS7846 touchscreen support ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge (part of) tag 'omap-for-v3.19/hwmod-and-defconfig' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc SoC related changes for omaps including hwmod clean-up for DSS, and hwmod data for more UARTs and ADC. Also few defconfig changes to enable devices found on am335x and am437x. [arnd: I removed the defconfig changes from the branch in order to cherry-pick them onto the next/defconfig branch, but I did not change the other commits] * commit '29c4ce17bcad': ARM: dts: cm-t3x30: add keypad support ARM: OMAP2+: hwmod: AM43x: add hwmod support for ADC on AM43xx ARM: DRA7: hwmod data: Add missing UART hwmod data ARM: dts: omap4.dtsi: remove dss_fck ARM: OMAP4: fix RFBI iclk ARM: OMAP4: hwmod: use MODULEMODE properly ARM: OMAP4: hwmod: set DSS submodule parent hwmods ARM: OMAP5: hwmod: set DSS submodule parent hwmods ARM: OMAP2+: hwmod: add parent_hwmod support Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'samsung-dt-3' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt Pull "Samsung 3rd DT updates for v3.19" from Kukjin Kim: - exynos3250 : remove unused bootargs on exynos3250-rinato : add new board dt file for exynos3250-monk - exynos4 : add missing clock for MFC : specify default clocks for camera - exynos4x12 : add TMU related DT nodes - exynos4412-trats2 : add max77693-haptic and pwm nodes, enable TMU support - exynos4412-odroid : specify audio clock parents and rates - exynos5250 and exynos5420 : add syscon based phandle to i2c device nodes - exynos5250-spring : add trackpad, temperature sensor and usb3505 pinctrl Note: based on previous tags/samsung-dt-2 for v3.19 * tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: add sysreg phandle to i2c device nodes for exynos ARM: dts: Remove unused bootargs from exynos3250-rinato ARM: dts: add board dts file for Exynos3250-based Monk board Documentation: devicetree: Add Exynos-based boards compatible string ARM: dts: add missing clock to MFC device for exynos4 ARM: dts: Specify audio clock parents and rates for exynos4412-odroid-common ARM: dts: Add trackpad to exynos5250-spring ARM: dts: Add temperature sensor to exynos5250-spring ARM: dts: Add usb3503 pinctrl to exynos5250-spring ARM: dts: Add max77693-haptic node for exynos4412-trats2 ARM: dts: add pwm node for exynos4412-trats2 ARM: dts: Specify default clocks for Exynos4 camera devices ARM: dts: Enable TMU support for exynos4412-trats2 ARM: dts: Device tree node definition for TMU on exynos4x12 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'samsung-driver' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers Pull "Samsung driver update for v3.19" from Kukjin Kim: - Change samsung serial dependencies for exynos7 (ARMv8) * tag 'samsung-driver' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: serial: samsung: Fix serial config dependencies for exynos7 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'samsung-pm-3' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc Pull "Samsung PM 3rd updates for v3.19" from Kukjin Kim: - exynos3250 : add PMU support - PMU refactoring : move restart code into PMU driver : move restart code for exynos440 into clk driver - use u8 for val[] in struct exynos_pmu_conf Note that this branch is based on tags/samsung-exynos-v3.19 * tag 'samsung-pm-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: use u8 for val[] in struct exynos_pmu_conf ARM: EXYNOS: move restart code into pmu driver clk: exynos5440: move restart code into clock driver ARM: EXYNOS: add exynos3250 PMU support Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'samsung-exynos-v3.19' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc Pull "Samsung exynos updates in arch/arm/mach-exynos/ for v3.19" from Kukjin Kim: - add SOC_EXYNOS4415 config to be used in audio driver - add support platform driver for exynos PMU - move PMU specific definitions from common.h to exynos-pmu.h - for exynos5420, add support PMU and Suspend-to-RAM use MCPM call backs and call regulator core suspend prepare and finish functions NOTE: including v3.19-next/non-critical-fixes, v3.19-next/cleanup-samsung and v3.19-next/pm-samsung-2 branches * tag 'samsung-exynos-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Call regulator core suspend prepare and finish functions ARM: EXYNOS: Use MCPM call-backs to support S2R on exynos5420 ARM: EXYNOS: Add Suspend-to-RAM support for exynos5420 ARM: EXYNOS: Add PMU support for exynos5420 ARM: EXYNOS: Move PMU specific definitions from common.h ARM: EXYNOS: Add platform driver support for Exynos PMU ARM: EXYNOS: Add support for exynos4415 SoC ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe" ARM: EXYNOS: Fix CPU idle clock down after CPU off ARM: EXYNOS: Remove unneeded __ref annotation for cpu_die function ARM: EXYNOS: Move code from hotplug.c to platsmp.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'samsung-dt-2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt Pull "Samsung 2nd DT updates for v3.19" from Kukjin Kim: - add micro SD card SDHCI node for exynos4412-trats - add exynos4415 DT - add exynos3250-rinato DT and sleep mode support Note: based on previous tags/samsung-dt for v3.19 * tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Add micro SD card SDHCI node for exynos4412-trats ARM: dts: Add dts files for exynos4415 SoC ARM: dts: Add sleep mode of regulator for exynos3250-rinato ARM: dts: Add sleep mode pin configuration for exynos3250-rinato ARM: dts: Add board dts file for exynos3250-rinato Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28ARM: exynos_defconfig: Use 16 minors per MMC block deviceKrzysztof Kozlowski
16 minors per MMC block device are required to boot Rinato (Gear 2) board because up to 15 partitions are used. With default 8 minors booting failed with: [ 1.329092] mmcblk0: mmc0:0001 F5X5MA 3.64 GiB [ 1.329448] mmcblk0boot0: mmc0:0001 F5X5MA partition 1 4.00 MiB [ 1.329627] mmcblk0boot1: mmc0:0001 F5X5MA partition 2 4.00 MiB [ 1.329808] mmcblk0rpmb: mmc0:0001 F5X5MA partition 3 512 KiB [ 1.335717] mmcblk0: p1 p2 p3 p4 p5 p6 p7 [ 1.436553] Waiting for root device /dev/mmcblk0p15... while the correct list of partitions on mmcblk0 for Gear 2 is: [ 1.436651] mmcblk0: p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-11-28Merge tag 'samsung-cleanup-2' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup Pull "Samsung 2nd cleanup for v3.19" from Kukjin Kim: - remove unused static iomapping for exynos SoCs : remove unused static iomapping from exynos4/5_iodesc table, and related macros from mach/map.h and plat/map-s5p.h. * tag 'samsung-cleanup-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Remove unused static iomapping Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'samsung-fixes-v3.19' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical Pull "Samsung non-critical-fixes for v3.19" from Kukjin Kim: - fix typo in static struct name "exynos5_list_diable_wfi_wfe" : it should be "exynos5_list_disable_wfi_wfe" * tag 'samsung-fixes-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe" Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-28Merge tag 'v3.19-rockchip-dts3' of ↵Arnd Bergmann
git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt Pull "temporarily disable rk3288-smp" from Heiko Stuebner: Disable smp again on rk3288 temporarily to make Olof's boottest run again, until the patches for using the physical architected timers got accepted. * tag 'v3.19-rockchip-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: temporarily disable smp on rk3288 Signed-off-by: Arnd Bergmann <arnd@arndb.de>