TI-Nspire cleanups
Subsystems (3)
PATCH v2 1/2 ARM: nspire: Use syscon-reboot to handle restart
In reply to Andrew DavisWriting this bit can be handled by the syscon-reboot driver. Add the info to DT and remove the machine_desc version.
--- 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(-)
arch/arm/boot/dts/nspire.dtsi +7 -0
@@ -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 {
arch/arm/mach-nspire/Kconfig +2 -0
@@ -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
arch/arm/mach-nspire/mmio.h +0 -3
@@ -5,9 +5,6 @@* Copyright (C) 2013 Daniel Tang <[email protected]> */ -#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
arch/arm/mach-nspire/nspire.c +0 -10
@@ -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
Signature · 1 line
2.37.3
v2 cover TI-Nspire cleanups
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
Changes from v1:
- Add ACKs
- Rebase on latest
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%)
Signature · 1 line
2.37.3
PATCH v2 2/2 ARM: nspire: Remove unused header file mmio.h
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.
--- 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
arch/arm/mach-nspire/mmio.h deleted +0 -13
@@ -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
arch/arm/mach-nspire/nspire.c +0 -14
@@ -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" ,
Signature · 1 line
2.37.3
Re: [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart
In reply to Andrew DavisHi,
Am Mittwoch, 26. Oktober 2022, 18:13:01 CEST schrieb Andrew Davis:
Quoted 5 lines
Writing this bit can be handled by the syscon-reboot driver. Add the info to DT and remove the
machine_descversion.Signed-off-by Andrew Davis <[email protected]>Reviewed-by Linus Walleij <[email protected]>
finally got this to run on real HW after reverting to an older .config and refreshing options. Rebooting works fine here. Thanks a lot!
Quoted 73 lines
--- 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(-)arch/arm/boot/dts/nspire.dtsi +7
-0@@ -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 {arch/arm/mach-nspire/Kconfig +2
-0@@ -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 CPUarch/arm/mach-nspire/mmio.h +0
-3@@ -5,9 +5,6 @@* Copyright (C) 2013 Daniel Tang <[email protected]> */ -#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 0x18arch/arm/mach-nspire/nspire.c +0
-10@@ -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
Re: [PATCH v2 2/2] ARM: nspire: Remove unused header file mmio.h
In reply to Andrew DavisHi,
Am Mittwoch, 26. Oktober 2022, 18:13:02 CEST schrieb Andrew Davis:
Quoted 7 lines
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]>
Builds and runs fine here, thanks!
Quoted 54 lines
--- 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.harch/arm/mach-nspire/mmio.h deleted +0
-13@@ -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 0xC0000000arch/arm/mach-nspire/nspire.c +0
-14@@ -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" ,
Re: [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart
In reply to Andrew DavisQuoted 7 lines · Andrew Davis
Writing this bit can be handled by the syscon-reboot driver. Add the info to DT and remove the
machine_descversion.Signed-off-by Andrew Davis <[email protected]>Reviewed-by Linus Walleij <[email protected]>--- arch/arm/boot/dts/nspire.dtsi | 7 +++++++
DTS cannot go with code.
Additionally, this breaks people's filtering as there is no "dts" prefix in the subject.
Quoted 10 lines
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(-)arch/arm/boot/dts/nspire.dtsi +0
-0
arch/arm/boot/dts/nspire.dtsi rtc: rtc@90090000 { · line 175
Quoted 4 lines
arch/arm/boot/dts/nspire.dtsi +1
-0@@ -172,7 +172,14 @@ rtc: rtc@90090000 { }; misc: misc@900a0000 { + compatible = "syscon", "simple-mfd";
These are not allowed on their own (need specific compatible) and you should have warnings when running dtbs_check.
Best regards,
Krzysztof
Re: [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart
Quoted 26 lines · Krzysztof Kozlowski
Quoted 7 lines · Andrew Davis
Writing this bit can be handled by the syscon-reboot driver. Add the info to DT and remove the
machine_descversion.Signed-off-by Andrew Davis <[email protected]>Reviewed-by Linus Walleij <[email protected]>--- arch/arm/boot/dts/nspire.dtsi | 7 +++++++DTS cannot go with code.
Additionally, this breaks people's filtering as there is no "dts" prefix in the subject.
Quoted 12 lines
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(-)arch/arm/boot/dts/nspire.dtsi +0
-0@@ -172,7 +172,14 @@ rtc: rtc@90090000 { };
Quoted 6 lines
arch/arm/boot/dts/nspire.dtsi rtc: rtc@90090000 { · line 175
Quoted 2 lines
arch/arm/boot/dts/nspire.dtsi +1
-0misc: misc@900a0000 { + compatible = "syscon", "simple-mfd";These are not allowed on their own (need specific compatible) and you should have warnings when running
dtbs_check.
Ah, my bad, must have gotten lost in the other existing warnings. Sent v3 with the above fixes, and tried to remove some existing warnings.
Thanks,
Andrew
Quoted 3 lines
Best regards,
Krzysztof