TI-Nspire cleanups
Subsystems (4)
v8 cover TI-Nspire cleanups
Hello all,
This series is an extended version of the series started here[0] and here[1].
We break out what was the first patch into one for DTS change and one for code changes as suggested by Krzysztof. Those are now patches 1 and 8 of this series (I kept the ACKs, hope that is okay).
While I was adding that, I noticed some other dtbs_check issues, so while here fixed some of those up too (patches 2-6).
Thanks,
Andrew
[0] https://lore.kernel.org/lkml/[email protected]/
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
Changes from v7:
- Rebase on latest with new dts dirs
Changes from v6:
- Old first patch was taken, remove from series
- Add new patch 7/9, should be trivial enough
Changes from v5:
- Rebase on latest master
- Fix DT binding comments from Rob and add ACK
Changes from v4:
- Rebase on latest master
Changes from v3:
- Add Reviewed-by
- Make new binding for patch #1
Changes from v2:
- See cover letter message
Changes from v1:
- Add ACKs
- Rebase on latest
Andrew Davis (9):
ARM: dts: nspire: Use syscon-reboot to handle restart
ARM: dts: nspire: Fix cpu node to conform with DT binding
ARM: dts: nspire: Fix sram node to conform with DT binding
ARM: dts: nspire: Fix vbus_reg node to conform with DT binding
ARM: dts: nspire: Fix uart node to conform with DT binding
ARM: dts: nspire: Use MATRIX_KEY macro for linux,keymap
ARM: dts: nspire: Remove file name from the files themselves
ARM: nspire: Use syscon-reboot to handle restart
ARM: nspire: Remove unused header file mmio.h
arch/arm/boot/dts/nspire/nspire-classic.dtsi | 2 - arch/arm/boot/dts/nspire/nspire-clp.dts | 93 ++++++++++++++----- arch/arm/boot/dts/nspire/nspire-cx.dts | 95 ++++++++++++++------ arch/arm/boot/dts/nspire/nspire-tp.dts | 93 ++++++++++++++----- arch/arm/boot/dts/nspire/nspire.dtsi | 26 ++++-- arch/arm/mach-nspire/Kconfig | 2 + arch/arm/mach-nspire/mmio.h | 16 ---- arch/arm/mach-nspire/nspire.c | 24 ----- 8 files changed, 231 insertions(+), 120 deletions(-) delete mode 100644 arch/arm/mach-nspire/mmio.h
Signature · 1 line
2.39.2
PATCH v8 1/9 ARM: dts: nspire: Use syscon-reboot to handle restart
Writing this bit can be handled by the syscon-reboot driver. Add this node to DT.
--- arch/arm/boot/dts/nspire/nspire.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/boot/dts/nspire/nspire.dtsi +7 -0
@@ -172,7 +172,14 @@ rtc: rtc@90090000 { }; misc: misc@900a0000 { + compatible = "ti,nspire-misc", "syscon", "simple-mfd"; reg = <0x900a0000 0x1000>; + + reboot { + compatible = "syscon-reboot"; + offset = <0x08>; + value = <0x02>; + }; }; pwr: pwr@900b0000 {
Signature · 1 line
2.39.2
PATCH v8 2/9 ARM: dts: nspire: Fix cpu node to conform with DT binding
In reply to Andrew DavisThis node does not follow the DT binding schema, correct this. Should result in no functional change.
--- arch/arm/boot/dts/nspire/nspire.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/nspire/nspire.dtsi +5 -0
@@ -11,8 +11,13 @@ / { interrupt-parent = <&intc>; cpus { + #address-cells = <1>; + #size-cells = <0>; + cpu@0 { compatible = "arm,arm926ej-s"; + device_type = "cpu"; + reg = <0>; }; };
Signature · 1 line
2.39.2
PATCH v8 3/9 ARM: dts: nspire: Fix sram node to conform with DT binding
In reply to Andrew DavisThis node does not follow the DT binding schema, correct this. Should result in no functional change.
--- arch/arm/boot/dts/nspire/nspire.dtsi | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
arch/arm/boot/dts/nspire/nspire.dtsi +9 -2
@@ -26,8 +26,15 @@ bootrom: bootrom@0 { }; sram: sram@a4000000 { - device = "memory"; - reg = <0xa4000000 0x20000>; + compatible = "mmio-sram"; + reg = <0xa4000000 0x20000>; /* 128k */ + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0xa4000000 0x20000>; + + sram@0 { + reg = <0x0 0x20000>; + }; }; timer_clk: timer_clk {
Signature · 1 line
2.39.2
PATCH v8 4/9 ARM: dts: nspire: Fix vbus_reg node to conform with DT binding
In reply to Andrew DavisThis node does not follow the DT binding schema, correct this. All "regulator-fixed" are voltage type, so drop "regulator-type". Should result in no functional change.
--- arch/arm/boot/dts/nspire/nspire.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/nspire/nspire.dtsi +0 -1
@@ -71,7 +71,6 @@ vbus_reg: vbus_reg { compatible = "regulator-fixed"; regulator-name = "USB VBUS output"; - regulator-type = "voltage"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
Signature · 1 line
2.39.2
PATCH v8 5/9 ARM: dts: nspire: Fix uart node to conform with DT binding
In reply to Andrew DavisThis node does not follow the DT binding schema, correct this. The arm,pl011 binding requires the first clock to be named "uartclk". Should result in no functional change.
--- arch/arm/boot/dts/nspire/nspire-cx.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/nspire/nspire-cx.dts +1 -1
@@ -24,7 +24,7 @@ &uart { compatible = "arm,pl011", "arm,primecell"; clocks = <&uart_clk>, <&apb_pclk>; - clock-names = "uart_clk", "apb_pclk"; + clock-names = "uartclk", "apb_pclk"; }; &timer0 {
Signature · 1 line
2.39.2
PATCH v8 6/9 ARM: dts: nspire: Use MATRIX_KEY macro for linux,keymap
In reply to Andrew DavisThis looks better and allows us to see the row and column numbers more easily. Switch to this macro here.
--- arch/arm/boot/dts/nspire/nspire-clp.dts | 90 +++++++++++++++++++------ arch/arm/boot/dts/nspire/nspire-cx.dts | 90 +++++++++++++++++++------ arch/arm/boot/dts/nspire/nspire-tp.dts | 90 +++++++++++++++++++------ 3 files changed, 204 insertions(+), 66 deletions(-)
arch/arm/boot/dts/nspire/nspire-clp.dts +68 -22
@@ -6,32 +6,78 @@ */ /dts-v1/; +#include <dt-bindings/input/input.h> + /include/ "nspire-classic.dtsi" &keypad { linux,keymap = < - 0x0000001c 0x0001001c 0x00020039 - 0x0004002c 0x00050034 0x00060015 - 0x0007000b 0x0008002d 0x01000033 - 0x0101004e 0x01020011 0x01030004 - 0x0104002f 0x01050003 0x01060016 - 0x01070002 0x01080014 0x02000062 - 0x0201000c 0x0202001f 0x02030007 - 0x02040013 0x02050006 0x02060010 - 0x02070005 0x02080019 0x03000027 - 0x03010037 0x03020018 0x0303000a - 0x03040031 0x03050009 0x03060032 - 0x03070008 0x03080026 0x04000028 - 0x04010035 0x04020025 0x04040024 - 0x04060017 0x04080023 0x05000028 - 0x05020022 0x0503001b 0x05040021 - 0x0505001a 0x05060012 0x0507006f - 0x05080020 0x0509002a 0x0601001c - 0x0602002e 0x06030068 0x06040030 - 0x0605006d 0x0606001e 0x06070001 - 0x0608002b 0x0609000f 0x07000067 - 0x0702006a 0x0704006c 0x07060069 - 0x0707000e 0x0708001d 0x070a000d + MATRIX_KEY(0, 0, 0x1c) + MATRIX_KEY(0, 1, 0x1c) + MATRIX_KEY(0, 2, 0x39) + MATRIX_KEY(0, 4, 0x2c) + MATRIX_KEY(0, 5, 0x34) + MATRIX_KEY(0, 6, 0x15) + MATRIX_KEY(0, 7, 0x0b) + MATRIX_KEY(0, 8, 0x2d) + MATRIX_KEY(1, 0, 0x33) + MATRIX_KEY(1, 1, 0x4e) + MATRIX_KEY(1, 2, 0x11) + MATRIX_KEY(1, 3, 0x04) + MATRIX_KEY(1, 4, 0x2f) + MATRIX_KEY(1, 5, 0x03) + MATRIX_KEY(1, 6, 0x16) + MATRIX_KEY(1, 7, 0x02) + MATRIX_KEY(1, 8, 0x14) + MATRIX_KEY(2, 0, 0x62) + MATRIX_KEY(2, 1, 0x0c) + MATRIX_KEY(2, 2, 0x1f) + MATRIX_KEY(2, 3, 0x07) + MATRIX_KEY(2, 4, 0x13) + MATRIX_KEY(2, 5, 0x06) + MATRIX_KEY(2, 6, 0x10) + MATRIX_KEY(2, 7, 0x05) + MATRIX_KEY(2, 8, 0x19) + MATRIX_KEY(3, 0, 0x27) + MATRIX_KEY(3, 1, 0x37) + MATRIX_KEY(3, 2, 0x18) + MATRIX_KEY(3, 3, 0x0a) + MATRIX_KEY(3, 4, 0x31) + MATRIX_KEY(3, 5, 0x09) + MATRIX_KEY(3, 6, 0x32) + MATRIX_KEY(3, 7, 0x08) + MATRIX_KEY(3, 8, 0x26) + MATRIX_KEY(4, 0, 0x28) + MATRIX_KEY(4, 1, 0x35) + MATRIX_KEY(4, 2, 0x25) + MATRIX_KEY(4, 4, 0x24) + MATRIX_KEY(4, 6, 0x17) + MATRIX_KEY(4, 8, 0x23) + MATRIX_KEY(5, 0, 0x28) + MATRIX_KEY(5, 2, 0x22) + MATRIX_KEY(5, 3, 0x1b) + MATRIX_KEY(5, 4, 0x21) + MATRIX_KEY(5, 5, 0x1a) + MATRIX_KEY(5, 6, 0x12) + MATRIX_KEY(5, 7, 0x6f) + MATRIX_KEY(5, 8, 0x20) + MATRIX_KEY(5, 9, 0x2a) + MATRIX_KEY(6, 1, 0x1c) + MATRIX_KEY(6, 2, 0x2e) + MATRIX_KEY(6, 3, 0x68) + MATRIX_KEY(6, 4, 0x30) + MATRIX_KEY(6, 5, 0x6d) + MATRIX_KEY(6, 6, 0x1e) + MATRIX_KEY(6, 7, 0x01) + MATRIX_KEY(6, 8, 0x2b) + MATRIX_KEY(6, 9, 0x0f) + MATRIX_KEY(7, 0, 0x67) + MATRIX_KEY(7, 2, 0x6a) + MATRIX_KEY(7, 4, 0x6c) + MATRIX_KEY(7, 6, 0x69) + MATRIX_KEY(7, 7, 0x0e) + MATRIX_KEY(7, 8, 0x1d) + MATRIX_KEY(7, 10, 0x0d) >; };
arch/arm/boot/dts/nspire/nspire-cx.dts +68 -22
102 lines not on this page · raw message
arch/arm/boot/dts/nspire/nspire-tp.dts +68 -22
100 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH v8 7/9 ARM: dts: nspire: Remove file name from the files themselves
In reply to Andrew DavisFile names inside the file does not add much and just makes it difficult to move the files, often the file name is not updated and becomes wrong. Remove them.
--- arch/arm/boot/dts/nspire/nspire-classic.dtsi | 2 -- arch/arm/boot/dts/nspire/nspire-clp.dts | 3 +-- arch/arm/boot/dts/nspire/nspire-cx.dts | 3 +-- arch/arm/boot/dts/nspire/nspire-tp.dts | 3 +-- arch/arm/boot/dts/nspire/nspire.dtsi | 2 -- 5 files changed, 3 insertions(+), 10 deletions(-)
arch/arm/boot/dts/nspire/nspire-classic.dtsi +0 -2
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * linux/arch/arm/boot/nspire-classic.dts - * * Copyright (C) 2013 Daniel Tang <[email protected]> */
arch/arm/boot/dts/nspire/nspire-clp.dts +1 -2
@@ -1,9 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * linux/arch/arm/boot/nspire-clp.dts - * * Copyright (C) 2013 Daniel Tang <[email protected]> */ + /dts-v1/; #include <dt-bindings/input/input.h>
arch/arm/boot/dts/nspire/nspire-cx.dts +1 -2
@@ -1,9 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * linux/arch/arm/boot/nspire-cx.dts - * * Copyright (C) 2013 Daniel Tang <[email protected]> */ + /dts-v1/; #include <dt-bindings/input/input.h>
arch/arm/boot/dts/nspire/nspire-tp.dts +1 -2
@@ -1,9 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * linux/arch/arm/boot/nspire-tp.dts - * * Copyright (C) 2013 Daniel Tang <[email protected]> */ + /dts-v1/; #include <dt-bindings/input/input.h>
arch/arm/boot/dts/nspire/nspire.dtsi +0 -2
@@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * linux/arch/arm/boot/nspire.dtsi - * * Copyright (C) 2013 Daniel Tang <[email protected]> */
Signature · 1 line
2.39.2
PATCH v8 8/9 ARM: nspire: Use syscon-reboot to handle restart
In reply to Andrew DavisWriting this bit can be handled by the DT syscon-reboot driver. Enable that driver and remove the machine_desc version.
--- arch/arm/mach-nspire/Kconfig | 2 ++ arch/arm/mach-nspire/mmio.h | 3 --- arch/arm/mach-nspire/nspire.c | 10 ---------- 3 files changed, 2 insertions(+), 13 deletions(-)
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.39.2
PATCH v8 9/9 ARM: nspire: Remove unused header file mmio.h
In reply to Andrew DavisThe 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.39.2
Hi,
Am Mittwoch, 2. August 2023, 17:33:24 CEST schrieb Andrew Davis:
Quoted 11 lines
Hello all,
This series is an extended version of the series started here[0] and here[1].
We break out what was the first patch into one for DTS change and one for code changes as suggested by Krzysztof. Those are now patches 1 and 8 of this series (I kept the ACKs, hope that is okay).
While I was adding that, I noticed some other
dtbs_checkissues, so while here fixed some of those up too (patches 2-6).
Whole series applied on top of cacc6e22932f and confirmed to work:
Thanks,
Fabian
Quoted 52 lines
Thanks,
Andrew[0] https://lore.kernel.org/lkml/[email protected]/
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/Changes from v7:
- Rebase on latest with new dts dirsChanges from v6:
- Old first patch was taken, remove from series
- Add new patch 7/9, should be trivial enoughChanges from v5:
- Rebase on latest master
- Fix DT binding comments from Rob and add ACKChanges from v4:
- Rebase on latest masterChanges from v3:
- Add Reviewed-by
- Make new binding for patch #1Changes from v2:
- See cover letter messageChanges from v1:
- Add ACKs
- Rebase on latestAndrew Davis (9):
ARM: dts: nspire: Use syscon-reboot to handle restart
ARM: dts: nspire: Fix cpu node to conform with DT binding
ARM: dts: nspire: Fix sram node to conform with DT binding
ARM: dts: nspire: Fixvbus_regnode to conform with DT binding
ARM: dts: nspire: Fix uart node to conform with DT binding
ARM: dts: nspire: UseMATRIX_KEYmacro for linux,keymap
ARM: dts: nspire: Remove file name from the files themselves
ARM: nspire: Use syscon-reboot to handle restart
ARM: nspire: Remove unused header filemmio.harch/arm/boot/dts/nspire/nspire-classic.dtsi | 2 - arch/arm/boot/dts/nspire/nspire-clp.dts | 93 ++++++++++++++----- arch/arm/boot/dts/nspire/nspire-cx.dts | 95 ++++++++++++++------ arch/arm/boot/dts/nspire/nspire-tp.dts | 93 ++++++++++++++----- arch/arm/boot/dts/nspire/nspire.dtsi | 26 ++++-- arch/arm/mach-nspire/Kconfig | 2 + arch/arm/mach-nspire/mmio.h | 16 ---- arch/arm/mach-nspire/nspire.c | 24 ----- 8 files changed, 231 insertions(+), 120 deletions(-) delete mode 100644 arch/arm/mach-nspire/mmio.h
Quoted 12 lines · Fabian Vogt
Hi,
Am Mittwoch, 2. August 2023, 17:33:24 CEST schrieb Andrew Davis:
Quoted 9 lines
Hello all,
This series is an extended version of the series started here[0] and here[1].
We break out what was the first patch into one for DTS change and one for code changes as suggested by Krzysztof. Those are now patches 1 and 8 of this series (I kept the ACKs, hope that is okay).
Quoted 6 lines
Quoted 2 lines
While I was adding that, I noticed some other
dtbs_checkissues, so while here fixed some of those up too (patches 2-6).Whole series applied on top of
cacc6e22932fand confirmed to work:Tested-by Fabian Vogt <[email protected]>
I've added all 9 patches to the soc tree now, the first seven in the soc/dt branch, the other two in the soc/arm branch.
This does mean that the soc/arm branch has a minor regression when tested by itself, as it won't be able to restart the system, which is a regression we'd still get with old dtb files, but I think this is acceptable here since it does not impact normal operation, and there is a very small user base that is affected by this.
Thanks,
Arnd