1. 15 5月, 2018 1 次提交
    • O
      Merge tag 'omap-for-v4.18/dt-sdhci-signed' of... · f4f8ef04
      Olof Johansson 提交于
      Merge tag 'omap-for-v4.18/dt-sdhci-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
      
      Device tree changes for omap variants for SDHCI
      
      This series adds the devicetree configuration needed for pinctrl on
      dra7 variants to use the SDHCI SDIO driver instead of mmc-omap-hs
      driver. To use SDHCI, both the pins and the iodelay needs to be
      configured.
      
      This series is based on the related SDHCI drivers changes on a branch
      set up by Ulf.
      
      * tag 'omap-for-v4.18/dt-sdhci-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (28 commits)
        Documentation: ARM: Add new MMC requirements for DRA7/K2G
        ARM: dts: dra7: Add high speed modes capability to MMC1/MMC2 dt node
        ARM: dts: dra7: Use sdhci-omap programming model
        ARM: dts: dra76-evm: Add wilink8 wlan support
        ARM: dts: dra7-evm: Add wilink8 wlan support
        ARM: dts: dra7-evm: Model EVM_3V6 regulator
        ARM: dts: dra72-evm-common: Add wilink8 wlan support
        ARM: dts: am57xx-beagle-x15/am57xx-idk: Fix pinctrl-names
        ARM: dts: am574x-idk: Add pinmux configuration for MMC
        ARM: dts: dra71-evm: Use pinctrl group from dra7-mmc-iodelay.dtsi to select pulldown
        ARM: dts: am57xx-idk: Use pinctrl group from dra7-mmc-iodelay.dtsi to select pulldown
        ARM: dts: dra7-mmc-iodelay: Add a new pinctrl group for clk line without pullup
        ARM: dts: dra71-evm: Add "vqmmc-supply" property for mmc2
        ARM: dts: dra72-evm-common: Remove mmc specific pinmux
        mmc: sdhci-omap: Get IODelay values for 3.3v DDR mode
        dt-bindings: sdhci-omap: Add pinctrl bindings
        mmc: sdhci-omap: Add sdhci_omap specific ops for enable_sdio_irq
        mmc: sdhci-omap: Add support for MMC/SD controller in k2g SoC
        dt-bindings: sdhci-omap: Add K2G specific binding
        mmc: sdhci-omap: Workaround for Errata i834
        ...
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      f4f8ef04
  2. 14 5月, 2018 9 次提交
    • O
      Merge tag 'keystone_dts_for_4.18' of... · 09411939
      Olof Johansson 提交于
      Merge tag 'keystone_dts_for_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt
      
      ARM: DTS: Add DCAN support for Keystone K2G
      
      * tag 'keystone_dts_for_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
        ARM: dts: k2g-evm: Add DCAN dt nodes
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      09411939
    • O
      Merge tag 'omap-for-v4.18/dt-signed' of... · ccba0c68
      Olof Johansson 提交于
      Merge tag 'omap-for-v4.18/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
      
      Device tree changes for omap variants for v4.18 merge window
      
      This series adds support for am335x-pockebeagle and also add missing
      pinctrl configuration for am335x evm and beagle bone variants.
      
      There are also changes to add missing omap3 oscillator clocks for audio,
      and fixes am437x tps65218 irq type used for various board specific
      files.
      
      There are also few minor fixes included that are not urgent. The
      fixes for n8x0 audio also depend on driver changes, and the hp t410
      mmc card detect mux typo is harmless.
      
      * tag 'omap-for-v4.18/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: correct invalid I/O definition for MMC/SD card detect on T410
        ARM: dts: omap2420-n810: Correct the audio codec (tlv320aic33) node
        ARM: dts: omap2420-n810: Enable McBSP2 for audio
        ARM: dts: am437x-sk-evm: Correct tps65218 irq type
        ARM: dts: am437x-epos-evm: Correct tps65218 irq type
        ARM: dts: am437x-cm-t43: Correct tps65218 irq type
        ARM: dts: am437x-gp-evm: Correct tps65218 irq type
        ARM: dts: Add am335x-pocketbeagle
        ARM: dts: am33xx: Add pinmux data for mmc1 in am335x-evm, evmsk and beaglebone
        ARM: dts: omap3-gta04: Add fixed 26MHz clock as fck for twl
        ARM: dts: omap3-pandora: Add fixed 26MHz clock as fck for twl
        ARM: dts: omap3-beagle-xm: Add fixed 26MHz clock as fck for twl
        ARM: dts: logicpd-som-lv: Enable Touchscreen controller
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      ccba0c68
    • O
      Merge tag 'stm32-dt-for-v4.18-1' of... · aa264238
      Olof Johansson 提交于
      Merge tag 'stm32-dt-for-v4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/dt
      
      STM32 DT updates for v4.18, round 1
      
      Highlights:
      -----------
      -MCU platforms updates:
       -Update pwm-cells for stm32h743
       -Add I2C support on stm32f7xx-disco boards and
        on stm32h743i-eval board
       -Add new stm32f469 dtsi file
       -Add display support on stm32f469-disco (LTDC/DSI)
        + pannel orisetech (otm8009a)
      
      -MPU STM32MP157 platform updates:
       -Fix DTC (W=12) warnings
       -Fix IRQ type definition for usart
       -Add QSPI & NOR flash support on EV1 board
       -Add CEC support
       -Add USB host
       -Add USBPHYC support and enable it on EV1 board
       -Add LTDC and DSI support
       -Add I2C support and enable it on ED1 and EV1 boards
       -Add CRC support
       -Add RNG support
       -Add CRYP support
       -Add DAC support
       -Add LPTIMER support
       -Add VREFBUFF support
       -Add timers supports and enable timer trigger 6 on ED1 board
       -Add MDMA, DMA and DMAMUX support and enable it
       -Enable clock driver
      
      * tag 'stm32-dt-for-v4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: (42 commits)
        ARM: dts: stm32: update pwm-cells for LPTimer on stm32h743
        ARM: dts: stm32: Add I2C1 support for stm32h743i-eval Board
        ARM: dts: stm32: Add I2C support for STM32H743 SoC
        ARM: dts: stm32: Add I2C1 support for stm32f746-disco Board
        ARM: dts: stm32: Add I2C1 support for stm32f769-disco Board
        ARM: dts: stm32: Append additional I2Cs for STM32F746 SoC
        ARM: dts: stm32: Add display support on stm32f469-disco
        ARM: dts: stm32: Add new stm32f469 dtsi file with mipi dsi
        ARM: dts: stm32: Use gpio bindings in stm32f469-disco
        ARM: dts: stm32: Fix IRQ_TYPE_NONE warnings on stm32mp157c
        ARM: dts: stm32: Fix DTC warnings for stm32mp157
        ARM: dts: stm32: add flash nor support on stm32mp157c eval board
        ARM: dts: stm32: add qspi support for stm32mp157c
        ARM: dts: stm32: add cec support on stm32mp157c-ev1
        ARM: dts: stm32: add cec pins to stm32mp157c
        ARM: dts: stm32: add cec support on stm32mp157c
        ARM: dts: stm32: add USB Host (USBH) support to stm32mp157c
        ARM: dts: stm32: enable USBPHYC on stm32mp157c-ev1
        ARM: dts: stm32: add supplies to usbphyc ports on stm32mp157c-ed1
        ARM: dts: stm32: add USBPHYC support to stm32mp157c
        ...
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      aa264238
    • O
      Merge tag 'ux500-dts-arm-soc' of... · edb52033
      Olof Johansson 提交于
      Merge tag 'ux500-dts-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
      
      This:
      - Corrects the debounce interval on some nodes
      - Drops the U8540/U9540 device trees
      
      * tag 'ux500-dts-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
        ARM: ux500: Drop the U8540 device trees
        ARM: dts: Ux500: Fix "debounce-interval" property misspelling
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      edb52033
    • L
      Linux 4.17-rc5 · 67b8d5c7
      Linus Torvalds 提交于
      67b8d5c7
    • L
      Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 66e1c94d
      Linus Torvalds 提交于
      Pull x86/pti updates from Thomas Gleixner:
       "A mixed bag of fixes and updates for the ghosts which are hunting us.
      
        The scheduler fixes have been pulled into that branch to avoid
        conflicts.
      
         - A set of fixes to address a khread_parkme() race which caused lost
           wakeups and loss of state.
      
         - A deadlock fix for stop_machine() solved by moving the wakeups
           outside of the stopper_lock held region.
      
         - A set of Spectre V1 array access restrictions. The possible
           problematic spots were discuvered by Dan Carpenters new checks in
           smatch.
      
         - Removal of an unused file which was forgotten when the rest of that
           functionality was removed"
      
      * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/vdso: Remove unused file
        perf/x86/cstate: Fix possible Spectre-v1 indexing for pkg_msr
        perf/x86/msr: Fix possible Spectre-v1 indexing in the MSR driver
        perf/x86: Fix possible Spectre-v1 indexing for x86_pmu::event_map()
        perf/x86: Fix possible Spectre-v1 indexing for hw_perf_event cache_*
        perf/core: Fix possible Spectre-v1 indexing for ->aux_pages[]
        sched/autogroup: Fix possible Spectre-v1 indexing for sched_prio_to_weight[]
        sched/core: Fix possible Spectre-v1 indexing for sched_prio_to_weight[]
        sched/core: Introduce set_special_state()
        kthread, sched/wait: Fix kthread_parkme() completion issue
        kthread, sched/wait: Fix kthread_parkme() wait-loop
        sched/fair: Fix the update of blocked load when newly idle
        stop_machine, sched: Fix migrate_swap() vs. active_balance() deadlock
      66e1c94d
    • L
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 86a4ac43
      Linus Torvalds 提交于
      Pull scheduler fix from Thomas Gleixner:
       "Revert the new NUMA aware placement approach which turned out to
        create more problems than it solved"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        Revert "sched/numa: Delay retrying placement for automatic NUMA balance after wake_affine()"
      86a4ac43
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · baeda713
      Linus Torvalds 提交于
      Pull perf tooling fixes from Thomas Gleixner:
       "Another small set of perf tooling fixes and updates:
      
         - Revert "perf pmu: Fix pmu events parsing rule", as it broke Intel
           PT event description parsing (Arnaldo Carvalho de Melo)
      
         - Sync x86's cpufeatures.h and kvm UAPI headers with the kernel
           sources, suppressing the ABI drift warnings (Arnaldo Carvalho de
           Melo)
      
         - Remove duplicated entry for westmereep-dp in Intel's mapfile.csv
           (William Cohen)
      
         - Fix typo in 'perf bench numa' options description (Yisheng Xie)"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        Revert "perf pmu: Fix pmu events parsing rule"
        tools headers kvm: Sync ARM UAPI headers with the kernel sources
        tools headers kvm: Sync uapi/linux/kvm.h with the kernel sources
        tools headers: Sync x86 cpufeatures.h with the kernel sources
        perf vendor events intel: Remove duplicated entry for westmereep-dp in mapfile.csv
        perf bench numa: Fix typo in options
      baeda713
    • L
      Merge tag 'dma-mapping-4.17-5' of git://git.infradead.org/users/hch/dma-mapping · 0503fd65
      Linus Torvalds 提交于
      Pull dma-mapping fix from Christoph Hellwig:
       "Just one little fix from Jean to avoid a harmless but very annoying
        warning, especially for the drm code"
      
      * tag 'dma-mapping-4.17-5' of git://git.infradead.org/users/hch/dma-mapping:
        swiotlb: silent unwanted warning "buffer is full"
      0503fd65
  3. 13 5月, 2018 3 次提交
  4. 12 5月, 2018 27 次提交