From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Subject: [PATCH 06/26 v6] mips: mtmips: make use of sysreset-resetctrl for mt7628 soc
Date: Wed, 8 Apr 2020 10:09:22 +0200 [thread overview]
Message-ID: <20200408080942.7694-7-sr@denx.de> (raw)
In-Reply-To: <20200408080942.7694-1-sr@denx.de>
From: Weijie Gao <weijie.gao@mediatek.com>
This patch replaces sysreset-syscon with sysreset-resetctrl for mt7628 soc.
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
---
Changes since v3: none
arch/mips/dts/mt7628a.dtsi | 10 +++++-----
arch/mips/mach-mtmips/Kconfig | 1 +
configs/gardena-smart-gateway-mt7688-ram_defconfig | 1 -
configs/gardena-smart-gateway-mt7688_defconfig | 1 -
configs/linkit-smart-7688-ram_defconfig | 1 -
configs/linkit-smart-7688_defconfig | 1 -
6 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/arch/mips/dts/mt7628a.dtsi b/arch/mips/dts/mt7628a.dtsi
index 76a80c8952..409695b5c7 100644
--- a/arch/mips/dts/mt7628a.dtsi
+++ b/arch/mips/dts/mt7628a.dtsi
@@ -46,11 +46,11 @@
reg = <0x0 0x100>;
};
- syscon-reboot {
- compatible = "syscon-reboot";
- regmap = <&sysc>;
- offset = <0x34>;
- mask = <0x1>;
+ reboot: resetctl-reboot {
+ compatible = "resetctl-reboot";
+
+ resets = <&rstctrl MT7628_SYS_RST>;
+ reset-names = "sysreset";
};
clkctrl: clkctrl at 0x2c {
diff --git a/arch/mips/mach-mtmips/Kconfig b/arch/mips/mach-mtmips/Kconfig
index 8e10719b27..8cb76c4560 100644
--- a/arch/mips/mach-mtmips/Kconfig
+++ b/arch/mips/mach-mtmips/Kconfig
@@ -27,6 +27,7 @@ config SOC_MT7628
select MIPS_L1_CACHE_SHIFT_5
select PINCTRL_MT7628
select MTK_SERIAL
+ select SYSRESET_RESETCTL
help
This supports MediaTek MT7628/MT7688.
diff --git a/configs/gardena-smart-gateway-mt7688-ram_defconfig b/configs/gardena-smart-gateway-mt7688-ram_defconfig
index dbc94b4106..5e10a4051e 100644
--- a/configs/gardena-smart-gateway-mt7688-ram_defconfig
+++ b/configs/gardena-smart-gateway-mt7688-ram_defconfig
@@ -68,7 +68,6 @@ CONFIG_MT7628_ETH=y
CONFIG_PHY=y
CONFIG_SPI=y
CONFIG_MT7621_SPI=y
-CONFIG_SYSRESET_SYSCON=y
CONFIG_WDT=y
CONFIG_WDT_MT7621=y
CONFIG_LZMA=y
diff --git a/configs/gardena-smart-gateway-mt7688_defconfig b/configs/gardena-smart-gateway-mt7688_defconfig
index 23d8ddb128..7a496fe5b3 100644
--- a/configs/gardena-smart-gateway-mt7688_defconfig
+++ b/configs/gardena-smart-gateway-mt7688_defconfig
@@ -71,7 +71,6 @@ CONFIG_MT7628_ETH=y
CONFIG_PHY=y
CONFIG_SPI=y
CONFIG_MT7621_SPI=y
-CONFIG_SYSRESET_SYSCON=y
CONFIG_WDT=y
CONFIG_WDT_MT7621=y
CONFIG_LZMA=y
diff --git a/configs/linkit-smart-7688-ram_defconfig b/configs/linkit-smart-7688-ram_defconfig
index d1691abfda..7f29617ddc 100644
--- a/configs/linkit-smart-7688-ram_defconfig
+++ b/configs/linkit-smart-7688-ram_defconfig
@@ -53,7 +53,6 @@ CONFIG_PHY=y
CONFIG_MT76X8_USB_PHY=y
CONFIG_SPI=y
CONFIG_MT7621_SPI=y
-CONFIG_SYSRESET_SYSCON=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
diff --git a/configs/linkit-smart-7688_defconfig b/configs/linkit-smart-7688_defconfig
index a567c0c507..484c338348 100644
--- a/configs/linkit-smart-7688_defconfig
+++ b/configs/linkit-smart-7688_defconfig
@@ -57,7 +57,6 @@ CONFIG_PHY=y
CONFIG_MT76X8_USB_PHY=y
CONFIG_SPI=y
CONFIG_MT7621_SPI=y
-CONFIG_SYSRESET_SYSCON=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_EHCI_HCD=y
--
2.26.0
next prev parent reply other threads:[~2020-04-08 8:09 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-08 8:09 [PATCH 00/26 v6] Refactor the architecture parts of mt7628 Stefan Roese
2020-04-08 8:09 ` [PATCH 01/26 v6] mips: add support to restore exception vector base before booting linux Stefan Roese
2020-04-08 8:09 ` [PATCH 02/26 v6] mips: mtmips: add predefined i-cache/d-cache size and linesize Stefan Roese
2020-04-08 8:09 ` [PATCH 03/26 v6] mips: add an option to support initialize SRAM for initial stack Stefan Roese
2020-04-08 8:09 ` [PATCH 04/26 v6] mips: start.S: avoid overwriting outside gd when clearing global data in stack Stefan Roese
2020-04-08 8:09 ` [PATCH 05/26 v6] sysreset: add reset controller based reboot driver Stefan Roese
2020-04-08 8:09 ` Stefan Roese [this message]
2020-04-08 8:09 ` [PATCH 07/26 v6] configs: enable CONFIG_RESTORE_EXCEPTION_VECTOR_BASE for all mtmips boards Stefan Roese
2020-04-08 8:09 ` [PATCH 08/26 v6] mips: add a mtmips-specific field to architecture-specific global data Stefan Roese
2020-04-08 8:09 ` [PATCH 09/26 v6] mips: add a option to support not reserving malloc space on initial stack Stefan Roese
2020-04-08 8:09 ` [PATCH 10/26 v6] mips: mtmips: rewrite lowlevel codes of mt7628 Stefan Roese
2020-04-08 8:09 ` [PATCH 11/26 v6] dts: mtmips: add alternative pinmux node for uart2 Stefan Roese
2020-04-08 8:09 ` [PATCH 12/26 v6] mips: enable support for appending dtb to spl binary Stefan Roese
2020-04-08 8:09 ` [PATCH 13/26 v6] mips: add an option to enable u_boot_list section for SPL loaders in u-boot-spl.lds Stefan Roese
2020-04-08 8:09 ` [PATCH 14/26 v6] lib: enable lzma decompression support for SPL build Stefan Roese
2020-04-08 8:09 ` [PATCH 15/26 v6] Makefile: add support to generate LZMA compressed u-boot image Stefan Roese
2020-04-08 8:09 ` [PATCH 16/26 v6] tools: binman: add etype file for u-boot-lzma-img Stefan Roese
2020-04-08 8:09 ` [PATCH 17/26 v6] spl: Extract legacy image handling into separate file Stefan Roese
2020-04-08 8:09 ` [PATCH 18/26 v6] spl: spl_legacy: Use IS_ENABLED() to remove #ifdef Stefan Roese
2020-04-08 8:09 ` [PATCH 19/26 v6] spl: spl_nor: Copy image header to local struct Stefan Roese
2020-04-09 7:24 ` Simon Goldschmidt
2020-04-08 8:09 ` [PATCH 20/26 v6] spl: spl_nor: Move legacy image loading into spl_legacy.c Stefan Roese
2020-04-09 18:51 ` Daniel Schwierzeck
2020-04-10 8:02 ` Stefan Roese
2020-04-08 8:09 ` [PATCH 21/26 v6] spl: spl_legacy: Add lzma decompression support for legacy image Stefan Roese
2020-04-08 8:09 ` [PATCH 22/26 v6] spl: spl_legacy: Add cache flush after reading U-Boot image Stefan Roese
2020-04-09 7:29 ` Simon Goldschmidt
2020-04-09 7:43 ` Stefan Roese
2020-04-09 16:47 ` Daniel Schwierzeck
2020-04-10 7:50 ` Stefan Roese
2020-04-09 18:15 ` Simon Goldschmidt
2020-04-08 8:09 ` [PATCH 23/26 v6] mips: mtmips: add SPL support Stefan Roese
2020-04-08 8:09 ` [PATCH 24/26 v6] mips: mtmips: enable SPL for all boards Stefan Roese
2020-04-08 8:09 ` [PATCH 25/26 v6] mips: mtmips: add support for mt7628-rfb Stefan Roese
2020-04-08 8:09 ` [PATCH 26/26 v6] mips: mtmips: Increase CONFIG_SPL_SYS_MALLOC_F_LEN Stefan Roese
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=20200408080942.7694-7-sr@denx.de \
--to=sr@denx.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox