* [PATCH v4 0/9] TI-Nspire cleanups
@ 2022-11-01 21:57 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:57 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, 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).
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/20221026161302.5319-1-afd@ti.com/
[1] https://lore.kernel.org/linux-arm-kernel/20221027181337.8651-1-afd@ti.com/
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
--
2.37.3
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v4 0/9] TI-Nspire cleanups
@ 2022-11-01 21:57 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:57 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, 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).
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/20221026161302.5319-1-afd@ti.com/
[1] https://lore.kernel.org/linux-arm-kernel/20221027181337.8651-1-afd@ti.com/
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
--
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] 34+ messages in thread
* [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
2022-11-01 21:57 ` Andrew Davis
@ 2022-11-01 21:57 ` Andrew Davis
-1 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:57 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, 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 <afd@ti.com>
---
.../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
diff --git a/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
new file mode 100644
index 0000000000000..d409eae7537bd
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
@@ -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 <afd@ti.com>
+
+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>;
+ };
+ };
--
2.37.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
@ 2022-11-01 21:57 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:57 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, 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 <afd@ti.com>
---
.../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
diff --git a/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
new file mode 100644
index 0000000000000..d409eae7537bd
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
@@ -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 <afd@ti.com>
+
+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>;
+ };
+ };
--
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] 34+ messages in thread
* [PATCH v4 2/9] ARM: dts: nspire: Use syscon-reboot to handle restart
2022-11-01 21:57 ` Andrew Davis
@ 2022-11-01 21:57 ` Andrew Davis
-1 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:57 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, Andrew Davis
Writing this bit can be handled by the syscon-reboot driver.
Add this node to DT.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Fabian Vogt <fabian@ritter-vogt.de>
Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
---
arch/arm/boot/dts/nspire.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi
index bb240e6a3a6f1..48fbc9d533c39 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 = "ti,nspire-misc", "syscon", "simple-mfd";
reg = <0x900a0000 0x1000>;
+
+ reboot {
+ compatible = "syscon-reboot";
+ offset = <0x08>;
+ value = <0x02>;
+ };
};
pwr: pwr@900b0000 {
--
2.37.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 2/9] ARM: dts: nspire: Use syscon-reboot to handle restart
@ 2022-11-01 21:57 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:57 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, Andrew Davis
Writing this bit can be handled by the syscon-reboot driver.
Add this node to DT.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Fabian Vogt <fabian@ritter-vogt.de>
Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
---
arch/arm/boot/dts/nspire.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi
index bb240e6a3a6f1..48fbc9d533c39 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 = "ti,nspire-misc", "syscon", "simple-mfd";
reg = <0x900a0000 0x1000>;
+
+ reboot {
+ compatible = "syscon-reboot";
+ offset = <0x08>;
+ value = <0x02>;
+ };
};
pwr: pwr@900b0000 {
--
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] 34+ messages in thread
* [PATCH v4 3/9] ARM: dts: nspire: Fix cpu node to conform with DT binding
2022-11-01 21:57 ` Andrew Davis
@ 2022-11-01 21:57 ` Andrew Davis
-1 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:57 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, Andrew Davis
This node does not follow the DT binding schema, correct this.
Should result in no functional change.
Signed-off-by: Andrew Davis <afd@ti.com>
---
arch/arm/boot/dts/nspire.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi
index 48fbc9d533c39..cb72370515126 100644
--- a/arch/arm/boot/dts/nspire.dtsi
+++ b/arch/arm/boot/dts/nspire.dtsi
@@ -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>;
};
};
--
2.37.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 3/9] ARM: dts: nspire: Fix cpu node to conform with DT binding
@ 2022-11-01 21:57 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:57 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, Andrew Davis
This node does not follow the DT binding schema, correct this.
Should result in no functional change.
Signed-off-by: Andrew Davis <afd@ti.com>
---
arch/arm/boot/dts/nspire.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi
index 48fbc9d533c39..cb72370515126 100644
--- a/arch/arm/boot/dts/nspire.dtsi
+++ b/arch/arm/boot/dts/nspire.dtsi
@@ -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>;
};
};
--
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] 34+ messages in thread
* [PATCH v4 4/9] ARM: dts: nspire: Fix sram node to conform with DT binding
2022-11-01 21:57 ` Andrew Davis
@ 2022-11-01 21:57 ` Andrew Davis
-1 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:57 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, Andrew Davis
This node does not follow the DT binding schema, correct this.
Should result in no functional change.
Signed-off-by: Andrew Davis <afd@ti.com>
---
arch/arm/boot/dts/nspire.dtsi | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi
index cb72370515126..f979b28e2576e 100644
--- a/arch/arm/boot/dts/nspire.dtsi
+++ b/arch/arm/boot/dts/nspire.dtsi
@@ -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 {
--
2.37.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 4/9] ARM: dts: nspire: Fix sram node to conform with DT binding
@ 2022-11-01 21:57 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:57 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, Andrew Davis
This node does not follow the DT binding schema, correct this.
Should result in no functional change.
Signed-off-by: Andrew Davis <afd@ti.com>
---
arch/arm/boot/dts/nspire.dtsi | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi
index cb72370515126..f979b28e2576e 100644
--- a/arch/arm/boot/dts/nspire.dtsi
+++ b/arch/arm/boot/dts/nspire.dtsi
@@ -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 {
--
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] 34+ messages in thread
* [PATCH v4 5/9] ARM: dts: nspire: Fix vbus_reg node to conform with DT binding
2022-11-01 21:57 ` Andrew Davis
@ 2022-11-01 21:58 ` Andrew Davis
-1 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:58 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, Andrew Davis
This 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.
Signed-off-by: Andrew Davis <afd@ti.com>
---
arch/arm/boot/dts/nspire.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi
index f979b28e2576e..9587e1ebeb931 100644
--- a/arch/arm/boot/dts/nspire.dtsi
+++ b/arch/arm/boot/dts/nspire.dtsi
@@ -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>;
--
2.37.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 5/9] ARM: dts: nspire: Fix vbus_reg node to conform with DT binding
@ 2022-11-01 21:58 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:58 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, Andrew Davis
This 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.
Signed-off-by: Andrew Davis <afd@ti.com>
---
arch/arm/boot/dts/nspire.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi
index f979b28e2576e..9587e1ebeb931 100644
--- a/arch/arm/boot/dts/nspire.dtsi
+++ b/arch/arm/boot/dts/nspire.dtsi
@@ -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>;
--
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] 34+ messages in thread
* [PATCH v4 6/9] ARM: dts: nspire: Fix uart node to conform with DT binding
2022-11-01 21:57 ` Andrew Davis
@ 2022-11-01 21:58 ` Andrew Davis
-1 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:58 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, Andrew Davis
This 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.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
arch/arm/boot/dts/nspire-cx.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/nspire-cx.dts b/arch/arm/boot/dts/nspire-cx.dts
index 590b7dff6ae50..837dbdd9af552 100644
--- a/arch/arm/boot/dts/nspire-cx.dts
+++ b/arch/arm/boot/dts/nspire-cx.dts
@@ -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 {
--
2.37.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 6/9] ARM: dts: nspire: Fix uart node to conform with DT binding
@ 2022-11-01 21:58 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:58 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, Andrew Davis
This 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.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
arch/arm/boot/dts/nspire-cx.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/nspire-cx.dts b/arch/arm/boot/dts/nspire-cx.dts
index 590b7dff6ae50..837dbdd9af552 100644
--- a/arch/arm/boot/dts/nspire-cx.dts
+++ b/arch/arm/boot/dts/nspire-cx.dts
@@ -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 {
--
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] 34+ messages in thread
* [PATCH v4 7/9] ARM: dts: nspire: Use MATRIX_KEY macro for linux,keymap
2022-11-01 21:57 ` Andrew Davis
@ 2022-11-01 21:58 ` Andrew Davis
-1 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:58 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, 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 <afd@ti.com>
---
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(-)
diff --git a/arch/arm/boot/dts/nspire-clp.dts b/arch/arm/boot/dts/nspire-clp.dts
index f52f38c615886..916ede0c2499c 100644
--- a/arch/arm/boot/dts/nspire-clp.dts
+++ b/arch/arm/boot/dts/nspire-clp.dts
@@ -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)
>;
};
diff --git a/arch/arm/boot/dts/nspire-cx.dts b/arch/arm/boot/dts/nspire-cx.dts
index 837dbdd9af552..96c48fc522035 100644
--- a/arch/arm/boot/dts/nspire-cx.dts
+++ b/arch/arm/boot/dts/nspire-cx.dts
@@ -6,6 +6,8 @@
*/
/dts-v1/;
+#include <dt-bindings/input/input.h>
+
/include/ "nspire.dtsi"
&lcd {
@@ -45,28 +47,72 @@ &ahb_clk {
&keypad {
linux,keymap = <
- 0x0000001c 0x0001001c 0x00040039
- 0x0005002c 0x00060015 0x0007000b
- 0x0008000f 0x0100002d 0x01010011
- 0x0102002f 0x01030004 0x01040016
- 0x01050014 0x0106001f 0x01070002
- 0x010a006a 0x02000013 0x02010010
- 0x02020019 0x02030007 0x02040018
- 0x02050031 0x02060032 0x02070005
- 0x02080028 0x0209006c 0x03000026
- 0x03010025 0x03020024 0x0303000a
- 0x03040017 0x03050023 0x03060022
- 0x03070008 0x03080035 0x03090069
- 0x04000021 0x04010012 0x04020020
- 0x0404002e 0x04050030 0x0406001e
- 0x0407000d 0x04080037 0x04090067
- 0x05010038 0x0502000c 0x0503001b
- 0x05040034 0x0505001a 0x05060006
- 0x05080027 0x0509000e 0x050a006f
- 0x0600002b 0x0602004e 0x06030068
- 0x06040003 0x0605006d 0x06060009
- 0x06070001 0x0609000f 0x0708002a
- 0x0709001d 0x070a0033 >;
+ MATRIX_KEY(0, 0, 0x1c)
+ MATRIX_KEY(0, 1, 0x1c)
+ MATRIX_KEY(0, 4, 0x39)
+ MATRIX_KEY(0, 5, 0x2c)
+ MATRIX_KEY(0, 6, 0x15)
+ MATRIX_KEY(0, 7, 0x0b)
+ MATRIX_KEY(0, 8, 0x0f)
+ MATRIX_KEY(1, 0, 0x2d)
+ MATRIX_KEY(1, 1, 0x11)
+ MATRIX_KEY(1, 2, 0x2f)
+ MATRIX_KEY(1, 3, 0x04)
+ MATRIX_KEY(1, 4, 0x16)
+ MATRIX_KEY(1, 5, 0x14)
+ MATRIX_KEY(1, 6, 0x1f)
+ MATRIX_KEY(1, 7, 0x02)
+ MATRIX_KEY(1, 10, 0x6a)
+ MATRIX_KEY(2, 0, 0x13)
+ MATRIX_KEY(2, 1, 0x10)
+ MATRIX_KEY(2, 2, 0x19)
+ MATRIX_KEY(2, 3, 0x07)
+ MATRIX_KEY(2, 4, 0x18)
+ MATRIX_KEY(2, 5, 0x31)
+ MATRIX_KEY(2, 6, 0x32)
+ MATRIX_KEY(2, 7, 0x05)
+ MATRIX_KEY(2, 8, 0x28)
+ MATRIX_KEY(2, 9, 0x6c)
+ MATRIX_KEY(3, 0, 0x26)
+ MATRIX_KEY(3, 1, 0x25)
+ MATRIX_KEY(3, 2, 0x24)
+ MATRIX_KEY(3, 3, 0x0a)
+ MATRIX_KEY(3, 4, 0x17)
+ MATRIX_KEY(3, 5, 0x23)
+ MATRIX_KEY(3, 6, 0x22)
+ MATRIX_KEY(3, 7, 0x08)
+ MATRIX_KEY(3, 8, 0x35)
+ MATRIX_KEY(3, 9, 0x69)
+ MATRIX_KEY(4, 0, 0x21)
+ MATRIX_KEY(4, 1, 0x12)
+ MATRIX_KEY(4, 2, 0x20)
+ MATRIX_KEY(4, 4, 0x2e)
+ MATRIX_KEY(4, 5, 0x30)
+ MATRIX_KEY(4, 6, 0x1e)
+ MATRIX_KEY(4, 7, 0x0d)
+ MATRIX_KEY(4, 8, 0x37)
+ MATRIX_KEY(4, 9, 0x67)
+ MATRIX_KEY(5, 1, 0x38)
+ MATRIX_KEY(5, 2, 0x0c)
+ MATRIX_KEY(5, 3, 0x1b)
+ MATRIX_KEY(5, 4, 0x34)
+ MATRIX_KEY(5, 5, 0x1a)
+ MATRIX_KEY(5, 6, 0x06)
+ MATRIX_KEY(5, 8, 0x27)
+ MATRIX_KEY(5, 9, 0x0e)
+ MATRIX_KEY(5, 10, 0x6f)
+ MATRIX_KEY(6, 0, 0x2b)
+ MATRIX_KEY(6, 2, 0x4e)
+ MATRIX_KEY(6, 3, 0x68)
+ MATRIX_KEY(6, 4, 0x03)
+ MATRIX_KEY(6, 5, 0x6d)
+ MATRIX_KEY(6, 6, 0x09)
+ MATRIX_KEY(6, 7, 0x01)
+ MATRIX_KEY(6, 9, 0x0f)
+ MATRIX_KEY(7, 8, 0x2a)
+ MATRIX_KEY(7, 9, 0x1d)
+ MATRIX_KEY(7, 10, 0x33)
+ >;
};
&vbus_reg {
diff --git a/arch/arm/boot/dts/nspire-tp.dts b/arch/arm/boot/dts/nspire-tp.dts
index f7d0faacd4ccd..235cd4264da79 100644
--- a/arch/arm/boot/dts/nspire-tp.dts
+++ b/arch/arm/boot/dts/nspire-tp.dts
@@ -6,32 +6,78 @@
*/
/dts-v1/;
+#include <dt-bindings/input/input.h>
+
/include/ "nspire-classic.dtsi"
&keypad {
linux,keymap = <
- 0x0000001c 0x0001001c 0x00040039
- 0x0005002c 0x00060015 0x0007000b
- 0x0008000f 0x0100002d 0x01010011
- 0x0102002f 0x01030004 0x01040016
- 0x01050014 0x0106001f 0x01070002
- 0x010a006a 0x02000013 0x02010010
- 0x02020019 0x02030007 0x02040018
- 0x02050031 0x02060032 0x02070005
- 0x02080028 0x0209006c 0x03000026
- 0x03010025 0x03020024 0x0303000a
- 0x03040017 0x03050023 0x03060022
- 0x03070008 0x03080035 0x03090069
- 0x04000021 0x04010012 0x04020020
- 0x0404002e 0x04050030 0x0406001e
- 0x0407000d 0x04080037 0x04090067
- 0x05010038 0x0502000c 0x0503001b
- 0x05040034 0x0505001a 0x05060006
- 0x05080027 0x0509000e 0x050a006f
- 0x0600002b 0x0602004e 0x06030068
- 0x06040003 0x0605006d 0x06060009
- 0x06070001 0x0609000f 0x0708002a
- 0x0709001d 0x070a0033 >;
+ MATRIX_KEY(0, 0, 0x1c)
+ MATRIX_KEY(0, 1, 0x1c)
+ MATRIX_KEY(0, 4, 0x39)
+ MATRIX_KEY(0, 5, 0x2c)
+ MATRIX_KEY(0, 6, 0x15)
+ MATRIX_KEY(0, 7, 0x0b)
+ MATRIX_KEY(0, 8, 0x0f)
+ MATRIX_KEY(1, 0, 0x2d)
+ MATRIX_KEY(1, 1, 0x11)
+ MATRIX_KEY(1, 2, 0x2f)
+ MATRIX_KEY(1, 3, 0x04)
+ MATRIX_KEY(1, 4, 0x16)
+ MATRIX_KEY(1, 5, 0x14)
+ MATRIX_KEY(1, 6, 0x1f)
+ MATRIX_KEY(1, 7, 0x02)
+ MATRIX_KEY(1, 10, 0x6a)
+ MATRIX_KEY(2, 0, 0x13)
+ MATRIX_KEY(2, 1, 0x10)
+ MATRIX_KEY(2, 2, 0x19)
+ MATRIX_KEY(2, 3, 0x07)
+ MATRIX_KEY(2, 4, 0x18)
+ MATRIX_KEY(2, 5, 0x31)
+ MATRIX_KEY(2, 6, 0x32)
+ MATRIX_KEY(2, 7, 0x05)
+ MATRIX_KEY(2, 8, 0x28)
+ MATRIX_KEY(2, 9, 0x6c)
+ MATRIX_KEY(3, 0, 0x26)
+ MATRIX_KEY(3, 1, 0x25)
+ MATRIX_KEY(3, 2, 0x24)
+ MATRIX_KEY(3, 3, 0x0a)
+ MATRIX_KEY(3, 4, 0x17)
+ MATRIX_KEY(3, 5, 0x23)
+ MATRIX_KEY(3, 6, 0x22)
+ MATRIX_KEY(3, 7, 0x08)
+ MATRIX_KEY(3, 8, 0x35)
+ MATRIX_KEY(3, 9, 0x69)
+ MATRIX_KEY(4, 0, 0x21)
+ MATRIX_KEY(4, 1, 0x12)
+ MATRIX_KEY(4, 2, 0x20)
+ MATRIX_KEY(4, 4, 0x2e)
+ MATRIX_KEY(4, 5, 0x30)
+ MATRIX_KEY(4, 6, 0x1e)
+ MATRIX_KEY(4, 7, 0x0d)
+ MATRIX_KEY(4, 8, 0x37)
+ MATRIX_KEY(4, 9, 0x67)
+ MATRIX_KEY(5, 1, 0x38)
+ MATRIX_KEY(5, 2, 0x0c)
+ MATRIX_KEY(5, 3, 0x1b)
+ MATRIX_KEY(5, 4, 0x34)
+ MATRIX_KEY(5, 5, 0x1a)
+ MATRIX_KEY(5, 6, 0x06)
+ MATRIX_KEY(5, 8, 0x27)
+ MATRIX_KEY(5, 9, 0x0e)
+ MATRIX_KEY(5, 10, 0x6f)
+ MATRIX_KEY(6, 0, 0x2b)
+ MATRIX_KEY(6, 2, 0x4e)
+ MATRIX_KEY(6, 3, 0x68)
+ MATRIX_KEY(6, 4, 0x03)
+ MATRIX_KEY(6, 5, 0x6d)
+ MATRIX_KEY(6, 6, 0x09)
+ MATRIX_KEY(6, 7, 0x01)
+ MATRIX_KEY(6, 9, 0x0f)
+ MATRIX_KEY(7, 8, 0x2a)
+ MATRIX_KEY(7, 9, 0x1d)
+ MATRIX_KEY(7, 10, 0x33)
+ >;
};
/ {
--
2.37.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v4 7/9] ARM: dts: nspire: Use MATRIX_KEY macro for linux,keymap
@ 2022-11-01 21:58 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:58 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, 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 <afd@ti.com>
---
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(-)
diff --git a/arch/arm/boot/dts/nspire-clp.dts b/arch/arm/boot/dts/nspire-clp.dts
index f52f38c615886..916ede0c2499c 100644
--- a/arch/arm/boot/dts/nspire-clp.dts
+++ b/arch/arm/boot/dts/nspire-clp.dts
@@ -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)
>;
};
diff --git a/arch/arm/boot/dts/nspire-cx.dts b/arch/arm/boot/dts/nspire-cx.dts
index 837dbdd9af552..96c48fc522035 100644
--- a/arch/arm/boot/dts/nspire-cx.dts
+++ b/arch/arm/boot/dts/nspire-cx.dts
@@ -6,6 +6,8 @@
*/
/dts-v1/;
+#include <dt-bindings/input/input.h>
+
/include/ "nspire.dtsi"
&lcd {
@@ -45,28 +47,72 @@ &ahb_clk {
&keypad {
linux,keymap = <
- 0x0000001c 0x0001001c 0x00040039
- 0x0005002c 0x00060015 0x0007000b
- 0x0008000f 0x0100002d 0x01010011
- 0x0102002f 0x01030004 0x01040016
- 0x01050014 0x0106001f 0x01070002
- 0x010a006a 0x02000013 0x02010010
- 0x02020019 0x02030007 0x02040018
- 0x02050031 0x02060032 0x02070005
- 0x02080028 0x0209006c 0x03000026
- 0x03010025 0x03020024 0x0303000a
- 0x03040017 0x03050023 0x03060022
- 0x03070008 0x03080035 0x03090069
- 0x04000021 0x04010012 0x04020020
- 0x0404002e 0x04050030 0x0406001e
- 0x0407000d 0x04080037 0x04090067
- 0x05010038 0x0502000c 0x0503001b
- 0x05040034 0x0505001a 0x05060006
- 0x05080027 0x0509000e 0x050a006f
- 0x0600002b 0x0602004e 0x06030068
- 0x06040003 0x0605006d 0x06060009
- 0x06070001 0x0609000f 0x0708002a
- 0x0709001d 0x070a0033 >;
+ MATRIX_KEY(0, 0, 0x1c)
+ MATRIX_KEY(0, 1, 0x1c)
+ MATRIX_KEY(0, 4, 0x39)
+ MATRIX_KEY(0, 5, 0x2c)
+ MATRIX_KEY(0, 6, 0x15)
+ MATRIX_KEY(0, 7, 0x0b)
+ MATRIX_KEY(0, 8, 0x0f)
+ MATRIX_KEY(1, 0, 0x2d)
+ MATRIX_KEY(1, 1, 0x11)
+ MATRIX_KEY(1, 2, 0x2f)
+ MATRIX_KEY(1, 3, 0x04)
+ MATRIX_KEY(1, 4, 0x16)
+ MATRIX_KEY(1, 5, 0x14)
+ MATRIX_KEY(1, 6, 0x1f)
+ MATRIX_KEY(1, 7, 0x02)
+ MATRIX_KEY(1, 10, 0x6a)
+ MATRIX_KEY(2, 0, 0x13)
+ MATRIX_KEY(2, 1, 0x10)
+ MATRIX_KEY(2, 2, 0x19)
+ MATRIX_KEY(2, 3, 0x07)
+ MATRIX_KEY(2, 4, 0x18)
+ MATRIX_KEY(2, 5, 0x31)
+ MATRIX_KEY(2, 6, 0x32)
+ MATRIX_KEY(2, 7, 0x05)
+ MATRIX_KEY(2, 8, 0x28)
+ MATRIX_KEY(2, 9, 0x6c)
+ MATRIX_KEY(3, 0, 0x26)
+ MATRIX_KEY(3, 1, 0x25)
+ MATRIX_KEY(3, 2, 0x24)
+ MATRIX_KEY(3, 3, 0x0a)
+ MATRIX_KEY(3, 4, 0x17)
+ MATRIX_KEY(3, 5, 0x23)
+ MATRIX_KEY(3, 6, 0x22)
+ MATRIX_KEY(3, 7, 0x08)
+ MATRIX_KEY(3, 8, 0x35)
+ MATRIX_KEY(3, 9, 0x69)
+ MATRIX_KEY(4, 0, 0x21)
+ MATRIX_KEY(4, 1, 0x12)
+ MATRIX_KEY(4, 2, 0x20)
+ MATRIX_KEY(4, 4, 0x2e)
+ MATRIX_KEY(4, 5, 0x30)
+ MATRIX_KEY(4, 6, 0x1e)
+ MATRIX_KEY(4, 7, 0x0d)
+ MATRIX_KEY(4, 8, 0x37)
+ MATRIX_KEY(4, 9, 0x67)
+ MATRIX_KEY(5, 1, 0x38)
+ MATRIX_KEY(5, 2, 0x0c)
+ MATRIX_KEY(5, 3, 0x1b)
+ MATRIX_KEY(5, 4, 0x34)
+ MATRIX_KEY(5, 5, 0x1a)
+ MATRIX_KEY(5, 6, 0x06)
+ MATRIX_KEY(5, 8, 0x27)
+ MATRIX_KEY(5, 9, 0x0e)
+ MATRIX_KEY(5, 10, 0x6f)
+ MATRIX_KEY(6, 0, 0x2b)
+ MATRIX_KEY(6, 2, 0x4e)
+ MATRIX_KEY(6, 3, 0x68)
+ MATRIX_KEY(6, 4, 0x03)
+ MATRIX_KEY(6, 5, 0x6d)
+ MATRIX_KEY(6, 6, 0x09)
+ MATRIX_KEY(6, 7, 0x01)
+ MATRIX_KEY(6, 9, 0x0f)
+ MATRIX_KEY(7, 8, 0x2a)
+ MATRIX_KEY(7, 9, 0x1d)
+ MATRIX_KEY(7, 10, 0x33)
+ >;
};
&vbus_reg {
diff --git a/arch/arm/boot/dts/nspire-tp.dts b/arch/arm/boot/dts/nspire-tp.dts
index f7d0faacd4ccd..235cd4264da79 100644
--- a/arch/arm/boot/dts/nspire-tp.dts
+++ b/arch/arm/boot/dts/nspire-tp.dts
@@ -6,32 +6,78 @@
*/
/dts-v1/;
+#include <dt-bindings/input/input.h>
+
/include/ "nspire-classic.dtsi"
&keypad {
linux,keymap = <
- 0x0000001c 0x0001001c 0x00040039
- 0x0005002c 0x00060015 0x0007000b
- 0x0008000f 0x0100002d 0x01010011
- 0x0102002f 0x01030004 0x01040016
- 0x01050014 0x0106001f 0x01070002
- 0x010a006a 0x02000013 0x02010010
- 0x02020019 0x02030007 0x02040018
- 0x02050031 0x02060032 0x02070005
- 0x02080028 0x0209006c 0x03000026
- 0x03010025 0x03020024 0x0303000a
- 0x03040017 0x03050023 0x03060022
- 0x03070008 0x03080035 0x03090069
- 0x04000021 0x04010012 0x04020020
- 0x0404002e 0x04050030 0x0406001e
- 0x0407000d 0x04080037 0x04090067
- 0x05010038 0x0502000c 0x0503001b
- 0x05040034 0x0505001a 0x05060006
- 0x05080027 0x0509000e 0x050a006f
- 0x0600002b 0x0602004e 0x06030068
- 0x06040003 0x0605006d 0x06060009
- 0x06070001 0x0609000f 0x0708002a
- 0x0709001d 0x070a0033 >;
+ MATRIX_KEY(0, 0, 0x1c)
+ MATRIX_KEY(0, 1, 0x1c)
+ MATRIX_KEY(0, 4, 0x39)
+ MATRIX_KEY(0, 5, 0x2c)
+ MATRIX_KEY(0, 6, 0x15)
+ MATRIX_KEY(0, 7, 0x0b)
+ MATRIX_KEY(0, 8, 0x0f)
+ MATRIX_KEY(1, 0, 0x2d)
+ MATRIX_KEY(1, 1, 0x11)
+ MATRIX_KEY(1, 2, 0x2f)
+ MATRIX_KEY(1, 3, 0x04)
+ MATRIX_KEY(1, 4, 0x16)
+ MATRIX_KEY(1, 5, 0x14)
+ MATRIX_KEY(1, 6, 0x1f)
+ MATRIX_KEY(1, 7, 0x02)
+ MATRIX_KEY(1, 10, 0x6a)
+ MATRIX_KEY(2, 0, 0x13)
+ MATRIX_KEY(2, 1, 0x10)
+ MATRIX_KEY(2, 2, 0x19)
+ MATRIX_KEY(2, 3, 0x07)
+ MATRIX_KEY(2, 4, 0x18)
+ MATRIX_KEY(2, 5, 0x31)
+ MATRIX_KEY(2, 6, 0x32)
+ MATRIX_KEY(2, 7, 0x05)
+ MATRIX_KEY(2, 8, 0x28)
+ MATRIX_KEY(2, 9, 0x6c)
+ MATRIX_KEY(3, 0, 0x26)
+ MATRIX_KEY(3, 1, 0x25)
+ MATRIX_KEY(3, 2, 0x24)
+ MATRIX_KEY(3, 3, 0x0a)
+ MATRIX_KEY(3, 4, 0x17)
+ MATRIX_KEY(3, 5, 0x23)
+ MATRIX_KEY(3, 6, 0x22)
+ MATRIX_KEY(3, 7, 0x08)
+ MATRIX_KEY(3, 8, 0x35)
+ MATRIX_KEY(3, 9, 0x69)
+ MATRIX_KEY(4, 0, 0x21)
+ MATRIX_KEY(4, 1, 0x12)
+ MATRIX_KEY(4, 2, 0x20)
+ MATRIX_KEY(4, 4, 0x2e)
+ MATRIX_KEY(4, 5, 0x30)
+ MATRIX_KEY(4, 6, 0x1e)
+ MATRIX_KEY(4, 7, 0x0d)
+ MATRIX_KEY(4, 8, 0x37)
+ MATRIX_KEY(4, 9, 0x67)
+ MATRIX_KEY(5, 1, 0x38)
+ MATRIX_KEY(5, 2, 0x0c)
+ MATRIX_KEY(5, 3, 0x1b)
+ MATRIX_KEY(5, 4, 0x34)
+ MATRIX_KEY(5, 5, 0x1a)
+ MATRIX_KEY(5, 6, 0x06)
+ MATRIX_KEY(5, 8, 0x27)
+ MATRIX_KEY(5, 9, 0x0e)
+ MATRIX_KEY(5, 10, 0x6f)
+ MATRIX_KEY(6, 0, 0x2b)
+ MATRIX_KEY(6, 2, 0x4e)
+ MATRIX_KEY(6, 3, 0x68)
+ MATRIX_KEY(6, 4, 0x03)
+ MATRIX_KEY(6, 5, 0x6d)
+ MATRIX_KEY(6, 6, 0x09)
+ MATRIX_KEY(6, 7, 0x01)
+ MATRIX_KEY(6, 9, 0x0f)
+ MATRIX_KEY(7, 8, 0x2a)
+ MATRIX_KEY(7, 9, 0x1d)
+ MATRIX_KEY(7, 10, 0x33)
+ >;
};
/ {
--
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] 34+ messages in thread
* [PATCH v4 8/9] ARM: nspire: Use syscon-reboot to handle restart
2022-11-01 21:57 ` Andrew Davis
@ 2022-11-01 21:58 ` Andrew Davis
-1 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:58 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, Andrew Davis
Writing this bit can be handled by the DT syscon-reboot driver.
Enable that driver and remove the machine_desc version.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Fabian Vogt <fabian@ritter-vogt.de>
Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
---
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(-)
diff --git a/arch/arm/mach-nspire/Kconfig b/arch/arm/mach-nspire/Kconfig
index b7a3871876d75..0ffdcaca1e6b4 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 48e32f13f3119..2ce0656139ece 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 2d4abb0288b9d..1e13337972dd5 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] 34+ messages in thread
* [PATCH v4 8/9] ARM: nspire: Use syscon-reboot to handle restart
@ 2022-11-01 21:58 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:58 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, Andrew Davis
Writing this bit can be handled by the DT syscon-reboot driver.
Enable that driver and remove the machine_desc version.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Fabian Vogt <fabian@ritter-vogt.de>
Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
---
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(-)
diff --git a/arch/arm/mach-nspire/Kconfig b/arch/arm/mach-nspire/Kconfig
index b7a3871876d75..0ffdcaca1e6b4 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 48e32f13f3119..2ce0656139ece 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 2d4abb0288b9d..1e13337972dd5 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] 34+ messages in thread
* [PATCH v4 9/9] ARM: nspire: Remove unused header file mmio.h
2022-11-01 21:57 ` Andrew Davis
@ 2022-11-01 21:58 ` Andrew Davis
-1 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:58 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, 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 2ce0656139ece..0000000000000
--- 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 1e13337972dd5..2fbfc23237ffe 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] 34+ messages in thread
* [PATCH v4 9/9] ARM: nspire: Remove unused header file mmio.h
@ 2022-11-01 21:58 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-01 21:58 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel, 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 2ce0656139ece..0000000000000
--- 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 1e13337972dd5..2fbfc23237ffe 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] 34+ messages in thread
* Re: [PATCH v4 0/9] TI-Nspire cleanups
2022-11-01 21:57 ` Andrew Davis
@ 2022-11-02 12:42 ` Arnd Bergmann
-1 siblings, 0 replies; 34+ messages in thread
From: Arnd Bergmann @ 2022-11-02 12:42 UTC (permalink / raw)
To: Andrew Davis, Lee Jones, Rob Herring, Krzysztof Kozlowski,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel
On Tue, Nov 1, 2022, at 22:57, Andrew Davis wrote:
> 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).
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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 0/9] TI-Nspire cleanups
@ 2022-11-02 12:42 ` Arnd Bergmann
0 siblings, 0 replies; 34+ messages in thread
From: Arnd Bergmann @ 2022-11-02 12:42 UTC (permalink / raw)
To: Andrew Davis, Lee Jones, Rob Herring, Krzysztof Kozlowski,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt
Cc: devicetree, linux-arm-kernel, linux-kernel
On Tue, Nov 1, 2022, at 22:57, Andrew Davis wrote:
> 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).
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
_______________________________________________
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] 34+ messages in thread
* Re: [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
2022-11-01 21:57 ` Andrew Davis
@ 2022-11-02 17:35 ` Rob Herring
-1 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2022-11-02 17:35 UTC (permalink / raw)
To: Andrew Davis
Cc: Lee Jones, Krzysztof Kozlowski, Arnd Bergmann, Linus Walleij,
Geert Uytterhoeven, Daniel Tang, Fabian Vogt, devicetree,
linux-arm-kernel, linux-kernel
On Tue, Nov 01, 2022 at 04:57:56PM -0500, Andrew Davis wrote:
> 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 <afd@ti.com>
> ---
> .../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++
> 1 file changed, 55 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>
> diff --git a/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
> new file mode 100644
> index 0000000000000..d409eae7537bd
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
> @@ -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 <afd@ti.com>
> +
> +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.
> +
> +properties:
> + compatible:
> + items:
> + - 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.
> +
> +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>;
> + };
> + };
> --
> 2.37.3
>
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
@ 2022-11-02 17:35 ` Rob Herring
0 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2022-11-02 17:35 UTC (permalink / raw)
To: Andrew Davis
Cc: Lee Jones, Krzysztof Kozlowski, Arnd Bergmann, Linus Walleij,
Geert Uytterhoeven, Daniel Tang, Fabian Vogt, devicetree,
linux-arm-kernel, linux-kernel
On Tue, Nov 01, 2022 at 04:57:56PM -0500, Andrew Davis wrote:
> 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 <afd@ti.com>
> ---
> .../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++
> 1 file changed, 55 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>
> diff --git a/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
> new file mode 100644
> index 0000000000000..d409eae7537bd
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
> @@ -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 <afd@ti.com>
> +
> +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.
> +
> +properties:
> + compatible:
> + items:
> + - 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.
> +
> +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>;
> + };
> + };
> --
> 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] 34+ messages in thread
* Re: [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
2022-11-02 17:35 ` Rob Herring
@ 2022-11-02 19:05 ` Andrew Davis
-1 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-02 19:05 UTC (permalink / raw)
To: Rob Herring
Cc: Lee Jones, Krzysztof Kozlowski, Arnd Bergmann, Linus Walleij,
Geert Uytterhoeven, Daniel Tang, Fabian Vogt, devicetree,
linux-arm-kernel, linux-kernel
On 11/2/22 12:35 PM, Rob Herring wrote:
> On Tue, Nov 01, 2022 at 04:57:56PM -0500, Andrew Davis wrote:
>> 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 <afd@ti.com>
>> ---
>> .../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++
>> 1 file changed, 55 insertions(+)
>> create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>>
>> diff --git a/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>> new file mode 100644
>> index 0000000000000..d409eae7537bd
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>> @@ -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 <afd@ti.com>
>> +
>> +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.
>
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
>> +
>> +properties:
>> + compatible:
>> + items:
>> + - 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.
>
Will fix.
Andrew
>> +
>> +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>;
>> + };
>> + };
>> --
>> 2.37.3
>>
>>
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
@ 2022-11-02 19:05 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-02 19:05 UTC (permalink / raw)
To: Rob Herring
Cc: Lee Jones, Krzysztof Kozlowski, Arnd Bergmann, Linus Walleij,
Geert Uytterhoeven, Daniel Tang, Fabian Vogt, devicetree,
linux-arm-kernel, linux-kernel
On 11/2/22 12:35 PM, Rob Herring wrote:
> On Tue, Nov 01, 2022 at 04:57:56PM -0500, Andrew Davis wrote:
>> 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 <afd@ti.com>
>> ---
>> .../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++
>> 1 file changed, 55 insertions(+)
>> create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>>
>> diff --git a/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>> new file mode 100644
>> index 0000000000000..d409eae7537bd
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>> @@ -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 <afd@ti.com>
>> +
>> +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.
>
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
>> +
>> +properties:
>> + compatible:
>> + items:
>> + - 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.
>
Will fix.
Andrew
>> +
>> +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>;
>> + };
>> + };
>> --
>> 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] 34+ messages in thread
* Re: [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
2022-11-02 19:05 ` Andrew Davis
@ 2022-11-02 21:26 ` Rob Herring
-1 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2022-11-02 21:26 UTC (permalink / raw)
To: Andrew Davis
Cc: Lee Jones, Krzysztof Kozlowski, Arnd Bergmann, Linus Walleij,
Geert Uytterhoeven, Daniel Tang, Fabian Vogt, devicetree,
linux-arm-kernel, linux-kernel
On Wed, Nov 02, 2022 at 02:05:28PM -0500, Andrew Davis wrote:
> On 11/2/22 12:35 PM, Rob Herring wrote:
> > On Tue, Nov 01, 2022 at 04:57:56PM -0500, Andrew Davis wrote:
> > > 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 <afd@ti.com>
> > > ---
> > > .../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++
> > > 1 file changed, 55 insertions(+)
> > > create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
> > >
> > > diff --git a/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
> > > new file mode 100644
> > > index 0000000000000..d409eae7537bd
> > > --- /dev/null
> > > +++ b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
> > > @@ -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 <afd@ti.com>
> > > +
> > > +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.
> >
>
> 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...
> 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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
@ 2022-11-02 21:26 ` Rob Herring
0 siblings, 0 replies; 34+ messages in thread
From: Rob Herring @ 2022-11-02 21:26 UTC (permalink / raw)
To: Andrew Davis
Cc: Lee Jones, Krzysztof Kozlowski, Arnd Bergmann, Linus Walleij,
Geert Uytterhoeven, Daniel Tang, Fabian Vogt, devicetree,
linux-arm-kernel, linux-kernel
On Wed, Nov 02, 2022 at 02:05:28PM -0500, Andrew Davis wrote:
> On 11/2/22 12:35 PM, Rob Herring wrote:
> > On Tue, Nov 01, 2022 at 04:57:56PM -0500, Andrew Davis wrote:
> > > 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 <afd@ti.com>
> > > ---
> > > .../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++
> > > 1 file changed, 55 insertions(+)
> > > create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
> > >
> > > diff --git a/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
> > > new file mode 100644
> > > index 0000000000000..d409eae7537bd
> > > --- /dev/null
> > > +++ b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
> > > @@ -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 <afd@ti.com>
> > > +
> > > +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.
> >
>
> 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...
> 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
_______________________________________________
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] 34+ messages in thread
* Re: [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
2022-11-02 21:26 ` Rob Herring
@ 2022-11-03 1:13 ` Andrew Davis
-1 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-03 1:13 UTC (permalink / raw)
To: Rob Herring
Cc: Lee Jones, Krzysztof Kozlowski, Arnd Bergmann, Linus Walleij,
Geert Uytterhoeven, Daniel Tang, Fabian Vogt, devicetree,
linux-arm-kernel, linux-kernel
On 11/2/22 4:26 PM, Rob Herring wrote:
> On Wed, Nov 02, 2022 at 02:05:28PM -0500, Andrew Davis wrote:
>> On 11/2/22 12:35 PM, Rob Herring wrote:
>>> On Tue, Nov 01, 2022 at 04:57:56PM -0500, Andrew Davis wrote:
>>>> 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 <afd@ti.com>
>>>> ---
>>>> .../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++
>>>> 1 file changed, 55 insertions(+)
>>>> create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>>>> new file mode 100644
>>>> index 0000000000000..d409eae7537bd
>>>> --- /dev/null
>>>> +++ b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>>>> @@ -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 <afd@ti.com>
>>>> +
>>>> +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.
>>>
>>
>> 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...
>
>> 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'.
>
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 :(
> 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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers
@ 2022-11-03 1:13 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-03 1:13 UTC (permalink / raw)
To: Rob Herring
Cc: Lee Jones, Krzysztof Kozlowski, Arnd Bergmann, Linus Walleij,
Geert Uytterhoeven, Daniel Tang, Fabian Vogt, devicetree,
linux-arm-kernel, linux-kernel
On 11/2/22 4:26 PM, Rob Herring wrote:
> On Wed, Nov 02, 2022 at 02:05:28PM -0500, Andrew Davis wrote:
>> On 11/2/22 12:35 PM, Rob Herring wrote:
>>> On Tue, Nov 01, 2022 at 04:57:56PM -0500, Andrew Davis wrote:
>>>> 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 <afd@ti.com>
>>>> ---
>>>> .../bindings/mfd/ti,nspire-misc.yaml | 55 +++++++++++++++++++
>>>> 1 file changed, 55 insertions(+)
>>>> create mode 100644 Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>>>> new file mode 100644
>>>> index 0000000000000..d409eae7537bd
>>>> --- /dev/null
>>>> +++ b/Documentation/devicetree/bindings/mfd/ti,nspire-misc.yaml
>>>> @@ -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 <afd@ti.com>
>>>> +
>>>> +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.
>>>
>>
>> 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...
>
>> 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'.
>
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 :(
> 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
_______________________________________________
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] 34+ messages in thread
* Re: [PATCH v4 7/9] ARM: dts: nspire: Use MATRIX_KEY macro for linux,keymap
2022-11-01 21:58 ` Andrew Davis
@ 2022-11-03 4:07 ` Dmitry Torokhov
-1 siblings, 0 replies; 34+ messages in thread
From: Dmitry Torokhov @ 2022-11-03 4:07 UTC (permalink / raw)
To: Andrew Davis
Cc: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt,
devicetree, linux-arm-kernel, linux-kernel
Hi Andrew,
On Tue, Nov 1, 2022 at 2:59 PM Andrew Davis <afd@ti.com> wrote:
>
> 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 <afd@ti.com>
> ---
> 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(-)
>
> diff --git a/arch/arm/boot/dts/nspire-clp.dts b/arch/arm/boot/dts/nspire-clp.dts
> index f52f38c615886..916ede0c2499c 100644
> --- a/arch/arm/boot/dts/nspire-clp.dts
> +++ b/arch/arm/boot/dts/nspire-clp.dts
> @@ -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)
Can this also be switched over to using KEY_* macros to describe the
keycodes emitted?
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 7/9] ARM: dts: nspire: Use MATRIX_KEY macro for linux,keymap
@ 2022-11-03 4:07 ` Dmitry Torokhov
0 siblings, 0 replies; 34+ messages in thread
From: Dmitry Torokhov @ 2022-11-03 4:07 UTC (permalink / raw)
To: Andrew Davis
Cc: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt,
devicetree, linux-arm-kernel, linux-kernel
Hi Andrew,
On Tue, Nov 1, 2022 at 2:59 PM Andrew Davis <afd@ti.com> wrote:
>
> 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 <afd@ti.com>
> ---
> 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(-)
>
> diff --git a/arch/arm/boot/dts/nspire-clp.dts b/arch/arm/boot/dts/nspire-clp.dts
> index f52f38c615886..916ede0c2499c 100644
> --- a/arch/arm/boot/dts/nspire-clp.dts
> +++ b/arch/arm/boot/dts/nspire-clp.dts
> @@ -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)
Can this also be switched over to using KEY_* macros to describe the
keycodes emitted?
Thanks.
--
Dmitry
_______________________________________________
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] 34+ messages in thread
* Re: [PATCH v4 7/9] ARM: dts: nspire: Use MATRIX_KEY macro for linux,keymap
2022-11-03 4:07 ` Dmitry Torokhov
@ 2022-11-03 16:29 ` Andrew Davis
-1 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-03 16:29 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt,
devicetree, linux-arm-kernel, linux-kernel
On 11/2/22 11:07 PM, Dmitry Torokhov wrote:
> Hi Andrew,
>
> On Tue, Nov 1, 2022 at 2:59 PM Andrew Davis <afd@ti.com> wrote:
>>
>> 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 <afd@ti.com>
>> ---
>> 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(-)
>>
>> diff --git a/arch/arm/boot/dts/nspire-clp.dts b/arch/arm/boot/dts/nspire-clp.dts
>> index f52f38c615886..916ede0c2499c 100644
>> --- a/arch/arm/boot/dts/nspire-clp.dts
>> +++ b/arch/arm/boot/dts/nspire-clp.dts
>> @@ -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)
>
> 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
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v4 7/9] ARM: dts: nspire: Use MATRIX_KEY macro for linux,keymap
@ 2022-11-03 16:29 ` Andrew Davis
0 siblings, 0 replies; 34+ messages in thread
From: Andrew Davis @ 2022-11-03 16:29 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Lee Jones, Rob Herring, Krzysztof Kozlowski, Arnd Bergmann,
Linus Walleij, Geert Uytterhoeven, Daniel Tang, Fabian Vogt,
devicetree, linux-arm-kernel, linux-kernel
On 11/2/22 11:07 PM, Dmitry Torokhov wrote:
> Hi Andrew,
>
> On Tue, Nov 1, 2022 at 2:59 PM Andrew Davis <afd@ti.com> wrote:
>>
>> 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 <afd@ti.com>
>> ---
>> 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(-)
>>
>> diff --git a/arch/arm/boot/dts/nspire-clp.dts b/arch/arm/boot/dts/nspire-clp.dts
>> index f52f38c615886..916ede0c2499c 100644
>> --- a/arch/arm/boot/dts/nspire-clp.dts
>> +++ b/arch/arm/boot/dts/nspire-clp.dts
>> @@ -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)
>
> 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
_______________________________________________
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] 34+ messages in thread
end of thread, other threads:[~2022-11-03 16:31 UTC | newest]
Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-01 21:57 [PATCH v4 0/9] TI-Nspire cleanups Andrew Davis
2022-11-01 21:57 ` Andrew Davis
2022-11-01 21:57 ` [PATCH v4 1/9] dt-bindings: mfd: Add TI-Nspire misc registers Andrew Davis
2022-11-01 21:57 ` Andrew Davis
2022-11-02 17:35 ` Rob Herring
2022-11-02 17:35 ` Rob Herring
2022-11-02 19:05 ` Andrew Davis
2022-11-02 19:05 ` Andrew Davis
2022-11-02 21:26 ` Rob Herring
2022-11-02 21:26 ` Rob Herring
2022-11-03 1:13 ` Andrew Davis
2022-11-03 1:13 ` Andrew Davis
2022-11-01 21:57 ` [PATCH v4 2/9] ARM: dts: nspire: Use syscon-reboot to handle restart Andrew Davis
2022-11-01 21:57 ` Andrew Davis
2022-11-01 21:57 ` [PATCH v4 3/9] ARM: dts: nspire: Fix cpu node to conform with DT binding Andrew Davis
2022-11-01 21:57 ` Andrew Davis
2022-11-01 21:57 ` [PATCH v4 4/9] ARM: dts: nspire: Fix sram " Andrew Davis
2022-11-01 21:57 ` Andrew Davis
2022-11-01 21:58 ` [PATCH v4 5/9] ARM: dts: nspire: Fix vbus_reg " Andrew Davis
2022-11-01 21:58 ` Andrew Davis
2022-11-01 21:58 ` [PATCH v4 6/9] ARM: dts: nspire: Fix uart " Andrew Davis
2022-11-01 21:58 ` Andrew Davis
2022-11-01 21:58 ` [PATCH v4 7/9] ARM: dts: nspire: Use MATRIX_KEY macro for linux,keymap Andrew Davis
2022-11-01 21:58 ` Andrew Davis
2022-11-03 4:07 ` Dmitry Torokhov
2022-11-03 4:07 ` Dmitry Torokhov
2022-11-03 16:29 ` Andrew Davis
2022-11-03 16:29 ` Andrew Davis
2022-11-01 21:58 ` [PATCH v4 8/9] ARM: nspire: Use syscon-reboot to handle restart Andrew Davis
2022-11-01 21:58 ` Andrew Davis
2022-11-01 21:58 ` [PATCH v4 9/9] ARM: nspire: Remove unused header file mmio.h Andrew Davis
2022-11-01 21:58 ` Andrew Davis
2022-11-02 12:42 ` [PATCH v4 0/9] TI-Nspire cleanups Arnd Bergmann
2022-11-02 12:42 ` Arnd Bergmann
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.