[PATCH v2 2/5] ARM: dts: aspeed: Put the lpc_ctrl under lpc_host node for regmap
Cyril Bur
cyrilbur at gmail.com
Thu Dec 22 17:06:07 AEDT 2016
Signed-off-by: Cyril Bur <cyrilbur at gmail.com>
---
arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 6 ++++++
arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 6 ++++++
arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts | 6 ++++++
arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 5 -----
arch/arm/boot/dts/aspeed-g4.dtsi | 30 ++++++++++++++++++++++++++
5 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
index 9dc3e67fc98c..19aeb3eb4a0a 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts
@@ -29,6 +29,12 @@
no-map;
reg = <0x5f000000 0x01000000>; /* 16MB */
};
+
+ flash_memory: region at 54000000 {
+ compatible = "aspeed,ast2400-lpc-ctrl";
+ no-map;
+ reg = <0x54000000 0x04000000>; /* 64M */
+ };
};
ahb {
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
index 68946aa34e31..a99fef94a616 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts
@@ -33,6 +33,12 @@
no-map;
reg = <0x5f000000 0x01000000>; /* 16MB */
};
+
+ flash_memory: region at 54000000 {
+ compatible = "aspeed,ast2400-lpc-ctrl";
+ no-map;
+ reg = <0x54000000 0x04000000>; /* 64M */
+ };
};
leds {
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
index 639b8f877184..12b1cbcdf9d6 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts
@@ -29,6 +29,12 @@
no-map;
reg = <0x5f000000 0x01000000>; /* 16MB */
};
+
+ flash_memory: region at 54000000 {
+ compatible = "aspeed,ast2400-lpc-ctrl";
+ no-map;
+ reg = <0x54000000 0x04000000>; /* 64M */
+ };
};
ahb {
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
index b60044800ea1..bba911d79fbf 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
@@ -37,11 +37,6 @@
};
};
- flash_buffer at 1e789000 {
- compatible = "aspeed,ast2400-lpc-ctrl";
- memory-region = <&flash_memory>;
- reg = <0x1e789000 0x8>;
- };
leds {
compatible = "gpio-leds";
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 1ed2a9ba7ab8..2db7915de790 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -33,6 +33,36 @@
#size-cells = <1>;
ranges;
+ lpc: lpc at 1e789000 {
+ compatible = "aspeed,ast2400-lpc", "simple-mfd";
+ reg = <0x1e789000 0x1000>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0x0 0x1e789000 0x1000>;
+
+ lpc_bmc: lpc-bmc at 0 {
+ compatible = "aspeed,ast2400-lpc-bmc";
+ reg = <0x0 0x80>;
+ };
+
+ lpc_host: lpc-host at 80 {
+ compatible = "aspeed,ast2400-lpc-host", "simple-mfd", "syscon";
+ reg = <0x80 0x1e0>;
+ reg-io-width = <4>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges = <0x0 0x80 0x1e0>;
+
+ lpc-ctrl at 0 {
+ compatible = "aspeed,ast2400-lpc-ctrl";
+ memory-region = <&flash_memory>;
+ reg = <0x0 0x80>;
+ };
+ };
+ };
+
vic: interrupt-controller at 1e6c0080 {
compatible = "aspeed,ast2400-vic";
interrupt-controller;
--
2.11.0
More information about the openbmc
mailing list