summaryrefslogtreecommitdiff
path: root/drivers/reset
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-12-04 18:44:05 +0300
committerArnd Bergmann <arnd@arndb.de>2014-12-04 18:44:05 +0300
commit136a713d80476fe993284bdf8b21709c179c9965 (patch)
tree60d764088a87ee17650c60a2cc4dfb1a7cf41b83 /drivers/reset
parent0cef9ab561c6d5c4e62252629709c38c573095d1 (diff)
parentd1d6786846e1c40f780edb83569597a8a7769e95 (diff)
downloadlinux-136a713d80476fe993284bdf8b21709c179c9965.tar.xz
Merge tag 'arm-soc/for-3.19/brcmstb-drivers' of https://github.com/brcm/linux into next/drivers
This pull request contains the following changes to the Broadcom GISB bus arbiter from Kevin Cernekee: - Extend brcmstb GISB bus driver to work on MIPS (currently ARM-only) and support 65nm and 40nm MIPS-based chips such as: BCM7038, BCM7400 and BCM7435 * tag 'arm-soc/for-3.19/brcmstb-drivers' of https://github.com/brcm/linux: bus: brcmstb_gisb: Add register offset tables for older chips bus: brcmstb_gisb: Look up register offsets in a table bus: brcmstb_gisb: Introduce wrapper functions for MMIO accesses bus: brcmstb_gisb: Make the driver buildable on MIPS Conflicts: drivers/bus/brcmstb_gisb.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/reset')
0 files changed, 0 insertions, 0 deletions