All of lore.kernel.org
 help / color / mirror / Atom feed
From: Maxim Sloyko <maxims@google.com>
To: u-boot@lists.denx.de, Simon Glass <sjg@chromium.org>
Cc: openbmc@lists.ozlabs.org, Maxim Sloyko <maxims@google.com>,
	Albert Aribaud <albert.u.boot@aribaud.net>
Subject: [PATCH v2 06/15] aspeed: Device Tree configuration for Reset Driver
Date: Fri,  5 May 2017 15:01:06 -0700	[thread overview]
Message-ID: <20170505220115.143025-7-maxims@google.com> (raw)
In-Reply-To: <20170505220115.143025-1-maxims@google.com>

Add Reset Driver configuration to ast2500 SoC Device Tree and bindings
for various reset signals

Signed-off-by: Maxim Sloyko <maxims@google.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None
Changes in v1: None

 arch/arm/dts/ast2500-evb.dts              | 15 +++++++++++
 arch/arm/dts/ast2500-u-boot.dtsi          | 10 +++++++
 include/dt-bindings/reset/ast2500-reset.h | 45 +++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 include/dt-bindings/reset/ast2500-reset.h

diff --git a/arch/arm/dts/ast2500-evb.dts b/arch/arm/dts/ast2500-evb.dts
index dc13952fb8..723941ac0b 100644
--- a/arch/arm/dts/ast2500-evb.dts
+++ b/arch/arm/dts/ast2500-evb.dts
@@ -21,3 +21,18 @@
 &sdrammc {
 	clock-frequency = <400000000>;
 };
+
+&wdt1 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&wdt2 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&wdt3 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
diff --git a/arch/arm/dts/ast2500-u-boot.dtsi b/arch/arm/dts/ast2500-u-boot.dtsi
index c95a7ba835..faeeec1be4 100644
--- a/arch/arm/dts/ast2500-u-boot.dtsi
+++ b/arch/arm/dts/ast2500-u-boot.dtsi
@@ -1,4 +1,5 @@
 #include <dt-bindings/clock/ast2500-scu.h>
+#include <dt-bindings/reset/ast2500-reset.h>
 
 #include "ast2500.dtsi"
 
@@ -11,12 +12,21 @@
 		#reset-cells = <1>;
 	};
 
+	rst: reset-controller {
+		u-boot,dm-pre-reloc;
+		compatible = "aspeed,ast2500-reset";
+		aspeed,wdt = <&wdt1>;
+		#reset-cells = <1>;
+	};
+
 	sdrammc: sdrammc@1e6e0000 {
 		u-boot,dm-pre-reloc;
 		compatible = "aspeed,ast2500-sdrammc";
 		reg = <0x1e6e0000 0x174
 			0x1e6e0200 0x1d4 >;
+		#reset-cells = <1>;
 		clocks = <&scu PLL_MPLL>;
+		resets = <&rst AST_RESET_SDRAM>;
 	};
 
 	ahb {
diff --git a/include/dt-bindings/reset/ast2500-reset.h b/include/dt-bindings/reset/ast2500-reset.h
new file mode 100644
index 0000000000..eb5e1db97b
--- /dev/null
+++ b/include/dt-bindings/reset/ast2500-reset.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2017 Google, Inc
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef _ABI_MACH_ASPEED_AST2500_RESET_H_
+#define _ABI_MACH_ASPEED_AST2500_RESET_H_
+
+/*
+ * The values are intentionally layed out as flags in
+ * WDT reset parameter.
+ */
+
+#define AST_RESET_SOC			0
+#define AST_RESET_CHIP			1
+#define AST_RESET_CPU			(1 << 1)
+#define AST_RESET_ARM			(1 << 2)
+#define AST_RESET_COPROC		(1 << 3)
+#define AST_RESET_SDRAM			(1 << 4)
+#define AST_RESET_AHB			(1 << 5)
+#define AST_RESET_I2C			(1 << 6)
+#define AST_RESET_MAC1			(1 << 7)
+#define AST_RESET_MAC2			(1 << 8)
+#define AST_RESET_GCRT			(1 << 9)
+#define AST_RESET_USB20			(1 << 10)
+#define AST_RESET_USB11_HOST		(1 << 11)
+#define AST_RESET_USB11_HID		(1 << 12)
+#define AST_RESET_VIDEO			(1 << 13)
+#define AST_RESET_HAC			(1 << 14)
+#define AST_RESET_LPC			(1 << 15)
+#define AST_RESET_SDIO			(1 << 16)
+#define AST_RESET_MIC			(1 << 17)
+#define AST_RESET_CRT2D			(1 << 18)
+#define AST_RESET_PWM			(1 << 19)
+#define AST_RESET_PECI			(1 << 20)
+#define AST_RESET_JTAG			(1 << 21)
+#define AST_RESET_ADC			(1 << 22)
+#define AST_RESET_GPIO			(1 << 23)
+#define AST_RESET_MCTP			(1 << 24)
+#define AST_RESET_XDMA			(1 << 25)
+#define AST_RESET_SPI			(1 << 26)
+#define AST_RESET_MISC			(1 << 27)
+
+#endif  /* _ABI_MACH_ASPEED_AST2500_RESET_H_ */
-- 
2.13.0.rc1.294.g07d810a77f-goog

WARNING: multiple messages have this Message-ID (diff)
From: Maxim Sloyko <maxims@google.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 06/15] aspeed: Device Tree configuration for Reset Driver
Date: Fri,  5 May 2017 15:01:06 -0700	[thread overview]
Message-ID: <20170505220115.143025-7-maxims@google.com> (raw)
In-Reply-To: <20170505220115.143025-1-maxims@google.com>

