All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 0/2] TI-Nspire cleanups
@ 2022-10-26 16:13 ` Andrew Davis
  0 siblings, 0 replies; 14+ messages in thread
From: Andrew Davis @ 2022-10-26 16:13 UTC (permalink / raw)
  To: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, Daniel Tang,
	Fabian Vogt, devicetree, linux-arm-kernel, linux-kernel
  Cc: Andrew Davis

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%)

-- 
2.37.3


^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH v2 0/2] TI-Nspire cleanups
@ 2022-10-26 16:13 ` Andrew Davis
  0 siblings, 0 replies; 14+ messages in thread
From: Andrew Davis @ 2022-10-26 16:13 UTC (permalink / raw)
  To: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, Daniel Tang,
	Fabian Vogt, devicetree, linux-arm-kernel, linux-kernel
  Cc: Andrew Davis

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%)

-- 
2.37.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart
  2022-10-26 16:13 ` Andrew Davis
@ 2022-10-26 16:13   ` Andrew Davis
  -1 siblings, 0 replies; 14+ messages in thread
From: Andrew Davis @ 2022-10-26 16:13 UTC (permalink / raw)
  To: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, Daniel Tang,
	Fabian Vogt, 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>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
---
 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
-- 
2.37.3


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart
@ 2022-10-26 16:13   ` Andrew Davis
  0 siblings, 0 replies; 14+ messages in thread
From: Andrew Davis @ 2022-10-26 16:13 UTC (permalink / raw)
  To: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, Daniel Tang,
	Fabian Vogt, 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>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
---
 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
-- 
2.37.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [PATCH v2 2/2] ARM: nspire: Remove unused header file mmio.h
  2022-10-26 16:13 ` Andrew Davis
@ 2022-10-26 16:13   ` Andrew Davis
  -1 siblings, 0 replies; 14+ messages in thread
From: Andrew Davis @ 2022-10-26 16:13 UTC (permalink / raw)
  To: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, Daniel Tang,
	Fabian Vogt, 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.37.3


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [PATCH v2 2/2] ARM: nspire: Remove unused header file mmio.h
@ 2022-10-26 16:13   ` Andrew Davis
  0 siblings, 0 replies; 14+ messages in thread
From: Andrew Davis @ 2022-10-26 16:13 UTC (permalink / raw)
  To: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, Daniel Tang,
	Fabian Vogt, 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.37.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart
  2022-10-26 16:13   ` Andrew Davis
@ 2022-10-26 18:35     ` Fabian Vogt
  -1 siblings, 0 replies; 14+ messages in thread
From: Fabian Vogt @ 2022-10-26 18:35 UTC (permalink / raw)
  To: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, Daniel Tang,
	devicetree, linux-arm-kernel, linux-kernel, Andrew Davis

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



^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart
@ 2022-10-26 18:35     ` Fabian Vogt
  0 siblings, 0 replies; 14+ messages in thread
From: Fabian Vogt @ 2022-10-26 18:35 UTC (permalink / raw)
  To: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, Daniel Tang,
	devicetree, linux-arm-kernel, linux-kernel, Andrew Davis

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

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ARM: nspire: Remove unused header file mmio.h
  2022-10-26 16:13   ` Andrew Davis
@ 2022-10-26 18:36     ` Fabian Vogt
  -1 siblings, 0 replies; 14+ messages in thread
From: Fabian Vogt @ 2022-10-26 18:36 UTC (permalink / raw)
  To: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, Daniel Tang,
	devicetree, linux-arm-kernel, linux-kernel, Andrew Davis

Hi,

Am Mittwoch, 26. Oktober 2022, 18:13:02 CEST schrieb 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>

Builds and runs fine here, thanks!

Tested-by: Fabian Vogt <fabian@ritter-vogt.de>
Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>

> ---
>  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",
> 





^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ARM: nspire: Remove unused header file mmio.h
@ 2022-10-26 18:36     ` Fabian Vogt
  0 siblings, 0 replies; 14+ messages in thread
From: Fabian Vogt @ 2022-10-26 18:36 UTC (permalink / raw)
  To: Arnd Bergmann, Linus Walleij, Geert Uytterhoeven, Daniel Tang,
	devicetree, linux-arm-kernel, linux-kernel, Andrew Davis

Hi,

Am Mittwoch, 26. Oktober 2022, 18:13:02 CEST schrieb 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>

Builds and runs fine here, thanks!

Tested-by: Fabian Vogt <fabian@ritter-vogt.de>
Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>

> ---
>  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",
> 





_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart
  2022-10-26 16:13   ` Andrew Davis
@ 2022-10-26 20:17     ` Krzysztof Kozlowski
  -1 siblings, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-26 20:17 UTC (permalink / raw)
  To: Andrew Davis, Arnd Bergmann, Linus Walleij, Geert Uytterhoeven,
	Daniel Tang, Fabian Vogt, devicetree, linux-arm-kernel,
	linux-kernel

On 26/10/2022 12:13, Andrew Davis wrote:
> 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>
> ---
>  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.

>  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";

These are not allowed on their own (need specific compatible) and you
should have warnings when running dtbs_check.

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart
@ 2022-10-26 20:17     ` Krzysztof Kozlowski
  0 siblings, 0 replies; 14+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-26 20:17 UTC (permalink / raw)
  To: Andrew Davis, Arnd Bergmann, Linus Walleij, Geert Uytterhoeven,
	Daniel Tang, Fabian Vogt, devicetree, linux-arm-kernel,
	linux-kernel

On 26/10/2022 12:13, Andrew Davis wrote:
> 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>
> ---
>  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.

>  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";

These are not allowed on their own (need specific compatible) and you
should have warnings when running dtbs_check.

Best regards,
Krzysztof


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart
  2022-10-26 20:17     ` Krzysztof Kozlowski
@ 2022-10-27 18:16       ` Andrew Davis
  -1 siblings, 0 replies; 14+ messages in thread
From: Andrew Davis @ 2022-10-27 18:16 UTC (permalink / raw)
  To: Krzysztof Kozlowski, Arnd Bergmann, Linus Walleij,
	Geert Uytterhoeven, Daniel Tang, Fabian Vogt, devicetree,
	linux-arm-kernel, linux-kernel

On 10/26/22 3:17 PM, Krzysztof Kozlowski wrote:
> On 26/10/2022 12:13, Andrew Davis wrote:
>> 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>
>> ---
>>   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.
> 
>>   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";
> 
> 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

> Best regards,
> Krzysztof
> 

^ permalink raw reply	[flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/2] ARM: nspire: Use syscon-reboot to handle restart
@ 2022-10-27 18:16       ` Andrew Davis
  0 siblings, 0 replies; 14+ messages in thread
From: Andrew Davis @ 2022-10-27 18:16 UTC (permalink / raw)
  To: Krzysztof Kozlowski, Arnd Bergmann, Linus Walleij,
	Geert Uytterhoeven, Daniel Tang, Fabian Vogt, devicetree,
	linux-arm-kernel, linux-kernel

On 10/26/22 3:17 PM, Krzysztof Kozlowski wrote:
> On 26/10/2022 12:13, Andrew Davis wrote:
>> 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>
>> ---
>>   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.
> 
>>   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";
> 
> 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

> Best regards,
> Krzysztof
> 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2022-10-27 18:17 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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

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.