From: Fabian Vogt <fabian@ritter-vogt.de>
To: Arnd Bergmann <arnd@arndb.de>,
Linus Walleij <linus.walleij@linaro.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Daniel Tang <dt.tangr@gmail.com>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Andrew Davis <afd@ti.com>
Subject: Re: [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart
Date: Wed, 26 Oct 2022 20:35:52 +0200 [thread overview]
Message-ID: <4750364.GXAFRqVoOG@fabians-envy> (raw)
In-Reply-To: <20221026161302.5319-2-afd@ti.com>
Hi,
Am Mittwoch, 26. Oktober 2022, 18:13:01 CEST schrieb Andrew Davis:
> Writing this bit can be handled by the syscon-reboot driver. Add the
> info to DT and remove the machine_desc version.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
finally got this to run on real HW after reverting to an older .config
and refreshing options. Rebooting works fine here. Thanks a lot!
Tested-by: Fabian Vogt <fabian@ritter-vogt.de>
Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
> ---
> arch/arm/boot/dts/nspire.dtsi | 7 +++++++
> arch/arm/mach-nspire/Kconfig | 2 ++
> arch/arm/mach-nspire/mmio.h | 3 ---
> arch/arm/mach-nspire/nspire.c | 10 ----------
> 4 files changed, 9 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi
> index bb240e6a3a6f..6357b803521e 100644
> --- a/arch/arm/boot/dts/nspire.dtsi
> +++ b/arch/arm/boot/dts/nspire.dtsi
> @@ -172,7 +172,14 @@ rtc: rtc@90090000 {
> };
>
> misc: misc@900a0000 {
> + compatible = "syscon", "simple-mfd";
> reg = <0x900a0000 0x1000>;
> +
> + reboot {
> + compatible = "syscon-reboot";
> + offset = <0x08>;
> + value = <0x02>;
> + };
> };
>
> pwr: pwr@900b0000 {
> diff --git a/arch/arm/mach-nspire/Kconfig b/arch/arm/mach-nspire/Kconfig
> index b7a3871876d7..0ffdcaca1e6b 100644
> --- a/arch/arm/mach-nspire/Kconfig
> +++ b/arch/arm/mach-nspire/Kconfig
> @@ -9,5 +9,7 @@ config ARCH_NSPIRE
> select ARM_VIC
> select ARM_TIMER_SP804
> select NSPIRE_TIMER
> + select POWER_RESET
> + select POWER_RESET_SYSCON
> help
> This enables support for systems using the TI-NSPIRE CPU
> diff --git a/arch/arm/mach-nspire/mmio.h b/arch/arm/mach-nspire/mmio.h
> index 48e32f13f311..2ce0656139ec 100644
> --- a/arch/arm/mach-nspire/mmio.h
> +++ b/arch/arm/mach-nspire/mmio.h
> @@ -5,9 +5,6 @@
> * Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
> */
>
> -#define NSPIRE_MISC_PHYS_BASE 0x900A0000
> -#define NSPIRE_MISC_HWRESET 0x08
> -
> #define NSPIRE_PWR_PHYS_BASE 0x900B0000
> #define NSPIRE_PWR_VIRT_BASE 0xFEEB0000
> #define NSPIRE_PWR_BUS_DISABLE1 0x18
> diff --git a/arch/arm/mach-nspire/nspire.c b/arch/arm/mach-nspire/nspire.c
> index 2d4abb0288b9..1e13337972dd 100644
> --- a/arch/arm/mach-nspire/nspire.c
> +++ b/arch/arm/mach-nspire/nspire.c
> @@ -27,16 +27,6 @@ static const char *const nspire_dt_match[] __initconst = {
> NULL,
> };
>
> -static void nspire_restart(enum reboot_mode mode, const char *cmd)
> -{
> - void __iomem *base = ioremap(NSPIRE_MISC_PHYS_BASE, SZ_4K);
> - if (!base)
> - return;
> -
> - writel(2, base + NSPIRE_MISC_HWRESET);
> -}
> -
> DT_MACHINE_START(NSPIRE, "TI-NSPIRE")
> .dt_compat = nspire_dt_match,
> - .restart = nspire_restart,
> MACHINE_END
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Fabian Vogt <fabian@ritter-vogt.de>
To: Arnd Bergmann <arnd@arndb.de>,
Linus Walleij <linus.walleij@linaro.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Daniel Tang <dt.tangr@gmail.com>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Andrew Davis <afd@ti.com>
Subject: Re: [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart
Date: Wed, 26 Oct 2022 20:35:52 +0200 [thread overview]
Message-ID: <4750364.GXAFRqVoOG@fabians-envy> (raw)
In-Reply-To: <20221026161302.5319-2-afd@ti.com>
Hi,
Am Mittwoch, 26. Oktober 2022, 18:13:01 CEST schrieb Andrew Davis:
> Writing this bit can be handled by the syscon-reboot driver. Add the
> info to DT and remove the machine_desc version.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
finally got this to run on real HW after reverting to an older .config
and refreshing options. Rebooting works fine here. Thanks a lot!
Tested-by: Fabian Vogt <fabian@ritter-vogt.de>
Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
> ---
> arch/arm/boot/dts/nspire.dtsi | 7 +++++++
> arch/arm/mach-nspire/Kconfig | 2 ++
> arch/arm/mach-nspire/mmio.h | 3 ---
> arch/arm/mach-nspire/nspire.c | 10 ----------
> 4 files changed, 9 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi
> index bb240e6a3a6f..6357b803521e 100644
> --- a/arch/arm/boot/dts/nspire.dtsi
> +++ b/arch/arm/boot/dts/nspire.dtsi
> @@ -172,7 +172,14 @@ rtc: rtc@90090000 {
> };
>
> misc: misc@900a0000 {
> + compatible = "syscon", "simple-mfd";
> reg = <0x900a0000 0x1000>;
> +
> + reboot {
> + compatible = "syscon-reboot";
> + offset = <0x08>;
> + value = <0x02>;
> + };
> };
>
> pwr: pwr@900b0000 {
> diff --git a/arch/arm/mach-nspire/Kconfig b/arch/arm/mach-nspire/Kconfig
> index b7a3871876d7..0ffdcaca1e6b 100644
> --- a/arch/arm/mach-nspire/Kconfig
> +++ b/arch/arm/mach-nspire/Kconfig
> @@ -9,5 +9,7 @@ config ARCH_NSPIRE
> select ARM_VIC
> select ARM_TIMER_SP804
> select NSPIRE_TIMER
> + select POWER_RESET
> + select POWER_RESET_SYSCON
> help
> This enables support for systems using the TI-NSPIRE CPU
> diff --git a/arch/arm/mach-nspire/mmio.h b/arch/arm/mach-nspire/mmio.h
> index 48e32f13f311..2ce0656139ec 100644
> --- a/arch/arm/mach-nspire/mmio.h
> +++ b/arch/arm/mach-nspire/mmio.h
> @@ -5,9 +5,6 @@
> * Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
> */
>
> -#define NSPIRE_MISC_PHYS_BASE 0x900A0000
> -#define NSPIRE_MISC_HWRESET 0x08
> -
> #define NSPIRE_PWR_PHYS_BASE 0x900B0000
> #define NSPIRE_PWR_VIRT_BASE 0xFEEB0000
> #define NSPIRE_PWR_BUS_DISABLE1 0x18
> diff --git a/arch/arm/mach-nspire/nspire.c b/arch/arm/mach-nspire/nspire.c
> index 2d4abb0288b9..1e13337972dd 100644
> --- a/arch/arm/mach-nspire/nspire.c
> +++ b/arch/arm/mach-nspire/nspire.c
> @@ -27,16 +27,6 @@ static const char *const nspire_dt_match[] __initconst = {
> NULL,
> };
>
> -static void nspire_restart(enum reboot_mode mode, const char *cmd)
> -{
> - void __iomem *base = ioremap(NSPIRE_MISC_PHYS_BASE, SZ_4K);
> - if (!base)
> - return;
> -
> - writel(2, base + NSPIRE_MISC_HWRESET);
> -}
> -
> DT_MACHINE_START(NSPIRE, "TI-NSPIRE")
> .dt_compat = nspire_dt_match,
> - .restart = nspire_restart,
> MACHINE_END
next prev parent reply other threads:[~2022-10-26 18:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-26 16:13 [PATCH v2 0/2] TI-Nspire cleanups Andrew Davis
2022-10-26 16:13 ` Andrew Davis
2022-10-26 16:13 ` [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart Andrew Davis
2022-10-26 16:13 ` Andrew Davis
2022-10-26 18:35 ` Fabian Vogt [this message]
2022-10-26 18:35 ` Fabian Vogt
2022-10-26 20:17 ` Krzysztof Kozlowski
2022-10-26 20:17 ` Krzysztof Kozlowski
2022-10-27 18:16 ` Andrew Davis
2022-10-27 18:16 ` Andrew Davis
2022-10-26 16:13 ` [PATCH v2 2/2] ARM: nspire: Remove unused header file mmio.h Andrew Davis
2022-10-26 16:13 ` Andrew Davis
2022-10-26 18:36 ` Fabian Vogt
2022-10-26 18:36 ` Fabian Vogt
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=4750364.GXAFRqVoOG@fabians-envy \
--to=fabian@ritter-vogt.de \
--cc=afd@ti.com \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=dt.tangr@gmail.com \
--cc=geert+renesas@glider.be \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/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.