summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-26staging: r8192ee: Fix kernel WARN splat associated with rate controlLarry Finger
The 0day kernel testing robot got the kernel warning caused by trying to register a particular rate-control algorithm more than once. I believe that the core already protects against a particular driver doing the registration more than once, but an analysis of the code reveals that the identical name is used for the rtlwifi drivers in the regular wireless tree, and the staging drivers r8192ee and r8821ae. The fix is to rename the algorithm used in r8192ee. Reported-by: Jet Chen <jet.chen@intel.com> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Tested-by: Jet Chen <jet.chen@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-26block/blk-lib.c: make __blkdev_issue_zeroout staticFabian Frederick
__blkdev_issue_zeroout is only used in blk-lib.c Cc: Jens Axboe <axboe@kernel.dk> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Jens Axboe <axboe@fb.com>
2014-05-26Merge branches 'dma-api', 'pci/virtualization', 'pci/msi', 'pci/misc' and ↵Bjorn Helgaas
'pci/resource' into next * dma-api: iommu/exynos: Remove unnecessary "&" from function pointers DMA-API: Update dma_pool_create ()and dma_pool_alloc() descriptions DMA-API: Fix duplicated word in DMA-API-HOWTO.txt DMA-API: Capitalize "CPU" consistently sh/PCI: Pass GAPSPCI_DMA_BASE CPU & bus address to dma_declare_coherent_memory() DMA-API: Change dma_declare_coherent_memory() CPU address to phys_addr_t DMA-API: Clarify physical/bus address distinction * pci/virtualization: PCI: Mark RTL8110SC INTx masking as broken * pci/msi: PCI/MSI: Remove pci_enable_msi_block() * pci/misc: PCI: Remove pcibios_add_platform_entries() s390/pci: use pdev->dev.groups for attribute creation PCI: Move Open Firmware devspec attribute to PCI common code * pci/resource: PCI: Add resource allocation comments PCI: Simplify __pci_assign_resource() coding style PCI: Change pbus_size_mem() return values to be more conventional PCI: Restrict 64-bit prefetchable bridge windows to 64-bit resources PCI: Support BAR sizes up to 8GB resources: Clarify sanity check message PCI: Don't add disabled subtractive decode bus resources PCI: Don't print anything while decoding is disabled PCI: Don't set BAR to zero if dma_addr_t is too small PCI: Don't convert BAR address to resource if dma_addr_t is too small PCI: Reject BAR above 4GB if dma_addr_t is too small PCI: Fail safely if we can't handle BARs larger than 4GB x86/gart: Tidy messages and add bridge device info x86/gart: Replace printk() with pr_info() x86/PCI: Move pcibios_assign_resources() annotation to definition x86/PCI: Mark ATI SBx00 HPET BAR as IORESOURCE_PCI_FIXED x86/PCI: Don't try to move IORESOURCE_PCI_FIXED resources x86/PCI: Fix Broadcom CNB20LE unintended sign extension
2014-05-26iommu/exynos: Remove unnecessary "&" from function pointersBjorn Helgaas
Remove unnecessary "&" from function pointers in exynos_iommu_ops. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
2014-05-26DMA-API: Update dma_pool_create ()and dma_pool_alloc() descriptionsGioh Kim
Use "boundary" to be more descriptive than "alloc" in the dma_pool_create() documentation. Replace "SLAB_KERNEL" and "SLAB_ATOMIC" with the correct "GFP_KERNEL" and "GFP_ATOMIC." [bhelgaas: changelog] Signed-off-by: Gioh Kim <gioh.kim@lge.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2014-05-26DMA-API: Fix duplicated word in DMA-API-HOWTO.txtEmilio López
"coherent" is written twice when it should be just once. Signed-off-by: Emilio López <emilio@elopez.com.ar> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2014-05-26DMA-API: Capitalize "CPU" consistentlyBjorn Helgaas
Sometimes we used "cpu," other times "CPU." Use "CPU" consistently. Suggested-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2014-05-26blk-mq: idle all hardware contexts before freeing a queueChristoph Hellwig
Without this we can leak the active_queues reference if a command is freed while it is considered active. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
2014-05-27staging: go7007: remove reference to CONFIG_KMODPaul Bolle
The Kconfig symbol KMOD was removed in v2.6.29. Remove CONFIG_KMOD from this list of options too. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2014-05-27HID: uhid: Use kmemdup instead of kmalloc + memcpyBenoit Taine
This issue was reported by coccicheck using the semantic patch at scripts/coccinelle/api/memdup.cocci Signed-off-by: Benoit Taine <benoit.taine@lip6.fr> Reviewed-by: David Herrmann <dh.herrmann@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2014-05-26Merge tag 'socfpga_dt_updates-for-3.16_take_2_version_2' of ↵Olof Johansson
git://git.rocketboards.org/linux-socfpga-next into next/dt Merge "SOCFPGA DTS updates for 3.16, take 2-version 2" from Dinh Nguyen: Add the gpio and watchdog dts entries for the SOCFPGA platform. * tag 'socfpga_dt_updates-for-3.16_take_2_version_2' of git://git.rocketboards.org/linux-socfpga-next: ARM: socfpga: dts: add watchdog0+1 ARM: dts: socfpga: add gpio pieces Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Input: synaptics - change min/max quirk table to pnp-id matchingHans de Goede
Most of the affected models share pnp-ids for the touchpad. So switching to pnp-ids give us 2 advantages: 1) It shrinks the quirk list 2) It will lower the new quirk addition frequency, ie the recently added W540 quirk would not have been necessary since it uses the same LEN0034 pnp ids as other models already added before it As an added bonus it actually puts the quirk on the actual psmouse, rather then on the machine, which is technically more correct. Cc: stable@vger.kernel.org Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
2014-05-26Input: synaptics - add a matches_pnp_id helper functionHans de Goede
This is a preparation patch for simplifying the min/max quirk table. Cc: stable@vger.kernel.org Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
2014-05-26Input: synaptics - T540p - unify with other LEN0034 modelsHans de Goede
The T540p has a touchpad with pnp-id LEN0034, all the models with this pnp-id have the same min/max values, except the T540p where the values are slightly off. Fix them to be identical. This is a preparation patch for simplifying the quirk table. Cc: stable@vger.kernel.org Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
2014-05-26Merge tag 'sirf-dts-for-3.16' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/dt Merge "ARM: sirf: dts update for 3.16" from Barry Son: some minor cleanup and add some missed nodes: 1. move dma channel descriptions to generic dma properity 2. add resets properity for some nodes; 3. add missed pinctrl groups. * tag 'sirf-dts-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux: ARM: dts: sirf: add resets for dspif, gps and dsp nodes ARM: dts: atlas6: add cortex-a9-pmu compatible PMU node ARM: dts: sirf: move to use generic dma dt-binding for spi ARM: dts: sirf: add pin group for USP0 with only RX or TX frame sync for atlas6 Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Merge tag 'davinci-for-v3.16/edma' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers Merge "DaVinci EDMA clean-up for v3.16" from Sekhar Nori: This series makes edma use configuration information available within the IP instead of reading it from platform data or DT. Some other useful clean-ups are included too. * tag 'davinci-for-v3.16/edma' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: (34 commits) ARM: edma: Remove redundant/unused parameters from edma_soc_info ARM: davinci: Remove redundant/unused parameters for edma ARM: dts: am4372: Remove obsolete properties from edma node ARM: dts: am33xx: Remove obsolete properties from edma node dt/bindings: ti,edma: Remove redundant properties from documentation ARM: edma: Get IP configuration from HW (number of channels, tc, etc) ARM: edma: Save number of regions from pdata to struct edma ARM: edma: Remove num_cc member from struct edma ARM: edma: Remove queue_tc_mapping data from edma_soc_info ARM: davinci: Remove eDMA3 queue_tc_mapping data from edma_soc_info ARM: edma: Do not change TC -> Queue mapping, leave it to default. ARM: edma: Take the number of tc from edma_soc_info (pdata) ARM: edma: No need to clean the pdata in edma_of_parse_dt() ARM: edma: Clean up and simplify the code around irq request dmaengine: edma: update DMA memcpy to use new param element dmaengine: edma: Document variables used for residue accounting dmaengine: edma: Provide granular accounting dmaengine: edma: Make reading the position of active channels work dmaengine: edma: Store transfer data in edma_desc and edma_pset dmaengine: edma: Create private pset struct ... Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Merge tag 'davinci-fixes-for-v3.15-rc4' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers The patch fixes EDMA crossbar mapping to actually make it work. The patch has been tagged for stable. * tag 'davinci-fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: common: edma: Fix xbar mapping
2014-05-26Merge tag 'zynq-cleanup-for-3.16' of git://git.xilinx.com/linux-xlnx into ↵Olof Johansson
next/soc Merge "Xilinx Zynq changes for v3.16" from Michal Simek: arm: Xilinx Zynq cleanup patches for v3.16 - Add support for BIG Endian - Add SOC_BUS support - Sort Kconfig options - Fix early console * tag 'zynq-cleanup-for-3.16' of git://git.xilinx.com/linux-xlnx: ARM: zynq: Enable big-endian ARM: zynq: Fix uart0 early console virtual address clocksource: cadence_ttc: Use readl/writel_relaxed instead of __raw ARM: zynq: Sort Kconfig options ARM: zynq: Add support for SOC_BUS Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Merge tag 'davinci-for-v3.16/board' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/boards Merge "DaVinci board changes for v3.16" from Sekhar Nori: This patch clean-up an unused #define from code. * tag 'davinci-for-v3.16/board' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: remove checks for CONFIG_USB_MUSB_PERIPHERAL Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Merge branches 'pm-cpufreq' and 'acpi-thermal'Rafael J. Wysocki
* pm-cpufreq: cpufreq: cpu0: drop wrong devm usage cpufreq: remove race while accessing cur_policy * acpi-thermal: ACPI / thermal: fix workqueue destroy order
2014-05-26clk: samsung: fix build errorOlof Johansson
"clk: samsung: clk-s3c2410-dlck: do not use PNAME macro as it declares __initdata" had a typo in it which caused build failure. Trivial fix. Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Merge tag 'zynq-dt-for-3.16' of git://git.xilinx.com/linux-xlnx into next/dtOlof Johansson
Merge "arm: Xilinx Zynq dt patches for v3.16" from Michal Simek: - Cleanup GIC mode - Cleanup node names - Add regulators * tag 'zynq-dt-for-3.16' of git://git.xilinx.com/linux-xlnx: ARM: zynq: dt: Add a fixed regulator for CPU voltage ARM: zynq: dt: Clean up device tree ARM: dts: zynq: drop address cells from GIC node Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26m68k: Toward platform agnostic framebuffer debug loggingFinn Thain
Code subject to #ifdef CONSOLE is made more generic, as was apparently intended by the original author. Remove console_put_stats() routine. If it should be somehow useful, it should also be useful on platforms without framebuffer debug logging. The present implementation is only built #if defined CONFIG_MAC && defined CONSOLE even though puts() works everywhere. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Tested-by: Stephen N Chivers <schivers@csc.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2014-05-26m68k/atari - atari_scsi: use correct virt/phys translation for DMA bufferMichael Schmitz
With the kernel running from FastRAM instead of ST-RAM, none of ST-RAM is mapped by mem_init, and DMA-addressable buffer must be mapped by ioremap. Use platform specific virt/phys translation helpers for this case. Signed-off-by: Michael Schmitz <schmitz@debian.org> Cc: linux-scsi@vger.kernel.org Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2014-05-26m68k/atari - ataflop: use correct virt/phys translation for DMA bufferMichael Schmitz
With the kernel running from FastRAM instead of ST-RAM, none of ST-RAM is mapped by mem_init, and DMA-addressable buffer must be mapped by ioremap. Use platform specific virt/phys translation helpers for this case. Signed-off-by: Michael Schmitz <schmitz@debian.org> Cc: linux-kernel@vger.kernel.org Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2014-05-26m68k/atari - atafb: convert allocation of fb ram to new interfaceMichael Schmitz
The new atari_stram_alloc interface returns kernel virtual addresses even if the kernel runs in FastRAM. These addresses are not guaranteed to be identical with the physical addresses. Since ST-RAM mappings have not been set up by mem_init, virt_to_phys() and its cousin do not work and the atari_stram_to_phys() etc. helpers must be used to determine physical addresses. fb.fix->smem_start needs physical addresses, fb.par->screen_base needs virtual addresses. Take care of the virt-to-phys conversion both on fb init and par changes. Signed-off-by: Michael Schmitz <schmitz@debian.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2014-05-26m68k/atari - stram: alloc ST-RAM pool even if kernel not in ST-RAMMichael Schmitz
With the kernel loaded to FastRAM (TT-RAM), none of the ST-RAM address range is mapped by init_mem, and ST-RAM is not accessible through the normal allocation pathways as a result. Implement ST-RAM pool allocation to be based on physical addresses always (it already was when the kernel was loaded in ST-RAM). Return kernel virtual addresses as per normal. The current test for the kernel residing in ST-RAM always returns true. Use the bootinfo memory chunk order instead - with the kernel in FastRAM, ST-RAM (phys. 0x0) is not the first chunk. In case the kernel is running from FastRAM, delay mapping of ST-RAM pool until after mem_init. Provide helper functions for those users of ST-RAM that need to be aware of the backing physical addresses. Kudos to Geert for his hints on getting this started. Signed-off-by: Michael Schmitz <schmitz@debian.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2014-05-26Merge tag 'berlin-soc-3.16' of https://github.com/shesselba/linux-berlin ↵Olof Johansson
into next/soc Merge "ARM: berlin: SoC changes for v3.16" from Sebastian Hesselbart: Despite relatively young Berlin SoC support, we already have support for a BG2Q SoC provided by Alexandre Belloni and Antoine Tenart. Also, we gained support for DW gpio and a pinctrl driver. * tag 'berlin-soc-3.16' of https://github.com/shesselba/linux-berlin: ARM: berlin: add the pinctrl dependency for the Marvell Berlin SoCs ARM: berlin: add the LIBGPIO as a dependency for the BG2Q ARM: berlin: add MACH_BERLIN_BG2Q symbol ARM: berlin: add Marvell Armada 1500 pro to Marvell doc Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Merge tag 'berlin-dt-3.16' of https://github.com/shesselba/linux-berlin into ↵Olof Johansson
next/dt Merge "ARM: berlin: DT changes for v3.16" from Sebastian Hesselbart: Quite a lot changes but it looks like DT approach is really paying off. BG2Q joins Berlin SoC family with corresponding development board, DW gpio nodes for all SoCs. Most notably, we have settled clock bindings to allow us to continue on drivers requiring clocks and pinctrl bindings. Last but not least, BG2Q gained SDHCI support and is able to properly boot into userspace. * tag 'berlin-dt-3.16' of https://github.com/shesselba/linux-berlin: ARM: dts: berlin: enable SD card reader and eMMC for the BG2Q DMP ARM: dts: berlin: add the SDHCI nodes for the BG2Q ARM: dts: berlin: add the pinctrl node and muxing setup for uarts dt-binding: ARM: add pinctrl binding docs for Marvell Berlin2 SoCs ARM: dts: berlin: convert BG2Q to DT clock nodes ARM: dts: berlin: convert BG2 to DT clock nodes ARM: dts: berlin: convert BG2CD to DT clock nodes clk: berlin: add binding include for Berlin SoC clock ids dt-binding: ARM: add clock binding docs for Marvell Berlin2 SoCs ARM: dts: berlin: add the BG2CD GPIO nodes ARM: dts: berlin: add the BG2 GPIO nodes ARM: dts: berlin: add the BG2Q GPIO nodes ARM: dts: berlin: add scu and chipctrl device nodes for BG2/BG2Q ARM: dts: berlin: add the Marvell BG2-Q DMP device tree ARM: dts: berlin: add the Marvell Armada 1500 pro Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Merge tag 'omap-for-v3.16/l3-noc-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers Merge "ARM: omap l3-noc bus driver changes for v3.16 merge window, resend" from Tony Lindgren: Improvments to omap l3-noc bus driver for v3.16 merge window to add support for am347x and dra7. * tag 'omap-for-v3.16/l3-noc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (25 commits) bus: omap_l3_noc: Add AM4372 interconnect error data bus: omap_l3_noc: Add DRA7 interconnect error data bus: omap_l3_noc: introduce concept of submodule bus: omap_l3_noc: Add information about the context of operation bus: omap_l3_noc: add information about the type of operation bus: omap_l3_noc: ignore masked out unclearable targets bus: omap_l3_noc: improve readability by using helper for slave event parsing bus: omap_l3_noc: make error reporting and handling common bus: omap_l3_noc: fix masterid detection bus: omap_l3_noc: convert flagmux information into a structure bus: omap_l3_noc: use of_match_data to pick up SoC information bus: omap_l3_noc: Add support for discountinous flag mux input numbers bus: omap_l3_noc: convert target information into a structure bus: omap_l3_noc: move L3 master data structure out bus: omap_l3_noc: un-obfuscate l3_targ address computation bus: omap_l3_noc: switch over to relaxed variants of readl/writel bus: omap_l3_noc: populate l3->dev and use it bus: omap_l3_noc: remove iclk from omap_l3 struct bus: omap_l3_noc: rename functions and data to omap_l3 bus: omap_l3_noc: Fix copyright information ... Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Merge tag 'omap-for-v3.16/pm-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Merge "ARM: omap pm changes for v3.16 merge window, resend" from Tony Lindgren: PM related fixes for omap3 that were discovered during omap3 conversion to device tree. This series sets up the PMIC signaling in a way where we can test for PM regressions easily by looking at state of the the sys_clkreq and sys_off_mode pins. Note that this series alone does not make omap3 PM to cut off core voltage during off-idle, changes to twl4030-power.c configurations are still needed. Those will be posted separately. * tag 'omap-for-v3.16/pm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Enable CPUidle in omap2plus_defconfig ARM: dts: Enable N900 keyboard sleep leds by default ARM: OMAP2+: Fix voltage scaling init for device tree ARM: dts: Configure omap3 twl4030 I2C4 pins by default ARM: OMAP3: Fix voltage control for deeper idle states ARM: OMAP3: Disable broken omap3_set_off_timings function ARM: OMAP3: Fix idle mode signaling for sys_clkreq and sys_off_mode ARM: dts: Fix omap serial wake-up when booted with device tree mfd: twl-core: Fix idle mode signaling for omaps when booted with device tree Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Merge tag 'omap-for-v3.16/fixes-not-urgent-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical Merge "ARM: omap non urgent fixes for v3.16 merge window, resend" from Tony Lindgren: Non urgent omap fixes for v3.16 merge window. * tag 'omap-for-v3.16/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am43xx: fix starting offset of NAND.filesystem MTD partition ARM: dts: am335x-boneblack: remove use of ti,vcc-aux-disable-is-sleep ARM: OMAP2+: free use_gptimer_clksrc variable after boot ARM: OMAP5: Redo THUMB mode switch on secondary CPU ARM: dts: AM4372: add l3-noc information ARM: dts: DRA7: Use dra7-l3-noc instead of omap4-l3-noc Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Merge tag 'omap-for-v3.16/dt-part2-v2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Merge "ARM: omap dt changes for v3.16 merge window, part 2" From Tony Lindgren: Device tree related changes for omaps. * tag 'omap-for-v3.16/dt-part2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (49 commits) ARM: dts: Enable mcpdm and mcbsp1 on DuoVero ARM: dts: Convert DuoVero Parlor to use IOPAD macro ARM: dts: am43xx: fix starting offset of NAND.filesystem MTD partition ARM: dts: dra7: add support for parallel NAND flash ARM: dts: am437x-gp-evm: Add ethernet support for GP EVM ARM: dts: am4372: Add cpsw phy sel dt node ARM: OMAP2+: Use pdata quirks for wl12xx on VAR-STK/DVK-OM44 ARM: dts: Add VAR-SOM-OM44 WLAN nodes ARM: dts: Add support for OMAP4 VAR-DVK-OM44 ARM: dts: Add support for OMAP4 Variscite OM44 family ARM: dts: Change IOPAD macro's for OMAP4/5 ARM: dts: AM33XX: fix ethernet and mdio default state ARM: dts: am4372: Add hdq device tree data ARM: omap2+: skip device build from platform code for dt dts: dra7-evm: add USB support ARM: dts: dra7: Add USB related nodes ARM: dts: dra7-clock: Add "l3init_960m_gfclk" clock gate ARM: dts: omap4+: Add clocks to USB2 PHY node ARM: dts: dra7: add OCP2SCP3 and SATA nodes ARM: dts: omap5: add sata node ... Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Merge branch 'mvebu/soc-orion5x' into next/dtOlof Johansson
Merging in a local copy from the next/soc branch to avoid some annoying context conflicts in the dts Makefile. * mvebu/soc-orion5x: (29 commits) ARM: orion: remove no longer needed gpio DT code ARM: orion: remove no longer needed DT IRQ code ARM: orion5x: convert Maxtor Shared Storage II to the Device Tree ARM: orion5x: convert d2net to Device Tree ARM: orion5x: convert RD-88F5182 to Device Tree ARM: orion5x: remove unneeded code for edmini_v2 ARM: orion5x: keep TODO list in edmini_v2 DT ARM: orion5x: use DT to describe NOR on edmini_v2 ARM: orion5x: use DT to describe EHCI on edmini_v2 ARM: orion5x: use DT to describe I2C devices on edmini_v2 ARM: orion5x: convert edmini_v2 to DT pinctrl ARM: orion5x: add standard pinctrl configs for sata0 and sata1 ARM: orion5x: add Device Bus description at SoC level ARM: orion5x: update I2C description at SoC level ARM: orion5x: enable pinctrl driver at SoC level ARM: orion5x: switch to DT interrupts and timer ARM: orion: switch to a per-platform handle_irq() function ARM: orion5x: convert to use 'clocks' property for UART controllers ARM: orion5x: switch to use the clock driver for DT platforms ARM: orion5x: add interrupt for Ethernet in Device Tree ...
2014-05-26Merge tag 'omap-for-v3.16/board-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards Merge "ARM: omap board changes for v3.16 merge window" from Tony Lindgren: Board related changes for omaps. * tag 'omap-for-v3.16/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP ARM: OMAP: AM3517EVM: remove check for CONFIG_PANEL_SHARP_LQ043T1DG01 ARM: OMAP: SX1: remove check for CONFIG_SX1_OLD_FLASH ARM: OMAP: remove some dead code ARM: OMAP: omap3stalker: remove two Kconfig macros ARM: OMAP2+: Add support for RNG on DT booted N900 Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Merge tag 'omap-for-v3.16/prcm-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup Merge "ARM: omap prcm changes for v3.16 merge window" from Tony Lindgren: PRCM changes for omaps. I ended up merging these with the big endian changes because of the merge conflicts for read and write operations. Via Paul Walmsley <paul@pwsan.com>: Some OMAP PRCM cleanup patches. These help prepare to convert the PRCM code into drivers. Basic build, boot, and PM test results are available here: http://www.pwsan.com/omap/testlogs/prcm-cleanup-v3.16/20140515213244/ * tag 'omap-for-v3.16/prcm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP4: PRCM: remove references to cm-regbits-44xx.h from PRCM core files ARM: OMAP3/4: PRM: add support of late_init call to prm_ll_ops ARM: OMAP3/OMAP4: PRM: add prm_features flags and add IO wakeup under it ARM: OMAP3/4: PRM: provide io chain reconfig function through irq setup ARM: OMAP2+: PRM: remove unnecessary cpu_is_XXX calls from prm_init / exit ARM: OMAP2+: PRCM: cleanup some header includes ARM: OMAP4: CM: use cm_base* in register address calculations ARM: OMAP2/3: CM: remove some external dependencies ARM: OMAP2+: prcm: add omap_test_timeout to prcm-common.h ARM: OMAP3: CM: remove a few OMAP34XX_CM_REGADDR defines ARM: OMAP: debug-leds: raw read and write endian fix ARM: OMAP: counter-32k: raw read and write endian fix ARM: OMAP: dmtimer: raw read and write endian fix ARM: OMAP2+: raw read and write endian fix Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Merge tag 'omap-for-v3.16/soc-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Pull "ARM: omap soc changes for v3.16 merge window" from Tony Lindgren: SoC related changes for omaps. * tag 'omap-for-v3.16/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: DRA752: add detection of SoC information ARM: OMAP2+: Remove suspend_set_ops from common pm late init ARM: OMAP2+: hwmod: OMAP5 DSS hwmod data ARM: omap4: hwmod_data: Clean up audio related structures (remove/merge them) Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26ARM: sunxi: allow building without reset controllerArnd Bergmann
The sunxi reset controller code is only used with sun6i (a31). After the platform has been split up into per-soc options, it's now possible to build it without the reset controller code, so the base platform init must not call into the reset driver if that is turned off at compile time. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-26soc: qcom: fix of_device_id tableArnd Bergmann
The match tables must be zero-terminated, and Kbuild now helpfully fails to link the kernel if that isn't the case. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-26ARM: vexpress: refine dependencies for new codeArnd Bergmann
The versatile express changes for 3.16 introduced a number of build regressions for randconfig kernels by not tracking dependencies between the components right. This patch tries to rectify that: * the mach-vexpress code cannot link without the syscfg driver, which in turn needs MFD_VEXPRESS_SYSREG * various drivers call devm_regmap_init_vexpress_config(), which has to be exported so it can be used by loadable modules * the configuration bus uses OF DT helper functions that are not available to platforms disable CONFIG_OF * The sysreg driver exports GPIOs through gpiolib, which can be disabled on some platforms. * The clocksource code cannot be built on platforms that don't use modern timekeeping but rely on gettimeoffset. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-05-26Merge branch 'reset/fixes' of git://git.pengutronix.de/git/pza/linux into ↵Olof Johansson
next/fixes-non-critical Merge a fix from Philipp Zabel: This patch fixes an erroneous revert that slipped in with commit b424080a9e086e683ad5fdc624a7cf3c024e0c0f reset: Add optional resets and stubs. * 'reset/fixes' of git://git.pengutronix.de/git/pza/linux: reset: Add of_reset_control_get to reset.h Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26clk: samsung: clk-s3c2410-dlck: do not use PNAME macro as it declares __initdataHeiko Stübner
The originally used PNAME macro from the core samsung clock infrastructure declares the created array as initdata, creating section mismatch warnings in the dclk driver. Thus declare them directly, removing these warning. Reported-by: Olof Johansson <olof@lixom.net> Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26Documentation: devicetree: arm: sort enable-method entriesOlof Johansson
People have appended new entries instead of inserting them at the right location, so sort them. Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26ARM: rockchip: convert smp bringup to CPU_METHOD_OF_DECLAREHeiko Stübner
With the newly introduced CPU_METHOD_OF_DECLARE is not necessary anymore to reference the relevant smp_ops in the board file, but instead it can simply be set by the enable-method property of the cpu nodes. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Olof Johansson <olof@lixom.net>
2014-05-26staging: rtl8188eu: Remove empty file odm_interface.hnavin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-26staging: rtl8188eu: Remove unused enum odm_h2c_cmd.navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-26staging: rtl8188eu: Remove unused function declaration.navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-26staging: rtl8188eu: Remove unused macros defined in odm_interface.hnavin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-26staging: rtl8188eu: Use ODM_REG_IGI_A_11N and ODM_BIT_IGI_11N in ODM_Write_DIG()navin patidar
ODM_REG(IGI_A, pDM_Odm) and ODM_BIT(IGI, pDM_Odm) macros produce ODM_REG_IGI_A_11N and ODM_BIT_IGI_11N respectively after preprocessing. Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-26staging: rtl8188eu: Remove unnecessary debugging message from ODM_Write_DIG()navin patidar
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>