* [PATCH 1/2] ARM: nspire: Use syscon-reboot to handle restart
2022-08-22 23:20 [PATCH 0/2] TI-Nspire cleanups Andrew Davis
@ 2022-08-22 23:20 ` Andrew Davis
2022-08-26 8:34 ` Linus Walleij
2022-08-22 23:20 ` [PATCH 2/2] ARM: nspire: Remove unused header file mmio.h Andrew Davis
2022-08-23 9:16 ` [PATCH 0/2] TI-Nspire cleanups Daniel Tang
2 siblings, 1 reply; 6+ messages in thread
From: Andrew Davis @ 2022-08-22 23:20 UTC (permalink / raw)
To: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, Daniel Tang,
devicetree, linux-arm-kernel, linux-kernel
Cc: 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>
---
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 eb9916233dea..37e2dae60c2b 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
--
2.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] ARM: nspire: Remove unused header file mmio.h
2022-08-22 23:20 [PATCH 0/2] TI-Nspire cleanups Andrew Davis
2022-08-22 23:20 ` [PATCH 1/2] ARM: nspire: Use syscon-reboot to handle restart Andrew Davis
@ 2022-08-22 23:20 ` Andrew Davis
2022-08-23 9:16 ` [PATCH 0/2] TI-Nspire cleanups Daniel Tang
2 siblings, 0 replies; 6+ messages in thread
From: Andrew Davis @ 2022-08-22 23:20 UTC (permalink / raw)
To: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, Daniel Tang,
devicetree, linux-arm-kernel, linux-kernel
Cc: Andrew Davis
The Nspire boardfile platform drivers have all been converted. None
of the definitions in this header are used anymore. Remove it.
While here lets remove all the other unused headers and the file
name from in the file itself.
Signed-off-by: Andrew Davis <afd@ti.com>
---
arch/arm/mach-nspire/mmio.h | 13 -------------
arch/arm/mach-nspire/nspire.c | 14 --------------
2 files changed, 27 deletions(-)
delete mode 100644 arch/arm/mach-nspire/mmio.h
diff --git a/arch/arm/mach-nspire/mmio.h b/arch/arm/mach-nspire/mmio.h
deleted file mode 100644
index 2ce0656139ec..000000000000
--- a/arch/arm/mach-nspire/mmio.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * linux/arch/arm/mach-nspire/mmio.h
- *
- * Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
- */
-
-#define NSPIRE_PWR_PHYS_BASE 0x900B0000
-#define NSPIRE_PWR_VIRT_BASE 0xFEEB0000
-#define NSPIRE_PWR_BUS_DISABLE1 0x18
-#define NSPIRE_PWR_BUS_DISABLE2 0x20
-
-#define NSPIRE_LCD_PHYS_BASE 0xC0000000
diff --git a/arch/arm/mach-nspire/nspire.c b/arch/arm/mach-nspire/nspire.c
index 1e13337972dd..2fbfc23237ff 100644
--- a/arch/arm/mach-nspire/nspire.c
+++ b/arch/arm/mach-nspire/nspire.c
@@ -1,23 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * linux/arch/arm/mach-nspire/nspire.c
- *
* Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
*/
-#include <linux/init.h>
-#include <linux/of_irq.h>
-#include <linux/of_address.h>
-#include <linux/of_platform.h>
-#include <linux/irqchip.h>
-#include <linux/irqchip/arm-vic.h>
-#include <linux/clkdev.h>
-#include <linux/amba/bus.h>
#include <asm/mach/arch.h>
-#include <asm/mach-types.h>
-#include <asm/mach/map.h>
-
-#include "mmio.h"
static const char *const nspire_dt_match[] __initconst = {
"ti,nspire",
--
2.36.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/2] TI-Nspire cleanups
2022-08-22 23:20 [PATCH 0/2] TI-Nspire cleanups Andrew Davis
2022-08-22 23:20 ` [PATCH 1/2] ARM: nspire: Use syscon-reboot to handle restart Andrew Davis
2022-08-22 23:20 ` [PATCH 2/2] ARM: nspire: Remove unused header file mmio.h Andrew Davis
@ 2022-08-23 9:16 ` Daniel Tang
2022-09-01 19:38 ` Fabian Vogt
2 siblings, 1 reply; 6+ messages in thread
From: Daniel Tang @ 2022-08-23 9:16 UTC (permalink / raw)
To: Andrew Davis
Cc: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, devicetree,
linux-arm-kernel, linux-kernel, fabian
I've CC'd in Fabian, who has previously been able to assist testing
kernel patches for this platform.
On Tue, 23 Aug 2022 at 09:20, Andrew Davis <afd@ti.com> wrote:
>
> Hello all,
>
> I don't have the hardware to test this (yes I know who my current
> employer is), but it does look right and this lets us remove the rest
> of mach-nspire/ without losing any functionality.
> Does anyone have one of these to test with?
>
> The second patch removes a couple defines that do not seem to have ever
> been used, but if one want to implement it, then it should be a simple
> generic syscon DT node.
>
> Thanks,
> Andrew
>
> Andrew Davis (2):
> ARM: nspire: Use syscon-reboot to handle restart
> ARM: nspire: Remove unused header file mmio.h
>
> arch/arm/boot/dts/nspire.dtsi | 7 ++++
> arch/arm/mach-nspire/Kconfig | 2 ++
> arch/arm/mach-nspire/mmio.h | 16 ----------
> arch/arm/mach-nspire/nspire.c | 60 +++++++++++------------------------
> 4 files changed, 27 insertions(+), 58 deletions(-)
> delete mode 100644 arch/arm/mach-nspire/mmio.h
> rewrite arch/arm/mach-nspire/nspire.c (61%)
>
> --
> 2.36.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] TI-Nspire cleanups
2022-08-23 9:16 ` [PATCH 0/2] TI-Nspire cleanups Daniel Tang
@ 2022-09-01 19:38 ` Fabian Vogt
0 siblings, 0 replies; 6+ messages in thread
From: Fabian Vogt @ 2022-09-01 19:38 UTC (permalink / raw)
To: Andrew Davis, Daniel Tang
Cc: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, devicetree,
linux-arm-kernel, linux-kernel
Hi,
Am Dienstag, 23. August 2022, 11:16:17 CEST schrieb Daniel Tang:
> I've CC'd in Fabian, who has previously been able to assist testing
> kernel patches for this platform.
>
>
> On Tue, 23 Aug 2022 at 09:20, Andrew Davis <afd@ti.com> wrote:
> >
> > Hello all,
> >
> > I don't have the hardware to test this (yes I know who my current
> > employer is), but it does look right and this lets us remove the rest
> > of mach-nspire/ without losing any functionality.
> > Does anyone have one of these to test with?
> >
> > The second patch removes a couple defines that do not seem to have ever
> > been used, but if one want to implement it, then it should be a simple
> > generic syscon DT node.
I applied both patches on current master (c5e4d5e99162) and they work fine in
the emulator (including rebooting). On real HW the kernel does unfortunately
not boot, so I'll have to do some further testing and debugging. The changes
look good to me, so it's probably some other change which broke it though.
Cheers,
Fabian
> > Thanks,
> > Andrew
> >
> > Andrew Davis (2):
> > ARM: nspire: Use syscon-reboot to handle restart
> > ARM: nspire: Remove unused header file mmio.h
> >
> > arch/arm/boot/dts/nspire.dtsi | 7 ++++
> > arch/arm/mach-nspire/Kconfig | 2 ++
> > arch/arm/mach-nspire/mmio.h | 16 ----------
> > arch/arm/mach-nspire/nspire.c | 60 +++++++++++------------------------
> > 4 files changed, 27 insertions(+), 58 deletions(-)
> > delete mode 100644 arch/arm/mach-nspire/mmio.h
> > rewrite arch/arm/mach-nspire/nspire.c (61%)
> >
> > --
> > 2.36.1
> >
^ permalink raw reply [flat|nested] 6+ messages in thread