Merge branch 'baikal/drivers' into arm/drivers

Browse source

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>

...

This commit is contained in:

Arnd Bergmann 2020-05-28 22:17:49 +02:00

parent 0d583273b4 22e795b470

commit 78f7d98be7

4 changed files with 82 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

63

Documentation/devicetree/bindings/memory-controllers/baikal,bt1-l2-ctl.yaml

View file

4

drivers/bus/Kconfig

View file

19

drivers/bus/bt1-apb.c

View file

22

drivers/bus/bt1-axi.c

View file