Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d523e0cf authored by Doug Berger's avatar Doug Berger Committed by Florian Fainelli
Browse files

bus: brcmstb_gisb: update to support new revision 



The 7278 introduces a new version of this core.  This
commit adds support for that revision.

Signed-off-by: default avatarDoug Berger <opendmb@gmail.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent 8c7aa17a

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,8 @@ Broadcom GISB bus Arbiter controller 
Required properties:

Required properties:





- compatible:

- compatible:

    "brcm,gisb-arb" or "brcm,bcm7445-gisb-arb" for 28nm chips

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

    "brcm,gisb-arb" or "brcm,bcm7445-gisb-arb" for other 28nm chips

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

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

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

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

    "brcm,bcm7038-gisb-arb" for 130nm chips

    "brcm,bcm7038-gisb-arb" for 130nm chips

drivers/bus/brcmstb_gisb.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,15 @@ static const int gisb_offsets_bcm7038[] = { 
	[ARB_ERR_CAP_MASTER]	= -1,

	[ARB_ERR_CAP_MASTER]	= -1,

};

};





static const int gisb_offsets_bcm7278[] = {

	[ARB_TIMER]		= 0x008,

	[ARB_ERR_CAP_CLR]	= 0x7f8,

	[ARB_ERR_CAP_HI_ADDR]	= -1,

	[ARB_ERR_CAP_ADDR]	= 0x7e0,

	[ARB_ERR_CAP_STATUS]	= 0x7f0,

	[ARB_ERR_CAP_MASTER]	= 0x7f4,

};



static const int gisb_offsets_bcm7400[] = {

static const int gisb_offsets_bcm7400[] = {

	[ARB_TIMER]		= 0x00c,

	[ARB_TIMER]		= 0x00c,

	[ARB_ERR_CAP_CLR]	= 0x0c8,

	[ARB_ERR_CAP_CLR]	= 0x0c8,
@@ -307,6 +316,7 @@ static const struct of_device_id brcmstb_gisb_arb_of_match[] = { 
	{ .compatible = "brcm,bcm7445-gisb-arb", .data = gisb_offsets_bcm7445 },

	{ .compatible = "brcm,bcm7445-gisb-arb", .data = gisb_offsets_bcm7445 },

	{ .compatible = "brcm,bcm7435-gisb-arb", .data = gisb_offsets_bcm7435 },

	{ .compatible = "brcm,bcm7435-gisb-arb", .data = gisb_offsets_bcm7435 },

	{ .compatible = "brcm,bcm7400-gisb-arb", .data = gisb_offsets_bcm7400 },

	{ .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,bcm7038-gisb-arb", .data = gisb_offsets_bcm7038 },

	{ },

	{ },

};

};