1. 25 6月, 2015 29 次提交
  2. 24 6月, 2015 11 次提交
    • L
      Merge tag 'powerpc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 08d183e3
      Linus Torvalds 提交于
      Pull powerpc updates from Michael Ellerman:
      
       - disable the 32-bit vdso when building LE, so we can build with a
         64-bit only toolchain.
      
       - EEH fixes from Gavin & Richard.
      
       - enable the sys_kcmp syscall from Laurent.
      
       - sysfs control for fastsleep workaround from Shreyas.
      
       - expose OPAL events as an irq chip by Alistair.
      
       - MSI ops moved to pci_controller_ops by Daniel.
      
       - fix for kernel to userspace backtraces for perf from Anton.
      
       - merge pseries and pseries_le defconfigs from Cyril.
      
       - CXL in-kernel API from Mikey.
      
       - OPAL prd driver from Jeremy.
      
       - fix for DSCR handling & tests from Anshuman.
      
       - Powernv flash mtd driver from Cyril.
      
       - dynamic DMA Window support on powernv from Alexey.
      
       - LLVM clang fixes & workarounds from Anton.
      
       - reworked version of the patch to abort syscalls when transactional.
      
       - fix the swap encoding to support 4TB, from Aneesh.
      
       - various fixes as usual.
      
       - Freescale updates from Scott: Highlights include more 8xx
         optimizations, an e6500 hugetlb optimization, QMan device tree nodes,
         t1024/t1023 support, and various fixes and cleanup.
      
      * tag 'powerpc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (180 commits)
        cxl: Fix typo in debug print
        cxl: Add CXL_KERNEL_API config option
        powerpc/powernv: Fix wrong IOMMU table in pnv_ioda_setup_bus_dma()
        powerpc/mm: Change the swap encoding in pte.
        powerpc/mm: PTE_RPN_MAX is not used, remove the same
        powerpc/tm: Abort syscalls in active transactions
        powerpc/iommu/ioda2: Enable compile with IOV=on and IOMMU_API=off
        powerpc/include: Add opal-prd to installed uapi headers
        powerpc/powernv: fix construction of opal PRD messages
        powerpc/powernv: Increase opal-irqchip initcall priority
        powerpc: Make doorbell check preemption safe
        powerpc/powernv: pnv_init_idle_states() should only run on powernv
        macintosh/nvram: Remove as unused
        powerpc: Don't use gcc specific options on clang
        powerpc: Don't use -mno-strict-align on clang
        powerpc: Only use -mtraceback=no, -mno-string and -msoft-float if toolchain supports it
        powerpc: Only use -mabi=altivec if toolchain supports it
        powerpc: Fix duplicate const clang warning in user access code
        vfio: powerpc/spapr: Support Dynamic DMA windows
        vfio: powerpc/spapr: Register memory and define IOMMU v2
        ...
      08d183e3
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 4b1f2af6
      Linus Torvalds 提交于
      Pull s390 updates from Martin Schwidefsky:
       "Pretty boring for a merge window pull.
      
        One change in behaviour is the patch for dasd driver, the module which
        provides the diagnose discipline is now loaded automatically.
      
        The SCLP code got a nice cleanup, a new global structure replaces a
        bunch of accessor functions.
      
        And a couple of random, small improvements"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/pci: improve handling of hotplug event 0x301
        s390/setup: fix DMA_API_DEBUG warnings
        s390/zcrypt: remove obsolete __constant
        s390/keyboard: avoid off-by-one when using strnlen_user()
        s390/sclp: pass timeout as HZ independent value
        s390/mm: s/specifiation/specification/, s/an specification/a specification/
        s390/sclp: Use DECLARE_BITMAP
        s390/dasd: Enable automatic loading of dasd_diag_mod
        s390/sclp: move sclp_facilities into "struct sclp"
        s390/sclp: get rid of sclp_get_mtid() and sclp_get_mtid_max()
        s390/sclp: unify basic sclp access by exposing "struct sclp"
        s390/sclp: prepare smp_fill_possible_mask for global "struct sclp"
      4b1f2af6
    • L
      Merge tag 'microblaze-4.2-rc1' of git://git.monstr.eu/linux-2.6-microblaze · aaa64485
      Linus Torvalds 提交于
      Pull Microblaze updates from Michal Simek:
      
       - some PCI fixups
      
       - add new MB versions
      
       - sparse fixups
      
      * tag 'microblaze-4.2-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze/PCI: Remove unnecessary struct pci_dev declaration
        microblaze/PCI: Remove unnecessary pci_bus_find_capability() declaration
        microblaze/PCI: Remove unused declarations
        microblaze: Label local function static
        microblaze: Add missing release version code
      aaa64485
    • L
      Merge tag 'iommu-updates-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 6eae81a5
      Linus Torvalds 提交于
      Pull IOMMU updates from Joerg Roedel:
       "This time with bigger changes than usual:
      
         - A new IOMMU driver for the ARM SMMUv3.
      
           This IOMMU is pretty different from SMMUv1 and v2 in that it is
           configured through in-memory structures and not through the MMIO
           register region.  The ARM SMMUv3 also supports IO demand paging for
           PCI devices with PRI/PASID capabilities, but this is not
           implemented in the driver yet.
      
         - Lots of cleanups and device-tree support for the Exynos IOMMU
           driver.  This is part of the effort to bring Exynos DRM support
           upstream.
      
         - Introduction of default domains into the IOMMU core code.
      
           The rationale behind this is to move functionalily out of the IOMMU
           drivers to common code to get to a unified behavior between
           different drivers.  The patches here introduce a default domain for
           iommu-groups (isolation groups).
      
           A device will now always be attached to a domain, either the
           default domain or another domain handled by the device driver.  The
           IOMMU drivers have to be modified to make use of that feature.  So
           long the AMD IOMMU driver is converted, with others to follow.
      
         - Patches for the Intel VT-d drvier to fix DMAR faults that happen
           when a kdump kernel boots.
      
           When the kdump kernel boots it re-initializes the IOMMU hardware,
           which destroys all mappings from the crashed kernel.  As this
           happens before the endpoint devices are re-initialized, any
           in-flight DMA causes a DMAR fault.  These faults cause PCI master
           aborts, which some devices can't handle properly and go into an
           undefined state, so that the device driver in the kdump kernel
           fails to initialize them and the dump fails.
      
           This is now fixed by copying over the mapping structures (only
           context tables and interrupt remapping tables) from the old kernel
           and keep the old mappings in place until the device driver of the
           new kernel takes over.  This emulates the the behavior without an
           IOMMU to the best degree possible.
      
         - A couple of other small fixes and cleanups"
      
      * tag 'iommu-updates-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (69 commits)
        iommu/amd: Handle large pages correctly in free_pagetable
        iommu/vt-d: Don't disable IR when it was previously enabled
        iommu/vt-d: Make sure copied over IR entries are not reused
        iommu/vt-d: Copy IR table from old kernel when in kdump mode
        iommu/vt-d: Set IRTA in intel_setup_irq_remapping
        iommu/vt-d: Disable IRQ remapping in intel_prepare_irq_remapping
        iommu/vt-d: Move QI initializationt to intel_setup_irq_remapping
        iommu/vt-d: Move EIM detection to intel_prepare_irq_remapping
        iommu/vt-d: Enable Translation only if it was previously disabled
        iommu/vt-d: Don't disable translation prior to OS handover
        iommu/vt-d: Don't copy translation tables if RTT bit needs to be changed
        iommu/vt-d: Don't do early domain assignment if kdump kernel
        iommu/vt-d: Allocate si_domain in init_dmars()
        iommu/vt-d: Mark copied context entries
        iommu/vt-d: Do not re-use domain-ids from the old kernel
        iommu/vt-d: Copy translation tables from old kernel
        iommu/vt-d: Detect pre enabled translation
        iommu/vt-d: Make root entry visible for hardware right after allocation
        iommu/vt-d: Init QI before root entry is allocated
        iommu/vt-d: Cleanup log messages
        ...
      6eae81a5
    • L
      Merge tag 'for-linus-20150623' of git://git.infradead.org/linux-mtd · 54245ed8
      Linus Torvalds 提交于
      Pull MTD updates from Brian Norris:
       "JFFS2:
         - fix a theoretical unbalanced locking issue; the lock handling was a
           bit unclean, but AFAICT, it didn't actually lead to real deadlocks
      
        NAND:
         - brcmnand driver: new driver supporting NAND controller found
           originally on Broadcom STB SoCs (BCM7xxx), but now also found on
           BCM63xxx, iProc (e.g., Cygnus, BCM5301x), BCM3xxx, and more
      
         - begin factoring out BBT code so it can be shared between
           traditional (parallel) NAND drivers and upcoming SPI NAND drivers
           (WIP)
      
         - add common DT-based init support, so nand_base can pick up some
           flash properties automatically, using established common NAND DT
           properties
      
         - mxc_nand: support 8-bit ECC
      
         - pxa3xx_nand:
           * fix build for ARM64
           * use a jiffies-based timeout
      
        SPI NOR:
         - add a few new IDs
      
         - clear out some unnecessary entries
      
         - make sure SECT_4K flags are correct for all (?) entries
      
        Core:
         - fix mtd->usecount race conditions (BUG_ON())
      
         - switch to modern PM ops
      
        Other:
         - CFI: save code space by de-inlining large functions
      
         - clean up some partition parser selection code across several
           drivers
      
         - various miscellaneous changes, mostly minor"
      
      * tag 'for-linus-20150623' of git://git.infradead.org/linux-mtd: (57 commits)
        mtd: docg3: Fix kasprintf() usage
        mtd: docg3: Don't leak docg3->bbt in error path
        mtd: nandsim: Fix kasprintf() usage
        mtd: cs553x_nand: Fix kasprintf() usage
        mtd: r852: Fix device_create_file() usage
        mtd: brcmnand: drop unnecessary initialization
        mtd: propagate error codes from add_mtd_device()
        mtd: diskonchip: remove two-phase partitioning / registration
        mtd: dc21285: use raw spinlock functions for nw_gpio_lock
        mtd: chips: fixup dependencies, to prevent build error
        mtd: cfi_cmdset_0002: Initialize datum before calling map_word_load_partial
        mtd: cfi: deinline large functions
        mtd: lantiq-flash: use default partition parsers
        mtd: plat_nand: use default partition probe
        mtd: nand: correct indentation within conditional
        mtd: remove incorrect file name
        mtd: blktrans: use better error code for unimplemented ioctl()
        mtd: maps: Spelling s/reseved/reserved/
        mtd: blktrans: change blktrans_getgeo return value
        mtd: mxc_nand: generate nand_ecclayout for 8 bit ECC
        ...
      54245ed8
    • L
      Merge tag 'mfd-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 84e9c87e
      Linus Torvalds 提交于
      Pull MFD updates from Lee Jones:
       "Changes to existing drivers:
         - Constify structures; throughout the subsystem
         - Move support to DT in; cros_ec
         - DT changes and documentation; cros-ec, max77693, max77686, arizona, da9063
         - ACPI changes and documentation; mfd-core
         - Use different platform specific API in; cros_ec_*, arizona-core
         - Remove unused parent field from; cros_ec_i2c
         - Add wake-up/reset delay in; cross_ec_spi, arizona-core
         - Staticise structures/functions in; cros_ec
         - Remove redundant code; arizona-core, max77686
         - Bugfix; twl4030-power
         - Allow compile test; aat2870, tps65910
         - MAINTAINERS adaptions; samsung, syscon
         - Resource Management (devm_*); arizona-core
         - Refactor Reset code; arizona-core
         - Insist on at least one full boot; arizona-core
         - Trivial formatting; arizona-core
         - Add low-power-sleep; arizona-core
         - IRQ ONESHOT changes; twl4030-irq, mc13xxx-core, wm831x-auxadc, htc-i2cpld,
                                wm8350-core, ab8500-debugfs, ab8500-gpadc, si476x-i2c
      
        (Re-)moved drivers:
         - Move protocol helpers out to drivers/platform; cros_ec
      
        New drivers/supported devices:
         - Add support for AXP22x into axp20x
         - Add support for OnKey into da9063-core
         - Add support for Pinctrl into mt6397-core
         - New STMicroelectronics LPC Watchdog driver
         - New STMicroelectronics LPC Real-Time Clock driver"
      
      * tag 'mfd-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (59 commits)
        mfd: lpc_ich: Assign subdevice ids automatically
        mfd: si476x-i2c: Pass the IRQF_ONESHOT flag
        mfd: ab8500-gpadc: Pass the IRQF_ONESHOT flag
        mfd: ab8500-debugfs: Pass the IRQF_ONESHOT flag
        mfd: wm8350-core: Pass the IRQF_ONESHOT flag
        mfd: htc-i2cpld: Pass the IRQF_ONESHOT flag
        mfd: wm831x-auxadc: Pass the IRQF_ONESHOT flag
        mfd: mc13xxx-core: Pass the IRQF_ONESHOT flag
        mfd: twl4030-irq: Pass the IRQF_ONESHOT flag
        mfd: mt6397-core: Add GPIO sub-module support
        mfd: arizona: Add convience defines for micd_rate/micd_bias_starttime
        mfd: dt: Add bindings for DA9063 OnKey
        mfd: da9063: Add support for OnKey driver
        mfd: arizona: Fix incorrect Makefile conditionals
        mfd: arizona: Add stub for wm5102_patch()
        mfd: Check ACPI device companion before checking resources
        Documentation: Add WM8998/WM1814 device tree bindings
        mfd: arizona: Split INx_MODE into two fields
        mfd: wm5110: Add delay before releasing reset line
        mfd: arizona: Add better support for system suspend
        ...
      84e9c87e
    • L
      Merge tag 'regulator-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 7fe0bf90
      Linus Torvalds 提交于
      Pull regulator updates from Mark Brown:
       "Another fairly quiet release, some new drivers with generic handling
        for minor features but nothing that makes a substantial difference
        outside of the subsystem or for most boards:
      
         - support for a bunch of new parameters which are present on enough
           regulators to be worth having generic handling for in the
           framework.
      
         - fixes for some issues with printing constraints during boot which
           should probably have gone in for v4.1 but didn't.
      
         - new drivers for Dialog DA9062, Maxim MAX77621 and Qualcomm SPMI
           regulators"
      
      * tag 'regulator-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (45 commits)
        regulator: qcom_spmi: Fix calculating number of voltages
        regulator: qcom_spmi: Add missing braces for aligned code
        regulator: fix simple_return.cocci warnings
        regulator: Add QCOM SPMI regulator driver
        regulator: Add docbook for soft start
        regulator: Add input current limit support
        regulator: Add soft start support
        regulator: Add pull down support
        regulator: Add system_load constraint
        regulator: max8973: Fix up ramp_delay for MAX8973_RAMP_25mV_PER_US case
        regulator: core: replace sprintf with scnprintf
        regulator: core: fix constraints output buffer
        regulator: core: Don't corrupt display when printing uV offsets
        regulator: max8973: add support for MAX77621
        regulator: max8973: configure ramp delay through callback
        regulator: pwm-regulator: Diffientiate between dev (device) and rdev (regulator_dev)
        regulator: pwm-regulator: Remove superfluous is_enabled check
        regulator: pwm-regulator: Remove unnecessary descriptor attribute from ddata
        regulator: core: Don't spew backtraces on duplicate sysfs
        regulator: da9063: Fix up irq leak
        ...
      7fe0bf90
    • L
      Merge tag 'spi-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 5a602e15
      Linus Torvalds 提交于
      Pull spi updates from Mark Brown:
       "No framework updates for the SPI API this time around aside from one
        small fix, just driver improvments.  Some highlights include:
      
         - New driver support for CSR USP, Mikrotik RB4xx and Zynq GQSPI
           controllers.
      
         - Modernisation of the OMAP McSPI controller driver, moving it to
           current APIs to enable support for a wider range of client drivers.
      
         - DMA support for the bcm2835 controller"
      
      * tag 'spi-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (60 commits)
        spi: zynq: Remove execute bit
        spi: atmel: add support to FIFOs
        spi: atmel: update DT bindings documentation
        spi: spi-fsl-dspi: Update DT binding documentation
        spi: pxa2xx: Constify ACPI device ids
        spi: Add support for Zynq Ultrascale+ MPSoC GQSPI controller
        spi: zynq: Add DT bindings documentation for Zynq Ultrascale+ MPSoC GQSPI controller
        spi: fsl-dspi: Use pinctrl PM helpers
        spi: davinci: change the lower limit of pre-scale divider to 1
        spi: spi-fsl-dspi: Change the way of increasing spi_message->actual_length
        spi: spi-fsl-dspi: Enable TCF interrupt mode support
        spi: atmel: add support for the internal chip-select of the spi controller
        spi: spi-pxa2xx: remove legacy PXA DMA bits
        spi: pxa2xx: Make LPSS SPI general register optional
        spi: pxa2xx: Prepare for new Intel LPSS SPI type
        spi: pxa2xx: Differentiate Intel LPSS types
        spi: restore rx/tx_buf in case of unset CONFIG_HAS_DMA
        spi: rspi: Re-do the returning value of qspi_transfer_out_in
        spi: rspi: modify the name of "qspi_trigger_transfer_out_int" function
        spi: orion: Fix extended baud rates for each Armada SoCs
        ...
      5a602e15
    • L
      Merge tag 'regmap-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · e12bdf0d
      Linus Torvalds 提交于
      Pull regmap updates from Mark Brown:
       "As well as a few fixes and updates for API changes there's two new
        features for the API:
      
         - Better support for handling a reset of the underlying hardware,
           marking the register map as needing a resync to the device when we
           need to do that automatically
      
         - Support for querying the size and stride of the register map,
           allowing higher level frameworks to configure themselves more
           readily"
      
      * tag 'regmap-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: Fix possible shift overflow in regmap_field_init()
        regmap: Fix regmap_bulk_read in BE mode
        regmap: kill off set_irq_flags usage
        regmap: irq: Fixed a typo error
        regmap: drop unneeded goto
        regmap: Introduce regmap_get_reg_stride
        regmap: Introduce regmap_get_max_register
        regmap: Use regcache_mark_dirty() to indicate power loss or reset
        regmap: Add a helper function for regcache sync test
        regmap: Constify irq_domain_ops
      e12bdf0d
    • L
      Merge tag 'fbdev-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 1a13e36a
      Linus Torvalds 提交于
      Pull fbdev updates from Tomi Valkeinen:
      
       - ssd1307fb: various fixes and improvements, SSD1305 support
      
       - use architecture agnostic functions instead of MTRR functions in
         various fbdev drivers
      
       - TI DRA7xx SoC display support (arch/arm/ side)
      
       - OMAPDSS componentization to fix probing order issues
      
       - OMAPDSS scaling fixes
      
       - msm_fb: remove obsoleted driver
      
      * tag 'fbdev-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (77 commits)
        msm: msm_fb: Remove dead code
        OMAPDSS: HDMI: wait for framedone when stopping video
        OMAPDSS: HDMI4: fix error handling
        OMAPDSS: DISPC: scaler debug print
        OMAPDSS: DISPC: do only y decimation on OMAP3
        OMAPDSS: DISPC: check if scaling setup failed
        OMAPDSS: DISPC: fix 64 bit issue in 5-tap
        OMAPDSS: DISPC: fix row_inc for OMAP3
        OMAPDSS: DISPC: add check for scaling limits
        OMAPDSS: DISPC: fix check_horiz_timing_omap3 args
        OMAPDSS: DISPC: fix predecimation for YUV modes
        OMAPDSS: DISPC: work-around for errata i631
        OMAPDSS: simplify submodule reg/unreg code
        OMAPDSS: componentize omapdss
        OMAPDSS: reorder uninit calls
        OMAPDSS: remove uses of __init/__exit
        OMAPDSS: fix dss_init_ports error handling
        OMAPDSS: refactor dss probe function
        OMAPDSS: move 'dss_initialized' to dss driver
        fbdev: propagate result of fb_videomode_from_videomode()
        ...
      1a13e36a
    • L
      Merge tag 'for-4.2' of git://git.infradead.org/battery-2.6 · 36a1624d
      Linus Torvalds 提交于
      Pull power supply and reset updates from Sebastian Reichel:
      
       - new charger drivers: BQ24257, BQ25890, AXP288, RT9455
      
       - MAX17042 battery: add health & temperature support
      
       - BQ2415x charger: add ACPI support
      
       - misc fixes and cleanups
      
      * tag 'for-4.2' of git://git.infradead.org/battery-2.6: (32 commits)
        power_supply: Correct kerneldoc copy paste errors
        wm831x_power: Fix off-by-one at free_irq()
        power_supply: rt9455_charger: Fix error reported by static analysis tool
        power_supply: bq24257: use flags argument of devm_gpiod_get
        power_supply: bq25890: use flags argument of devm_gpiod_get
        sbs-battery: add option to always register battery
        power: Add devm_power_supply_get_by_phandle() helper function
        power_supply: max17042: Add OF support for setting thresholds
        power_supply: sysfs: Bring back write to writeable properties
        power_supply: rt9455_charger: Check if CONFIG_USB_PHY is enabled
        power: reset: gpio-restart: increase priority slightly
        power_supply: bq25890: make chip_id int
        power_supply: Add support for Richtek RT9455 battery charger
        Documentation: devicetree: Add Richtek RT9455 bindings
        of: Add vendor prefix for Richtek Technology Corporation
        power_supply: 88pm860x_charger: Do not call free_irq() twice
        power: bq24190_charger: Change first_time flag reset condition
        power: axp288_charger: axp288 charger driver
        power: max17042_battery: add HEALTH and TEMP_* properties support
        power_supply: Add support for TI BQ25890 charger chip
        ...
      36a1624d