| Message ID | 20190917202039.25266-2-bradleyb@fuzziesquirrel.com |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | ARM: dts: aspeed-g6 lpc, rainier | expand |
On 9/17/19 3:20 PM, Brad Bishop wrote: > Assume The AST2600 SoCs contain the same LPC devices as the AST2500. Reviewed-by: Eddie James <eajames@linux.ibm.com> > > Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> > --- > .../devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 3 ++- > Documentation/devicetree/bindings/mfd/aspeed-lpc.txt | 8 +++++++- > drivers/char/ipmi/bt-bmc.c | 1 + > drivers/char/ipmi/kcs_bmc_aspeed.c | 1 + > drivers/reset/reset-simple.c | 1 + > drivers/soc/aspeed/aspeed-lpc-ctrl.c | 1 + > drivers/soc/aspeed/aspeed-lpc-snoop.c | 2 ++ > 7 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt > index 028268fd99ee..4b43b7829bd9 100644 > --- a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt > +++ b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt > @@ -1,6 +1,6 @@ > * Aspeed BT (Block Transfer) IPMI interface > > -The Aspeed SOCs (AST2400 and AST2500) are commonly used as BMCs > +The Aspeed SOCs (AST2400, AST2500 and AST2600) are commonly used as BMCs > (BaseBoard Management Controllers) and the BT interface can be used to > perform in-band IPMI communication with their host. > > @@ -9,6 +9,7 @@ Required properties: > - compatible : should be one of > "aspeed,ast2400-ibt-bmc" > "aspeed,ast2500-ibt-bmc" > + "aspeed,ast2600-ibt-bmc" > - reg: physical address and size of the registers > > Optional properties: > diff --git a/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt b/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt > index 86446074e206..e1197bab57bb 100644 > --- a/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt > +++ b/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt > @@ -46,6 +46,7 @@ Required properties > - compatible: One of: > "aspeed,ast2400-lpc", "simple-mfd" > "aspeed,ast2500-lpc", "simple-mfd" > + "aspeed,ast2600-lpc", "simple-mfd" > > - reg: contains the physical address and length values of the Aspeed > LPC memory region. > @@ -64,6 +65,7 @@ BMC Node > - compatible: One of: > "aspeed,ast2400-lpc-bmc" > "aspeed,ast2500-lpc-bmc" > + "aspeed,ast2600-lpc-bmc" > > - reg: contains the physical address and length values of the > H8S/2168-compatible LPC controller memory region > @@ -74,6 +76,7 @@ Host Node > - compatible: One of: > "aspeed,ast2400-lpc-host", "simple-mfd", "syscon" > "aspeed,ast2500-lpc-host", "simple-mfd", "syscon" > + "aspeed,ast2600-lpc-host", "simple-mfd", "syscon" > > - reg: contains the address and length values of the host-related > register space for the Aspeed LPC controller > @@ -128,6 +131,7 @@ Required properties: > - compatible: One of: > "aspeed,ast2400-lpc-ctrl"; > "aspeed,ast2500-lpc-ctrl"; > + "aspeed,ast2600-lpc-ctrl"; > > - reg: contains offset/length values of the host interface controller > memory regions > @@ -168,6 +172,7 @@ Required properties: > - compatible: One of: > "aspeed,ast2400-lhc"; > "aspeed,ast2500-lhc"; > + "aspeed,ast2600-lhc"; > > - reg: contains offset/length values of the LHC memory regions. In the > AST2400 and AST2500 there are two regions. > @@ -187,7 +192,8 @@ state of the LPC bus. Some systems may chose to modify this configuration. > > Required properties: > > - - compatible: "aspeed,ast2500-lpc-reset" or > + - compatible: "aspeed,ast2600-lpc-reset" or > + "aspeed,ast2500-lpc-reset" > "aspeed,ast2400-lpc-reset" > - reg: offset and length of the IP in the LHC memory region > - #reset-controller indicates the number of reset cells expected > diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c > index 40b9927c072c..0e600449931b 100644 > --- a/drivers/char/ipmi/bt-bmc.c > +++ b/drivers/char/ipmi/bt-bmc.c > @@ -513,6 +513,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" }, > + { .compatible = "aspeed,ast2600-ibt-bmc" }, > { }, > }; > > diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c b/drivers/char/ipmi/kcs_bmc_aspeed.c > index 3c955946e647..a0a8bb89c9b3 100644 > --- a/drivers/char/ipmi/kcs_bmc_aspeed.c > +++ b/drivers/char/ipmi/kcs_bmc_aspeed.c > @@ -301,6 +301,7 @@ static int aspeed_kcs_remove(struct platform_device *pdev) > static const struct of_device_id ast_kcs_bmc_match[] = { > { .compatible = "aspeed,ast2400-kcs-bmc" }, > { .compatible = "aspeed,ast2500-kcs-bmc" }, > + { .compatible = "aspeed,ast2600-kcs-bmc" }, > { } > }; > MODULE_DEVICE_TABLE(of, ast_kcs_bmc_match); > diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c > index 1154f7b1f4dd..2fe9c889a75a 100644 > --- a/drivers/reset/reset-simple.c > +++ b/drivers/reset/reset-simple.c > @@ -125,6 +125,7 @@ static const struct of_device_id reset_simple_dt_ids[] = { > .data = &reset_simple_active_low }, > { .compatible = "aspeed,ast2400-lpc-reset" }, > { .compatible = "aspeed,ast2500-lpc-reset" }, > + { .compatible = "aspeed,ast2600-lpc-reset" }, > { .compatible = "bitmain,bm1880-reset", > .data = &reset_simple_active_low }, > { /* sentinel */ }, > diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c > index 01ed21e8bfee..12e4421dee37 100644 > --- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c > +++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c > @@ -291,6 +291,7 @@ static int aspeed_lpc_ctrl_remove(struct platform_device *pdev) > static const struct of_device_id aspeed_lpc_ctrl_match[] = { > { .compatible = "aspeed,ast2400-lpc-ctrl" }, > { .compatible = "aspeed,ast2500-lpc-ctrl" }, > + { .compatible = "aspeed,ast2600-lpc-ctrl" }, > { }, > }; > > diff --git a/drivers/soc/aspeed/aspeed-lpc-snoop.c b/drivers/soc/aspeed/aspeed-lpc-snoop.c > index 48f7ac238861..c7b4ac066b40 100644 > --- a/drivers/soc/aspeed/aspeed-lpc-snoop.c > +++ b/drivers/soc/aspeed/aspeed-lpc-snoop.c > @@ -325,6 +325,8 @@ static const struct of_device_id aspeed_lpc_snoop_match[] = { > .data = &ast2400_model_data }, > { .compatible = "aspeed,ast2500-lpc-snoop", > .data = &ast2500_model_data }, > + { .compatible = "aspeed,ast2600-lpc-snoop", > + .data = &ast2500_model_data }, > { }, > }; >
diff --git a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt index 028268fd99ee..4b43b7829bd9 100644 --- a/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt +++ b/Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt @@ -1,6 +1,6 @@ * Aspeed BT (Block Transfer) IPMI interface -The Aspeed SOCs (AST2400 and AST2500) are commonly used as BMCs +The Aspeed SOCs (AST2400, AST2500 and AST2600) are commonly used as BMCs (BaseBoard Management Controllers) and the BT interface can be used to perform in-band IPMI communication with their host. @@ -9,6 +9,7 @@ Required properties: - compatible : should be one of "aspeed,ast2400-ibt-bmc" "aspeed,ast2500-ibt-bmc" + "aspeed,ast2600-ibt-bmc" - reg: physical address and size of the registers Optional properties: diff --git a/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt b/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt index 86446074e206..e1197bab57bb 100644 --- a/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt +++ b/Documentation/devicetree/bindings/mfd/aspeed-lpc.txt @@ -46,6 +46,7 @@ Required properties - compatible: One of: "aspeed,ast2400-lpc", "simple-mfd" "aspeed,ast2500-lpc", "simple-mfd" + "aspeed,ast2600-lpc", "simple-mfd" - reg: contains the physical address and length values of the Aspeed LPC memory region. @@ -64,6 +65,7 @@ BMC Node - compatible: One of: "aspeed,ast2400-lpc-bmc" "aspeed,ast2500-lpc-bmc" + "aspeed,ast2600-lpc-bmc" - reg: contains the physical address and length values of the H8S/2168-compatible LPC controller memory region @@ -74,6 +76,7 @@ Host Node - compatible: One of: "aspeed,ast2400-lpc-host", "simple-mfd", "syscon" "aspeed,ast2500-lpc-host", "simple-mfd", "syscon" + "aspeed,ast2600-lpc-host", "simple-mfd", "syscon" - reg: contains the address and length values of the host-related register space for the Aspeed LPC controller @@ -128,6 +131,7 @@ Required properties: - compatible: One of: "aspeed,ast2400-lpc-ctrl"; "aspeed,ast2500-lpc-ctrl"; + "aspeed,ast2600-lpc-ctrl"; - reg: contains offset/length values of the host interface controller memory regions @@ -168,6 +172,7 @@ Required properties: - compatible: One of: "aspeed,ast2400-lhc"; "aspeed,ast2500-lhc"; + "aspeed,ast2600-lhc"; - reg: contains offset/length values of the LHC memory regions. In the AST2400 and AST2500 there are two regions. @@ -187,7 +192,8 @@ state of the LPC bus. Some systems may chose to modify this configuration. Required properties: - - compatible: "aspeed,ast2500-lpc-reset" or + - compatible: "aspeed,ast2600-lpc-reset" or + "aspeed,ast2500-lpc-reset" "aspeed,ast2400-lpc-reset" - reg: offset and length of the IP in the LHC memory region - #reset-controller indicates the number of reset cells expected diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c index 40b9927c072c..0e600449931b 100644 --- a/drivers/char/ipmi/bt-bmc.c +++ b/drivers/char/ipmi/bt-bmc.c @@ -513,6 +513,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" }, + { .compatible = "aspeed,ast2600-ibt-bmc" }, { }, }; diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c b/drivers/char/ipmi/kcs_bmc_aspeed.c index 3c955946e647..a0a8bb89c9b3 100644 --- a/drivers/char/ipmi/kcs_bmc_aspeed.c +++ b/drivers/char/ipmi/kcs_bmc_aspeed.c @@ -301,6 +301,7 @@ static int aspeed_kcs_remove(struct platform_device *pdev) static const struct of_device_id ast_kcs_bmc_match[] = { { .compatible = "aspeed,ast2400-kcs-bmc" }, { .compatible = "aspeed,ast2500-kcs-bmc" }, + { .compatible = "aspeed,ast2600-kcs-bmc" }, { } }; MODULE_DEVICE_TABLE(of, ast_kcs_bmc_match); diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c index 1154f7b1f4dd..2fe9c889a75a 100644 --- a/drivers/reset/reset-simple.c +++ b/drivers/reset/reset-simple.c @@ -125,6 +125,7 @@ static const struct of_device_id reset_simple_dt_ids[] = { .data = &reset_simple_active_low }, { .compatible = "aspeed,ast2400-lpc-reset" }, { .compatible = "aspeed,ast2500-lpc-reset" }, + { .compatible = "aspeed,ast2600-lpc-reset" }, { .compatible = "bitmain,bm1880-reset", .data = &reset_simple_active_low }, { /* sentinel */ }, diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c index 01ed21e8bfee..12e4421dee37 100644 --- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c +++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c @@ -291,6 +291,7 @@ static int aspeed_lpc_ctrl_remove(struct platform_device *pdev) static const struct of_device_id aspeed_lpc_ctrl_match[] = { { .compatible = "aspeed,ast2400-lpc-ctrl" }, { .compatible = "aspeed,ast2500-lpc-ctrl" }, + { .compatible = "aspeed,ast2600-lpc-ctrl" }, { }, }; diff --git a/drivers/soc/aspeed/aspeed-lpc-snoop.c b/drivers/soc/aspeed/aspeed-lpc-snoop.c index 48f7ac238861..c7b4ac066b40 100644 --- a/drivers/soc/aspeed/aspeed-lpc-snoop.c +++ b/drivers/soc/aspeed/aspeed-lpc-snoop.c @@ -325,6 +325,8 @@ static const struct of_device_id aspeed_lpc_snoop_match[] = { .data = &ast2400_model_data }, { .compatible = "aspeed,ast2500-lpc-snoop", .data = &ast2500_model_data }, + { .compatible = "aspeed,ast2600-lpc-snoop", + .data = &ast2500_model_data }, { }, };
Assume The AST2600 SoCs contain the same LPC devices as the AST2500. Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> --- .../devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 3 ++- Documentation/devicetree/bindings/mfd/aspeed-lpc.txt | 8 +++++++- drivers/char/ipmi/bt-bmc.c | 1 + drivers/char/ipmi/kcs_bmc_aspeed.c | 1 + drivers/reset/reset-simple.c | 1 + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 1 + drivers/soc/aspeed/aspeed-lpc-snoop.c | 2 ++ 7 files changed, 15 insertions(+), 2 deletions(-)