Unverified Commit c00304ac authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-6.9/drivers' of https://github.com/Broadcom/stblinux into soc/late 

This pull request contains Broadcom SoC device drivers changes for 6.9,
please pull the following:

- Florian adds support for the 74165 GISB arbiter layout which shuffled
  register offsets around

* tag 'arm-soc/for-6.9/drivers' of https://github.com/Broadcom/stblinux:
  bus: brcmstb_gisb: Added support for 74165 register layout
  dt-bindings: bus: Document Broadcom GISB arbiter 74165 compatible

Link: https://lore.kernel.org/r/20240307200441.2151734-2-florian.fainelli@broadcom.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents de79649b 86964bb6

Documentation/devicetree/bindings/bus/brcm,gisb-arb.yaml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
          - const: brcm,gisb-arb

      - items:

          - enum:

              - brcm,bcm74165-gisb-arb  # for V7 new style 16nm chips

              - brcm,bcm7278-gisb-arb  # for V7 28nm chips

              - brcm,bcm7435-gisb-arb  # for newer 40nm chips

              - brcm,bcm7400-gisb-arb  # for older 40nm chips and all 65nm chips

drivers/bus/brcmstb_gisb.c

+15 −0
Original line number Diff line number Diff line
@@ -96,6 +96,20 @@ static const int gisb_offsets_bcm7400[] = { 
	[ARB_ERR_CAP_MASTER]	= 0x0d8,

};



static const int gisb_offsets_bcm74165[] = {

	[ARB_TIMER]		= 0x008,

	[ARB_BP_CAP_CLR]	= 0x044,

	[ARB_BP_CAP_HI_ADDR]	= -1,

	[ARB_BP_CAP_ADDR]	= 0x048,

	[ARB_BP_CAP_STATUS]	= 0x058,

	[ARB_BP_CAP_MASTER]	= 0x05c,

	[ARB_ERR_CAP_CLR]	= 0x038,

	[ARB_ERR_CAP_HI_ADDR]	= -1,

	[ARB_ERR_CAP_ADDR]	= 0x020,

	[ARB_ERR_CAP_STATUS]	= 0x030,

	[ARB_ERR_CAP_MASTER]	= 0x034,

};



static const int gisb_offsets_bcm7435[] = {

	[ARB_TIMER]		= 0x00c,

	[ARB_BP_CAP_CLR]	= 0x014,
@@ -393,6 +407,7 @@ static const struct of_device_id brcmstb_gisb_arb_of_match[] = { 
	{ .compatible = "brcm,bcm7400-gisb-arb", .data = gisb_offsets_bcm7400 },

	{ .compatible = "brcm,bcm7278-gisb-arb", .data = gisb_offsets_bcm7278 },

	{ .compatible = "brcm,bcm7038-gisb-arb", .data = gisb_offsets_bcm7038 },

	{ .compatible = "brcm,bcm74165-gisb-arb", .data = gisb_offsets_bcm74165 },

	{ },

};