]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'nios2-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Apr 2020 18:38:44 +0000 (11:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Apr 2020 18:38:44 +0000 (11:38 -0700)
Pull nios2 updates from Ley Foon Tan:

 - Remove nios2-dev@lists.rocketboards.org from MAINTAINERS

 - remove 'resetvalue' property

 - rename 'altr,gpio-bank-width' -> 'altr,ngpio'

 - enable the common clk subsystem on Nios2

* tag 'nios2-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
  MAINTAINERS: Remove nios2-dev@lists.rocketboards.org
  arch: nios2: remove 'resetvalue' property
  arch: nios2: rename 'altr,gpio-bank-width' -> 'altr,ngpio'
  arch: nios2: Enable the common clk subsystem on Nios2

1  2 
MAINTAINERS
arch/nios2/Kconfig

diff --cc MAINTAINERS
Simple merge
index 2fc4ed210b5f0446ce526f1c063d91d4f347b6b6,4b7c951e80e23e7836333eb62110025bc2d09d99..c6645141bb2a8885ba9ef0f5dd887570a4974968
@@@ -2,11 -2,11 +2,12 @@@
  config NIOS2
        def_bool y
        select ARCH_32BIT_OFF_T
 +      select ARCH_HAS_DMA_PREP_COHERENT
        select ARCH_HAS_SYNC_DMA_FOR_CPU
        select ARCH_HAS_SYNC_DMA_FOR_DEVICE
 -      select ARCH_HAS_UNCACHED_SEGMENT
 +      select ARCH_HAS_DMA_SET_UNCACHED
        select ARCH_NO_SWAP
+       select COMMON_CLK
        select TIMER_OF
        select GENERIC_ATOMIC64
        select GENERIC_CLOCKEVENTS