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
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 <[email protected]>
---
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 <[email protected]>
- */
-
-#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 <[email protected]>
*/
-#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
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 <[email protected]> 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
>
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 <[email protected]> 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
> >