Merge tag 'drivers_soc_for_5.1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Feb 2019 17:01:47 +0000 (18:01 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Feb 2019 17:02:04 +0000 (18:02 +0100)
commit50b0225bf412df3cdeb2dc89b7e4b1119e30bedb
tree1d1065be8855c4db666af6eff58950a0e1fb50d5
parent187b4ac7dfeb74cf6e6043f82aeab4ddc2a4c44a
parent2b13ef1f4261688c2dc5d67dbee69ed2fdddf53e
Merge tag 'drivers_soc_for_5.1' of git://git./linux/kernel/git/ssantosh/linux-keystone into arm/drivers

soc: ti: couple of non critical fixes for v5.1

 - Fix the Clang warning for enum in Navigator dma
 - Simplify code in ti_sci with DEFINE_SHOW_ATTRIBUTE macro

* tag 'drivers_soc_for_5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  soc: ti: knav_dma: Use proper enum in pktdma_init_chan
  firmware: ti_sci: Change to use DEFINE_SHOW_ATTRIBUTE macro

Signed-off-by: Arnd Bergmann <arnd@arndb.de>