1. 14 10月, 2016 3 次提交
    • L
      Merge tag 'pci-v4.9-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 40bd3a5f
      Linus Torvalds 提交于
      PCI changes for the v4.9 merge window:
       "Here are some more changes I'd like to have in v4.9.  There's one
        small Tegra bug fix in the PHY poweroff path, which is only used in
        failure paths.
      
        The rest is all strictly cleanup that should make host bridge drivers
        more readable, but shouldn't actually change any behavior.
      
        Summary:
      
         - use local struct device pointers in many host bridge drivers for
           clarity
      
         - remove unused platform data
      
         - use generic DesignWare accessors
      
         - misc cleanups: remove redundant structure entries and re-order
           structure members to put comon generic fields first etc"
      
      * tag 'pci-v4.9-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (108 commits)
        MAINTAINERS: Add maintainer for the PCIe Marvell Armada 8K driver
        MAINTAINERS: Add DT binding to the Aardvark PCIe driver maintainer
        PCI: rockchip: Indent "if" statement body
        PCI: hisi: Reorder struct hisi_pcie
        PCI: hisi: Pass device-specific struct to internal functions
        PCI: hisi: Include register block base in PCIE_SYS_STATE4 address
        PCI: dra7xx: Reorder struct dra7xx_pcie
        PCI: xilinx-nwl: Remove unused platform data
        PCI: xilinx-nwl: Add local struct device pointers
        PCI: xilinx: Removed unused xilinx_pcie_assign_msi() argument
        PCI: xilinx: Remove unused platform data
        PCI: xilinx: Add local struct device pointers
        PCI: xgene: Add register accessors
        PCI: xgene: Pass struct xgene_pcie_port to setup functions
        PCI: xgene: Remove unused platform data
        PCI: tegra: Remove unused platform data
        PCI: tegra: Add local struct device pointers
        PCI: tegra: Fix argument order in tegra_pcie_phy_disable()
        PCI: rockchip: Remove unused platform data
        PCI: rcar-gen2: Add local struct device pointers
        ...
      40bd3a5f
    • L
      Merge tag 'platform-drivers-x86-v4.9-1' of... · 44dc8c9d
      Linus Torvalds 提交于
      Merge tag 'platform-drivers-x86-v4.9-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform drivers updates from Darren Hart:
       "Cleanups, refactoring, and a couple bug fixes.
      
        intel_pmc_core:
         - avoid boot time warning for !CONFIG_DEBUGFS_FS
      
        intel_pmc_ipc:
         - Convert to use platform_device_register_full
      
        asus-wmi:
         - Filter buggy scan codes on ASUS Q500A
      
        toshiba_bluetooth:
         - Decouple an error checking status code
      
        toshiba_haps:
         - Change logging level from info to debug
         - Split ACPI and HDD protection error handling
      
        asus-laptop:
         - get rid of parse_arg()
      
        asus-wmi:
         - fix asus ux303ub brightness issue
      
        toshiba_acpi:
         - Fix typo in *_cooling_method_set function
         - Change error checking logic from TCI functions
         - Clean up variable declaration"
      
      * tag 'platform-drivers-x86-v4.9-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        platform/x86: intel_pmc_core: avoid boot time warning for !CONFIG_DEBUGFS_FS
        platform/x86: intel_pmc_ipc: Convert to use platform_device_register_full
        platform/x86: asus-wmi: Filter buggy scan codes on ASUS Q500A
        platform/x86: toshiba_bluetooth: Decouple an error checking status code
        platform/x86: toshiba_haps: Change logging level from info to debug
        platform/x86: toshiba_haps: Split ACPI and HDD protection error handling
        platform/x86: asus-laptop: get rid of parse_arg()
        platform/x86: asus-wmi: fix asus ux303ub brightness issue
        platform/x86: toshiba_acpi: Fix typo in *_cooling_method_set function
        platform/x86: toshiba_acpi: Change error checking logic from TCI functions
        platform/x86: toshiba_acpi: Clean up variable declaration
      44dc8c9d
    • L
      Merge git://www.linux-watchdog.org/linux-watchdog · e3799a21
      Linus Torvalds 提交于
      Pull watchdog updates from Wim Van Sebroeck:
      
       - a new watchdog pretimeout governor framework
      
       - support to upload the firmware on the ziirave_wdt
      
       - several fixes and cleanups
      
      * git://www.linux-watchdog.org/linux-watchdog: (26 commits)
        watchdog: imx2_wdt: add pretimeout function support
        watchdog: softdog: implement pretimeout support
        watchdog: pretimeout: add pretimeout_available_governors attribute
        watchdog: pretimeout: add option to select a pretimeout governor in runtime
        watchdog: pretimeout: add panic pretimeout governor
        watchdog: pretimeout: add noop pretimeout governor
        watchdog: add watchdog pretimeout governor framework
        watchdog: hpwdt: add support for iLO5
        fs: compat_ioctl: add pretimeout functions for watchdogs
        watchdog: add pretimeout support to the core
        watchdog: imx2_wdt: use preferred BIT macro instead of open coded values
        watchdog: st_wdt: Remove support for obsolete platforms
        watchdog: bindings: Remove obsolete platforms from dt doc.
        watchdog: mt7621_wdt: Remove assignment of dev pointer
        watchdog: rt2880_wdt: Remove assignment of dev pointer
        watchdog: constify watchdog_ops structures
        watchdog: tegra: constify watchdog_ops structures
        watchdog: iTCO_wdt: constify iTCO_wdt_pm structure
        watchdog: cadence_wdt: Fix the suspend resume
        watchdog: txx9wdt: Add missing clock (un)prepare calls for CCF
        ...
      e3799a21
  2. 13 10月, 2016 9 次提交
    • L
      Merge tag 'pwm/for-4.9-rc1' of... · b67be92f
      Linus Torvalds 提交于
      Merge tag 'pwm/for-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "This set of changes contains support for PWM signal capture in the STi
        driver as well as support for the PWM controller found on Meson SoCs.
        There's also support added for the MediaTek MT2701 and SunXi H3 to the
        existing drivers.
      
        Other than that there's a fair set of miscellaneous cleanups and fixes
        across the board"
      
      * tag 'pwm/for-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (24 commits)
        pwm: meson: Handle unknown ID values
        pwm: sti: Take the opportunity to conduct a little house keeping
        pwm: sti: It's now valid for number of PWM channels to be zero
        pwm: sti: Add PWM capture callback
        pwm: sti: Add support for PWM capture interrupts
        pwm: sti: Initialise PWM capture device data
        pwm: sti: Supply PWM Capture clock handling
        pwm: sti: Supply PWM capture register addresses and bit locations
        pwm: sti: Only request clock rate when needed
        pwm: sti: Reorganise register names in preparation for new functionality
        pwm: sti: Rename channel => device
        dt-bindings: pwm: sti: Update DT bindings for capture support
        pwm: lpc-18xx: use pwm_set_chip_data
        pwm: sunxi: Add H3 support
        pwm: Add support for Meson PWM Controller
        dt-bindings: pwm: Add bindings for Meson PWM Controller
        pwm: samsung: Fix to use lowest div for large enough modulation bits
        pwm: pwm-tipwmss: Remove all runtime PM gets/puts
        pwm: cros-ec: Add __packed to prevent padding
        pwm: Add MediaTek MT2701 display PWM driver support
        ...
      b67be92f
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 2d2474a1
      Linus Torvalds 提交于
      Pull thermal managament updates from Zhang Rui:
      
       - Enhance thermal "userspace" governor to export the reason when a
         thermal event is triggered and delivered to user space. From Srinivas
         Pandruvada
      
       - Introduce a single TSENS thermal driver for the different versions of
         the TSENS IP that exist, on different qcom msm/apq SoCs'. Support for
         msm8916, msm8960, msm8974 and msm8996 families is also added. From
         Rajendra Nayak
      
       - Introduce hardware-tracked trip points support to the device tree
         thermal sensor framework. The framework supports an arbitrary number
         of trip points. Whenever the current temperature is changed, the trip
         points immediately below and above the current temperature are found,
         driver callback is invoked to program the hardware to get notified
         when either of the two trip points are triggered. Hardware-tracked
         trip points support for rockchip thermal driver is also added at the
         same time. From Sascha Hauer, Caesar Wang
      
       - Introduce a new thermal driver, which enables TMU (Thermal Monitor
         Unit) on QorIQ platform. From Jia Hongtao
      
       - Introduce a new thermal driver for Maxim MAX77620. From Laxman
         Dewangan
      
       - Introduce a new thermal driver for Intel platforms using WhiskeyCove
         PMIC. From Bin Gao
      
       - Add mt2701 chip support to MTK thermal driver. From Dawei Chien
      
       - Enhance Tegra thermal driver to enable soctherm node and set
         "critical", "hot" trips, for Tegra124, Tegra132, Tegra210. From Wei
         Ni
      
       - Add resume support for tango thermal driver. From Marc Gonzalez
      
       - several small fixes and improvements for rockchip, qcom, imx, rcar,
         mtk thermal drivers and thermal core code. From Caesar Wang, Keerthy,
         Rocky Hao, Wei Yongjun, Peter Robinson, Bui Duc Phuc, Axel Lin, Hugh
         Kang
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (48 commits)
        thermal: int3403: Process trip change notification
        thermal: int340x: New Interface to read trip and notify
        thermal: user_space gov: Add additional information in uevent
        thermal: Enhance thermal_zone_device_update for events
        arm64: tegra: set hot trips for Tegra210
        arm64: tegra: set critical trips for Tegra210
        arm64: tegra: add soctherm node for Tegra210
        arm64: tegra: set hot trips for Tegra132
        arm64: tegra: set critical trips for Tegra132
        arm64: tegra: use tegra132-soctherm for Tegra132
        arm: tegra: set hot trips for Tegra124
        arm: tegra: set critical trips for Tegra124
        thermal: tegra: add hw-throttle for Tegra132
        thermal: tegra: add hw-throttle function
        of: Add bindings of hw throttle for Tegra soctherm
        thermal: mtk_thermal: Check return value of devm_thermal_zone_of_sensor_register
        thermal: Add Mediatek thermal driver for mt2701.
        dt-bindings: thermal: Add binding document for Mediatek thermal controller
        thermal: max77620: Add thermal driver for reporting junction temp
        thermal: max77620: Add DT binding doc for thermal driver
        ...
      2d2474a1
    • L
      Merge tag 'fbdev-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 084165a3
      Linus Torvalds 提交于
      Pull fbdev updates from Tomi Valkeinen:
       "Main changes:
      
         - amba-cldc: DT backlight support, Nomadik support, Versatile
           improvements, fixes
      
         - efifb: fix fbcon RGB565 palette
      
         - exynos: remove unused DSI driver"
      
      * tag 'fbdev-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (42 commits)
        video: smscufx: remove unused variable
        matroxfb: fix size of memcpy
        fbdev: ssd1307fb: fix a possible NULL dereference
        fbdev: ssd1307fb: constify the device_info pointer
        simplefb: Disable and release clocks and regulators in destroy callback
        video: fbdev: constify fb_fix_screeninfo and fb_var_screeninfo structures
        matroxfb: constify local structures
        video: fbdev: i810: add in missing white space in error message text
        video: fbdev: add missing \n at end of printk error message
        ARM: exynos_defconfig: Remove old non-working MIPI driver
        video: fbdev: exynos: Remove old non-working MIPI driver
        omapfb: fix return value check in dsi_bind()
        MAINTAINERS: update fbdev entries
        video: fbdev: offb: Call pci_enable_device() before using the PCI VGA device
        fbdev: vfb: simplify memory management
        fbdev: vfb: add option for video mode
        fbdev: vfb: add description to module parameters
        video: fbdev: intelfb: remove impossible condition
        fb: adv7393: off by one in probe function
        video: fbdev: pxafb: add missing of_node_put() in of_get_pxafb_mode_info()
        ...
      084165a3
    • L
      Disable the __builtin_return_address() warning globally after all · ef6000b4
      Linus Torvalds 提交于
      This affectively reverts commit 377ccbb4 ("Makefile: Mute warning
      for __builtin_return_address(>0) for tracing only") because it turns out
      that it really isn't tracing only - it's all over the tree.
      
      We already also had the warning disabled separately for mm/usercopy.c
      (which this commit also removes), and it turns out that we will also
      want to disable it for get_lock_parent_ip(), that is used for at least
      TRACE_IRQFLAGS.  Which (when enabled) ends up being all over the tree.
      
      Steven Rostedt had a patch that tried to limit it to just the config
      options that actually triggered this, but quite frankly, the extra
      complexity and abstraction just isn't worth it.  We have never actually
      had a case where the warning is actually useful, so let's just disable
      it globally and not worry about it.
      Acked-by: NSteven Rostedt <rostedt@goodmis.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Peter Anvin <hpa@zytor.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ef6000b4
    • B
      Merge branches 'pci/host-armada', 'pci/host-artpec', 'pci/host-dra7xx',... · 217c6d21
      Bjorn Helgaas 提交于
      Merge branches 'pci/host-armada', 'pci/host-artpec', 'pci/host-dra7xx', 'pci/host-exynos', 'pci/host-hisi', 'pci/host-imx6', 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-qcom' and 'pci/host-spear' into next
      
      * pci/host-armada:
        MAINTAINERS: Add maintainer for the PCIe Marvell Armada 8K driver
        PCI: armada: Reorder struct armada8k_pcie
        PCI: armada: Pass device-specific struct to internal functions
        PCI: armada: Use generic DesignWare accessors
        PCI: armada: Remove redundant struct armada8k_pcie.base
        PCI: armada: Add local base pointer
        PCI: armada: Remove unused platform data
      
      * pci/host-artpec:
        PCI: artpec6: Add resource name comments
        PCI: artpec6: Pass device-specific struct to internal functions
        PCI: artpec6: Remove unnecessary artpec6_pcie_link_up()
        PCI: artpec6: Use generic DesignWare accessors
        PCI: artpec6: Add register accessors
        PCI: artpec6: Remove unused platform data
        PCI: artpec6: Add local struct device pointers
      
      * pci/host-dra7xx:
        PCI: dra7xx: Reorder struct dra7xx_pcie
        PCI: dra7xx: Move struct pcie_port setup to probe function
        PCI: dra7xx: Pass device-specific struct to internal functions
        PCI: dra7xx: Use generic DesignWare accessors
        PCI: dra7xx: Set drvdata at end of probe function
        PCI: dra7xx: Remove redundant struct device pointer from dra7xx_pcie
        PCI: dra7xx: Add local struct device pointers
      
      * pci/host-exynos:
        PCI: exynos: Reorder struct exynos_pcie
        PCI: exynos: Pass device-specific struct to internal functions
        PCI: exynos: Name private struct pointer "exynos_pcie" consistently
        PCI: exynos: Uninline register accessors
        PCI: exynos: Add local struct device pointers
      
      * pci/host-hisi:
        PCI: hisi: Reorder struct hisi_pcie
        PCI: hisi: Pass device-specific struct to internal functions
        PCI: hisi: Include register block base in PCIE_SYS_STATE4 address
        PCI: hisi: Use generic DesignWare accessors
        PCI: hisi: Remove redundant struct hisi_pcie.reg_base
        PCI: hisi: Name private struct pointer "hisi_pcie" consistently
        PCI: hisi: Remove unused platform data
        PCI: hisi: Add local struct device pointers
      
      * pci/host-imx6:
        PCI: imx6: Remove unused return values
        PCI: imx6: Reorder struct imx6_pcie
        PCI: imx6: Use generic DesignWare accessors
        PCI: imx6: Pass device-specific struct to internal functions
        PCI: imx6: Pass struct imx6_pcie to PHY accessors
        PCI: imx6: Removed unused struct imx6_pcie.mem_base
        PCI: imx6: Remove redundant of_node pointer
        PCI: imx6: Add local struct device pointers
      
      * pci/host-keystone:
        PCI: keystone: Reorder struct keystone_pcie
        PCI: keystone: Add app register accessors
        PCI: keystone: Pass keystone_pcie, not va_app_base, to DBI functions
        PCI: keystone: Pass keystone_pcie, not address, to IRQ functions
        PCI: keystone: Use generic DesignWare accessors
        PCI: keystone: Add local struct device pointers
      
      * pci/host-layerscape:
        PCI: layerscape: Reorder struct ls_pcie
        PCI: layerscape: Remove unused ls_add_pcie_port() platform_device arg
        PCI: layerscape: Move struct pcie_port setup to probe function
        PCI: layerscape: Pass device-specific struct to internal functions
        PCI: layerscape: Remove redundant struct ls_pcie.dbi
        PCI: layerscape: Remove unused platform data
        PCI: layerscape: Add local struct device pointers
      
      * pci/host-qcom:
        PCI: qcom: Reorder struct qcom_pcie
        PCI: qcom: Remove redundant struct qcom_pcie.dev
        PCI: qcom: Remove redundant struct qcom_pcie.dbi
        PCI: qcom: Remove unused platform data
      
      * pci/host-spear:
        PCI: spear: Clean up struct device usage
        PCI: spear: Reorder struct spear13xx_pcie
        PCI: spear: Pass device-specific struct to internal functions
        PCI: spear: Remove unused constants
      217c6d21
    • B
      Merge branch 'pci/host-designware' into next · 22c7e1d4
      Bjorn Helgaas 提交于
      * pci/host-designware:
        PCI: designware-plat: Remove unused platform data
        PCI: designware-plat: Add local struct device pointers
        PCI: designware-plat: Remove redundant dw_plat_pcie.mem_base
        PCI: designware: Swap order of dw_pcie_writel_unroll() reg/val arguments
        PCI: designware: Uninline register accessors
        PCI: designware: Export dw_pcie_readl_rc(), dw_pcie_writel_rc()
        PCI: designware: Swap order of dw_pcie_writel_rc() reg/val arguments
        PCI: designware: Simplify pcie_host_ops.readl_rc() and .writel_rc() interfaces
        PCI: designware: Simplify dw_pcie_readl_unroll(), dw_pcie_writel_unroll()
        PCI: designware: Rename dw_pcie_valid_config() to dw_pcie_valid_device()
      22c7e1d4
    • B
      Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-iproc',... · dd5bba52
      Bjorn Helgaas 提交于
      Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-iproc', 'pci/host-mvebu', 'pci/host-rcar', 'pci/host-rockchip', 'pci/host-tegra', 'pci/host-xgene' and 'pci/host-xilinx' into next
      
      * pci/host-aardvark:
        MAINTAINERS: Add DT binding to the Aardvark PCIe driver maintainer
        PCI: aardvark: Remove unused platform data
        PCI: aardvark: Add local struct device pointers
      
      * pci/host-altera:
        PCI: altera: Simplify TLP_CFG_DW1 usage
        PCI: altera: Simplify TLB_CFG_DW0 usage
        PCI: altera: Rename altera_pcie_valid_config() to altera_pcie_valid_device()
        PCI: altera: Remove redundant platform_get_resource() return value check
        PCI: altera: Remove unused platform data
        PCI: altera: Add local struct device pointers
      
      * pci/host-iproc:
        PCI: iproc: Hard-code PCIe capability offset instead of searching
        PCI: iproc: Remove redundant null pointer checking
        PCI: iproc: Validate CSR base in BCMA setup code
        PCI: iproc: Set drvdata at end of probe function
        PCI: iproc: Add local struct device pointers
      
      * pci/host-mvebu:
        PCI: mvebu: Use existing of_node pointer
        PCI: mvebu: Add local struct device pointers
      
      * pci/host-rcar:
        PCI: rcar-gen2: Add local struct device pointers
        PCI: rcar: Remove DRV_NAME macro
        PCI: rcar: Remove unused rcar_pcie_get_resources() platform_device arg
        PCI: rcar: Remove unused platform data
        PCI: rcar: Add local struct device pointers
      
      * pci/host-rockchip:
        PCI: rockchip: Indent "if" statement body
        PCI: rockchip: Remove unused platform data
      
      * pci/host-tegra:
        PCI: tegra: Remove unused platform data
        PCI: tegra: Add local struct device pointers
        PCI: tegra: Fix argument order in tegra_pcie_phy_disable()
      
      * pci/host-xgene:
        PCI: xgene: Add register accessors
        PCI: xgene: Pass struct xgene_pcie_port to setup functions
        PCI: xgene: Remove unused platform data
        PCI: xgene: Add local struct device pointers
      
      * pci/host-xilinx:
        PCI: xilinx-nwl: Remove unused platform data
        PCI: xilinx-nwl: Add local struct device pointers
        PCI: xilinx: Removed unused xilinx_pcie_assign_msi() argument
        PCI: xilinx: Remove unused platform data
        PCI: xilinx: Add local struct device pointers
      dd5bba52
    • T
    • T
  3. 12 10月, 2016 28 次提交