| Message ID | 20170322140112.2479-1-joel@jms.id.au |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 03/22/2017 03:01 PM, Joel Stanley wrote: > The ast2500 SoCs contain the same IPMI BT device. > > Signed-off-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 4 +++- > drivers/char/ipmi/bt-bmc.c | 1 + > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt > index 6f28969af9dc..028268fd99ee 100644 > --- a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt > +++ b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt > @@ -6,7 +6,9 @@ perform in-band IPMI communication with their host. > > Required properties: > > -- compatible : should be "aspeed,ast2400-ibt-bmc" > +- compatible : should be one of > + "aspeed,ast2400-ibt-bmc" > + "aspeed,ast2500-ibt-bmc" > - reg: physical address and size of the registers > > Optional properties: > diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c > index fc9e8891eae3..002907e6c7d9 100644 > --- a/drivers/char/ipmi/bt-bmc.c > +++ b/drivers/char/ipmi/bt-bmc.c > @@ -485,6 +485,7 @@ static int bt_bmc_remove(struct platform_device *pdev) > > static const struct of_device_id bt_bmc_match[] = { > { .compatible = "aspeed,ast2400-ibt-bmc" }, > + { .compatible = "aspeed,ast2500-ibt-bmc" }, > { }, > }; > > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Mar 23, 2017 at 12:31:12AM +1030, Joel Stanley wrote: > The ast2500 SoCs contain the same IPMI BT device. > > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- > Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 4 +++- > drivers/char/ipmi/bt-bmc.c | 1 + > 2 files changed, 4 insertions(+), 1 deletion(-) Acked-by: Rob Herring <robh@kernel.org> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 03/28/2017 08:22 PM, Rob Herring wrote: > On Thu, Mar 23, 2017 at 12:31:12AM +1030, Joel Stanley wrote: >> The ast2500 SoCs contain the same IPMI BT device. >> >> Signed-off-by: Joel Stanley <joel@jms.id.au> >> --- >> Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 4 +++- >> drivers/char/ipmi/bt-bmc.c | 1 + >> 2 files changed, 4 insertions(+), 1 deletion(-) > Acked-by: Rob Herring <robh@kernel.org> This is in the IPMI tree for the next kernel. Thanks all, -corey -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt index 6f28969af9dc..028268fd99ee 100644 --- a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt +++ b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt @@ -6,7 +6,9 @@ perform in-band IPMI communication with their host. Required properties: -- compatible : should be "aspeed,ast2400-ibt-bmc" +- compatible : should be one of + "aspeed,ast2400-ibt-bmc" + "aspeed,ast2500-ibt-bmc" - reg: physical address and size of the registers Optional properties: diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c index fc9e8891eae3..002907e6c7d9 100644 --- a/drivers/char/ipmi/bt-bmc.c +++ b/drivers/char/ipmi/bt-bmc.c @@ -485,6 +485,7 @@ static int bt_bmc_remove(struct platform_device *pdev) static const struct of_device_id bt_bmc_match[] = { { .compatible = "aspeed,ast2400-ibt-bmc" }, + { .compatible = "aspeed,ast2500-ibt-bmc" }, { }, };
The ast2500 SoCs contain the same IPMI BT device. Signed-off-by: Joel Stanley <joel@jms.id.au> --- Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 4 +++- drivers/char/ipmi/bt-bmc.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)