Add Reset Driver configuration to ast2500 SoC Device Tree and bindings
for various reset signals

Signed-off-by: Maxim Sloyko <maxims@google.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None
Changes in v1: None

 arch/arm/dts/ast2500-evb.dts              | 15 +++++++++++
 arch/arm/dts/ast2500-u-boot.dtsi          | 10 +++++++
 include/dt-bindings/reset/ast2500-reset.h | 45 +++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 include/dt-bindings/reset/ast2500-reset.h

diff --git a/arch/arm/dts/ast2500-evb.dts b/arch/arm/dts/ast2500-evb.dts
index dc13952fb8..723941ac0b 100644
--- a/arch/arm/dts/ast2500-evb.dts
+++ b/arch/arm/dts/ast2500-evb.dts
@@ -21,3 +21,18 @@
 &sdrammc {
 	clock-frequency = <400000000>;
 };
+
+&wdt1 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&wdt2 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&wdt3 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
diff --git a/arch/arm/dts/ast2500-u-boot.dtsi b/arch/arm/dts/ast2500-u-boot.dtsi
index c95a7ba835..faeeec1be4 100644
--- a/arch/arm/dts/ast2500-u-boot.dtsi
+++ b/arch/arm/dts/ast2500-u-boot.dtsi
@@ -1,4 +1,5 @@
 #include <dt-bindings/clock/ast2500-scu.h>
+#include <dt-bindings/reset/ast2500-reset.h>
 
 #include "ast2500.dtsi"
 
@@ -11,12 +12,21 @@
 		#reset-cells = <1>;
 	};
 
