mips: mtmips: make use of sysreset-resetctrl for mt7628 soc

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>

diff --git a/arch/mips/dts/mt7628a.dtsi b/arch/mips/dts/mt7628a.dtsi
index 76a80c8952dfa870face823ddbdf1d4c19b13f46..409695b5c710c840626487af838703324ddd9b30 100644 (file)
--- 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@0x2c {

diff --git a/arch/mips/mach-mtmips/Kconfig b/arch/mips/mach-mtmips/Kconfig
index 8e10719b27ddb3f9fa7bebf65a919d60378e97e4..8cb76c45608bb87058e14f0601b955d2d000a221 100644 (file)
--- 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 3d4a47fde9c1d35661b3e74a7ce13b18a8b0410a..48b7a436338e1e46b7735dad6d8fece011bba9b4 100644 (file)
--- a/configs/gardena-smart-gateway-mt7688-ram_defconfig
+++ b/configs/gardena-smart-gateway-mt7688-ram_defconfig
@@ -69,7 +69,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 9e902848effdda4c3a521bf74f1ee9c2ea2fb56f..7f040f57627235aa601f8edebb94bd73215364ff 100644 (file)
--- a/configs/gardena-smart-gateway-mt7688_defconfig
+++ b/configs/gardena-smart-gateway-mt7688_defconfig
@@ -72,7 +72,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 3115bad309999bb31415b3f20c16288d8f12f388..1db94db41f16f54b8d863b818fd4049658aae977 100644 (file)
--- a/configs/linkit-smart-7688-ram_defconfig
+++ b/configs/linkit-smart-7688-ram_defconfig
@@ -54,7 +54,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 f9b4beb0c77689097d69e2e177e64abc30619e2f..79939764437c949825fbd029e6a25a6b5e004a5d 100644 (file)
--- a/configs/linkit-smart-7688_defconfig
+++ b/configs/linkit-smart-7688_defconfig
@@ -58,7 +58,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