lkml.org 
[lkml]   [2017]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 6/6] bus: brcmstb_gisb: update to support new revision
    Date
    The 7278 introduces a new version of this core.  This
    commit adds support for that revision.

    Signed-off-by: Doug Berger <opendmb@gmail.com>
    ---
    Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt | 3 ++-
    drivers/bus/brcmstb_gisb.c | 10 ++++++++++
    2 files changed, 12 insertions(+), 1 deletion(-)

    diff --git a/Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt b/Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt
    index 1eceefb20f01..8a6c3c2e58fe 100644
    --- a/Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt
    +++ b/Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt
    @@ -3,7 +3,8 @@ Broadcom GISB bus Arbiter controller
    Required properties:

    - 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,bcm7400-gisb-arb" for older 40nm chips and all 65nm chips
    "brcm,bcm7038-gisb-arb" for 130nm chips
    diff --git a/drivers/bus/brcmstb_gisb.c b/drivers/bus/brcmstb_gisb.c
    index 3fbc116e6b95..68ac3e93b600 100644
    --- a/drivers/bus/brcmstb_gisb.c
    +++ b/drivers/bus/brcmstb_gisb.c
    @@ -56,6 +56,15 @@ static const int gisb_offsets_bcm7038[] = {
    [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[] = {
    [ARB_TIMER] = 0x00c,
    [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,bcm7435-gisb-arb", .data = gisb_offsets_bcm7435 },
    { .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 },
    { },
    };
    --
    2.12.0
    \
     
     \ /
      Last update: 2017-03-30 02:31    [W:2.373 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site