TI-Nspire cleanups
Subsystems (5)
v4 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 2 and 8 of this series (I kept the ACKs, hope that is okay).
As also pointed out by Krzysztof syscon nodes need a specific compatible, add that as patch 1.
While I was adding that, I noticed some other dtbs_check issues, so while here fixed some of those up too (patches 3-6).
Thanks,
Andrew
[0] https://lore.kernel.org/lkml/[email protected]/
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
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):
dt-bindings: mfd: Add TI-Nspire misc registers
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: nspire: Use syscon-reboot to handle restart
ARM: nspire: Remove unused header file mmio.h
.../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++ arch/arm/boot/dts/nspire-clp.dts | 90 +++++++++++++----- arch/arm/boot/dts/nspire-cx.dts | 92 ++++++++++++++----- arch/arm/boot/dts/nspire-tp.dts | 90 +++++++++++++----- arch/arm/boot/dts/nspire.dtsi | 24 ++++- arch/arm/mach-nspire/Kconfig | 2 + arch/arm/mach-nspire/mmio.h | 16 ---- arch/arm/mach-nspire/nspire.c | 24 ----- 8 files changed, 283 insertions(+), 110 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml delete mode 100644 arch/arm/mach-nspire/mmio.h
Signature · 1 line
2.37.3
PATCH v4 1/9 dt-bindings: mfd: Add TI-Nspire misc registers
The TI Nspire devices contain a set of registers with a seemingly miscellaneous set of functionality. This area is known simply as the "misc" region.
--- .../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +55 -0
@@ -0,0 +1,55 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/ +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/ti,nspire-misc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: TI Nspire MISC hardware block + +maintainers: + - Andrew Davis <[email protected]> + +description: | + System controller node represents a register region containing a set + of miscellaneous registers. The registers are not cohesive enough to + represent as any specific type of device. The typical use-case is + for some other node's driver, or platform-specific code, to acquire + a reference to the syscon node (e.g. by phandle, node path, or + search using a specific compatible value), interrogate the node (or + associated OS driver) to determine the location of the registers, + and access the registers directly. + +properties: + compatible: + items: + - enum: + - ti,nspire-misc + - const: syscon + - const: simple-mfd + + reg: + maxItems: 1 + + reboot: + $ref: "../power/reset/syscon-reboot.yaml" + +required: + - compatible + - reg + - reboot + +additionalProperties: false + +examples: + - | + misc: misc@900a0000 { + compatible = "ti,nspire-misc", "syscon", "simple-mfd"; + reg = <0x900a0000 0x1000>; + + reboot { + compatible = "syscon-reboot"; + offset = <0x08>; + value = <0x02>; + }; + };
Signature · 1 line
2.37.3
Rob Herring
maintainerRe: [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
Quoted 27 lines · Andrew Davis
The TI Nspire devices contain a set of registers with a seemingly miscellaneous set of functionality. This area is known simply as the "misc" region.
Signed-off-by Andrew Davis <[email protected]>--- .../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yamlDocumentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +11
-0@@ -0,0 +1,55 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/ +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/ti,nspire-misc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: TI Nspire MISC hardware block + +maintainers: + - Andrew Davis <[email protected]>
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml line 21
Quoted 10 lines
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +10
-0+ +description: | + System controller node represents a register region containing a set + of miscellaneous registers. The registers are not cohesive enough to + represent as any specific type of device. The typical use-case is + for some other node's driver, or platform-specific code, to acquire + a reference to the syscon node (e.g. by phandle, node path, or + search using a specific compatible value), interrogate the node (or + associated OS driver) to determine the location of the registers, + and access the registers directly.
Looks like you copied the generic description? Describe what MISC contains.
Quoted 4 lines
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +4
-0+ +properties: + compatible: + items:
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml line 35
Quoted 10 lines
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +10
-0+ - enum: + - ti,nspire-misc + - const: syscon + - const: simple-mfd + + reg: + maxItems: 1 + + reboot: + $ref: "../power/reset/syscon-reboot.yaml"
/schemas/power/...
And no quotes needed.
Quoted 24 lines
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +20
-0+ +required: + - compatible + - reg + - reboot + +additionalProperties: false + +examples: + - | + misc: misc@900a0000 { + compatible = "ti,nspire-misc", "syscon", "simple-mfd"; + reg = <0x900a0000 0x1000>; + + reboot { + compatible = "syscon-reboot"; + offset = <0x08>; + value = <0x02>; + }; + };Signature · 1 line
2.37.3
Re: [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
Quoted 33 lines · Rob Herring
Quoted 32 lines · Andrew Davis
The TI Nspire devices contain a set of registers with a seemingly miscellaneous set of functionality. This area is known simply as the "misc" region.
Signed-off-by Andrew Davis <[email protected]>--- .../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+)create mode 100644
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yamlDocumentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +16
-0@@ -0,0 +1,55 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/ +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/ti,nspire-misc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: TI Nspire MISC hardware block + +maintainers: + - Andrew Davis <[email protected]> + +description: | + System controller node represents a register region containing a set + of miscellaneous registers. The registers are not cohesive enough to + represent as any specific type of device. The typical use-case is
Quoted 9 lines
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml line 21
Quoted 5 lines
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +5
-0+ for some other node's driver, or platform-specific code, to acquire + a reference to the syscon node (e.g. by phandle, node path, or + search using a specific compatible value), interrogate the node (or + associated OS driver) to determine the location of the registers, + and access the registers directly.Looks like you copied the generic description? Describe what MISC contains.
I don't know what all MISC contains (or maybe I do, but it is not publicly available so I'm not going to add anything that hasn't already been found by clean-room reverse engineering [0]).
This is the point I was trying to make in that thread on v3. The node's content *is* the hardware description. Every time a new register is found it could have just been added to the DT. But now we also have to go back here and add the exact same information to the binding, every time. We don't require that for simple-bus, should simple-mfd be given the same flexibility?
[0] https://hackspire.org/index.php?title=Memory-mapped_I/O_ports_on_Classic#900A0000_-_Miscellaneous
Quoted 17 lines
Quoted 4 lines
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +4
-0+ +properties: + compatible: + items:Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml line 35
Quoted 10 lines
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +10
-0+ - enum: + - ti,nspire-misc + - const: syscon + - const: simple-mfd + + reg: + maxItems: 1 + + reboot: + $ref: "../power/reset/syscon-reboot.yaml"/schemas/power/...
Quoted 2 lines
And no quotes needed.
Will fix.
Andrew
Quoted 24 lines
Quoted 24 lines
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +20
-0+ +required: + - compatible + - reg + - reboot + +additionalProperties: false + +examples: + - | + misc: misc@900a0000 { + compatible = "ti,nspire-misc", "syscon", "simple-mfd"; + reg = <0x900a0000 0x1000>; + + reboot { + compatible = "syscon-reboot"; + offset = <0x08>; + value = <0x02>; + }; + };Signature · 1 line
2.37.3
Rob Herring
maintainerRe: [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
Quoted 44 lines · Andrew Davis
Quoted 33 lines · Rob Herring
Quoted 32 lines · Andrew Davis
The TI Nspire devices contain a set of registers with a seemingly miscellaneous set of functionality. This area is known simply as the "misc" region.
Signed-off-by Andrew Davis <[email protected]>--- .../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+)create mode 100644
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yamlDocumentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +16
-0@@ -0,0 +1,55 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/ +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/ti,nspire-misc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: TI Nspire MISC hardware block + +maintainers: + - Andrew Davis <[email protected]> + +description: | + System controller node represents a register region containing a set + of miscellaneous registers. The registers are not cohesive enough to + represent as any specific type of device. The typical use-case isQuoted 9 lines
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml line 21
Quoted 5 lines
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +5
-0+ for some other node's driver, or platform-specific code, to acquire + a reference to the syscon node (e.g. by phandle, node path, or + search using a specific compatible value), interrogate the node (or + associated OS driver) to determine the location of the registers, + and access the registers directly.Looks like you copied the generic description? Describe what MISC contains.
Quoted 3 lines
I don't know what all MISC contains (or maybe I do, but it is not publicly available so I'm not going to add anything that hasn't already been found by clean-room reverse engineering [0]).
Put whatever you are comfortable with, but not a duplicate generic description. You know it at least it has reboot registers...
Quoted 6 lines
This is the point I was trying to make in that thread on v3. The node's content *is* the hardware description. Every time a new register is found it could have just been added to the DT. But now we also have to go back here and add the exact same information to the binding, every time. We don't require that for simple-bus, should simple-mfd be given the same flexibility?
The thing with any MFD is it makes up a device even if it's 'simple', so it's important to get a full picture of the device. It could evolve to not being 'simple'.
For example, if you came along and wanted to make it a clock provider, you'd probably create a clock child node that's just a compatible and '#clock-cells'. The feedback would be just add '#clock-cells' to the 'ti,nspire-misc' node. So yes, I want to see additions.
Rob
Re: [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
Quoted 59 lines · Rob Herring
Quoted 44 lines · Andrew Davis
Quoted 33 lines · Rob Herring
Quoted 32 lines · Andrew Davis
The TI Nspire devices contain a set of registers with a seemingly miscellaneous set of functionality. This area is known simply as the "misc" region.
Signed-off-by Andrew Davis <[email protected]>--- .../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+)create mode 100644
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yamlDocumentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +16
-0@@ -0,0 +1,55 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/ +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/ti,nspire-misc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: TI Nspire MISC hardware block + +maintainers: + - Andrew Davis <[email protected]> + +description: | + System controller node represents a register region containing a set + of miscellaneous registers. The registers are not cohesive enough to + represent as any specific type of device. The typical use-case isQuoted 9 lines
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml line 21
Quoted 5 lines
Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml new file +5
-0+ for some other node's driver, or platform-specific code, to acquire + a reference to the syscon node (e.g. by phandle, node path, or + search using a specific compatible value), interrogate the node (or + associated OS driver) to determine the location of the registers, + and access the registers directly.Looks like you copied the generic description? Describe what MISC contains.
Quoted 3 lines
I don't know what all MISC contains (or maybe I do, but it is not publicly available so I'm not going to add anything that hasn't already been found by clean-room reverse engineering [0]).
Put whatever you are comfortable with, but not a duplicate generic description. You know it at least it has reboot registers...
Quoted 6 lines
This is the point I was trying to make in that thread on v3. The node's content *is* the hardware description. Every time a new register is found it could have just been added to the DT. But now we also have to go back here and add the exact same information to the binding, every time. We don't require that for simple-bus, should simple-mfd be given the same flexibility?
Quoted 4 lines
The thing with any MFD is it makes up a device even if it's 'simple', so it's important to get a full picture of the device. It could evolve to not being 'simple'.
It would not evolve as a generic simple-mfd binding would not allow any extra non-node properties.
'^.*$':
type: object
additionalProperties: false
Maybe I'm thinking about this group of registers wrong, maybe it is a simple-bus not a simple-mfd. I mean from software what else is a bus but a space of addressable registers.. The issue would be each child node of a simple-bus needs a unit-address and 'reg'. Which we *could* do here if not for all this syscon weirdness :(
Quoted 5 lines
For example, if you came along and wanted to make it a clock provider, you'd probably create a clock child node that's just a compatible and '#clock-cells'. The feedback would be just add '#clock-cells' to the 'ti,nspire-misc' node. So yes, I want to see additions.
And then that would still fail the dtbs_check, since the simple-mfd binding would only allow for child nodes, nothing else, that's what makes them "simple". Each child node would need a compatible and therefor a binding. You would still see everything and could prevent malformed nodes just the same.
Andrew
PATCH v4 2/9 ARM: dts: nspire: Use syscon-reboot to handle restart
In reply to Andrew DavisWriting this bit can be handled by the syscon-reboot driver. Add this node to DT.
--- arch/arm/boot/dts/nspire.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/boot/dts/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.37.3
PATCH v4 3/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.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/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.37.3
PATCH v4 4/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.dtsi | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
arch/arm/boot/dts/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.37.3
PATCH v4 5/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.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/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.37.3
PATCH v4 6/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-cx.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/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.37.3
PATCH v4 7/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-clp.dts | 90 ++++++++++++++++++++++++-------- arch/arm/boot/dts/nspire-cx.dts | 90 ++++++++++++++++++++++++-------- arch/arm/boot/dts/nspire-tp.dts | 90 ++++++++++++++++++++++++-------- 3 files changed, 204 insertions(+), 66 deletions(-)
arch/arm/boot/dts/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-cx.dts +68 -22
102 lines not on this page · raw message
arch/arm/boot/dts/nspire-tp.dts +68 -22
100 lines not on this page · raw message
Signature · 1 line
2.37.3
Re: [PATCH v4 7/9] ARM: dts: nspire: Use MATRIX_KEY macro for linux,keymap
Hi Andrew,
Quoted 40 lines · Andrew Davis
This looks better and allows us to see the row and column numbers more easily. Switch to this macro here.
Signed-off-by Andrew Davis <[email protected]>--- arch/arm/boot/dts/nspire-clp.dts | 90 ++++++++++++++++++++++++-------- arch/arm/boot/dts/nspire-cx.dts | 90 ++++++++++++++++++++++++-------- arch/arm/boot/dts/nspire-tp.dts | 90 ++++++++++++++++++++++++-------- 3 files changed, 204 insertions(+), 66 deletions(-)arch/arm/boot/dts/nspire-clp.dts +2
-15@@ -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
arch/arm/boot/dts/nspire-clp.dts line 17
Quoted 10 lines
arch/arm/boot/dts/nspire-clp.dts +3
-7- 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)
Can this also be switched over to using KEY_* macros to describe the keycodes emitted?
Thanks.
Signature · 1 line
Dmitry
Re: [PATCH v4 7/9] ARM: dts: nspire: Use MATRIX_KEY macro for linux,keymap
Quoted 48 lines · Dmitry Torokhov
Hi Andrew,
Quoted 45 lines · Andrew Davis
This looks better and allows us to see the row and column numbers more easily. Switch to this macro here.
Signed-off-by Andrew Davis <[email protected]>--- arch/arm/boot/dts/nspire-clp.dts | 90 ++++++++++++++++++++++++-------- arch/arm/boot/dts/nspire-cx.dts | 90 ++++++++++++++++++++++++-------- arch/arm/boot/dts/nspire-tp.dts | 90 ++++++++++++++++++++++++-------- 3 files changed, 204 insertions(+), 66 deletions(-)arch/arm/boot/dts/nspire-clp.dts +2
-20@@ -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
Quoted 9 lines
arch/arm/boot/dts/nspire-clp.dts line 17
Quoted 5 lines
arch/arm/boot/dts/nspire-clp.dts +3
-2- 0x0702006a 0x0704006c 0x07060069 - 0x0707000e 0x0708001d 0x070a000d + MATRIX_KEY(0, 0, 0x1c) + MATRIX_KEY(0, 1, 0x1c) + MATRIX_KEY(0, 2, 0x39)Can this also be switched over to using KEY_* macros to describe the keycodes emitted?
That's going to be done in a follow up patch. This change here was done mechanically, but moving to KEY_* might need to be double checked by hand since some of these do not seem to map how one would expect to the function on the keypad.
Thanks,
Andrew
PATCH v4 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.37.3
PATCH v4 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.37.3
Quoted 9 lines · Andrew Davis
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 2 and 8 of this series (I kept the ACKs, hope that is okay).
Quoted 5 lines
As also pointed out by Krzysztof syscon nodes need a specific compatible, add that as patch 1.
While I was adding that, I noticed some other
dtbs_checkissues, so while here fixed some of those up too (patches 3-6).
Hi Andrew,
Thanks for the cleanup series. All of this looks reasonable to me, but we need to decide how to merge it upstream. I can pick up the patches directly into the soc tree once everybody is happy with the latest version, though usually I prefer to take the patches or pull requests from the person listed in the MAINTAINERS file.I'm happy to
It looks like there has never been a maintainer listed for nspire, so it would be good to fix that. Between yourself, Daniel and Fabian, can you find one or more people that are willing to be listed as either reviewer or maintainer for future patches, and decide what status you want the platform to be listed at ("Maintained" or "Odd Fixes" I assume)?
Arnd