Merge branch 'baikal/drivers' into arm/drivers
authorArnd Bergmann <arnd@arndb.de>
Thu, 28 May 2020 20:17:49 +0000 (22:17 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 28 May 2020 20:17:49 +0000 (22:17 +0200)
commit78f7d98be7a869fd6f99c1c2abe7ce2adc3198e0
tree4d0999f4344b915de98170c3ba5b6bd98478b980
parent0d583273b49a2305d6f5fff668575bdbf9e85c70
parent22e795b470aebef4c01346e3b43e0af49c7638be
Merge branch 'baikal/drivers' into arm/drivers

These are mainly fixups for comments that collided with me
already merging v3 of the series, and one patch that I had forgotten
to pick up.

* baikal/drivers:
  bus: bt1-axi: Build the driver into the kernel
  bus: bt1-apb: Build the driver into the kernel
  bus: bt1-axi: Use sysfs_streq instead of strncmp
  bus: bt1-axi: Optimize the return points in the driver
  bus: bt1-apb: Use sysfs_streq instead of strncmp
  bus: bt1-apb: Use PTR_ERR_OR_ZERO to return from request-regs method
  bus: bt1-apb: Fix show/store callback identations
  bus: bt1-apb: Include linux/io.h
  dt-bindings: memory: Add Baikal-T1 L2-cache Control Block binding

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