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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmXoxhIACgkQh9CWnEQH
 BwTuYBAAgiI/K6CEXnimoUkK1zGW/RGStvgB8OUg+LZcxKAXCQf4yiFyoivw3xfH
 SC5UXDAggR/o2ElNDPRyNNjhSy7vB972Mke8rpXsGfLVFAV+UnwqpQCnoOHPzF0Q
 J/OXGssjJ+iEhEmh4HUGDDgHD0SX3K9JznNLOweliy/k87RCLQK0p2DpC7xDhBEw
 oCWrM9iPiR4OneVzhS+E9SuFRIloKRzw5PTsJHrRQXvIQQFt0EU0rpu4qm+hFNXs
 0VVAd2MLNhSd31QT5AMT31vbWYjpWAaFgwbQNjei3vdLUjKizCNHgVADkFrbAOSy
 kAVdO2n/yz8n3QB/jOlgecRGYZ9Himh7zK+SoPv67ZQeiTsI0fP/5cHYbPideU++
 U1iQjiLaEaS7iM+HsTje+WghD/SMXtaO7/tiWnu4oLCqPbVAzH4CO2BxhHeNvJAi
 VLq5WBq/BqAaLBsOEmUxzoR+BXKMfM9peECXrUNAHQ1JV+0X2REwMydtyJWCinkP
 omqPxdNxEfMwcAp5b3CIenYPMuBLcmXQXnKbuV8b+lU3T4oQRYmeeao+TZM2jYs3
 BFVzmCfp18NzxNQH15TpYHKLIIa7mYNGgEhfK39zl6RYJiOkdZeLk4UNTvILdCQ+
 inHb82RveUBh7vCG2N2FwV6A1F9g91Ta5N+lv+Jl/0SU/mqVNpU=
 =Hj1a
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmXuqEoACgkQYKtH/8kJ
 UifEbhAA0z+v7yvH3KvkxFPqGF60A7OhU96ysCMSZkUKphW/ckbos/vhdAT3e92P
 7VyMjtfqxAIiH/1Caqwy8Ap3rtq5CowlbfgUUVdNvIXNFpXQNK9J0/EQH6v9rDiq
 ODuq8CXhGlwT4L01UaG87U8snbaEUJIsX2AdVcN/lQ8XQFTy/ufTabk8sKXbEAWR
 UwgsoSWEzFV7ZRJy/Qd3yLhU7RlvRT1bxPBaJpOIjCxh4sAjcHhtqG7pUC9+q6T/
 yc100OwxFLT+G1fERsAEe/aqPF5L3aEKYekDylI3xiFKartyxDL30p/R+K5c4EY7
 jp1qDLTv7pbdwtrUjw4dqzXRHGFwnauTvx3E1DjARycA7DlZW/eZkfI0mqEeU889
 70M9gEbBLEaVE5gnlTLDLNSRcsDlMTdlA+3Qyroq8b9jUiW9wHl5aARizhlx6AtC
 4l70BjgfSLS+97WMuteXXqEQ8XPbbAGZu0LvZynlel/YDPsqm9MQLJDtEibfO/ti
 usv9xQEKzbJl/ksO8Q2U3So7/BAokx9lfCDC+TPQ0FbPlCuVio6v+MOgDl0GZvdO
 +RXYAl2QCnCnmoX2kxzaNdKTaLSBScd1g45TItKGxP85t0tBLTDJ7K1JcNQSk3RM
 GEFbdcvGwI6tkgkqJFbD5Qo9jbL9kckLnuoc8cpNX7SQ/RIIpbk=
 =f13N
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-03-11 07:44:25 +01:00
commit c00304acdc
2 changed files with 16 additions and 0 deletions

View File

@ -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

View File

@ -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 },
{ },
};