Merge tag 'arm-soc/for-3.19/brcmstb-drivers' of https://github.com/brcm/linux into...

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>

diff --cc drivers/bus/brcmstb_gisb.c
index b801234,172908d..bfd40f1
--- 1/drivers/bus/brcmstb_gisb.c
--- 2/drivers/bus/brcmstb_gisb.c
+++ b/drivers/bus/brcmstb_gisb.c
@@@ -192,7 -260,16 +260,16 @@@ static struct attribute_group gisb_arb_
        .attrs = gisb_arb_sysfs_attrs,
  };
  
 -static int brcmstb_gisb_arb_probe(struct platform_device *pdev)
+ static const struct of_device_id brcmstb_gisb_arb_of_match[] = {
+       { .compatible = "brcm,gisb-arb",         .data = gisb_offsets_bcm7445 },
+       { .compatible = "brcm,bcm7445-gisb-arb", .data = gisb_offsets_bcm7445 },
+       { .compatible = "brcm,bcm7435-gisb-arb", .data = gisb_offsets_bcm7435 },
+       { .compatible = "brcm,bcm7400-gisb-arb", .data = gisb_offsets_bcm7400 },
+       { .compatible = "brcm,bcm7038-gisb-arb", .data = gisb_offsets_bcm7038 },
+       { },
+ };
+ 
 +static int __init brcmstb_gisb_arb_probe(struct platform_device *pdev)
  {
        struct device_node *dn = pdev->dev.of_node;
        struct brcmstb_gisb_arb_device *gdev;
@@@ -267,12 -352,8 +352,7 @@@
        return 0;
  }
  
- static const struct of_device_id brcmstb_gisb_arb_of_match[] = {
-       { .compatible = "brcm,gisb-arb" },
-       { },
- };
- 
  static struct platform_driver brcmstb_gisb_arb_driver = {
 -      .probe  = brcmstb_gisb_arb_probe,
        .driver = {
                .name   = "brcm-gisb-arb",
                .owner  = THIS_MODULE,