Merge tag 'drivers_soc_for_4.20' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Tue, 25 Sep 2018 19:26:52 +0000 (12:26 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 25 Sep 2018 19:26:52 +0000 (12:26 -0700)
commit260c9ca90246fb317e1361fa2d513bd307decd68
tree3c734d94178991ede5e0186d8433eb5f4b39de2b
parent5bc45db5d2a7bf6eac577174e3634f58f867bb2f
parent7bcfe20d0d8b647879629798fa57e39905d6cded
Merge tag 'drivers_soc_for_4.20' of git://git./linux/kernel/git/ssantosh/linux-keystone into next/drivers

soc: driver soc update for v4.20

  - Enable host-id as an optional dt property
  - Fix minor typo in knav driver

* tag 'drivers_soc_for_4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  soc: ti: fix spelling mistake "instace" -> "instance"
  firmware: ti_sci: Provide host-id as an optional dt parameter
  Documentation: dt: keystone: ti-sci: Add optional host-id parameter

Signed-off-by: Olof Johansson <olof@lixom.net>