summaryrefslogtreecommitdiffstats
path: root/include/soc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2021-02-02 22:22:02 +0100
committerArnd Bergmann <arnd@arndb.de>2021-02-02 22:22:03 +0100
commit60a64da9f0d0b7e766ba9bb0c11e28ca780fc2fd (patch)
tree6d3b42971dd3632a536474695496a162dd930bd1 /include/soc
parent4d29b82686589fafd4cbdd2de5ae8b72fd5a3149 (diff)
parent8b8f095b9076ca61107c0910c9273afd1dfa1f04 (diff)
downloadlinux-stable-60a64da9f0d0b7e766ba9bb0c11e28ca780fc2fd.tar.gz
linux-stable-60a64da9f0d0b7e766ba9bb0c11e28ca780fc2fd.tar.bz2
linux-stable-60a64da9f0d0b7e766ba9bb0c11e28ca780fc2fd.zip
Merge tag 'arm-soc/for-5.12/drivers' of https://github.com/Broadcom/stblinux into arm/drivers
This pull request contains Broadcom SoCs drivers changes for 5.12, please pull the following: - Rafal adds support for the Power Management Bus (PMB) which is used in a variety of DSL/Cable modem/STB SoCs with a primary target being the 4908 Wi-Fi SoC from the DSL organization. He also adds empty stubs to get the chip identification (family and revision) to permit the Broadcom STB USB PHY driver from being decoupled from ARCH_BRCMSTB - Florian removes an unused function and its header * tag 'arm-soc/for-5.12/drivers' of https://github.com/Broadcom/stblinux: soc: bcm: brcmstb: Remove soc_is_brcmstb() soc: bcm: brcmstb: add stubs for getting platform IDs soc: bcm: add PM driver for Broadcom's PMB dt-bindings: power: document Broadcom's PMB binding Link: https://lore.kernel.org/r/20210131221721.685974-5-f.fainelli@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/soc')
-rw-r--r--include/soc/brcmstb/common.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/include/soc/brcmstb/common.h b/include/soc/brcmstb/common.h
deleted file mode 100644
index e4fe76856de9..000000000000
--- a/include/soc/brcmstb/common.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright © 2014 NVIDIA Corporation
- * Copyright © 2015 Broadcom Corporation
- */
-
-#ifndef __SOC_BRCMSTB_COMMON_H__
-#define __SOC_BRCMSTB_COMMON_H__
-
-bool soc_is_brcmstb(void);
-
-#endif /* __SOC_BRCMSTB_COMMON_H__ */