diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 22:09:07 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-15 22:09:07 +0200 |
| commit | d72b712824ef906f548210b0012ff7c2a041ef7e (patch) | |
| tree | a508cc3d23bd71fd81f059a62137de7473c7d024 /include/linux | |
| parent | aebd774de939c853122829c29c4cfe79f8b440ac (diff) | |
| parent | c4a8ea9e0698945b182ba1e1063a0981b1f35139 (diff) | |
Merge tag 'arm-soc/for-4.4/soc' of http://github.com/Broadcom/stblinux into next/soc
Merge "Broadcom soc changes for v4.4 (try 2)" from Florian Fainelli:
This pull request contains the following Broadcom SoC platform and driver changes:
- Brian Norris create a drivers/soc/brcmstb/ stub as a place holder for SoC-specific
code which is coming next
- Florian Fainelli adds support for configuring the BCM7xxx SoCs Bus Interface Unit
with their specific write-pairing setting, which must be saved and restored during
system-wide suspend/resume, and consequently updates the brcmstb machine code to
initialize the BIU
- Jon Mason adds support for the Northstar Plus SoCs by introducing a custom machine
descriptor matching their compatible string and setting up the PL310 L2 cache and
enabling the relevant ARM errata for their Cortex-A9
* tag 'arm-soc/for-4.4/soc' of http://github.com/Broadcom/stblinux:
ARM: brcmstb: Setup BIU control registers during boot
soc: brcmstb: Add Bus Interface Unit control setup
soc: add stubs for brcmstb SoC's
ARM: NSP: Add basic support for Broadcom Northstar Plus SoC
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/soc/brcmstb/brcmstb.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/soc/brcmstb/brcmstb.h b/include/linux/soc/brcmstb/brcmstb.h new file mode 100644 index 000000000000..337ce414e898 --- /dev/null +++ b/include/linux/soc/brcmstb/brcmstb.h @@ -0,0 +1,10 @@ +#ifndef __BRCMSTB_SOC_H +#define __BRCMSTB_SOC_H + +/* + * Bus Interface Unit control register setup, must happen early during boot, + * before SMP is brought up, called by machine entry point. + */ +void brcmstb_biuctrl_init(void); + +#endif /* __BRCMSTB_SOC_H */ |