+	rst: reset-controller {
+		u-boot,dm-pre-reloc;
+		compatible = "aspeed,ast2500-reset";
+		aspeed,wdt = <&wdt1>;
+		#reset-cells = <1>;
+	};
+
 	sdrammc: sdrammc at 1e6e0000 {
 		u-boot,dm-pre-reloc;
 		compatible = "aspeed,ast2500-sdrammc";
 		reg = <0x1e6e0000 0x174
 			0x1e6e0200 0x1d4 >;
+		#reset-cells = <1>;
 		clocks = <&scu PLL_MPLL>;
+		resets = <&rst AST_RESET_SDRAM>;
 	};
 
 	ahb {
diff --git a/include/dt-bindings/reset/ast2500-reset.h b/include/dt-bindings/reset/ast2500-reset.h
new file mode 100644
index 0000000000..eb5e1db97b
--- /dev/null
+++ b/include/dt-bindings/reset/ast2500-reset.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2017 Google, Inc
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef _ABI_MACH_ASPEED_AST2500_RESET_H_
+#define _ABI_MACH_ASPEED_AST2500_RESET_H_
+
+/*
+ * The values are intentionally layed out as flags in
+ * WDT reset parameter.
+ */
+
+#define AST_RESET_SOC			0
+#define AST_RESET_CHIP			1
+#define AST_RESET_CPU			(1 << 1)
+#define AST_RESET_ARM			(1 << 2)
+#define AST_RESET_COPROC		(1 << 3)
+#define AST_RESET_SDRAM			(1 << 4)
+#define AST_RESET_AHB			(1 << 5)
+#define AST_RESET_I2C			(1 << 6)
+#define AST_RESET_MAC1			(1 << 7)
+#define AST_RESET_MAC2			(1 << 8)
+#define AST_RESET_GCRT			(1 << 9)
+#define AST_RESET_USB20			(1 << 10)
+#define AST_RESET_USB11_HOST		(1 << 11)
+#define AST_RESET_USB11_HID		(1 << 12)
+#define AST_RESET_VIDEO			(1 << 13)
+#define AST_RESET_HAC			(1 << 14)
+#define AST_RESET_LPC			(1 << 15)
+#define AST_RESET_SDIO			(1 << 16)
+#define AST_RESET_MIC			(1 << 17)
+#define AST_RESET_CRT2D			(1 << 18)
+#define AST_RESET_PWM			(1 << 19)
+#define AST_RESET_PECI			(1 << 20)
+#define AST_RESET_JTAG			(1 << 21)
+#define AST_RESET_ADC			(1 << 22)
+#define AST_RESET_GPIO			(1 << 23)
+#define AST_RESET_MCTP			(1 << 24)
+#define AST_RESET_XDMA			(1 << 25)
+#define AST_RESET_SPI			(1 << 26)
+#define AST_RESET_MISC			(1 << 27)
+
+#endif  /* _ABI_MACH_ASPEED_AST2500_RESET_H_ */
-- 
2.13.0.rc1.294.g07d810a77f-goog

  parent reply	other threads:[~2017-05-05 22:01 UTC|newest]

Thread overview: 132+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-17 19:00 [PATCH v1 00/15] Expand Aspeed AST2500 Support Maxim Sloyko
2017-04-17 19:00 ` [U-Boot] " Maxim Sloyko
2017-04-17 19:00 ` [PATCH v1 01/15] aspeed: Update ast2500 Device Tree Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:11   ` Simon Glass
2017-04-19  0:11     ` [U-Boot] " Simon Glass
2017-05-08 19:42   ` [U-Boot,v1,01/15] " Tom Rini
2017-05-08 19:42     ` [U-Boot] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 02/15] dm: Simple Watchdog uclass Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:11   ` Simon Glass
2017-04-19  0:11     ` [U-Boot] " Simon Glass
2017-05-08 19:42   ` [U-Boot,v1,02/15] " Tom Rini
2017-05-08 19:42     ` [U-Boot] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 03/15] aspeed: Watchdog Timer Driver Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:11   ` Simon Glass
2017-04-19  0:11     ` [U-Boot] " Simon Glass
2017-05-08 19:42   ` [U-Boot,v1,03/15] " Tom Rini
2017-05-08 19:42     ` [U-Boot] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 04/15] aspeed: Make SCU lock/unlock functions part of SCU API Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:11   ` Simon Glass
2017-04-19  0:11     ` [U-Boot] " Simon Glass
2017-05-08 19:42   ` [U-Boot, v1, " Tom Rini
2017-05-08 19:42     ` [U-Boot] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 05/15] aspeed: Reset Driver Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:11   ` Simon Glass
2017-04-19  0:11     ` [U-Boot] " Simon Glass
2017-05-08 19:42   ` [U-Boot,v1,05/15] " Tom Rini
2017-05-08 19:42     ` [U-Boot] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 06/15] aspeed: Device Tree configuration for " Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:11   ` Simon Glass
2017-04-19  0:11     ` [U-Boot] " Simon Glass
2017-05-08 19:42   ` [U-Boot,v1,06/15] " Tom Rini
2017-05-08 19:42     ` [U-Boot] [U-Boot, v1, 06/15] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 07/15] aspeed: Refactor AST2500 RAM Driver and Sysreset Driver Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:11   ` Simon Glass
2017-04-19  0:11     ` [U-Boot] " Simon Glass
2017-05-08 19:42   ` [U-Boot, v1, " Tom Rini
2017-05-08 19:42     ` [U-Boot] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 08/15] aspeed: AST2500 Pinctrl Driver Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:11   ` Simon Glass
2017-04-19  0:11     ` [U-Boot] " Simon Glass
2017-05-08 19:42   ` [U-Boot,v1,08/15] " Tom Rini
2017-05-08 19:42     ` [U-Boot] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 09/15] aspeed: Enable Pinctrl Driver in AST2500 EVB Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:11   ` Simon Glass
2017-04-19  0:11     ` [U-Boot] " Simon Glass
2017-05-08 19:42   ` [U-Boot,v1,09/15] " Tom Rini
2017-05-08 19:42     ` [U-Boot] [U-Boot, v1, 09/15] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 10/15] aspeed: Add P-Bus clock in ast2500 clock driver Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:11   ` Simon Glass
2017-04-19  0:11     ` [U-Boot] " Simon Glass
2017-05-08 19:42   ` [U-Boot, v1, " Tom Rini
2017-05-08 19:42     ` [U-Boot] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 11/15] aspeed: Add I2C Driver Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:12   ` Simon Glass
2017-04-19  0:12     ` [U-Boot] " Simon Glass
2017-05-05 19:18     ` Maxim Sloyko
2017-05-05 19:18       ` [U-Boot] " Maxim Sloyko
2017-04-19 11:58   ` Heiko Schocher
2017-04-19 11:58     ` [U-Boot] " Heiko Schocher
2017-04-19 16:02     ` Maxim Sloyko
2017-04-19 16:02       ` [U-Boot] " Maxim Sloyko
2017-04-20  4:03       ` Heiko Schocher
2017-04-20  4:03         ` [U-Boot] " Heiko Schocher
2017-05-08 19:42   ` [U-Boot,v1,11/15] " Tom Rini
2017-05-08 19:42     ` [U-Boot] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 12/15] aspeed: Enable I2C in EVB defconfig Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:12   ` Simon Glass
2017-04-19  0:12     ` [U-Boot] " Simon Glass
2017-05-08 19:43   ` [U-Boot,v1,12/15] " Tom Rini
2017-05-08 19:43     ` [U-Boot] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 13/15] aspeed: Add support for Clocks needed by MACs Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:12   ` Simon Glass
2017-04-19  0:12     ` [U-Boot] " Simon Glass
2017-05-08 19:43   ` [U-Boot,v1,13/15] " Tom Rini
2017-05-08 19:43     ` [U-Boot] [U-Boot, v1, 13/15] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 14/15] aspeed: Refactor SCU to use consistent mask & shift Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:12   ` Simon Glass
2017-04-19  0:12     ` [U-Boot] " Simon Glass
2017-05-08 19:43   ` [U-Boot, v1, " Tom Rini
2017-05-08 19:43     ` [U-Boot] " Tom Rini
2017-04-17 19:00 ` [PATCH v1 15/15] aspeed: Cleanup ast2500-u-boot.dtsi Device Tree Maxim Sloyko
2017-04-17 19:00   ` [U-Boot] " Maxim Sloyko
2017-04-19  0:12   ` Simon Glass
2017-04-19  0:12     ` [U-Boot] " Simon Glass
2017-05-08 19:43   ` [U-Boot, v1, " Tom Rini
2017-05-08 19:43     ` [U-Boot] " Tom Rini
2017-05-05 22:01 ` [PATCH v2 00/15] Expand Aspeed AST2500 Support Maxim Sloyko
2017-05-05 22:01   ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 01/15] aspeed: Update ast2500 Device Tree Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 02/15] dm: Simple Watchdog uclass Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 03/15] aspeed: Watchdog Timer Driver Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 04/15] aspeed: Make SCU lock/unlock functions part of SCU API Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 05/15] aspeed: Reset Driver Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` Maxim Sloyko [this message]
2017-05-05 22:01     ` [U-Boot] [PATCH v2 06/15] aspeed: Device Tree configuration for " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 07/15] aspeed: Refactor AST2500 RAM Driver and Sysreset Driver Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 08/15] aspeed: AST2500 Pinctrl Driver Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 09/15] aspeed: Enable Pinctrl Driver in AST2500 EVB Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 10/15] aspeed: Add P-Bus clock in ast2500 clock driver Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 11/15] aspeed: Add I2C Driver Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 12/15] aspeed: Enable I2C in EVB defconfig Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 13/15] aspeed: Add support for Clocks needed by MACs Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 14/15] aspeed: Refactor SCU to use consistent mask & shift Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko
2017-05-05 22:01   ` [PATCH v2 15/15] aspeed: Cleanup ast2500-u-boot.dtsi Device Tree Maxim Sloyko
2017-05-05 22:01     ` [U-Boot] " Maxim Sloyko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170505220115.143025-7-maxims@google.com \
    --to=maxims@google.com \
    --cc=albert.u.boot@aribaud.net \
    --cc=openbmc@lists.ozlabs.org \
    --cc=sjg@chromium.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.