Commit 60a64da9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 4d29b826 8b8f095b

Documentation/devicetree/bindings/power/brcm,bcm-pmb.yaml

0 → 100644
+50 −0
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/power/brcm,bcm-pmb.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Broadcom PMB (Power Management Bus) controller



description: This document describes Broadcom's PMB controller. It supports

  powering various types of connected devices (e.g. PCIe, USB, SATA).



maintainers:

  - Rafał Miłecki <rafal@milecki.pl>



properties:

  compatible:

    enum:

      - brcm,bcm4908-pmb



  reg:

    description: register space of one or more buses

    maxItems: 1



  big-endian:

    $ref: /schemas/types.yaml#/definitions/flag

    description: Flag to use for block working in big endian mode.



  "#power-domain-cells":

    description: cell specifies device ID (see bcm-pmb.h)

    const: 1



required:

  - reg

  - "#power-domain-cells"



additionalProperties: false



examples:

  - |

    #include <dt-bindings/soc/bcm-pmb.h>



    pmb: power-controller@802800e0 {

        compatible = "brcm,bcm4908-pmb";

        reg = <0x802800e0 0x40>;

        #power-domain-cells = <1>;

    };



    foo {

        power-domains = <&pmb BCM_PMB_PCIE0>;

    };

MAINTAINERS

+10 −0
Original line number Original line Diff line number Diff line
@@ -3683,6 +3683,16 @@ L: linux-mips@vger.kernel.org 
S:	Maintained

S:	Maintained

F:	drivers/firmware/broadcom/*

F:	drivers/firmware/broadcom/*













BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER










M:	Rafał Miłecki <rafal@milecki.pl>










M:	Florian Fainelli <f.fainelli@gmail.com>










M:	bcm-kernel-feedback-list@broadcom.com










L:	linux-pm@vger.kernel.org










S:	Maintained










T:	git git://github.com/broadcom/stblinux.git










F:	drivers/soc/bcm/bcm-pmb.c










F:	include/dt-bindings/soc/bcm-pmb.h

















BROADCOM SPECIFIC AMBA DRIVER (BCMA)




BROADCOM SPECIFIC AMBA DRIVER (BCMA)








M:	Rafał Miłecki <zajec5@gmail.com>




M:	Rafał Miłecki <zajec5@gmail.com>








L:	linux-wireless@vger.kernel.org




L:	linux-wireless@vger.kernel.org


































drivers/soc/bcm/Makefile



+1
−1






























Original line number
Original line
Diff line number
Diff line








# SPDX-License-Identifier: GPL-2.0-only




# SPDX-License-Identifier: GPL-2.0-only








obj-$(CONFIG_BCM2835_POWER)	+= bcm2835-power.o




obj-$(CONFIG_BCM2835_POWER)	+= bcm2835-power.o








obj-$(CONFIG_RASPBERRYPI_POWER)	+= raspberrypi-power.o




obj-$(CONFIG_RASPBERRYPI_POWER)	+= raspberrypi-power.o








obj-$(CONFIG_SOC_BCM63XX)	+= bcm63xx/




obj-y				+= bcm63xx/








obj-$(CONFIG_SOC_BRCMSTB)	+= brcmstb/



obj-$(CONFIG_SOC_BRCMSTB)	+= brcmstb/
























drivers/soc/bcm/bcm63xx/Kconfig



+9
−0






























Original line number
Original line
Diff line number
Diff line







@@ -10,3 +10,12 @@ config BCM63XX_POWER






	  BCM6318, BCM6328, BCM6362 and BCM63268 SoCs.




	  BCM6318, BCM6328, BCM6362 and BCM63268 SoCs.






















endif # SOC_BCM63XX




endif # SOC_BCM63XX





















config BCM_PMB










	bool "Broadcom PMB (Power Management Bus) driver"










	depends on ARCH_BCM4908 || (COMPILE_TEST && OF)










	default ARCH_BCM4908










	select PM_GENERIC_DOMAINS if PM










	help










	  This enables support for the Broadcom's PMB (Power Management Bus) that










	  is used for disabling and enabling SoC devices.
























drivers/soc/bcm/bcm63xx/Makefile



+1
−0






























Original line number
Original line
Diff line number
Diff line








# SPDX-License-Identifier: GPL-2.0-only




# SPDX-License-Identifier: GPL-2.0-only








obj-$(CONFIG_BCM63XX_POWER) += bcm63xx-power.o




obj-$(CONFIG_BCM63XX_POWER) += bcm63xx-power.o










obj-$(CONFIG_BCM_PMB)		+= bcm-pmb.o