* [PATCH v3 linux dev-5.3 00/10] ARM: dts: aspeed-g6 lpc, rainier
@ 2019-09-24 19:47 Brad Bishop
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 01/10] dt-bindings: aspeed-lpc: Add G6 compatible strings Brad Bishop
` (10 more replies)
0 siblings, 11 replies; 21+ messages in thread
From: Brad Bishop @ 2019-09-24 19:47 UTC (permalink / raw)
To: joel; +Cc: openbmc
> This is a quick attempt at wiring up some of the LPC bits on the
> AST2600, and then using it on a new board, Rainier, a new POWER system
> with an AST2600. The only verification performed was ensuring the
> kernel still booted and the ibt device probed using the Rainier device
> tree atop the ast2600-evb qemu model. Please review.
Changes since v2:
- split lpc, ipmi binding updates into separate patches
- split soc, ipmi, reset compatibles into separate patches
- moved sio_regs to separate G6 dtsi patch
- moved i2c and mac additions from rainier DT to separate patches
Changes since v1:
- split DT binding docs and driver changes into separate patches.
- reordered rainier DT elements (alphabetized).
- added rainier rtc, lpc-ctl, reserved memory, mac devices
Brad Bishop (10):
dt-bindings: aspeed-lpc: Add G6 compatible strings
dt-bindings: ipmi: Add aspeed-g6 compatible strings
soc: aspeed: lpc: Add G6 compatible strings
ipmi: aspeed-g6: Add compatible strings
reset: simple: Add AST2600 compatibility string
ARM: dts: aspeed-g6: Add lpc devices
ARM: dts: aspeed: Add Rainier system
ARM: dts: aspeed-g6: Expose SuperIO scratch registers
ARM: dts: aspeed: rainier: Add mac devices
ARM: dts: aspeed: rainier: Add i2c devices
.../bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 3 +-
.../bindings/ipmi/aspeed-kcs-bmc.txt | 7 +-
.../devicetree/bindings/mfd/aspeed-lpc.txt | 8 +-
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 464 ++++++++++++++++++
arch/arm/boot/dts/aspeed-g6.dtsi | 91 ++++
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 +
11 files changed, 575 insertions(+), 5 deletions(-)
create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
--
2.21.0
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v3 linux dev-5.3 01/10] dt-bindings: aspeed-lpc: Add G6 compatible strings
2019-09-24 19:47 [PATCH v3 linux dev-5.3 00/10] ARM: dts: aspeed-g6 lpc, rainier Brad Bishop
@ 2019-09-24 19:47 ` Brad Bishop
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 02/10] dt-bindings: ipmi: Add aspeed-g6 " Brad Bishop
` (9 subsequent siblings)
10 siblings, 0 replies; 21+ messages in thread
From: Brad Bishop @ 2019-09-24 19:47 UTC (permalink / raw)
To: joel; +Cc: openbmc
Assume everyhing is the same as the AST2500 since the AST2600 datasheet
indicates the same register set behind the LPC controller address space.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
v2: new for v2
v3: move ipmi binding updates to a separate patch
---
Documentation/devicetree/bindings/mfd/aspeed-lpc.txt | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 linux dev-5.3 02/10] dt-bindings: ipmi: Add aspeed-g6 compatible strings
2019-09-24 19:47 [PATCH v3 linux dev-5.3 00/10] ARM: dts: aspeed-g6 lpc, rainier Brad Bishop
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 01/10] dt-bindings: aspeed-lpc: Add G6 compatible strings Brad Bishop
@ 2019-09-24 19:47 ` Brad Bishop
2019-09-25 2:35 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 03/10] soc: aspeed: lpc: Add G6 " Brad Bishop
` (8 subsequent siblings)
10 siblings, 1 reply; 21+ messages in thread
From: Brad Bishop @ 2019-09-24 19:47 UTC (permalink / raw)
To: joel; +Cc: openbmc
The AST2600 SoC contains the same IPMI devices (KCS and BT) as the
AST2500.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
v3: new for v3
---
.../devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 3 ++-
Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt | 7 ++++---
2 files changed, 6 insertions(+), 4 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/ipmi/aspeed-kcs-bmc.txt b/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt
index d98a9bf45d6c..709c2efb80ef 100644
--- a/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt
+++ b/Documentation/devicetree/bindings/ipmi/aspeed-kcs-bmc.txt
@@ -1,13 +1,14 @@
* Aspeed KCS (Keyboard Controller Style) IPMI interface
-The Aspeed SOCs (AST2400 and AST2500) are commonly used as BMCs
-(Baseboard Management Controllers) and the KCS interface can be
-used to perform in-band IPMI communication with their host.
+The Aspeed SOCs (AST2400, AST2500 and AST200) are commonly used as BMCs
+(Baseboard Management Controllers) and the KCS interface can be used to
+perform in-band IPMI communication with their host.
Required properties:
- compatible : should be one of
"aspeed,ast2400-kcs-bmc"
"aspeed,ast2500-kcs-bmc"
+ "aspeed,ast2600-kcs-bmc"
- interrupts : interrupt generated by the controller
- kcs_chan : The LPC channel number in the controller
- kcs_addr : The host CPU IO map address
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 linux dev-5.3 03/10] soc: aspeed: lpc: Add G6 compatible strings
2019-09-24 19:47 [PATCH v3 linux dev-5.3 00/10] ARM: dts: aspeed-g6 lpc, rainier Brad Bishop
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 01/10] dt-bindings: aspeed-lpc: Add G6 compatible strings Brad Bishop
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 02/10] dt-bindings: ipmi: Add aspeed-g6 " Brad Bishop
@ 2019-09-24 19:47 ` Brad Bishop
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 04/10] ipmi: aspeed-g6: Add " Brad Bishop
` (7 subsequent siblings)
10 siblings, 0 replies; 21+ messages in thread
From: Brad Bishop @ 2019-09-24 19:47 UTC (permalink / raw)
To: joel; +Cc: openbmc
The AST2600(G6) has the same lpc-ctrl and lpc-snoop devices as the
AST2500.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
v3:
- move ipmi, reset to a separate patch
v2:
- removed DT binding documentation changes
---
drivers/soc/aspeed/aspeed-lpc-ctrl.c | 1 +
drivers/soc/aspeed/aspeed-lpc-snoop.c | 2 ++
2 files changed, 3 insertions(+)
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 },
{ },
};
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 linux dev-5.3 04/10] ipmi: aspeed-g6: Add compatible strings
2019-09-24 19:47 [PATCH v3 linux dev-5.3 00/10] ARM: dts: aspeed-g6 lpc, rainier Brad Bishop
` (2 preceding siblings ...)
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 03/10] soc: aspeed: lpc: Add G6 " Brad Bishop
@ 2019-09-24 19:47 ` Brad Bishop
2019-09-25 3:06 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 05/10] reset: simple: Add AST2600 compatibility string Brad Bishop
` (6 subsequent siblings)
10 siblings, 1 reply; 21+ messages in thread
From: Brad Bishop @ 2019-09-24 19:47 UTC (permalink / raw)
To: joel; +Cc: openbmc
The AST2600 SoC contains the same IPMI (BT/KCS) devices as the AST2500.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
v3: new for v3
---
drivers/char/ipmi/bt-bmc.c | 1 +
drivers/char/ipmi/kcs_bmc_aspeed.c | 1 +
2 files changed, 2 insertions(+)
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);
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 linux dev-5.3 05/10] reset: simple: Add AST2600 compatibility string
2019-09-24 19:47 [PATCH v3 linux dev-5.3 00/10] ARM: dts: aspeed-g6 lpc, rainier Brad Bishop
` (3 preceding siblings ...)
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 04/10] ipmi: aspeed-g6: Add " Brad Bishop
@ 2019-09-24 19:47 ` Brad Bishop
2019-09-25 3:06 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 06/10] ARM: dts: aspeed-g6: Add lpc devices Brad Bishop
` (5 subsequent siblings)
10 siblings, 1 reply; 21+ messages in thread
From: Brad Bishop @ 2019-09-24 19:47 UTC (permalink / raw)
To: joel; +Cc: openbmc
The AST2600 SoC contains the same LPC register set as the AST2500.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
v3: new for v3
---
drivers/reset/reset-simple.c | 1 +
1 file changed, 1 insertion(+)
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 */ },
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 linux dev-5.3 06/10] ARM: dts: aspeed-g6: Add lpc devices
2019-09-24 19:47 [PATCH v3 linux dev-5.3 00/10] ARM: dts: aspeed-g6 lpc, rainier Brad Bishop
` (4 preceding siblings ...)
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 05/10] reset: simple: Add AST2600 compatibility string Brad Bishop
@ 2019-09-24 19:47 ` Brad Bishop
2019-09-25 3:18 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 07/10] ARM: dts: aspeed: Add Rainier system Brad Bishop
` (4 subsequent siblings)
10 siblings, 1 reply; 21+ messages in thread
From: Brad Bishop @ 2019-09-24 19:47 UTC (permalink / raw)
To: joel; +Cc: openbmc
Everything is the same as G5, except the devices have their own
interrupt now.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
v2: new for v2
v3: fixed broken ipmi/lpc interrupts
---
arch/arm/boot/dts/aspeed-g6.dtsi | 87 ++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
index 72038c16f541..3b42404b2ace 100644
--- a/arch/arm/boot/dts/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed-g6.dtsi
@@ -249,6 +249,93 @@
status = "disabled";
};
+ lpc: lpc@1e789000 {
+ compatible = "aspeed,ast2600-lpc", "simple-mfd";
+ reg = <0x1e789000 0x1000>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0x0 0x1e789000 0x1000>;
+
+ lpc_bmc: lpc-bmc@0 {
+ compatible = "aspeed,ast2600-lpc-bmc", "simple-mfd", "syscon";
+ reg = <0x0 0x80>;
+ reg-io-width = <4>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0x0 0x0 0x80>;
+
+ kcs1: kcs1@0 {
+ compatible = "aspeed,ast2600-kcs-bmc";
+ interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
+ kcs_chan = <1>;
+ status = "disabled";
+ };
+ kcs2: kcs2@0 {
+ compatible = "aspeed,ast2600-kcs-bmc";
+ interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
+ kcs_chan = <2>;
+ status = "disabled";
+ };
+ kcs3: kcs3@0 {
+ compatible = "aspeed,ast2600-kcs-bmc";
+ interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
+ kcs_chan = <3>;
+ status = "disabled";
+ };
+ };
+
+ lpc_host: lpc-host@80 {
+ compatible = "aspeed,ast2600-lpc-host", "simple-mfd", "syscon";
+ reg = <0x80 0x1e0>;
+ reg-io-width = <4>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0x0 0x80 0x1e0>;
+
+ kcs4: kcs4@0 {
+ compatible = "aspeed,ast2600-kcs-bmc";
+ interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
+ kcs_chan = <4>;
+ status = "disabled";
+ };
+
+ lpc_ctrl: lpc-ctrl@0 {
+ compatible = "aspeed,ast2600-lpc-ctrl";
+ reg = <0x0 0x80>;
+ clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
+ status = "disabled";
+ };
+
+ lpc_snoop: lpc-snoop@0 {
+ compatible = "aspeed,ast2600-lpc-snoop";
+ reg = <0x0 0x80>;
+ interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+
+ lhc: lhc@20 {
+ compatible = "aspeed,ast2600-lhc";
+ reg = <0x20 0x24 0x48 0x8>;
+ };
+
+ lpc_reset: reset-controller@18 {
+ compatible = "aspeed,ast2600-lpc-reset";
+ reg = <0x18 0x4>;
+ #reset-cells = <1>;
+ };
+
+ ibt: ibt@c0 {
+ compatible = "aspeed,ast2600-ibt-bmc";
+ reg = <0xc0 0x18>;
+ interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
+ };
+ };
+ };
+
sdc: sdc@1e740000 {
compatible = "aspeed,ast2600-sd-controller";
reg = <0x1e740000 0x100>;
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 linux dev-5.3 07/10] ARM: dts: aspeed: Add Rainier system
2019-09-24 19:47 [PATCH v3 linux dev-5.3 00/10] ARM: dts: aspeed-g6 lpc, rainier Brad Bishop
` (5 preceding siblings ...)
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 06/10] ARM: dts: aspeed-g6: Add lpc devices Brad Bishop
@ 2019-09-24 19:47 ` Brad Bishop
2019-09-25 4:09 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 08/10] ARM: dts: aspeed-g6: Expose SuperIO scratch registers Brad Bishop
` (3 subsequent siblings)
10 siblings, 1 reply; 21+ messages in thread
From: Brad Bishop @ 2019-09-24 19:47 UTC (permalink / raw)
To: joel; +Cc: openbmc
Rainier is a new IBM server with POWER host processors and an AST2600
BMC.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
v3:
- removed i2c, mac
- moved reserved memory
- set correct memory size
v2:
- reordered rainier DT elements (alphabetized).
- added rainier rtc, lpc-ctl, reserved memory, mac devices
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 57 ++++++++++++++++++++
2 files changed, 58 insertions(+)
create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5af075c2f819..3ad9706337a2 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1278,6 +1278,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-bmc-facebook-wedge40.dtb \
aspeed-bmc-facebook-wedge100.dtb \
aspeed-bmc-facebook-yamp.dtb \
+ aspeed-bmc-ibm-rainier.dtb \
aspeed-bmc-intel-s2600wf.dtb \
aspeed-bmc-inspur-fp5280g2.dtb \
aspeed-bmc-lenovo-hr630.dtb \
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
new file mode 100644
index 000000000000..f56a7dddba62
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2019 IBM Corp.
+/dts-v1/;
+
+#include "aspeed-g6.dtsi"
+
+/ {
+ model = "Rainier";
+ compatible = "ibm,rainier-bmc", "aspeed,ast2600";
+
+ aliases {
+ serial4 = &uart5;
+ };
+
+ chosen {
+ stdout-path = &uart5;
+ bootargs = "console=ttyS4,115200n8";
+ };
+
+ memory@80000000 {
+ device_type = "memory";
+ reg = <0x80000000 0x40000000>;
+ };
+
+ reserved-memory {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+
+ flash_memory: region@BB000000 {
+ no-map;
+ reg = <0xBB000000 0x04000000>; /* 64M */
+ };
+ };
+
+};
+
+&emmc_controller {
+ status = "okay";
+};
+
+&emmc {
+ status = "okay";
+};
+
+&fsim0 {
+ status = "okay";
+};
+
+&ibt {
+ status = "okay";
+};
+
+&lpc_ctrl {
+ status = "okay";
+ memory-region = <&flash_memory>;
+};
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 linux dev-5.3 08/10] ARM: dts: aspeed-g6: Expose SuperIO scratch registers
2019-09-24 19:47 [PATCH v3 linux dev-5.3 00/10] ARM: dts: aspeed-g6 lpc, rainier Brad Bishop
` (6 preceding siblings ...)
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 07/10] ARM: dts: aspeed: Add Rainier system Brad Bishop
@ 2019-09-24 19:47 ` Brad Bishop
2019-09-25 4:10 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 09/10] ARM: dts: aspeed: rainier: Add mac devices Brad Bishop
` (2 subsequent siblings)
10 siblings, 1 reply; 21+ messages in thread
From: Brad Bishop @ 2019-09-24 19:47 UTC (permalink / raw)
To: joel; +Cc: openbmc
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
v3: new for v3
---
arch/arm/boot/dts/aspeed-g6.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
index 3b42404b2ace..d09f0bdefa43 100644
--- a/arch/arm/boot/dts/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed-g6.dtsi
@@ -333,6 +333,10 @@
interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
+
+ sio_regs: regs {
+ compatible = "aspeed,bmc-misc";
+ };
};
};
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 linux dev-5.3 09/10] ARM: dts: aspeed: rainier: Add mac devices
2019-09-24 19:47 [PATCH v3 linux dev-5.3 00/10] ARM: dts: aspeed-g6 lpc, rainier Brad Bishop
` (7 preceding siblings ...)
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 08/10] ARM: dts: aspeed-g6: Expose SuperIO scratch registers Brad Bishop
@ 2019-09-24 19:47 ` Brad Bishop
2019-09-25 3:20 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 10/10] ARM: dts: aspeed: rainier: Add i2c devices Brad Bishop
2019-09-24 23:25 ` [PATCH v3 linux dev-5.3 01/10] dt-bindings: aspeed-lpc: Add G6 compatible strings Milton Miller II
10 siblings, 1 reply; 21+ messages in thread
From: Brad Bishop @ 2019-09-24 19:47 UTC (permalink / raw)
To: joel; +Cc: openbmc
Rainier contains two network devices.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
v3: new for v3
---
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index f56a7dddba62..f448fa5df43a 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -55,3 +55,17 @@
status = "okay";
memory-region = <&flash_memory>;
};
+
+&mac2 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_rmii3_default>;
+ use-ncsi;
+};
+
+&mac3 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_rmii4_default>;
+ use-ncsi;
+};
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v3 linux dev-5.3 10/10] ARM: dts: aspeed: rainier: Add i2c devices
2019-09-24 19:47 [PATCH v3 linux dev-5.3 00/10] ARM: dts: aspeed-g6 lpc, rainier Brad Bishop
` (8 preceding siblings ...)
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 09/10] ARM: dts: aspeed: rainier: Add mac devices Brad Bishop
@ 2019-09-24 19:47 ` Brad Bishop
2019-09-25 3:21 ` Andrew Jeffery
2019-09-24 23:25 ` [PATCH v3 linux dev-5.3 01/10] dt-bindings: aspeed-lpc: Add G6 compatible strings Milton Miller II
10 siblings, 1 reply; 21+ messages in thread
From: Brad Bishop @ 2019-09-24 19:47 UTC (permalink / raw)
To: joel; +Cc: openbmc
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
v3: new for v3
---
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 393 +++++++++++++++++++
1 file changed, 393 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index f448fa5df43a..be149aa5251e 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -51,6 +51,399 @@
status = "okay";
};
+&i2c0 {
+ status = "okay";
+};
+
+&i2c1 {
+ status = "okay";
+};
+
+&i2c2 {
+ status = "okay";
+};
+
+&i2c3 {
+ status = "okay";
+
+ power-supply@68 {
+ compatible = "ibm,cffps2";
+ reg = <0x68>;
+ };
+
+ power-supply@69 {
+ compatible = "ibm,cffps2";
+ reg = <0x69>;
+ };
+
+ power-supply@6a {
+ compatible = "ibm,cffps2";
+ reg = <0x6a>;
+ };
+
+ power-supply@6b {
+ compatible = "ibm,cffps2";
+ reg = <0x6b>;
+ };
+};
+
+&i2c4 {
+ status = "okay";
+
+ tmp275@48 {
+ compatible = "ti,tmp275";
+ reg = <0x48>;
+ };
+
+ tmp275@49 {
+ compatible = "ti,tmp275";
+ reg = <0x49>;
+ };
+
+ tmp275@4a {
+ compatible = "ti,tmp275";
+ reg = <0x4a>;
+ };
+};
+
+&i2c5 {
+ status = "okay";
+
+ tmp275@48 {
+ compatible = "ti,tmp275";
+ reg = <0x48>;
+ };
+
+ tmp275@49 {
+ compatible = "ti,tmp275";
+ reg = <0x49>;
+ };
+};
+
+&i2c6 {
+ status = "okay";
+
+ tmp275@48 {
+ compatible = "ti,tmp275";
+ reg = <0x48>;
+ };
+
+ tmp275@4a {
+ compatible = "ti,tmp275";
+ reg = <0x4a>;
+ };
+
+ tmp275@4b {
+ compatible = "ti,tmp275";
+ reg = <0x4b>;
+ };
+};
+
+&i2c7 {
+ status = "okay";
+
+ si7021-a20@20 {
+ compatible = "silabs,si7020";
+ reg = <0x20>;
+ };
+
+ tmp275@48 {
+ compatible = "ti,tmp275";
+ reg = <0x48>;
+ };
+
+ max31785@52 {
+ compatible = "maxim,max31785a";
+ reg = <0x52>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ fan@0 {
+ compatible = "pmbus-fan";
+ reg = <0>;
+ tach-pulses = <2>;
+ maxim,fan-rotor-input = "tach";
+ maxim,fan-pwm-freq = <25000>;
+ maxim,fan-dual-tach;
+ maxim,fan-no-watchdog;
+ maxim,fan-no-fault-ramp;
+ maxim,fan-ramp = <2>;
+ maxim,fan-fault-pin-mon;
+ };
+
+ fan@1 {
+ compatible = "pmbus-fan";
+ reg = <1>;
+ tach-pulses = <2>;
+ maxim,fan-rotor-input = "tach";
+ maxim,fan-pwm-freq = <25000>;
+ maxim,fan-dual-tach;
+ maxim,fan-no-watchdog;
+ maxim,fan-no-fault-ramp;
+ maxim,fan-ramp = <2>;
+ maxim,fan-fault-pin-mon;
+ };
+
+ fan@2 {
+ compatible = "pmbus-fan";
+ reg = <2>;
+ tach-pulses = <2>;
+ maxim,fan-rotor-input = "tach";
+ maxim,fan-pwm-freq = <25000>;
+ maxim,fan-dual-tach;
+ maxim,fan-no-watchdog;
+ maxim,fan-no-fault-ramp;
+ maxim,fan-ramp = <2>;
+ maxim,fan-fault-pin-mon;
+ };
+
+ fan@3 {
+ compatible = "pmbus-fan";
+ reg = <3>;
+ tach-pulses = <2>;
+ maxim,fan-rotor-input = "tach";
+ maxim,fan-pwm-freq = <25000>;
+ maxim,fan-dual-tach;
+ maxim,fan-no-watchdog;
+ maxim,fan-no-fault-ramp;
+ maxim,fan-ramp = <2>;
+ maxim,fan-fault-pin-mon;
+ };
+ };
+
+ pca0: pca9552@60 {
+ compatible = "nxp,pca9552";
+ reg = <0x60>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ gpio-controller;
+ #gpio-cells = <2>;
+
+ gpio@0 {
+ reg = <0>;
+ };
+
+ gpio@1 {
+ reg = <1>;
+ };
+
+ gpio@2 {
+ reg = <2>;
+ };
+
+ gpio@3 {
+ reg = <3>;
+ };
+
+ gpio@4 {
+ reg = <4>;
+ };
+
+ gpio@5 {
+ reg = <5>;
+ };
+
+ gpio@6 {
+ reg = <6>;
+ };
+
+ gpio@7 {
+ reg = <7>;
+ };
+
+ gpio@8 {
+ reg = <8>;
+ };
+
+ gpio@9 {
+ reg = <9>;
+ };
+
+ gpio@10 {
+ reg = <10>;
+ };
+
+ gpio@11 {
+ reg = <11>;
+ };
+
+ gpio@12 {
+ reg = <12>;
+ };
+
+ gpio@13 {
+ reg = <13>;
+ };
+
+ gpio@14 {
+ reg = <14>;
+ };
+
+ gpio@15 {
+ reg = <15>;
+ };
+ };
+
+ dps: dps310@76 {
+ compatible = "infineon,dps310";
+ reg = <0x76>;
+ #io-channel-cells = <0>;
+ };
+};
+
+&i2c8 {
+ status = "okay";
+
+ ucd90320@b {
+ compatible = "ti,ucd90160";
+ reg = <0x0b>;
+ };
+
+ ucd90320@c {
+ compatible = "ti,ucd90160";
+ reg = <0x0c>;
+ };
+
+ ucd90320@11 {
+ compatible = "ti,ucd90160";
+ reg = <0x11>;
+ };
+
+ rtc@32 {
+ compatible = "epson,rx8900";
+ reg = <0x32>;
+ };
+
+ tmp275@48 {
+ compatible = "ti,tmp275";
+ reg = <0x48>;
+ };
+
+ tmp275@4a {
+ compatible = "ti,tmp275";
+ reg = <0x4a>;
+ };
+};
+
+&i2c9 {
+ status = "okay";
+
+ ir35221@42 {
+ compatible = "infineon,ir35221";
+ reg = <0x42>;
+ };
+
+ ir35221@43 {
+ compatible = "infineon,ir35221";
+ reg = <0x43>;
+ };
+
+ ir35221@44 {
+ compatible = "infineon,ir35221";
+ reg = <0x44>;
+ };
+
+ tmp423a@4c {
+ compatible = "ti,tmp423";
+ reg = <0x4c>;
+ };
+
+ tmp423b@4d {
+ compatible = "ti,tmp423";
+ reg = <0x4d>;
+ };
+
+ ir35221@72 {
+ compatible = "infineon,ir35221";
+ reg = <0x72>;
+ };
+
+ ir35221@73 {
+ compatible = "infineon,ir35221";
+ reg = <0x73>;
+ };
+
+ ir35221@74 {
+ compatible = "infineon,ir35221";
+ reg = <0x74>;
+ };
+};
+
+&i2c10 {
+ status = "okay";
+
+ ir35221@42 {
+ compatible = "infineon,ir35221";
+ reg = <0x42>;
+ };
+
+ ir35221@43 {
+ compatible = "infineon,ir35221";
+ reg = <0x43>;
+ };
+
+ ir35221@44 {
+ compatible = "infineon,ir35221";
+ reg = <0x44>;
+ };
+
+ tmp423a@4c {
+ compatible = "ti,tmp423";
+ reg = <0x4c>;
+ };
+
+ tmp423b@4d {
+ compatible = "ti,tmp423";
+ reg = <0x4d>;
+ };
+
+ ir35221@72 {
+ compatible = "infineon,ir35221";
+ reg = <0x72>;
+ };
+
+ ir35221@73 {
+ compatible = "infineon,ir35221";
+ reg = <0x73>;
+ };
+
+ ir35221@74 {
+ compatible = "infineon,ir35221";
+ reg = <0x74>;
+ };
+};
+
+&i2c11 {
+ status = "okay";
+
+ tmp275@48 {
+ compatible = "ti,tmp275";
+ reg = <0x48>;
+ };
+
+ tmp275@49 {
+ compatible = "ti,tmp275";
+ reg = <0x49>;
+ };
+};
+
+&i2c12 {
+ status = "okay";
+};
+
+&i2c13 {
+ status = "okay";
+};
+
+&i2c14 {
+ status = "okay";
+};
+
+&i2c15 {
+ status = "okay";
+};
+
&lpc_ctrl {
status = "okay";
memory-region = <&flash_memory>;
--
2.21.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH v3 linux dev-5.3 01/10] dt-bindings: aspeed-lpc: Add G6 compatible strings
2019-09-24 19:47 [PATCH v3 linux dev-5.3 00/10] ARM: dts: aspeed-g6 lpc, rainier Brad Bishop
` (9 preceding siblings ...)
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 10/10] ARM: dts: aspeed: rainier: Add i2c devices Brad Bishop
@ 2019-09-24 23:25 ` Milton Miller II
2019-09-25 2:33 ` Andrew Jeffery
10 siblings, 1 reply; 21+ messages in thread
From: Milton Miller II @ 2019-09-24 23:25 UTC (permalink / raw)
To: Brad Bishop; +Cc: joel, openbmc
On 09/24/2019 at 02:48PM in some timezone, Brad Bishop wrote:
>Assume everyhing is the same as the AST2500 since the AST2600
>datasheet
>indicates the same register set behind the LPC controller address
>space.
Can we drop everything upto and including since?
>
>Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
>---
> v2: new for v2
> v3: move ipmi binding updates to a separate patch
>---
> Documentation/devicetree/bindings/mfd/aspeed-lpc.txt | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>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"
Minor nit: This one disn't use the phrase "One of" and needs either another
instance of "or", or it needs to adopt the "One of" like the other bindings.
> - reg: offset and length of the IP in the LHC memory region
> - #reset-controller indicates the number of reset cells expected
>--
>2.21.0
>
>
Thanks,
miilton
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 linux dev-5.3 01/10] dt-bindings: aspeed-lpc: Add G6 compatible strings
2019-09-24 23:25 ` [PATCH v3 linux dev-5.3 01/10] dt-bindings: aspeed-lpc: Add G6 compatible strings Milton Miller II
@ 2019-09-25 2:33 ` Andrew Jeffery
0 siblings, 0 replies; 21+ messages in thread
From: Andrew Jeffery @ 2019-09-25 2:33 UTC (permalink / raw)
To: Milton Miller II, Brad Bishop; +Cc: openbmc
On Wed, 25 Sep 2019, at 08:55, Milton Miller II wrote:
>
> On 09/24/2019 at 02:48PM in some timezone, Brad Bishop wrote:
> >Assume everyhing is the same as the AST2500 since the AST2600
> >datasheet
> >indicates the same register set behind the LPC controller address
> >space.
>
> Can we drop everything upto and including since?
I've confirmed with ASPEED that the LPC controller in the 2600 is the
same as the 2500. So we could reword this to remove all doubt.
Andrew
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 linux dev-5.3 02/10] dt-bindings: ipmi: Add aspeed-g6 compatible strings
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 02/10] dt-bindings: ipmi: Add aspeed-g6 " Brad Bishop
@ 2019-09-25 2:35 ` Andrew Jeffery
0 siblings, 0 replies; 21+ messages in thread
From: Andrew Jeffery @ 2019-09-25 2:35 UTC (permalink / raw)
To: Brad Bishop, Joel Stanley; +Cc: openbmc
On Wed, 25 Sep 2019, at 05:17, Brad Bishop wrote:
> The AST2600 SoC contains the same IPMI devices (KCS and BT) as the
> AST2500.
>
> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 linux dev-5.3 04/10] ipmi: aspeed-g6: Add compatible strings
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 04/10] ipmi: aspeed-g6: Add " Brad Bishop
@ 2019-09-25 3:06 ` Andrew Jeffery
0 siblings, 0 replies; 21+ messages in thread
From: Andrew Jeffery @ 2019-09-25 3:06 UTC (permalink / raw)
To: Brad Bishop, Joel Stanley; +Cc: openbmc
On Wed, 25 Sep 2019, at 05:17, Brad Bishop wrote:
> The AST2600 SoC contains the same IPMI (BT/KCS) devices as the AST2500.
>
> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 linux dev-5.3 05/10] reset: simple: Add AST2600 compatibility string
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 05/10] reset: simple: Add AST2600 compatibility string Brad Bishop
@ 2019-09-25 3:06 ` Andrew Jeffery
0 siblings, 0 replies; 21+ messages in thread
From: Andrew Jeffery @ 2019-09-25 3:06 UTC (permalink / raw)
To: Brad Bishop, Joel Stanley; +Cc: openbmc
On Wed, 25 Sep 2019, at 05:17, Brad Bishop wrote:
> The AST2600 SoC contains the same LPC register set as the AST2500.
>
> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> v3: new for v3
> ---
> drivers/reset/reset-simple.c | 1 +
> 1 file changed, 1 insertion(+)
>
> 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 */ },
> --
> 2.21.0
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 linux dev-5.3 06/10] ARM: dts: aspeed-g6: Add lpc devices
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 06/10] ARM: dts: aspeed-g6: Add lpc devices Brad Bishop
@ 2019-09-25 3:18 ` Andrew Jeffery
0 siblings, 0 replies; 21+ messages in thread
From: Andrew Jeffery @ 2019-09-25 3:18 UTC (permalink / raw)
To: Brad Bishop, Joel Stanley; +Cc: openbmc
On Wed, 25 Sep 2019, at 05:17, Brad Bishop wrote:
> Everything is the same as G5, except the devices have their own
> interrupt now.
>
> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Haven't cross-checked the IRQs but things look vaguely right. I would whinge
about ordering of some of the nodes, but I don't really care enough because
I don't like any of it anyway :)
Acked-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> v2: new for v2
> v3: fixed broken ipmi/lpc interrupts
> ---
> arch/arm/boot/dts/aspeed-g6.dtsi | 87 ++++++++++++++++++++++++++++++++
> 1 file changed, 87 insertions(+)
>
> diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
> index 72038c16f541..3b42404b2ace 100644
> --- a/arch/arm/boot/dts/aspeed-g6.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g6.dtsi
> @@ -249,6 +249,93 @@
> status = "disabled";
> };
>
> + lpc: lpc@1e789000 {
> + compatible = "aspeed,ast2600-lpc", "simple-mfd";
> + reg = <0x1e789000 0x1000>;
> +
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges = <0x0 0x1e789000 0x1000>;
> +
> + lpc_bmc: lpc-bmc@0 {
> + compatible = "aspeed,ast2600-lpc-bmc", "simple-mfd", "syscon";
> + reg = <0x0 0x80>;
> + reg-io-width = <4>;
> +
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges = <0x0 0x0 0x80>;
> +
> + kcs1: kcs1@0 {
> + compatible = "aspeed,ast2600-kcs-bmc";
> + interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
> + kcs_chan = <1>;
> + status = "disabled";
> + };
> + kcs2: kcs2@0 {
> + compatible = "aspeed,ast2600-kcs-bmc";
> + interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
> + kcs_chan = <2>;
> + status = "disabled";
> + };
> + kcs3: kcs3@0 {
> + compatible = "aspeed,ast2600-kcs-bmc";
> + interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
> + kcs_chan = <3>;
> + status = "disabled";
> + };
> + };
> +
> + lpc_host: lpc-host@80 {
> + compatible = "aspeed,ast2600-lpc-host", "simple-mfd", "syscon";
> + reg = <0x80 0x1e0>;
> + reg-io-width = <4>;
> +
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges = <0x0 0x80 0x1e0>;
> +
> + kcs4: kcs4@0 {
> + compatible = "aspeed,ast2600-kcs-bmc";
> + interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
> + kcs_chan = <4>;
> + status = "disabled";
> + };
> +
> + lpc_ctrl: lpc-ctrl@0 {
> + compatible = "aspeed,ast2600-lpc-ctrl";
> + reg = <0x0 0x80>;
> + clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
> + status = "disabled";
> + };
> +
> + lpc_snoop: lpc-snoop@0 {
> + compatible = "aspeed,ast2600-lpc-snoop";
> + reg = <0x0 0x80>;
> + interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
> + status = "disabled";
> + };
> +
> + lhc: lhc@20 {
> + compatible = "aspeed,ast2600-lhc";
> + reg = <0x20 0x24 0x48 0x8>;
> + };
> +
> + lpc_reset: reset-controller@18 {
> + compatible = "aspeed,ast2600-lpc-reset";
> + reg = <0x18 0x4>;
> + #reset-cells = <1>;
> + };
> +
> + ibt: ibt@c0 {
> + compatible = "aspeed,ast2600-ibt-bmc";
> + reg = <0xc0 0x18>;
> + interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
> + status = "disabled";
> + };
> + };
> + };
> +
> sdc: sdc@1e740000 {
> compatible = "aspeed,ast2600-sd-controller";
> reg = <0x1e740000 0x100>;
> --
> 2.21.0
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 linux dev-5.3 09/10] ARM: dts: aspeed: rainier: Add mac devices
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 09/10] ARM: dts: aspeed: rainier: Add mac devices Brad Bishop
@ 2019-09-25 3:20 ` Andrew Jeffery
0 siblings, 0 replies; 21+ messages in thread
From: Andrew Jeffery @ 2019-09-25 3:20 UTC (permalink / raw)
To: Brad Bishop, Joel Stanley; +Cc: openbmc
On Wed, 25 Sep 2019, at 05:17, Brad Bishop wrote:
> Rainier contains two network devices.
>
> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 linux dev-5.3 10/10] ARM: dts: aspeed: rainier: Add i2c devices
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 10/10] ARM: dts: aspeed: rainier: Add i2c devices Brad Bishop
@ 2019-09-25 3:21 ` Andrew Jeffery
0 siblings, 0 replies; 21+ messages in thread
From: Andrew Jeffery @ 2019-09-25 3:21 UTC (permalink / raw)
To: Brad Bishop, Joel Stanley; +Cc: openbmc
On Wed, 25 Sep 2019, at 05:17, Brad Bishop wrote:
> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Acked-by: Andrew Jeffery <andrew@aj.id.au>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 linux dev-5.3 07/10] ARM: dts: aspeed: Add Rainier system
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 07/10] ARM: dts: aspeed: Add Rainier system Brad Bishop
@ 2019-09-25 4:09 ` Andrew Jeffery
0 siblings, 0 replies; 21+ messages in thread
From: Andrew Jeffery @ 2019-09-25 4:09 UTC (permalink / raw)
To: Brad Bishop, Joel Stanley; +Cc: openbmc
On Wed, 25 Sep 2019, at 05:17, Brad Bishop wrote:
> Rainier is a new IBM server with POWER host processors and an AST2600
> BMC.
>
> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
> ---
> v3:
> - removed i2c, mac
> - moved reserved memory
> - set correct memory size
> v2:
> - reordered rainier DT elements (alphabetized).
> - added rainier rtc, lpc-ctl, reserved memory, mac devices
> ---
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 57 ++++++++++++++++++++
> 2 files changed, 58 insertions(+)
> create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 5af075c2f819..3ad9706337a2 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -1278,6 +1278,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
> aspeed-bmc-facebook-wedge40.dtb \
> aspeed-bmc-facebook-wedge100.dtb \
> aspeed-bmc-facebook-yamp.dtb \
> + aspeed-bmc-ibm-rainier.dtb \
> aspeed-bmc-intel-s2600wf.dtb \
> aspeed-bmc-inspur-fp5280g2.dtb \
> aspeed-bmc-lenovo-hr630.dtb \
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> new file mode 100644
> index 000000000000..f56a7dddba62
> --- /dev/null
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> @@ -0,0 +1,57 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +// Copyright 2019 IBM Corp.
> +/dts-v1/;
> +
> +#include "aspeed-g6.dtsi"
> +
> +/ {
> + model = "Rainier";
> + compatible = "ibm,rainier-bmc", "aspeed,ast2600";
> +
> + aliases {
> + serial4 = &uart5;
> + };
> +
> + chosen {
> + stdout-path = &uart5;
> + bootargs = "console=ttyS4,115200n8";
> + };
> +
> + memory@80000000 {
> + device_type = "memory";
> + reg = <0x80000000 0x40000000>;
> + };
> +
> + reserved-memory {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + ranges;
> +
> + flash_memory: region@BB000000 {
> + no-map;
> + reg = <0xBB000000 0x04000000>; /* 64M */
Probably should have warned you that the region needs to be naturally aligned, so
the address should be 0xb8000000.
Andrew
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3 linux dev-5.3 08/10] ARM: dts: aspeed-g6: Expose SuperIO scratch registers
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 08/10] ARM: dts: aspeed-g6: Expose SuperIO scratch registers Brad Bishop
@ 2019-09-25 4:10 ` Andrew Jeffery
0 siblings, 0 replies; 21+ messages in thread
From: Andrew Jeffery @ 2019-09-25 4:10 UTC (permalink / raw)
To: Brad Bishop, Joel Stanley; +Cc: openbmc
On Wed, 25 Sep 2019, at 05:17, Brad Bishop wrote:
> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
I really should fix this junk some day.
Acked-by: Andrew Jeffery <andrew@aj.id.au>
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2019-09-25 4:09 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-24 19:47 [PATCH v3 linux dev-5.3 00/10] ARM: dts: aspeed-g6 lpc, rainier Brad Bishop
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 01/10] dt-bindings: aspeed-lpc: Add G6 compatible strings Brad Bishop
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 02/10] dt-bindings: ipmi: Add aspeed-g6 " Brad Bishop
2019-09-25 2:35 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 03/10] soc: aspeed: lpc: Add G6 " Brad Bishop
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 04/10] ipmi: aspeed-g6: Add " Brad Bishop
2019-09-25 3:06 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 05/10] reset: simple: Add AST2600 compatibility string Brad Bishop
2019-09-25 3:06 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 06/10] ARM: dts: aspeed-g6: Add lpc devices Brad Bishop
2019-09-25 3:18 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 07/10] ARM: dts: aspeed: Add Rainier system Brad Bishop
2019-09-25 4:09 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 08/10] ARM: dts: aspeed-g6: Expose SuperIO scratch registers Brad Bishop
2019-09-25 4:10 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 09/10] ARM: dts: aspeed: rainier: Add mac devices Brad Bishop
2019-09-25 3:20 ` Andrew Jeffery
2019-09-24 19:47 ` [PATCH v3 linux dev-5.3 10/10] ARM: dts: aspeed: rainier: Add i2c devices Brad Bishop
2019-09-25 3:21 ` Andrew Jeffery
2019-09-24 23:25 ` [PATCH v3 linux dev-5.3 01/10] dt-bindings: aspeed-lpc: Add G6 compatible strings Milton Miller II
2019-09-25 2:33 ` Andrew Jeffery
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.